X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=base%2Fdali-toolkit%2Fpublic-api%2Fcontrols%2Fpopup%2Fpopup.cpp;h=d3a8187666aed912fafa379367764492abe45680;hb=refs%2Fchanges%2F02%2F34702%2F2;hp=d36c1e5d401d5f8d3dbcfb323f97407828b62e17;hpb=30f6ca1e541089b19f2b349a8a12d8a5bcaf2f9e;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/base/dali-toolkit/public-api/controls/popup/popup.cpp b/base/dali-toolkit/public-api/controls/popup/popup.cpp
index d36c1e5..d3a8187 100644
--- a/base/dali-toolkit/public-api/controls/popup/popup.cpp
+++ b/base/dali-toolkit/public-api/controls/popup/popup.cpp
@@ -1,18 +1,19 @@
-//
-// 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) 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.
+ *
+ */
 
 #include <dali-toolkit/public-api/controls/popup/popup.h>
 #include <dali-toolkit/internal/controls/popup/popup-impl.h>
@@ -136,12 +137,12 @@ void Popup::HideTail()
   GetImpl(*this).HideTail();
 }
 
-Popup::TouchedOutsideSignalV2& Popup::OutsideTouchedSignal()
+Popup::TouchedOutsideSignalType& Popup::OutsideTouchedSignal()
 {
   return GetImpl(*this).OutsideTouchedSignal();
 }
 
-Popup::HiddenSignalV2& Popup::HiddenSignal()
+Popup::HiddenSignalType& Popup::HiddenSignal()
 {
   return GetImpl(*this).HiddenSignal();
 }