Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent a997a80f3f
commit 96c62f7e35

@ -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 )
{

Loading…
Cancel
Save