Moved ECore specific virtual-keyboard out of 'common'

Change-Id: Ia0789f1c726ced719f845312ffdedeb6afe84d18

diff --git a/adaptors/common/file.list b/adaptors/common/file.list
index b30b3fe..8d947b3 100644 (file)
--- a/adaptors/common/file.list
+++ b/adaptors/common/file.list
@@ -29,7 +29,6 @@ adaptor_common_internal_src_files = \
   $(adaptor_common_dir)/style-monitor-impl.cpp \
   $(adaptor_common_dir)/trigger-event.cpp \
   $(adaptor_common_dir)/trigger-event-factory.cpp \
-  $(adaptor_common_dir)/virtual-keyboard-impl.cpp \
   $(adaptor_common_dir)/key-impl.cpp \
   \
   $(adaptor_common_dir)/events/gesture-manager.cpp \

diff --git a/adaptors/common/virtual-keyboard-impl.h b/adaptors/common/virtual-keyboard-impl.h
index 6acd185..b0bc55b 100644 (file)
--- a/adaptors/common/virtual-keyboard-impl.h
+++ b/adaptors/common/virtual-keyboard-impl.h
@@ -2,7 +2,7 @@
 #define __DALI_INTERNAL_VIRTUAL_KEYBOARD_H__
 
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,9 +18,6 @@
  *
  */
 
-// EXTERNAL INCLUDES
-#include <Ecore_IMF.h>
-
 // INTERNAL INCLUDES
 #include <virtual-keyboard.h>
 
@@ -40,20 +37,6 @@ namespace VirtualKeyboard
 {
 
 /**
- * Connect the virtual keyboard callbacks.
- * To get the virtual keyboard callbacks then you have to connect these callback.
- * If you don't connect callbacks, you can't get virtual keyboard signals.
- * The signals are StatusChangedSignal, ResizedSignal and LanguageChangedSignal.
- */
-void ConnectCallbacks( Ecore_IMF_Context *imfContext );
-
-/**
- * Disconnect the virtual keyboard callbacks.
- * The signals are StatusChangedSignal, ResizedSignal and LanguageChangedSignal.
- */
-void DisconnectCallbacks( Ecore_IMF_Context *imfContext );
-
-/**
  * @copydoc Dali::VirtualKeyboard::Show()
  */
 void Show();

diff --git a/adaptors/common/virtual-keyboard-impl.cpp b/adaptors/ecore/common/ecore-virtual-keyboard.cpp
similarity index 98%
rename from adaptors/common/virtual-keyboard-impl.cpp
rename to adaptors/ecore/common/ecore-virtual-keyboard.cpp
index df521d1..1bcfca8 100644 (file)
--- a/adaptors/common/virtual-keyboard-impl.cpp
+++ b/adaptors/ecore/common/ecore-virtual-keyboard.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
+#include "ecore-virtual-keyboard.h"
 #include <adaptor.h>
 #include <locale-utils.h>
 #include <imf-manager-impl.h>

diff --git a/adaptors/ecore/common/ecore-virtual-keyboard.h b/adaptors/ecore/common/ecore-virtual-keyboard.h
new file mode 100644 (file)
index 0000000..c0ecd7a
--- /dev/null
+++ b/adaptors/ecore/common/ecore-virtual-keyboard.h
@@ -0,0 +1,64 @@
+#ifndef __DALI_INTERNAL_ECORE_VIRTUAL_KEYBOARD_H__
+#define __DALI_INTERNAL_ECORE_VIRTUAL_KEYBOARD_H__
+
+/*
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <Ecore_IMF.h>
+
+// INTERNAL INCLUDES
+#include <virtual-keyboard.h>
+
+namespace Dali
+{
+
+namespace Internal
+{
+
+namespace Adaptor
+{
+
+/**
+ * Implementation of the virtual keyboard namespace
+ */
+namespace VirtualKeyboard
+{
+
+/**
+ * Connect the virtual keyboard callbacks.
+ * To get the virtual keyboard callbacks then you have to connect these callback.
+ * If you don't connect callbacks, you can't get virtual keyboard signals.
+ * The signals are StatusChangedSignal, ResizedSignal and LanguageChangedSignal.
+ */
+void ConnectCallbacks( Ecore_IMF_Context *imfContext );
+
+/**
+ * Disconnect the virtual keyboard callbacks.
+ * The signals are StatusChangedSignal, ResizedSignal and LanguageChangedSignal.
+ */
+void DisconnectCallbacks( Ecore_IMF_Context *imfContext );
+
+} // namespace VirtualKeyboard
+
+} // namespace Adaptor
+
+} // namespace Internal
+
+} // namespace Dali
+
+#endif // __DALI_INTERNAL_ECORE_VIRTUAL_KEYBOARD_H__

