diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
| commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
| tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /kioslave/remote | |
| 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/remote')
| -rw-r--r-- | kioslave/remote/kdedmodule/remotedirnotify.cpp | 4 | ||||
| -rw-r--r-- | kioslave/remote/kdedmodule/remotedirnotifymodule.cpp | 2 | ||||
| -rw-r--r-- | kioslave/remote/remoteimpl.cpp | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/kioslave/remote/kdedmodule/remotedirnotify.cpp b/kioslave/remote/kdedmodule/remotedirnotify.cpp index e6e2359a6..fa880b78b 100644 --- a/kioslave/remote/kdedmodule/remotedirnotify.cpp +++ b/kioslave/remote/kdedmodule/remotedirnotify.cpp @@ -30,10 +30,10 @@ RemoteDirNotify::RemoteDirNotify() { - KGlobal::dirs()->addResourceType("remote_entries", + TDEGlobal::dirs()->addResourceType("remote_entries", KStandardDirs::kde_default("data") + "remoteview"); - TQString path = KGlobal::dirs()->saveLocation("remote_entries"); + TQString path = TDEGlobal::dirs()->saveLocation("remote_entries"); m_baseURL.setPath(path); } diff --git a/kioslave/remote/kdedmodule/remotedirnotifymodule.cpp b/kioslave/remote/kdedmodule/remotedirnotifymodule.cpp index 894400ce2..13bfcfc29 100644 --- a/kioslave/remote/kdedmodule/remotedirnotifymodule.cpp +++ b/kioslave/remote/kdedmodule/remotedirnotifymodule.cpp @@ -30,7 +30,7 @@ RemoteDirNotifyModule::RemoteDirNotifyModule(const TQCString &obj) extern "C" { KDE_EXPORT KDEDModule *create_remotedirnotify(const TQCString &obj) { - KGlobal::locale()->insertCatalogue("kio_remote"); + TDEGlobal::locale()->insertCatalogue("kio_remote"); return new RemoteDirNotifyModule(obj); } } diff --git a/kioslave/remote/remoteimpl.cpp b/kioslave/remote/remoteimpl.cpp index 47e41b821..fbc21bfec 100644 --- a/kioslave/remote/remoteimpl.cpp +++ b/kioslave/remote/remoteimpl.cpp @@ -36,10 +36,10 @@ RemoteImpl::RemoteImpl() { - KGlobal::dirs()->addResourceType("remote_entries", + TDEGlobal::dirs()->addResourceType("remote_entries", KStandardDirs::kde_default("data") + "remoteview"); - TQString path = KGlobal::dirs()->saveLocation("remote_entries"); + TQString path = TDEGlobal::dirs()->saveLocation("remote_entries"); TQDir dir = path; if (!dir.exists()) @@ -54,7 +54,7 @@ void RemoteImpl::listRoot(TQValueList<KIO::UDSEntry> &list) const kdDebug(1220) << "RemoteImpl::listRoot" << endl; TQStringList names_found; - TQStringList dirList = KGlobal::dirs()->resourceDirs("remote_entries"); + TQStringList dirList = TDEGlobal::dirs()->resourceDirs("remote_entries"); TQStringList::ConstIterator dirpath = dirList.begin(); TQStringList::ConstIterator end = dirList.end(); @@ -89,7 +89,7 @@ bool RemoteImpl::findDirectory(const TQString &filename, TQString &directory) co { kdDebug(1220) << "RemoteImpl::findDirectory" << endl; - TQStringList dirList = KGlobal::dirs()->resourceDirs("remote_entries"); + TQStringList dirList = TDEGlobal::dirs()->resourceDirs("remote_entries"); TQStringList::ConstIterator dirpath = dirList.begin(); TQStringList::ConstIterator end = dirList.end(); |