remove mmi-common.h and move those contents to mmi.h

Those definition can be expose to app developer.
So, combine codes at one header file.
After that, replace using mmi-common.h to mmi.h.

Change-Id: Ibece423364b002f359de6ec9c8cd52e1eeff9928

diff --git a/src/meson.build b/src/meson.build
index aea3c8b..7803d2e 100644 (file)
--- a/src/meson.build
+++ b/src/meson.build
@@ -12,7 +12,6 @@ mmi_srcs = [
 
 install_headers(
        'mmi.h',
-       'mmi-common.h'
        )
 
 glib_dep = dependency('glib-2.0', method : 'pkg-config')

diff --git a/src/mmi-client.h b/src/mmi-client.h
index 5f1823a..6ff9210 100644 (file)
--- a/src/mmi-client.h
+++ b/src/mmi-client.h
@@ -24,8 +24,8 @@
 #ifndef __MMI_CLIENT_H__
 #define __MMI_CLIENT_H__
 
-#include "mmi-common.h"
 #include <glib.h>
+#include "mmi.h"
 
 typedef void* mmi_rpc_h;
 

diff --git a/src/mmi-common.h b/src/mmi-common.h
deleted file mode 100644 (file)
index 00200a1..0000000
--- a/src/mmi-common.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-* Copyright © 2021 Samsung Electronics co., Ltd. All Rights Reserved.
-*
-* Permission is hereby granted, free of charge, to any person obtaining a
-* copy of this software and associated documentation files (the "Software"),
-* to deal in the Software without restriction, including without limitation
-* the rights to use, copy, modify, merge, publish, distribute, sublicense,
-* and/or sell copies of the Software, and to permit persons to whom the
-* Software is furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice (including the next
-* paragraph) shall be included in all copies or substantial portions of the
-* Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-* DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef __MMI_COMMON_H__
-#define __MMI_COMMON_H__
-
-#include <tizen.h>
-
-#define MMI_API __attribute__ ((visibility("default")))
-
-typedef enum {
-       MMI_RESULT_NONE,
-       MMI_RESULT_FAIL,
-       MMI_RESULT_SUCCESS
-} mmi_result_e;
-
-typedef enum {
-       MMI_STATE_NONE,
-} mmi_state_e;
-
-typedef enum {
-       MMI_ERROR_NONE = TIZEN_ERROR_NONE, /**< Successful */
-       MMI_ERROR_OUT_OF_MEMORY = TIZEN_ERROR_OUT_OF_MEMORY, /**< Out of Memory */
-       MMI_ERROR_IO_ERROR = TIZEN_ERROR_IO_ERROR, /**< I/O error */
-       MMI_ERROR_INVALID_PARAMETER     = TIZEN_ERROR_INVALID_PARAMETER, /**< Invalid parameter */
-       MMI_ERROR_OUT_OF_NETWORK = TIZEN_ERROR_NETWORK_DOWN, /**< Network is down */
-       MMI_ERROR_TIMED_OUT = TIZEN_ERROR_TIMED_OUT, /**< No answer from the daemon */
-       MMI_ERROR_PERMISSION_DENIED     = TIZEN_ERROR_PERMISSION_DENIED, /**< Permission denied */
-       MMI_ERROR_NOT_SUPPORTED = TIZEN_ERROR_NOT_SUPPORTED, /**< MMI NOT supported */
-} mmi_error_e;
-
-typedef void (*result_cb)(void *user_data, int input_event_type, const char *result_out);
-
-typedef enum {
-       MMI_VOICE_TOUCH,
-       MMI_VOICE_RECOGNITION,
-} mmi_input_event_type_e;
-
-#endif //__MMI_COMMON_H__

diff --git a/src/mmi-ipc.c b/src/mmi-ipc.c
index 902cda8..0dc1d43 100644 (file)
--- a/src/mmi-ipc.c
+++ b/src/mmi-ipc.c
@@ -21,7 +21,6 @@
 * DEALINGS IN THE SOFTWARE.
 */
 
-#include "mmi.h"
 #include "mmi-ipc.h"
 #include "mmi-dbg.h"
 

diff --git a/src/mmi-ipc.h b/src/mmi-ipc.h
index 0f90d7a..7b0630e 100644 (file)
--- a/src/mmi-ipc.h
+++ b/src/mmi-ipc.h
@@ -25,7 +25,7 @@
 #define __MMI_IPC_H__
 
 #include "mmi_proxy.h"
-#include "mmi-common.h"
+#include "mmi.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/mmi.h b/src/mmi.h
index d65003f..87406d5 100644 (file)
--- a/src/mmi.h
+++ b/src/mmi.h
@@ -24,7 +24,37 @@
 #ifndef __MMI_H__
 #define __MMI_H__
 
-#include "mmi-common.h"
+#include <tizen.h>
+
+#define MMI_API __attribute__ ((visibility("default")))
+
+typedef enum {
+       MMI_RESULT_NONE,
+       MMI_RESULT_FAIL,
+       MMI_RESULT_SUCCESS
+} mmi_result_e;
+
+typedef enum {
+       MMI_STATE_NONE,
+} mmi_state_e;
+
+typedef enum {
+       MMI_ERROR_NONE = TIZEN_ERROR_NONE, /**< Successful */
+       MMI_ERROR_OUT_OF_MEMORY = TIZEN_ERROR_OUT_OF_MEMORY, /**< Out of Memory */
+       MMI_ERROR_IO_ERROR = TIZEN_ERROR_IO_ERROR, /**< I/O error */
+       MMI_ERROR_INVALID_PARAMETER     = TIZEN_ERROR_INVALID_PARAMETER, /**< Invalid parameter */
+       MMI_ERROR_OUT_OF_NETWORK = TIZEN_ERROR_NETWORK_DOWN, /**< Network is down */
+       MMI_ERROR_TIMED_OUT = TIZEN_ERROR_TIMED_OUT, /**< No answer from the daemon */
+       MMI_ERROR_PERMISSION_DENIED     = TIZEN_ERROR_PERMISSION_DENIED, /**< Permission denied */
+       MMI_ERROR_NOT_SUPPORTED = TIZEN_ERROR_NOT_SUPPORTED, /**< MMI NOT supported */
+} mmi_error_e;
+
+typedef void (*result_cb)(void *user_data, int input_event_type, const char *result_out);
+
+typedef enum {
+       MMI_VOICE_TOUCH,
+       MMI_VOICE_RECOGNITION,
+} mmi_input_event_type_e;
 
 #ifdef __cplusplus
 extern "C" {