Merge "Changed 'virtual' function override declarations to 'override' in automated...

[platform/core/uifw/dali-adaptor.git] / dali / public-api / adaptor-framework / widget-impl.h

diff --git a/dali/public-api/adaptor-framework/widget-impl.h b/dali/public-api/adaptor-framework/widget-impl.h
index c7e6979..18299d9 100644 (file)
--- a/dali/public-api/adaptor-framework/widget-impl.h
+++ b/dali/public-api/adaptor-framework/widget-impl.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_WIDGET_H
 
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 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,10 +24,10 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/adaptor-framework/widget.h>
+#include <dali/public-api/adaptor-framework/window.h>
 
 namespace Dali
 {
-class Window;
 
 /**
  * @addtogroup dali_adaptor_framework
@@ -56,7 +56,7 @@ typedef IntrusivePtr<Widget> WidgetPtr;
  *
  * @SINCE_1_3_5
  */
-class DALI_IMPORT_API Widget : public BaseObject, public ConnectionTrackerInterface
+class DALI_ADAPTOR_API Widget : public BaseObject, public ConnectionTrackerInterface
 {
 public:
 
@@ -120,12 +120,12 @@ public:
   /**
    * @copydoc ConnectionTrackerInterface::SignalConnected
    */
-  virtual void SignalConnected( SlotObserver* slotObserver, CallbackBase* callback );
+  void SignalConnected( SlotObserver* slotObserver, CallbackBase* callback ) override;
 
   /**
    * @copydoc ConnectionTrackerInterface::SignalDisconnected
    */
-  virtual void SignalDisconnected( SlotObserver* slotObserver, CallbackBase* callback );
+  void SignalDisconnected( SlotObserver* slotObserver, CallbackBase* callback ) override;
 
   /**
    * @brief Set content info to WidgetView.
@@ -175,7 +175,7 @@ private:
  * @return Implementation
  * @pre handle is initialized and points to a widget
  */
-DALI_IMPORT_API Internal::Adaptor::Widget& GetImplementation( Dali::Widget& widget );
+DALI_ADAPTOR_API Internal::Adaptor::Widget& GetImplementation( Dali::Widget& widget );
 
 /**
  * @brief Gets implementation from the handle.
@@ -185,7 +185,7 @@ DALI_IMPORT_API Internal::Adaptor::Widget& GetImplementation( Dali::Widget& widg
  * @return Implementation
  * @pre Handle is initialized and points to a widget.
  */
-DALI_IMPORT_API const Internal::Adaptor::Widget& GetImplementation( const Dali::Widget& widget );
+DALI_ADAPTOR_API const Internal::Adaptor::Widget& GetImplementation( const Dali::Widget& widget );
 
 } // namespace Adaptor