Remove dependency to std::vector and property::value from property notification API

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / navigation-frame / navigation-title-bar.h

diff --git a/dali-toolkit/internal/controls/navigation-frame/navigation-title-bar.h b/dali-toolkit/internal/controls/navigation-frame/navigation-title-bar.h
index 35cdfd3..c8200ed 100644 (file)
--- a/dali-toolkit/internal/controls/navigation-frame/navigation-title-bar.h
+++ b/dali-toolkit/internal/controls/navigation-frame/navigation-title-bar.h
@@ -1,28 +1,29 @@
 #ifndef __DALI_TOOLKIT_INTERNAL_NAVIGATION_TITLE_BAR_H__
 #define __DALI_TOOLKIT_INTERNAL_NAVIGATION_TITLE_BAR_H__
 
 #ifndef __DALI_TOOLKIT_INTERNAL_NAVIGATION_TITLE_BAR_H__
 #define __DALI_TOOLKIT_INTERNAL_NAVIGATION_TITLE_BAR_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.
+ *
+ */
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/controls/navigation-frame/page.h>

 #include <dali-toolkit/public-api/controls/table-view/table-view.h>
 #include <dali-toolkit/public-api/controls/table-view/table-view.h>

-#include <dali-toolkit/public-api/controls/text-view/text-view.h>
+#include <dali-toolkit/public-api/controls/text-controls/text-label.h>

 #include <dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h>
 #include <dali-toolkit/internal/controls/navigation-frame/navigation-bar.h>
 #include <dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h>
 #include <dali-toolkit/internal/controls/navigation-frame/navigation-bar.h>

-#include <dali-toolkit/public-api/controls/navigation-frame/page.h>

 
 namespace Dali
 {
 
 namespace Dali
 {


@@ -80,8 +81,8 @@ private:
   Toolkit::TableView mTitleLayout;
   Toolkit::TableView mTitleIconLayout;
 
   Toolkit::TableView mTitleLayout;
   Toolkit::TableView mTitleIconLayout;
 

-  Toolkit::TextView  mTitle;
-  Toolkit::TextView  mSubTitle;
+  Toolkit::TextLabel  mTitle;
+  Toolkit::TextLabel  mSubTitle;

 
 };
 
 
 };