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 /kicker/proxy | |
| parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
| download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kicker/proxy')
| -rw-r--r-- | kicker/proxy/appletproxy.cpp | 4 | ||||
| -rw-r--r-- | kicker/proxy/extensiondebugger.cpp | 4 | ||||
| -rw-r--r-- | kicker/proxy/extensionproxy.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/kicker/proxy/appletproxy.cpp b/kicker/proxy/appletproxy.cpp index 734c6ef8c..d6de4c39d 100644 --- a/kicker/proxy/appletproxy.cpp +++ b/kicker/proxy/appletproxy.cpp @@ -84,7 +84,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) TDEApplication a; a.disableSessionManagement(); - KGlobal::dirs()->addResourceType("applets", KStandardDirs::kde_default("data") + + TDEGlobal::dirs()->addResourceType("applets", KStandardDirs::kde_default("data") + "kicker/applets"); // setup proxy object @@ -162,7 +162,7 @@ void AppletProxy::loadApplet(const TQString& desktopFile, const TQString& config df = finfo.absFilePath(); } else { // locate desktop file - df = KGlobal::dirs()->findResource("applets", desktopFile); + df = TDEGlobal::dirs()->findResource("applets", desktopFile); } TQFile file(df); diff --git a/kicker/proxy/extensiondebugger.cpp b/kicker/proxy/extensiondebugger.cpp index a27d59321..55c832439 100644 --- a/kicker/proxy/extensiondebugger.cpp +++ b/kicker/proxy/extensiondebugger.cpp @@ -88,7 +88,7 @@ int main( int argc, char ** argv ) TDEApplication a; a.disableSessionManagement(); - KGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") + + TDEGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") + "kicker/extensions"); TQString df; @@ -109,7 +109,7 @@ int main( int argc, char ** argv ) df = finfo.absFilePath(); } else { // locate desktop file - df = KGlobal::dirs()->findResource("extensions", TQString(desktopFile)); + df = TDEGlobal::dirs()->findResource("extensions", TQString(desktopFile)); } // does the config file exist? diff --git a/kicker/proxy/extensionproxy.cpp b/kicker/proxy/extensionproxy.cpp index a2fc35ecc..23289c633 100644 --- a/kicker/proxy/extensionproxy.cpp +++ b/kicker/proxy/extensionproxy.cpp @@ -70,7 +70,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) TDEApplication a; a.disableSessionManagement(); - KGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") + + TDEGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") + "kicker/extensions"); // setup proxy object @@ -134,7 +134,7 @@ void ExtensionProxy::loadExtension(const TQCString& desktopFile, const TQCString df = finfo.absFilePath(); } else { // locate desktop file - df = KGlobal::dirs()->findResource("extensions", TQString(desktopFile)); + df = TDEGlobal::dirs()->findResource("extensions", TQString(desktopFile)); } TQFile file(df); |