diff options
author | Timothy Pearson <[email protected]> | 2013-01-25 00:13:26 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-25 00:13:26 -0600 |
commit | 151a9ebb248b018d3036f7da2f58f404851917d6 (patch) | |
tree | 7583d97e0a0fbed7e158846ed2b4db54152492ae /src/common/global | |
parent | bd55e01bc4764c5daa84bf46db6978d43898d619 (diff) | |
download | piklab-151a9ebb248b018d3036f7da2f58f404851917d6.tar.gz piklab-151a9ebb248b018d3036f7da2f58f404851917d6.zip |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'src/common/global')
-rw-r--r-- | src/common/global/generic_config.cpp | 4 | ||||
-rw-r--r-- | src/common/global/purl.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/common/global/generic_config.cpp b/src/common/global/generic_config.cpp index 6b50ff0..9d951aa 100644 --- a/src/common/global/generic_config.cpp +++ b/src/common/global/generic_config.cpp @@ -26,8 +26,8 @@ class GenericConfigPrivate public: GenericConfigPrivate(const TQString &group) : _group(group) {} ~GenericConfigPrivate() { kapp->config()->sync(); } - KConfig &config() { - KConfig *conf = kapp->config(); + TDEConfig &config() { + TDEConfig *conf = kapp->config(); conf->setGroup(_group); return *conf; } diff --git a/src/common/global/purl.cpp b/src/common/global/purl.cpp index c9ff16d..29da212 100644 --- a/src/common/global/purl.cpp +++ b/src/common/global/purl.cpp @@ -274,14 +274,14 @@ bool PURL::Base::exists(TQDateTime *lastModified) const if ( _url.protocol()=="http" ) return httpUrlExists(); #if !defined(NO_KDE) if (lastModified) { - KIO::UDSEntry uds; - if ( !KIO::NetAccess::stat(_url, uds, tqApp->mainWidget()) ) return false; + TDEIO::UDSEntry uds; + if ( !TDEIO::NetAccess::stat(_url, uds, tqApp->mainWidget()) ) return false; KFileItem item(uds, _url); - lastModified->setTime_t(item.time(KIO::UDS_MODIFICATION_TIME)); + lastModified->setTime_t(item.time(TDEIO::UDS_MODIFICATION_TIME)); return true; } else { // assume file exists if ioslave cannot tell... - return KIO::NetAccess::exists(_url, true, tqApp->mainWidget()); + return TDEIO::NetAccess::exists(_url, true, tqApp->mainWidget()); } #else if (lastModified) lastModified->setTime_t(0); |