Merge remote-tracking branch 'origin/tizen' into tizen_4.0submit/tizen_4.0/20170927.132429submit/tizen_4.0/20170927.132245submit/tizen_4.0/20170927.132202

Change-Id: I6da721b14bffe2e63bf019976a08bb04ccc836af

5 files changed, 0 insertions, 31 deletions

diff --git a/src/App/src/DateTimeFormatter.cpp b/src/App/src/DateTimeFormatter.cpp
index e5ab173..0b45bf9 100644
--- a/src/App/src/DateTimeFormatter.cpp
+++ b/src/App/src/DateTimeFormatter.cpp
@@ -135,7 +135,6 @@ void DateTimeFormatter::updateDate()
 	I18nString uBestPattern(128);
 
 	i18n_udatepg_get_best_pattern(m_Gen, skeleton, skeleton.getLen(), uBestPattern, uBestPattern.getCapacity(), &bestPatternLen);
-	std::string aPattern = uBestPattern.toStr();
 	i18n_udate_create(I18N_UDATE_PATTERN, I18N_UDATE_PATTERN, m_Region.c_str(), m_TimeZoneId, -1, uBestPattern, -1, &m_Date);
 	LOG("BestPattern: ", uBestPattern.toStr());
 }
diff --git a/src/Common/inc/I18nString.h b/src/Common/inc/I18nString.h
index 3203030..441f576 100644
--- a/src/Common/inc/I18nString.h
+++ b/src/Common/inc/I18nString.h
@@ -41,7 +41,6 @@ namespace IdleClock {
 			std::string toStr() const;
 			size_t getCapacity() const;
 			void clear();
-			bool isEmpty() const;
 
 		private:
 			using Impl = std::basic_string<i18n_uchar>;
diff --git a/src/Common/inc/WatchWindow.h b/src/Common/inc/WatchWindow.h
index 54b7877..a31d5db 100644
--- a/src/Common/inc/WatchWindow.h
+++ b/src/Common/inc/WatchWindow.h
@@ -28,10 +28,6 @@ namespace IdleClock {
 
 			Evas_Object *getLayout() const;
 			void setContent(Evas_Object *content);
-			void getScreenSize(int *w, int *h) const;
-			int getRotation() const;
-			void lower();
-			void raise();
 	};
 }
 
diff --git a/src/Common/src/I18nString.cpp b/src/Common/src/I18nString.cpp
index cac4eac..1aa7d54 100644
--- a/src/Common/src/I18nString.cpp
+++ b/src/Common/src/I18nString.cpp
@@ -95,11 +95,6 @@ void I18nString::clear()
 	std::basic_string<i18n_uchar>::clear();
 }
 
-bool I18nString::isEmpty() const
-{
-	return Impl::empty();
-}
-
 void I18nString::copyStr(const I18nString &that)
 {
 	copyStr(that.getUStr());
diff --git a/src/Common/src/WatchWindow.cpp b/src/Common/src/WatchWindow.cpp
index 5c87fb6..9f93e3a 100644
--- a/src/Common/src/WatchWindow.cpp
+++ b/src/Common/src/WatchWindow.cpp
@@ -43,16 +43,6 @@ WatchWindow::~WatchWindow()
 {
 }
 
-void WatchWindow::lower()
-{
-	elm_win_lower(getEo());
-}
-
-void WatchWindow::raise()
-{
-	elm_win_raise(getEo());
-}
-
 Evas_Object *WatchWindow::getLayout() const
 {
 	return getEo();
@@ -65,13 +55,3 @@ void WatchWindow::setContent(Evas_Object *content)
 	elm_win_resize_object_add(getEo(), content);
 }
 
-void WatchWindow::getScreenSize(int *w, int *h) const
-{
-	elm_win_screen_size_get(getEo(), nullptr, nullptr, w, h);
-}
-
-int WatchWindow::getRotation() const
-{
-	return elm_win_rotation_get(getEo());
-}
-