diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
| commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
| tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /kioslave/system | |
| parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
| download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kioslave/system')
| -rw-r--r-- | kioslave/system/kdedmodule/systemdirnotify.cpp | 4 | ||||
| -rw-r--r-- | kioslave/system/kdedmodule/systemdirnotifymodule.cpp | 2 | ||||
| -rw-r--r-- | kioslave/system/systemimpl.cpp | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/kioslave/system/kdedmodule/systemdirnotify.cpp b/kioslave/system/kdedmodule/systemdirnotify.cpp index 4f703efd6..3a6f029e6 100644 --- a/kioslave/system/kdedmodule/systemdirnotify.cpp +++ b/kioslave/system/kdedmodule/systemdirnotify.cpp @@ -41,11 +41,11 @@ void SystemDirNotify::init() printf("[systemdirnotify] SystemDirNotify::init(mInited)"); return; mInited = true; - KGlobal::dirs()->addResourceType("system_entries", + TDEGlobal::dirs()->addResourceType("system_entries", KStandardDirs::kde_default("data") + "systemview"); TQStringList names_found; - TQStringList dirList = KGlobal::dirs()->resourceDirs("system_entries"); + TQStringList dirList = TDEGlobal::dirs()->resourceDirs("system_entries"); TQStringList::ConstIterator dirpath = dirList.begin(); TQStringList::ConstIterator end = dirList.end(); diff --git a/kioslave/system/kdedmodule/systemdirnotifymodule.cpp b/kioslave/system/kdedmodule/systemdirnotifymodule.cpp index b89daf129..64e8c8d62 100644 --- a/kioslave/system/kdedmodule/systemdirnotifymodule.cpp +++ b/kioslave/system/kdedmodule/systemdirnotifymodule.cpp @@ -30,7 +30,7 @@ SystemDirNotifyModule::SystemDirNotifyModule(const TQCString &obj) extern "C" { KDE_EXPORT KDEDModule *create_systemdirnotify(const TQCString &obj) { - KGlobal::locale()->insertCatalogue("kio_system"); + TDEGlobal::locale()->insertCatalogue("kio_system"); return new SystemDirNotifyModule(obj); } } diff --git a/kioslave/system/systemimpl.cpp b/kioslave/system/systemimpl.cpp index 43792f8de..24d7776bf 100644 --- a/kioslave/system/systemimpl.cpp +++ b/kioslave/system/systemimpl.cpp @@ -33,7 +33,7 @@ SystemImpl::SystemImpl() : TQObject() { - KGlobal::dirs()->addResourceType("system_entries", + TDEGlobal::dirs()->addResourceType("system_entries", KStandardDirs::kde_default("data") + "systemview"); } @@ -42,7 +42,7 @@ bool SystemImpl::listRoot(TQValueList<KIO::UDSEntry> &list) kdDebug() << "SystemImpl::listRoot" << endl; TQStringList names_found; - TQStringList dirList = KGlobal::dirs()->resourceDirs("system_entries"); + TQStringList dirList = TDEGlobal::dirs()->resourceDirs("system_entries"); TQStringList::ConstIterator dirpath = dirList.begin(); TQStringList::ConstIterator end = dirList.end(); @@ -114,7 +114,7 @@ bool SystemImpl::statByName(const TQString &filename, KIO::UDSEntry& entry) { kdDebug() << "SystemImpl::statByName" << endl; - TQStringList dirList = KGlobal::dirs()->resourceDirs("system_entries"); + TQStringList dirList = TDEGlobal::dirs()->resourceDirs("system_entries"); TQStringList::ConstIterator dirpath = dirList.begin(); TQStringList::ConstIterator end = dirList.end(); @@ -147,7 +147,7 @@ KURL SystemImpl::findBaseURL(const TQString &filename) const { kdDebug() << "SystemImpl::findBaseURL" << endl; - TQStringList dirList = KGlobal::dirs()->resourceDirs("system_entries"); + TQStringList dirList = TDEGlobal::dirs()->resourceDirs("system_entries"); TQStringList::ConstIterator dirpath = dirList.begin(); TQStringList::ConstIterator end = dirList.end(); |