Merge "Added an devel-API to check whether video texture is supported" into devel...

[platform/core/uifw/dali-adaptor.git] / adaptors / public-api / dali.h

diff --git a/adaptors/public-api/dali.h b/adaptors/public-api/dali.h
index b02ca11..8a37838 100644 (file)
--- a/adaptors/public-api/dali.h
+++ b/adaptors/public-api/dali.h
@@ -2,7 +2,7 @@
 #define __DALI_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.
@@ -21,51 +21,13 @@
 #include <dali/public-api/dali-core.h>
 
 // Application / UI Framework adaption
-
-// These defines come from running pkg-config --cflags with the correct package config file
-
-#if defined(DALI_LIVEBOX_PLUGIN)
-#include <dali/public-api/livebox-plugin.h>
-#endif
-
-#if defined(DALI_EVAS_PLUGIN)
-#include <dali/public-api/evas-plugin.h>
-#endif
-
-#if defined(DALI_NATIVE_BUFFER_PLUGIN)
-#include <dali/public-api/native-buffer-plugin.h>
-#endif
-
-#if defined(DALI_APPLICATION)
-#include <dali/public-api/application.h>
-#endif
-
-#include <dali/public-api/accessibility-manager.h>
-#include <dali/public-api/adaptor.h>
-#include <dali/public-api/clipboard.h>
-#include <dali/public-api/clipboard-event-notifier.h>
-#include <dali/public-api/color-controller.h>
-#include <dali/public-api/device-layout.h>
-#include <dali/public-api/drag-and-drop-detector.h>
-#include <dali/public-api/haptic-player.h>
-#include <dali/public-api/imf-manager.h>
-#include <dali/public-api/key.h>
-#include <dali/public-api/orientation.h>
-#include <dali/public-api/pixmap-image.h>
-#include <dali/public-api/render-surface.h>
-#include <dali/public-api/sound-player.h>
-#include <dali/public-api/style-change.h>
-#include <dali/public-api/style-monitor.h>
-#include <dali/public-api/timer.h>
-#include <dali/public-api/tts-player.h>
-#include <dali/public-api/virtual-keyboard.h>
-#include <dali/public-api/window.h>
-
-#include <dali/public-api/accessibility-action-handler.h>
-#include <dali/public-api/accessibility-gesture-handler.h>
-#include <dali/public-api/event-feeder.h>
-#include <dali/public-api/feedback-plugin.h>
-#include <dali/public-api/physical-keyboard.h>
-#include <dali/public-api/tilt-sensor.h>
+#include <dali/public-api/adaptor-framework/application.h>
+#include <dali/public-api/adaptor-framework/device-status.h>
+#include <dali/public-api/adaptor-framework/input-method.h>
+#include <dali/public-api/adaptor-framework/key.h>
+#include <dali/public-api/adaptor-framework/timer.h>
+#include <dali/public-api/adaptor-framework/tts-player.h>
+#include <dali/public-api/adaptor-framework/native-image-source.h>
+#include <dali/public-api/dali-adaptor-version.h>
 
 #endif //__DALI_H__