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.cpp | |
| 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.cpp')
| -rw-r--r-- | tdecore/ktimezones.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tdecore/ktimezones.cpp b/tdecore/ktimezones.cpp index 77a0cca0f..3436cdabb 100644 --- a/tdecore/ktimezones.cpp +++ b/tdecore/ktimezones.cpp @@ -24,7 +24,7 @@ #include <kmdcodec.h> #include <kprocess.h> #include <kstringhandler.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tqdatetime.h> #include <tqfile.h> @@ -203,7 +203,7 @@ bool KTimezone::isValidLongitude(float longitude) } KTimezone::KTimezone( - KSharedPtr<KTimezoneSource> db, const TQString& name, + TDESharedPtr<KTimezoneSource> db, const TQString& name, const TQString &countryCode, float latitude, float longitude, const TQString &comment) : m_db(db), @@ -400,7 +400,7 @@ const KTimezones::ZoneMap KTimezones::allZones() "/bin/awk" << "'{print \"??\\t+9999+99999\\t\" $2}'"; // Note the use of blocking here...it is a trivial amount of data! temp.close(); - reader.start(KProcess::Block); + reader.start(TDEProcess::Block); f.setName(temp.name()); if (!temp.status() || !f.open(IO_ReadOnly)) { @@ -415,7 +415,7 @@ const KTimezones::ZoneMap KTimezones::allZones() TQTextStream str(&f); TQRegExp lineSeparator("[ \t]"); TQRegExp ordinateSeparator("[+-]"); - KSharedPtr<KTimezoneSource> db(new KTimezoneSource(m_zoneinfoDir)); + TDESharedPtr<KTimezoneSource> db(new KTimezoneSource(m_zoneinfoDir)); while (!str.atEnd()) { TQString line = str.readLine(); |