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

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / public-api / controls / navigation-frame / navigation-bar-style.h

diff --git a/dali-toolkit/public-api/controls/navigation-frame/navigation-bar-style.h b/dali-toolkit/public-api/controls/navigation-frame/navigation-bar-style.h
index 31e0566..52f1d07 100644 (file)
--- a/dali-toolkit/public-api/controls/navigation-frame/navigation-bar-style.h
+++ b/dali-toolkit/public-api/controls/navigation-frame/navigation-bar-style.h
@@ -1,23 +1,24 @@
 #ifndef __DALI_TOOLKIT_NAVIGATION_BAR_STYLE_H__
 #define __DALI_TOOLKIT_NAVIGATION_BAR_STYLE_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.
-//
+/*
+ * 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.
+ * 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.
+ *
+ */
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Toolkit
@@ -104,8 +105,6 @@ namespace Toolkit
      * Constructor
      */
     NaviTitleBarStyle( Actor background,
-                       TextStyle titleTextStyle,
-                       TextStyle subtitleTextStyle,
                        int referenceWidth,
                        int height,
                        int titleHeightWithoutSubtitle,
@@ -119,7 +118,6 @@ namespace Toolkit
                        int buttonBottomMargin,
                        int gapBetweenButtons )
     : BasicNaviBarStyle( background, referenceWidth, height),
-      titleTextStyle( titleTextStyle ), subtitleTextStyle( subtitleTextStyle ),
       titleHeightWithoutSubtitle( titleHeightWithoutSubtitle ),
       titleHeightWithSubtitle( titleHeightWithSubtitle ), subtitleHeight( subtitleHeight ),
       titleLeftMargin( titleLeftMargin ), titleBottomMargin( titleBottomMargin ),
@@ -129,8 +127,6 @@ namespace Toolkit
     {
     }
 
-    TextStyle titleTextStyle;               ///< the text style of the tile text
-    TextStyle subtitleTextStyle;            ///< the text style of the subtitle text
     int   titleHeightWithoutSubtitle;       ///< the height of the title when no subtitle exists
     int   titleHeightWithSubtitle;          ///< the height of the title when there is subtitle below
     int   subtitleHeight;                   ///< the height of the subtitle