Picked some defaults for dali-demo on Ubuntu

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / relayout-controller.h

diff --git a/dali-toolkit/internal/controls/relayout-controller.h b/dali-toolkit/internal/controls/relayout-controller.h
index dd7abca..40438b9 100644 (file)
--- a/dali-toolkit/internal/controls/relayout-controller.h
+++ b/dali-toolkit/internal/controls/relayout-controller.h
@@ -1,23 +1,25 @@
 #ifndef __DALI_TOOLKIT_INTERNAL_RELAYOUT_CONTROLLER_H__
 #define __DALI_TOOLKIT_INTERNAL_RELAYOUT_CONTROLLER_H__
 
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.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://floralicense.org/license/
-//
-// 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.
-//
-
-#include <dali/dali.h>
+/*
+ * Copyright (c) 2014 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 <dali/public-api/object/base-handle.h>
 
 namespace Dali
 {
@@ -45,24 +47,21 @@ public:
   RelayoutController();
 
   /**
-   * Virtual destructor.
-   */
-  virtual ~RelayoutController();
-
-  /**
-   * Get the singleton of RelayoutController object.
-   * @return A handle to the RelayoutController.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  static RelayoutController Get();
+  ~RelayoutController();
 
   /**
    * Request to relayout.
    */
-  void Request();
+  static void Request();
 
 private:
 
-  RelayoutController(Internal::RelayoutControllerImpl *impl);
+  RelayoutController(Internal::RelayoutControllerImpl* impl);
+
 };
 
 } // namespace Internal