author | mickeyl <mickeyl> | 2003-11-06 10:17:45 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-11-06 10:17:45 (UTC) |
commit | 55ea6367fba8a82fbdca74599422717e4b3c3ec6 (patch) (unidiff) | |
tree | b40bb13a1b4f05b4eda61cf0c4a02e32719a70c4 /core/settings/citytime/citytime.h | |
parent | 56ad1eb7fb39ddc78026a0df096703fcf42f5a94 (diff) | |
download | opie-55ea6367fba8a82fbdca74599422717e4b3c3ec6.zip opie-55ea6367fba8a82fbdca74599422717e4b3c3ec6.tar.gz opie-55ea6367fba8a82fbdca74599422717e4b3c3ec6.tar.bz2 |
merge core/settings/*
- light-and-power and security were a bit ugly, so I recommend someone
who actually dealt with these files looking into if I got it right
(not to tell about the frustratation about the fact that the ones who
dealt with these files didn't do the merge in the first place :(
Diffstat (limited to 'core/settings/citytime/citytime.h') (more/less context) (show whitespace changes)
-rw-r--r-- | core/settings/citytime/citytime.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/settings/citytime/citytime.h b/core/settings/citytime/citytime.h index 63e3102..cc3d487 100644 --- a/core/settings/citytime/citytime.h +++ b/core/settings/citytime/citytime.h | |||
@@ -33,13 +33,13 @@ class ZoneMap; | |||
33 | class CityTime : public CityTimeBase | 33 | class CityTime : public CityTimeBase |
34 | { | 34 | { |
35 | Q_OBJECT | 35 | Q_OBJECT |
36 | public: | 36 | public: |
37 | CityTime(QWidget* parent = 0, const char *name = 0, WFlags fl = 0); | 37 | CityTime(QWidget* parent = 0, const char *name = 0, WFlags fl = 0); |
38 | ~CityTime(); | 38 | ~CityTime(); |
39 | 39 | static QString appName() { return QString::fromLatin1("citytime"); } | |
40 | public slots: | 40 | public slots: |
41 | void beginNewTz(); | 41 | void beginNewTz(); |
42 | void slotNewTz( const QString& strNewCountry, const QString& strNewCity ); | 42 | void slotNewTz( const QString& strNewCountry, const QString& strNewCity ); |
43 | void changeClock( bool newClock ); | 43 | void changeClock( bool newClock ); |
44 | 44 | ||
45 | protected: | 45 | protected: |