From 79b21d47bce1ee428affc97534cd8b257232a871 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:43:14 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- twin/clients/default/config/config.cpp | 2 +- twin/clients/default/kdedefault.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'twin/clients/default') diff --git a/twin/clients/default/config/config.cpp b/twin/clients/default/config/config.cpp index eac4ef4e4..43302b552 100644 --- a/twin/clients/default/config/config.cpp +++ b/twin/clients/default/config/config.cpp @@ -32,7 +32,7 @@ extern "C" KDEDefaultConfig::KDEDefaultConfig( KConfig* conf, TQWidget* parent ) : TQObject( parent ) { - KGlobal::locale()->insertCatalogue("twin_clients"); + TDEGlobal::locale()->insertCatalogue("twin_clients"); highcolor = TQPixmap::defaultDepth() > 8; gb = new TQVBox( parent ); gb->setSpacing( KDialog::spacingHint() ); diff --git a/twin/clients/default/kdedefault.cpp b/twin/clients/default/kdedefault.cpp index c3be60c80..3c8ce2365 100644 --- a/twin/clients/default/kdedefault.cpp +++ b/twin/clients/default/kdedefault.cpp @@ -192,7 +192,7 @@ bool KDEDefaultHandler::reset( unsigned long changed ) unsigned long KDEDefaultHandler::readConfig( bool update ) { unsigned long changed = 0; - KConfig* conf = KGlobal::config(); + KConfig* conf = TDEGlobal::config(); conf->setGroup("KDEDefault"); bool new_showGrabBar = conf->readBoolEntry("ShowGrabBar", true); -- cgit v1.2.1