diff --git a/adaptors/ecore/common/file.list b/adaptors/ecore/common/file.list
new file mode 100644 (file)
index 0000000..d07a8d4
--- /dev/null
+++ b/adaptors/ecore/common/file.list
@@ -0,0 +1,4 @@
+# ECore Common
+
+adaptor_ecore_common_internal_src_files = \
+  $(adaptor_ecore_common_dir)/ecore-virtual-keyboard.cpp

diff --git a/adaptors/x11/imf-manager-impl-x.cpp b/adaptors/x11/imf-manager-impl-x.cpp
index bd1bb16..ec24338 100644 (file)
--- a/adaptors/x11/imf-manager-impl-x.cpp
+++ b/adaptors/x11/imf-manager-impl-x.cpp
@@ -29,6 +29,7 @@
 #include <adaptor-impl.h>
 #include <singleton-service-impl.h>
 #include <virtual-keyboard-impl.h>
+#include "ecore-virtual-keyboard.h"
 
 namespace Dali
 {

diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am
index 6cdfa75..a05c81c 100644 (file)
--- a/build/tizen/adaptor/Makefile.am
+++ b/build/tizen/adaptor/Makefile.am
@@ -40,6 +40,10 @@ include ../../../adaptors/integration-api/file.list
 adaptor_common_dir = ../../../adaptors/common
 include ../../../adaptors/common/file.list
 
+# ECore Common
+adaptor_ecore_common_dir = ../../../adaptors/ecore/common
+include ../../../adaptors/ecore/common/file.list
+
 # Wayland
 if WAYLAND
 adaptor_wayland_dir = ../../../adaptors/wayland
@@ -94,6 +98,7 @@ if COMMON_PROFILE
 
 adaptor_internal_src_files = $(adaptor_common_internal_src_files) \
                              $(adaptor_common_internal_default_profile_src_files) \
+                             $(adaptor_ecore_common_internal_src_files) \
                              $(adaptor_tizen_internal_src_files) \
                              $(static_libraries_libunibreak_src_files)
 
@@ -112,6 +117,7 @@ if UBUNTU_PROFILE
 
 adaptor_internal_src_files = $(adaptor_common_internal_src_files) \
                              $(adaptor_common_internal_default_profile_src_files) \
+                             $(adaptor_ecore_common_internal_src_files) \
                              $(adaptor_ubuntu_internal_src_files) \
                              $(adaptor_x11_ubuntu_internal_src_files) \
                              $(adaptor_x11_internal_default_profile_src_files) \
@@ -125,6 +131,7 @@ if MOBILE_PROFILE
 
 adaptor_internal_src_files = $(adaptor_common_internal_src_files) \
                              $(adaptor_common_internal_mobile_profile_src_files) \
+                             $(adaptor_ecore_common_internal_src_files) \
                              $(adaptor_tizen_internal_src_files) \
                              $(static_libraries_libunibreak_src_files)
 
@@ -141,6 +148,7 @@ if WEARABLE_PROFILE
 
 adaptor_internal_src_files = $(adaptor_common_internal_src_files) \
                              $(adaptor_common_internal_mobile_profile_src_files) \
+                             $(adaptor_ecore_common_internal_src_files) \
                              $(adaptor_tizen_internal_src_files) \
                              $(static_libraries_libunibreak_src_files)
 if WAYLAND
@@ -157,6 +165,7 @@ if TV_PROFILE
 
 adaptor_internal_src_files = $(adaptor_common_internal_src_files) \
                              $(adaptor_common_internal_tv_profile_src_files) \
+                             $(adaptor_ecore_common_internal_src_files) \
                              $(adaptor_tizen_internal_src_files) \
                              $(static_libraries_libunibreak_src_files)
 if WAYLAND
@@ -222,10 +231,12 @@ libdali_adaptor_la_includes = \
 
 if WAYLAND
 libdali_adaptor_la_includes += \
+                      -I../../../adaptors/ecore/common \
                       -I../../../adaptors/wayland \
                       -I../../../adaptors/integration-api/wayland
 else
 libdali_adaptor_la_includes += \
+                      -I../../../adaptors/ecore/common \
                       -I../../../adaptors/x11 \
                       -I../../../adaptors/integration-api/x11
 endif