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) (ignore 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 | |||
@@ -15,49 +15,49 @@ | |||
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #ifndef TIMEWIDGETIMPL_H | 21 | #ifndef TIMEWIDGETIMPL_H |
22 | #define TIMEWIDGETIMPL_H | 22 | #define TIMEWIDGETIMPL_H |
23 | 23 | ||
24 | #include <qlist.h> | 24 | #include <qlist.h> |
25 | #include <qwidget.h> | 25 | #include <qwidget.h> |
26 | 26 | ||
27 | #include "citytimebase.h" | 27 | #include "citytimebase.h" |
28 | 28 | ||
29 | const int CITIES = 6; // the number of cities... | 29 | const int CITIES = 6; // the number of cities... |
30 | 30 | ||
31 | class ZoneMap; | 31 | class ZoneMap; |
32 | 32 | ||
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: |
46 | void timerEvent( QTimerEvent* ); | 46 | void timerEvent( QTimerEvent* ); |
47 | void mousePressEvent( QMouseEvent* event ); | 47 | void mousePressEvent( QMouseEvent* event ); |
48 | 48 | ||
49 | private: | 49 | private: |
50 | void showTime( void ); // get and show the time for various places... | 50 | void showTime( void ); // get and show the time for various places... |
51 | void readInTimes( void ); // a method to get information from the config | 51 | void readInTimes( void ); // a method to get information from the config |
52 | QString strRealTz; // save the TZ var | 52 | QString strRealTz; // save the TZ var |
53 | QString nameRealTz; // and what it is called | 53 | QString nameRealTz; // and what it is called |
54 | QString strHome; // the home variable... | 54 | QString strHome; // the home variable... |
55 | bool bAdded; // a flag to indicate things have been added... | 55 | bool bAdded; // a flag to indicate things have been added... |
56 | bool bWhichClock; | 56 | bool bWhichClock; |
57 | int timerId; | 57 | int timerId; |
58 | 58 | ||
59 | 59 | ||
60 | QWidget* selWidget; | 60 | QWidget* selWidget; |
61 | // a spot to hold the time zone for each city | 61 | // a spot to hold the time zone for each city |
62 | QString strCityTz[CITIES]; | 62 | QString strCityTz[CITIES]; |
63 | QList<QToolButton> listCities; | 63 | QList<QToolButton> listCities; |