From c22a50ecdf280e3a0fb4e80cb893bad2900d76df Mon Sep 17 00:00:00 2001
From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Tue, 23 Sep 2014 16:40:01 +0100
Subject: [PATCH] Remove Adaptor class from Public API

Change-Id: Ie166cc3225dec2eb68c2cc4cb43a3545f671337e
---
 adaptors/{public-api/adaptor-framework => common}/adaptor.cpp | 0
 adaptors/{public-api/adaptor-framework => common}/adaptor.h   | 4 ++--
 adaptors/common/file.list                                     | 1 +
 adaptors/public-api/dali.h                                    | 1 -
 adaptors/public-api/file.list                                 | 2 --
 build/tizen/adaptor/linker-test.cpp                           | 7 +------
 6 files changed, 4 insertions(+), 11 deletions(-)
 rename adaptors/{public-api/adaptor-framework => common}/adaptor.cpp (100%)
 rename adaptors/{public-api/adaptor-framework => common}/adaptor.h (99%)

diff --git a/adaptors/public-api/adaptor-framework/adaptor.cpp b/adaptors/common/adaptor.cpp
similarity index 100%
rename from adaptors/public-api/adaptor-framework/adaptor.cpp
rename to adaptors/common/adaptor.cpp
diff --git a/adaptors/public-api/adaptor-framework/adaptor.h b/adaptors/common/adaptor.h
similarity index 99%
rename from adaptors/public-api/adaptor-framework/adaptor.h
rename to adaptors/common/adaptor.h
index 1d0f00c..9200a35 100644
--- a/adaptors/public-api/adaptor-framework/adaptor.h
+++ b/adaptors/common/adaptor.h
@@ -26,7 +26,7 @@
 #include <dali/public-api/math/rect.h>
 #include <dali/public-api/events/touch-event.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali DALI_INTERNAL
 {
 
 struct DeviceLayout;
@@ -264,7 +264,7 @@ private:
   /**
    * @brief Create an uninitialized Adaptor.
    */
-  DALI_INTERNAL Adaptor();
+  Adaptor();
 
   Internal::Adaptor::Adaptor* mImpl; ///< Implementation object
   friend class Internal::Adaptor::Adaptor;
diff --git a/adaptors/common/file.list b/adaptors/common/file.list
index 91784e7..98d4cbd 100644
--- a/adaptors/common/file.list
+++ b/adaptors/common/file.list
@@ -3,6 +3,7 @@
 adaptor_common_internal_src_files = \
   $(adaptor_common_dir)/abort-handler.cpp \
   $(adaptor_common_dir)/accessibility-gesture-detector.cpp \
+  $(adaptor_common_dir)/adaptor.cpp \
   $(adaptor_common_dir)/adaptor-impl.cpp \
   $(adaptor_common_dir)/application-impl.cpp \
   $(adaptor_common_dir)/bitmap-loader-impl.cpp \
diff --git a/adaptors/public-api/dali.h b/adaptors/public-api/dali.h
index c8e7abf..6ae56ad 100644
--- a/adaptors/public-api/dali.h
+++ b/adaptors/public-api/dali.h
@@ -25,7 +25,6 @@
 #include <dali/public-api/adaptor-framework/accessibility-action-handler.h>
 #include <dali/public-api/adaptor-framework/accessibility-gesture-handler.h>
 #include <dali/public-api/adaptor-framework/accessibility-manager.h>
-#include <dali/public-api/adaptor-framework/adaptor.h>
 #include <dali/public-api/adaptor-framework/application.h>
 #include <dali/public-api/adaptor-framework/bitmap-loader.h>
 #include <dali/public-api/adaptor-framework/bitmap-saver.h>
diff --git a/adaptors/public-api/file.list b/adaptors/public-api/file.list
index 75168f2..e71adba 100644
--- a/adaptors/public-api/file.list
+++ b/adaptors/public-api/file.list
@@ -1,6 +1,5 @@
 public_api_src_files = \
   $(adaptor_public_api_dir)/adaptor-framework/accessibility-manager.cpp \
-  $(adaptor_public_api_dir)/adaptor-framework/adaptor.cpp \
   $(adaptor_public_api_dir)/adaptor-framework/application.cpp \
   $(adaptor_public_api_dir)/adaptor-framework/bitmap-loader.cpp \
   $(adaptor_public_api_dir)/adaptor-framework/bitmap-saver.cpp \
@@ -34,7 +33,6 @@ public_api_adaptor_framework_header_files = \
   $(adaptor_public_api_dir)/adaptor-framework/accessibility-action-handler.h \
   $(adaptor_public_api_dir)/adaptor-framework/accessibility-gesture-handler.h \
   $(adaptor_public_api_dir)/adaptor-framework/accessibility-manager.h \
-  $(adaptor_public_api_dir)/adaptor-framework/adaptor.h \
   $(adaptor_public_api_dir)/adaptor-framework/application.h \
   $(adaptor_public_api_dir)/adaptor-framework/bitmap-loader.h \
   $(adaptor_public_api_dir)/adaptor-framework/bitmap-saver.h \
diff --git a/build/tizen/adaptor/linker-test.cpp b/build/tizen/adaptor/linker-test.cpp
index e6bb24b..df87996 100644
--- a/build/tizen/adaptor/linker-test.cpp
+++ b/build/tizen/adaptor/linker-test.cpp
@@ -51,12 +51,7 @@ main(int argc, char **argv)
 {
   Application app = Application::New(&argc, &argv);
   LinkerApp linkerApp (app);
-
-  Adaptor& adaptor = Dali::Adaptor::Get();
-  if(adaptor.IsAvailable())
-  {
-    app.MainLoop();
-  }
+  app.MainLoop();
 
   return 0;
 }
-- 
2.7.4