projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update copyright year to 2015 for public api: toolkit
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
popup
/
popup.cpp
diff --git
a/dali-toolkit/public-api/controls/popup/popup.cpp
b/dali-toolkit/public-api/controls/popup/popup.cpp
index
1e37523
..
5c851b7
100644
(file)
--- a/
dali-toolkit/public-api/controls/popup/popup.cpp
+++ b/
dali-toolkit/public-api/controls/popup/popup.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
4
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
5
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-15,7
+15,10
@@
*
*/
*
*/
+// CLASS HEADER
#include <dali-toolkit/public-api/controls/popup/popup.h>
#include <dali-toolkit/public-api/controls/popup/popup.h>
+
+// INTERNAL INCLUDES
#include <dali-toolkit/internal/controls/popup/popup-impl.h>
#include <dali-toolkit/public-api/controls/buttons/button.h>
#include <dali-toolkit/internal/controls/popup/popup-impl.h>
#include <dali-toolkit/public-api/controls/buttons/button.h>
@@
-84,12
+87,7
@@
void Popup::SetTitle( const std::string& text )
GetImpl(*this).SetTitle( text );
}
GetImpl(*this).SetTitle( text );
}
-void Popup::SetTitle( TextView titleActor )
-{
- GetImpl(*this).SetTitle( titleActor );
-}
-
-TextView Popup::GetTitle() const
+std::string Popup::GetTitle() const
{
return GetImpl(*this).GetTitle();
}
{
return GetImpl(*this).GetTitle();
}