diff options
author | Darrell Anderson <humanreadable@yahoo.com> | 2013-03-02 15:57:34 -0600 |
---|---|---|
committer | Darrell Anderson <humanreadable@yahoo.com> | 2013-03-02 15:57:34 -0600 |
commit | 7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f (patch) | |
tree | c76702a7f6310fbe9d437e347535422e836e94e9 /tdecore/ktimezones.h | |
parent | a2a38be7600e2a2c2b49c66902d912ca036a2c0f (diff) | |
parent | 27bbee9a5f9dcda53d8eb23863ee670ad1360e41 (diff) | |
download | tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.tar.gz tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'tdecore/ktimezones.h')
-rw-r--r-- | tdecore/ktimezones.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tdecore/ktimezones.h b/tdecore/ktimezones.h index d24e8ec10..339cbf5bf 100644 --- a/tdecore/ktimezones.h +++ b/tdecore/ktimezones.h @@ -49,7 +49,7 @@ class KTimezonesPrivate; * @author S.R.Haque <srhaque@iee.org>. */ class TDECORE_EXPORT KTimezoneSource : - public KShared + public TDEShared { public: KTimezoneSource(const TQString &db); @@ -114,7 +114,7 @@ public: * @param comment description of the timezone, if any. */ KTimezone( - KSharedPtr<KTimezoneSource> db, const TQString &name, + TDESharedPtr<KTimezoneSource> db, const TQString &name, const TQString &countryCode = TQString(), float latitude = UNKNOWN, float longitude = UNKNOWN, const TQString &comment = TQString()); ~KTimezone(); @@ -191,7 +191,7 @@ private: KTimezone(const KTimezone&); KTimezone& operator=(const KTimezone&); - KSharedPtr<KTimezoneSource> m_db; + TDESharedPtr<KTimezoneSource> m_db; TQString m_name; TQString m_countryCode; float m_latitude; |