aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorIain Lane <iain.lane@canonical.com>2015-09-01 10:52:13 +0100
committerIain Lane <iain.lane@canonical.com>2015-09-01 10:52:13 +0100
commita3937830bf656d5a8e2f368757b947cef0c8b1de (patch)
tree7a965b3f4a2cf3c1ba3fd4c701cfb75e8ed397e8 /src
parentf016debfbaac39f509f5947b098c141a03a3b65f (diff)
downloadayatana-indicator-datetime-a3937830bf656d5a8e2f368757b947cef0c8b1de.tar.gz
ayatana-indicator-datetime-a3937830bf656d5a8e2f368757b947cef0c8b1de.tar.bz2
ayatana-indicator-datetime-a3937830bf656d5a8e2f368757b947cef0c8b1de.zip
Rename FileTimezone to TimedatedTimezone
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/main.cpp4
-rw-r--r--src/timezone-timedated.cpp (renamed from src/timezone-file.cpp)12
3 files changed, 9 insertions, 9 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6f27e99..f8d219a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -33,9 +33,9 @@ set (SERVICE_CXX_SOURCES
settings-live.cpp
snap.cpp
sound.cpp
- timezone-file.cpp
timezone-geoclue.cpp
timezones-live.cpp
+ timezone-timedated.cpp
utils.c
wakeup-timer-mainloop.cpp
wakeup-timer-powerd.cpp)
diff --git a/src/main.cpp b/src/main.cpp
index 460f98c..c7769c9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -31,8 +31,8 @@
#include <datetime/settings-live.h>
#include <datetime/snap.h>
#include <datetime/state.h>
-#include <datetime/timezone-file.h>
#include <datetime/timezones-live.h>
+#include <datetime/timezone-timedated.h>
#include <datetime/wakeup-timer-powerd.h>
#include <notifications/notifications.h>
@@ -128,7 +128,7 @@ main(int /*argc*/, char** /*argv*/)
textdomain(GETTEXT_PACKAGE);
auto engine = create_engine();
- auto timezone_ = std::make_shared<FileTimezone>();
+ auto timezone_ = std::make_shared<TimedatedTimezone>();
auto state = create_state(engine, timezone_);
auto actions = std::make_shared<LiveActions>(state);
MenuFactory factory(actions, state);
diff --git a/src/timezone-file.cpp b/src/timezone-timedated.cpp
index ef9d78a..778697a 100644
--- a/src/timezone-file.cpp
+++ b/src/timezone-timedated.cpp
@@ -17,7 +17,7 @@
* Charles Kerr <charles.kerr@canonical.com>
*/
-#include <datetime/timezone-file.h>
+#include <datetime/timezone-timedated.h>
#include <gio/gio.h>
@@ -32,11 +32,11 @@ namespace datetime {
****
***/
-class FileTimezone::Impl
+class TimedatedTimezone::Impl
{
public:
- Impl(FileTimezone& owner):
+ Impl(TimedatedTimezone& owner):
m_owner(owner),
m_loop(g_main_loop_new(nullptr, FALSE))
{
@@ -208,7 +208,7 @@ out:
****
***/
- FileTimezone & m_owner;
+ TimedatedTimezone & m_owner;
unsigned long m_properties_changed_id = 0;
unsigned long m_bus_watch_id = 0;
unsigned long m_timeout_id = 0;
@@ -220,12 +220,12 @@ out:
****
***/
-FileTimezone::FileTimezone():
+TimedatedTimezone::TimedatedTimezone():
impl(new Impl{*this})
{
}
-FileTimezone::~FileTimezone()
+TimedatedTimezone::~TimedatedTimezone()
{
}