summaryrefslogtreecommitdiffstats
path: root/kcm_gtk/kcmgtk.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-24 13:19:07 -0600
committerTimothy Pearson <[email protected]>2013-01-24 13:19:07 -0600
commit96c62f7e356a2d63acc8edb149821a677c4d1bc8 (patch)
treee6549a07dbce048a964c3cdd888f02b66a5ee593 /kcm_gtk/kcmgtk.cpp
parenta997a80f3fe3f007a4faa825c65cb65848b6251b (diff)
downloadgtk-qt-engine-96c62f7e356a2d63acc8edb149821a677c4d1bc8.tar.gz
gtk-qt-engine-96c62f7e356a2d63acc8edb149821a677c4d1bc8.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kcm_gtk/kcmgtk.cpp')
-rw-r--r--kcm_gtk/kcmgtk.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/kcm_gtk/kcmgtk.cpp b/kcm_gtk/kcmgtk.cpp
index 2a39d6d..3e42a0a 100644
--- a/kcm_gtk/kcmgtk.cpp
+++ b/kcm_gtk/kcmgtk.cpp
@@ -57,7 +57,7 @@
#include "mozillaprofile.h"
const TQString KcmGtk::GTK_RC_FILE(".gtkrc-2.0-kde-kde4");
-const TQString KcmGtk::KDE_RC_DIR(KGlobal::dirs()->localtdedir() + "/env/");
+const TQString KcmGtk::KDE_RC_DIR(TDEGlobal::dirs()->localtdedir() + "/env/");
const TQString KcmGtk::GTK_TQT_RC_FILE("gtk-qt-engine.rc.sh");
const TQString KcmGtk::GTK3_INI_DIR(TQDir::homeDirPath() + "/.config/gtk-3.0/");
@@ -70,7 +70,7 @@ extern "C"
{
KCModule *create_kcmgtk( TQWidget * parent, const char * name )
{
- KGlobal::locale()->insertCatalogue( "gtkqtengine" );
+ TDEGlobal::locale()->insertCatalogue( "gtkqtengine" );
return new KcmGtk( parent, "kcmgtk" );
}
}
@@ -165,7 +165,7 @@ KcmGtk::KcmGtk(TQWidget *parent, const char *name, const TQStringList&)
emacsDetailsDialog(NULL),
searchPathsDialog(NULL)
{
- KGlobal::locale()->insertCatalogue("gtkqtengine");
+ TDEGlobal::locale()->insertCatalogue("gtkqtengine");
config = new KConfig("kcmgtkrc");
@@ -565,7 +565,7 @@ void KcmGtk::firefoxFixClicked()
w->profilesList->header()->hide();
w->profilesList->hideColumn(1);
- TQPixmap icon = KGlobal::iconLoader()->loadIcon("kuser", KIcon::Small);
+ TQPixmap icon = TDEGlobal::iconLoader()->loadIcon("kuser", KIcon::Small);
for ( TQMapIterator<TQString,TQString> it = profiles.begin(); it != profiles.end(); ++it )
{