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 /twin | |
parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'twin')
31 files changed, 100 insertions, 100 deletions
diff --git a/twin/client.cpp b/twin/client.cpp index f421560a4..4f5d618eb 100644 --- a/twin/client.cpp +++ b/twin/client.cpp @@ -1819,25 +1819,25 @@ void Client::killProcess( bool ask, Time timestamp ) { if( machine != "localhost" ) { - KProcess proc; + TDEProcess proc; proc << "xon" << machine << "kill" << pid; - proc.start( KProcess::DontCare ); + proc.start( TDEProcess::DontCare ); } else ::kill( pid, SIGTERM ); } else { // SELI TODO handle the window created by handler specially (on top,urgent?) - process_killer = new KProcess( this ); + process_killer = new TDEProcess( this ); *process_killer << KStandardDirs::findExe( "twin_killer_helper" ) << "--pid" << TQCString().setNum( pid ) << "--hostname" << machine << "--windowname" << caption().utf8() << "--applicationname" << resourceClass() << "--wid" << TQCString().setNum( window()) << "--timestamp" << TQCString().setNum( timestamp ); - connect( process_killer, TQT_SIGNAL( processExited( KProcess* )), + connect( process_killer, TQT_SIGNAL( processExited( TDEProcess* )), TQT_SLOT( processKillerExited())); - if( !process_killer->start( KProcess::NotifyOnExit )) + if( !process_killer->start( TDEProcess::NotifyOnExit )) { delete process_killer; process_killer = NULL; @@ -1957,15 +1957,15 @@ bool Client::queryUserSuspendedResume() return false; } // FIXME We should display a busy cursor until twin_resumer_helper loads - process_resumer = new KProcess( this ); + process_resumer = new TDEProcess( this ); *process_resumer << KStandardDirs::findExe( "twin_resumer_helper" ) << "--pid" << TQCString().setNum( info->pid() ) << "--hostname" << wmClientMachine( true ) << "--windowname" << caption().utf8() << "--applicationname" << resourceClass() << "--wid" << TQCString().setNum( window()); - connect( process_resumer, TQT_SIGNAL( processExited( KProcess* )), + connect( process_resumer, TQT_SIGNAL( processExited( TDEProcess* )), TQT_SLOT( processResumerExited())); - if( !process_resumer->start( KProcess::NotifyOnExit )) + if( !process_resumer->start( TDEProcess::NotifyOnExit )) { delete process_resumer; process_resumer = NULL; diff --git a/twin/client.h b/twin/client.h index c5365b578..98efe8f8e 100644 --- a/twin/client.h +++ b/twin/client.h @@ -31,7 +31,7 @@ License. See the file "COPYING" for the exact licensing terms. #include "rules.h" class TQTimer; -class KProcess; +class TDEProcess; class KStartupInfoData; namespace KWinInternal @@ -561,8 +561,8 @@ class Client : public TQObject, public KDecorationDefines Window window_group; Layer in_layer; TQTimer* ping_timer; - KProcess* process_killer; - KProcess* process_resumer; + TDEProcess* process_killer; + TDEProcess* process_resumer; Time ping_timestamp; Time user_time; unsigned long allowed_actions; diff --git a/twin/clients/b2/config/config.cpp b/twin/clients/b2/config/config.cpp index 956f55bb4..6289ec992 100644 --- a/twin/clients/b2/config/config.cpp +++ b/twin/clients/b2/config/config.cpp @@ -33,7 +33,7 @@ extern "C" B2Config::B2Config( KConfig* conf, TQWidget* parent ) : TQObject( parent ) { - KGlobal::locale()->insertCatalogue("twin_b2_config"); + TDEGlobal::locale()->insertCatalogue("twin_b2_config"); b2Config = new KConfig("twinb2rc"); gb = new TQVBox(parent); 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); diff --git a/twin/clients/keramik/config/config.cpp b/twin/clients/keramik/config/config.cpp index 1852eadd8..a11695dd2 100644 --- a/twin/clients/keramik/config/config.cpp +++ b/twin/clients/keramik/config/config.cpp @@ -51,7 +51,7 @@ extern "C" KeramikConfig::KeramikConfig( KConfig* conf, TQWidget* parent ) : TQObject( parent ) { - KGlobal::locale()->insertCatalogue("twin_clients"); + TDEGlobal::locale()->insertCatalogue("twin_clients"); c = new KConfig( "twinkeramikrc" ); ui = new KeramikConfigUI( parent ); diff --git a/twin/clients/kwmtheme/cli_installer/main.cpp b/twin/clients/kwmtheme/cli_installer/main.cpp index 41f5dd7ca..2d944e344 100644 --- a/twin/clients/kwmtheme/cli_installer/main.cpp +++ b/twin/clients/kwmtheme/cli_installer/main.cpp @@ -57,10 +57,10 @@ int main(int argc, char **argv) return(2); } - TQStringList appDirs = KGlobal::dirs()->findDirs("data", "twin"); + TQStringList appDirs = TDEGlobal::dirs()->findDirs("data", "twin"); TQString localDirStr = *(appDirs.end()); if(localDirStr.isEmpty()){ - localDirStr = KGlobal::dirs()->saveLocation("data", "twin"); + localDirStr = TDEGlobal::dirs()->saveLocation("data", "twin"); } localDirStr += "/pics/"; if(!TQFile::exists(localDirStr)) @@ -69,7 +69,7 @@ int main(int argc, char **argv) TQFileInfo fi(f); KSimpleConfig input(fi.absFilePath()); srcStr = fi.dirPath(true) + "/"; - KConfig *output = KGlobal::config(); + KConfig *output = TDEGlobal::config(); input.setGroup("Window Border"); output->setGroup("General"); diff --git a/twin/clients/kwmtheme/kwmthemeclient.cpp b/twin/clients/kwmtheme/kwmthemeclient.cpp index e7db7c2d6..012cacc0e 100644 --- a/twin/clients/kwmtheme/kwmthemeclient.cpp +++ b/twin/clients/kwmtheme/kwmthemeclient.cpp @@ -83,7 +83,7 @@ static void create_pixmaps() return; pixmaps_created = true; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("General"); TQString tmpStr; @@ -270,7 +270,7 @@ void KWMThemeClient::init() TQBoxLayout* hb = new TQBoxLayout(0, TQBoxLayout::LeftToRight, 0, 0, 0); layout->addLayout( hb, 1, 1 ); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Buttons"); TQString val; MyButton *btn; diff --git a/twin/clients/modernsystem/config/config.cpp b/twin/clients/modernsystem/config/config.cpp index a1e417cc7..84bc23506 100644 --- a/twin/clients/modernsystem/config/config.cpp +++ b/twin/clients/modernsystem/config/config.cpp @@ -28,7 +28,7 @@ extern "C" ModernSysConfig::ModernSysConfig(KConfig* conf, TQWidget* parent) : TQObject(parent) { clientrc = new KConfig("twinmodernsysrc"); - KGlobal::locale()->insertCatalogue("twin_clients"); + TDEGlobal::locale()->insertCatalogue("twin_clients"); mainw = new TQWidget(parent); vbox = new TQVBoxLayout(mainw); vbox->setSpacing(6); diff --git a/twin/clients/plastik/config/config.cpp b/twin/clients/plastik/config/config.cpp index aa1c7bd0f..73a749bdb 100644 --- a/twin/clients/plastik/config/config.cpp +++ b/twin/clients/plastik/config/config.cpp @@ -39,7 +39,7 @@ PlastikConfig::PlastikConfig(KConfig* config, TQWidget* parent) { // create the configuration object m_config = new KConfig("twinplastikrc"); - KGlobal::locale()->insertCatalogue("twin_clients"); + TDEGlobal::locale()->insertCatalogue("twin_clients"); // create and show the configuration dialog m_dialog = new ConfigDialog(parent); diff --git a/twin/clients/quartz/config/config.cpp b/twin/clients/quartz/config/config.cpp index c4c8e5cba..31ac3b83b 100644 --- a/twin/clients/quartz/config/config.cpp +++ b/twin/clients/quartz/config/config.cpp @@ -34,7 +34,7 @@ QuartzConfig::QuartzConfig( KConfig* conf, TQWidget* parent ) : TQObject( parent ) { quartzConfig = new KConfig("twinquartzrc"); - KGlobal::locale()->insertCatalogue("twin_clients"); + TDEGlobal::locale()->insertCatalogue("twin_clients"); gb = new TQVBox( parent ); cbColorBorder = new TQCheckBox( i18n("Draw window frames using &titlebar colors"), gb ); diff --git a/twin/kcmtwin/twindecoration/buttons.cpp b/twin/kcmtwin/twindecoration/buttons.cpp index 3cf0ab78d..fc00dea9d 100644 --- a/twin/kcmtwin/twindecoration/buttons.cpp +++ b/twin/kcmtwin/twindecoration/buttons.cpp @@ -607,7 +607,7 @@ void ButtonDropSite::drawContents( TQPainter* p ) TQColor c1( 0x0A, 0x5F, 0x89 ); // KDE 2 titlebar default colour p->fillRect( r, c1 ); p->setPen( Qt::white ); - p->setFont( TQFont( KGlobalSettings::generalFont().family(), 12, TQFont::Bold) ); + p->setFont( TQFont( TDEGlobalSettings::generalFont().family(), 12, TQFont::Bold) ); p->drawText( r, AlignLeft | AlignVCenter, i18n("KDE") ); offset = geometry().width() - 3 - rightoffset; diff --git a/twin/kcmtwin/twindecoration/preview.cpp b/twin/kcmtwin/twindecoration/preview.cpp index 29d93a7f3..43555ef60 100644 --- a/twin/kcmtwin/twindecoration/preview.cpp +++ b/twin/kcmtwin/twindecoration/preview.cpp @@ -321,8 +321,8 @@ NET::WindowType KDecorationPreviewBridge::windowType( unsigned long ) const TQIconSet KDecorationPreviewBridge::icon() const { - return TQIconSet( KGlobal::iconLoader()->loadIcon( "xapp", KIcon::NoGroup, 16 ), - KGlobal::iconLoader()->loadIcon( "xapp", KIcon::NoGroup, 32 )); + return TQIconSet( TDEGlobal::iconLoader()->loadIcon( "xapp", KIcon::NoGroup, 16 ), + TDEGlobal::iconLoader()->loadIcon( "xapp", KIcon::NoGroup, 32 )); } TQString KDecorationPreviewBridge::caption() const diff --git a/twin/kcmtwin/twindecoration/twindecoration.cpp b/twin/kcmtwin/twindecoration/twindecoration.cpp index 4f9c82a21..efe46c1bc 100644 --- a/twin/kcmtwin/twindecoration/twindecoration.cpp +++ b/twin/kcmtwin/twindecoration/twindecoration.cpp @@ -399,7 +399,7 @@ KWinDecorationModule::~KWinDecorationModule() // And insert these into a DecorationInfo structure void KWinDecorationModule::findDecorations() { - TQStringList dirList = KGlobal::dirs()->findDirs("data", "twin"); + TQStringList dirList = TDEGlobal::dirs()->findDirs("data", "twin"); TQStringList::ConstIterator it; for (it = dirList.begin(); it != dirList.end(); it++) @@ -819,13 +819,13 @@ void KWinDecorationModule::writeConfig( KConfig* conf ) wmExecutableName.truncate(descStart); } if (conf->readEntry("WMExecutable", "twin") != wmExecutableName) { - KProcess newWMProc; + TDEProcess newWMProc; TQStringList wmstartupcommand; wmstartupcommand.split(" ", thirdpartyWMArguments->text()); wmstartupcommand.prepend(wmExecutableName); wmstartupcommand.append("--replace"); newWMProc << wmstartupcommand; - newWMProc.start(KProcess::DontCare, KProcess::NoCommunication); + newWMProc.start(TDEProcess::DontCare, TDEProcess::NoCommunication); newWMProc.detach(); } conf->writeEntry("WMExecutable", wmExecutableName); diff --git a/twin/kcmtwin/twinoptions/main.cpp b/twin/kcmtwin/twinoptions/main.cpp index 5b193ed5f..3c072996b 100644 --- a/twin/kcmtwin/twinoptions/main.cpp +++ b/twin/kcmtwin/twinoptions/main.cpp @@ -39,7 +39,7 @@ extern "C" KDE_EXPORT KCModule *create_twinfocus(TQWidget *parent, const char *name) { //CT there's need for decision: kwm or twin? - KGlobal::locale()->insertCatalogue("kcmkwm"); + TDEGlobal::locale()->insertCatalogue("kcmkwm"); KConfig *c = new KConfig("twinrc", false, true); return new KFocusConfig(true, c, parent, name); } @@ -47,14 +47,14 @@ extern "C" KDE_EXPORT KCModule *create_twinactions(TQWidget *parent, const char *name) { //CT there's need for decision: kwm or twin? - KGlobal::locale()->insertCatalogue("kcmkwm"); + TDEGlobal::locale()->insertCatalogue("kcmkwm"); return new KActionsOptions( parent, name); } KDE_EXPORT KCModule *create_twinmoving(TQWidget *parent, const char *name) { //CT there's need for decision: kwm or twin? - KGlobal::locale()->insertCatalogue("kcmkwm"); + TDEGlobal::locale()->insertCatalogue("kcmkwm"); KConfig *c = new KConfig("twinrc", false, true); return new KMovingConfig(true, c, parent, name); } @@ -62,7 +62,7 @@ extern "C" KDE_EXPORT KCModule *create_twinadvanced(TQWidget *parent, const char *name) { //CT there's need for decision: kwm or twin? - KGlobal::locale()->insertCatalogue("kcmkwm"); + TDEGlobal::locale()->insertCatalogue("kcmkwm"); KConfig *c = new KConfig("twinrc", false, true); return new KAdvancedConfig(true, c, parent, name); } @@ -70,7 +70,7 @@ extern "C" KDE_EXPORT KCModule *create_twintranslucency(TQWidget *parent, const char *name) { //CT there's need for decision: kwm or twin? - KGlobal::locale()->insertCatalogue("kcmkwm"); + TDEGlobal::locale()->insertCatalogue("kcmkwm"); KConfig *c = new KConfig("twinrc", false, true); return new KTranslucencyConfig(true, c, parent, name); } @@ -78,7 +78,7 @@ extern "C" KDE_EXPORT KCModule *create_twinoptions ( TQWidget *parent, const char* name) { //CT there's need for decision: kwm or twin? - KGlobal::locale()->insertCatalogue("kcmkwm"); + TDEGlobal::locale()->insertCatalogue("kcmkwm"); return new KWinOptions( parent, name); } } diff --git a/twin/kcmtwin/twinoptions/mouse.cpp b/twin/kcmtwin/twinoptions/mouse.cpp index 077df2ee4..76b4ba2f9 100644 --- a/twin/kcmtwin/twinoptions/mouse.cpp +++ b/twin/kcmtwin/twinoptions/mouse.cpp @@ -109,8 +109,8 @@ void createMaxButtonPixmaps() "..............."}, }; - TQString baseColor(". c " + KGlobalSettings::baseColor().name()); - TQString textColor("# c " + KGlobalSettings::textColor().name()); + TQString baseColor(". c " + TDEGlobalSettings::baseColor().name()); + TQString textColor("# c " + TDEGlobalSettings::textColor().name()); for (int t = 0; t < 3; ++t) { maxButtonXpms[t][0] = "15 13 2 1"; @@ -143,7 +143,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf TQString strMouseButton1, strMouseButton3, strMouseWheel; TQString txtButton1, txtButton3, txtButton4; TQStringList items; - bool leftHandedMouse = ( KGlobalSettings::mouseSettings().handed == KGlobalSettings::KMouseSettings::LeftHanded); + bool leftHandedMouse = ( TDEGlobalSettings::mouseSettings().handed == TDEGlobalSettings::KMouseSettings::LeftHanded); /** Titlebar doubleclick ************/ @@ -595,7 +595,7 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config, TQString strMouseButton1, strMouseButton3; TQString txtButton1, txtButton3; TQStringList items; - bool leftHandedMouse = ( KGlobalSettings::mouseSettings().handed == KGlobalSettings::KMouseSettings::LeftHanded); + bool leftHandedMouse = ( TDEGlobalSettings::mouseSettings().handed == TDEGlobalSettings::KMouseSettings::LeftHanded); /** Inactive inner window ******************/ diff --git a/twin/kcmtwin/twinoptions/windows.cpp b/twin/kcmtwin/twinoptions/windows.cpp index f7b5780b7..fd2152db2 100644 --- a/twin/kcmtwin/twinoptions/windows.cpp +++ b/twin/kcmtwin/twinoptions/windows.cpp @@ -1708,9 +1708,9 @@ void KTranslucencyConfig::defaults() bool KTranslucencyConfig::kompmgrAvailable() { bool ret; - KProcess proc; + TDEProcess proc; proc << "kompmgr" << "-v"; - ret = proc.start(KProcess::DontCare, KProcess::AllOutput); + ret = proc.start(TDEProcess::DontCare, TDEProcess::AllOutput); proc.detach(); return ret; } diff --git a/twin/kcmtwin/twinoptions/windows.h b/twin/kcmtwin/twinoptions/windows.h index cbce12676..4c6290a4e 100644 --- a/twin/kcmtwin/twinoptions/windows.h +++ b/twin/kcmtwin/twinoptions/windows.h @@ -238,7 +238,7 @@ private: TQCheckBox* hideUtilityWindowsForInactive; }; -class KProcess; +class TDEProcess; class KTranslucencyConfig : public KCModule { Q_OBJECT @@ -289,7 +289,7 @@ private: void startKompmgr(); void stopKompmgr(); bool kompmgrAvailable_; - KProcess *kompmgr; + TDEProcess *kompmgr; private slots: void resetKompmgr(); diff --git a/twin/kcmtwin/twinrules/kcm.cpp b/twin/kcmtwin/twinrules/kcm.cpp index d498a5e71..9b3b1676e 100644 --- a/twin/kcmtwin/twinrules/kcm.cpp +++ b/twin/kcmtwin/twinrules/kcm.cpp @@ -31,7 +31,7 @@ extern "C" KDE_EXPORT KCModule *create_twinrules( TQWidget *parent, const char *name ) { //CT there's need for decision: kwm or twin? - KGlobal::locale()->insertCatalogue( "kcmtwinrules" ); + TDEGlobal::locale()->insertCatalogue( "kcmtwinrules" ); return new KWinInternal::KCMRules( parent, name ); } diff --git a/twin/killer/killer.cpp b/twin/killer/killer.cpp index 87f4c8b50..55b3cd34b 100644 --- a/twin/killer/killer.cpp +++ b/twin/killer/killer.cpp @@ -77,9 +77,9 @@ int main( int argc, char* argv[] ) { if( hostname != "localhost" ) { - KProcess proc; + TDEProcess proc; proc << "xon" << hostname << "kill" << pid; - proc.start( KProcess::DontCare ); + proc.start( TDEProcess::DontCare ); } else ::kill( pid, SIGKILL ); diff --git a/twin/lib/kdecoration_p.cpp b/twin/lib/kdecoration_p.cpp index 1e063d099..fbf35c285 100644 --- a/twin/lib/kdecoration_p.cpp +++ b/twin/lib/kdecoration_p.cpp @@ -145,7 +145,7 @@ unsigned long KDecorationOptionsPrivate::updateKWinSettings( KConfig* config ) TQFont old_activeFontSmall = activeFontSmall; TQFont old_inactiveFontSmall = inactiveFontSmall; - TQFont activeFontGuess = KGlobalSettings::windowTitleFont(); + TQFont activeFontGuess = TDEGlobalSettings::windowTitleFont(); activeFont = config->readFontEntry("activeFont", &activeFontGuess); inactiveFont = config->readFontEntry("inactiveFont", &activeFont); diff --git a/twin/lib/kdecoration_plugins_p.cpp b/twin/lib/kdecoration_plugins_p.cpp index 644f4a63c..b680170c3 100644 --- a/twin/lib/kdecoration_plugins_p.cpp +++ b/twin/lib/kdecoration_plugins_p.cpp @@ -168,13 +168,13 @@ bool KDecorationPlugins::loadPlugin( TQString nameStr ) // For clients in tdeartwork TQString catalogue = nameStr; catalogue.replace( "twin3_", "twin_" ); - KGlobal::locale()->insertCatalogue( catalogue ); + TDEGlobal::locale()->insertCatalogue( catalogue ); // For KCommonDecoration based clients - KGlobal::locale()->insertCatalogue( "twin_lib" ); + TDEGlobal::locale()->insertCatalogue( "twin_lib" ); // For clients in tdebase - KGlobal::locale()->insertCatalogue( "twin_clients" ); + TDEGlobal::locale()->insertCatalogue( "twin_clients" ); // For clients in tdeartwork - KGlobal::locale()->insertCatalogue( "twin_art_clients" ); + TDEGlobal::locale()->insertCatalogue( "twin_art_clients" ); old_library = oldLibrary; // save for delayed destroying old_fact = oldFactory; diff --git a/twin/main.cpp b/twin/main.cpp index 4a586cce2..e9474d4f9 100644 --- a/twin/main.cpp +++ b/twin/main.cpp @@ -307,7 +307,7 @@ KDE_EXPORT int kdemain( int argc, char * argv[] ) } } - KGlobal::locale()->setMainCatalogue("twin"); + TDEGlobal::locale()->setMainCatalogue("twin"); TDEAboutData aboutData( "twin", I18N_NOOP("TWin"), version, description, TDEAboutData::License_GPL, diff --git a/twin/options.cpp b/twin/options.cpp index ea9efd01e..c78cec2d9 100644 --- a/twin/options.cpp +++ b/twin/options.cpp @@ -46,7 +46,7 @@ Options::~Options() unsigned long Options::updateSettings() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); unsigned long changed = 0; changed |= d->updateKWinSettings( config ); // read decoration settings diff --git a/twin/plugins.cpp b/twin/plugins.cpp index d514c0963..bcba27dc0 100644 --- a/twin/plugins.cpp +++ b/twin/plugins.cpp @@ -20,7 +20,7 @@ namespace KWinInternal { PluginMgr::PluginMgr() - : KDecorationPlugins( KGlobal::config()) + : KDecorationPlugins( TDEGlobal::config()) { defaultPlugin = (TQPixmap::defaultDepth() > 8) ? "twin3_plastik" : "twin3_quartz"; diff --git a/twin/popupinfo.cpp b/twin/popupinfo.cpp index 5f75adfbc..ea05dae04 100644 --- a/twin/popupinfo.cpp +++ b/twin/popupinfo.cpp @@ -116,7 +116,7 @@ void PopupInfo::hide() void PopupInfo::reconfigure() { - KConfig * c(KGlobal::config()); + KConfig * c(TDEGlobal::config()); c->setGroup("PopupInfo"); m_show = c->readBoolEntry("ShowPopup", false ); m_delayTime = c->readNumEntry("PopupHideDelay", 350 ); diff --git a/twin/tabbox.cpp b/twin/tabbox.cpp index 4f5a19364..b66e0df71 100644 --- a/twin/tabbox.cpp +++ b/twin/tabbox.cpp @@ -667,7 +667,7 @@ void TabBox::hide() void TabBox::reconfigure() { - KConfig * c(KGlobal::config()); + KConfig * c(TDEGlobal::config()); c->setGroup("TabBox"); options_traverse_all = c->readBoolEntry("TraverseAll", false ); } @@ -692,7 +692,7 @@ void TabBox::reconfigure() */ void TabBox::delayedShow() { - KConfig * c(KGlobal::config()); + KConfig * c(TDEGlobal::config()); c->setGroup("TabBox"); bool delay = c->readBoolEntry("ShowDelay", true); @@ -1060,8 +1060,8 @@ void Workspace::CDEWalkThroughWindows( bool forward ) Client* nc = c; bool options_traverse_all; { - KConfigGroupSaver saver( KGlobal::config(), "TabBox" ); - options_traverse_all = KGlobal::config()->readBoolEntry("TraverseAll", false ); + KConfigGroupSaver saver( TDEGlobal::config(), "TabBox" ); + options_traverse_all = TDEGlobal::config()->readBoolEntry("TraverseAll", false ); } Client* firstClient = 0; diff --git a/twin/twinbindings.cpp b/twin/twinbindings.cpp index f1c47cda0..5e468d34b 100644 --- a/twin/twinbindings.cpp +++ b/twin/twinbindings.cpp @@ -160,7 +160,7 @@ DEF( I18N_NOOP("Desktop Screenshot"), CTRL+Qt::Key_Print, WIN+Qt::Key_Print, slotGrabDesktop() ); #ifdef IN_KWIN { - KGlobalAccel* keys = disable_shortcuts_keys; + TDEGlobalAccel* keys = disable_shortcuts_keys; #endif DEF( I18N_NOOP("Block Global Shortcuts"), 0, 0, slotDisableGlobalShortcuts()); #ifdef IN_KWIN diff --git a/twin/useractions.cpp b/twin/useractions.cpp index 37001bd93..09e93b27f 100644 --- a/twin/useractions.cpp +++ b/twin/useractions.cpp @@ -50,13 +50,13 @@ TQPopupMenu* Workspace::clientPopup() { popup = new TQPopupMenu; popup->setCheckable( TRUE ); - popup->setFont(KGlobalSettings::menuFont()); + popup->setFont(TDEGlobalSettings::menuFont()); connect( popup, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( clientPopupAboutToShow() ) ); connect( popup, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( clientPopupActivated(int) ) ); advanced_popup = new TQPopupMenu( popup ); advanced_popup->setCheckable( TRUE ); - advanced_popup->setFont(KGlobalSettings::menuFont()); + advanced_popup->setFont(TDEGlobalSettings::menuFont()); connect( advanced_popup, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( clientPopupActivated(int) ) ); advanced_popup->insertItem( SmallIconSet( "up" ), i18n("Keep &Above Others")+'\t'+keys->shortcut("Window Above Other Windows").seq(0).toString(), Options::KeepAboveOp ); @@ -102,7 +102,7 @@ TQPopupMenu* Workspace::clientPopup() popup->insertSeparator(); - if (!KGlobal::config()->isImmutable() && + if (!TDEGlobal::config()->isImmutable() && !kapp->authorizeControlModules(Workspace::configModules(true)).isEmpty()) { popup->insertItem(SmallIconSet( "configure" ), i18n("Configur&e Window Behavior..."), this, TQT_SLOT( configureWM() )); @@ -200,7 +200,7 @@ void Workspace::initDesktopPopup() desk_popup = new TQPopupMenu( popup ); desk_popup->setCheckable( TRUE ); - desk_popup->setFont(KGlobalSettings::menuFont()); + desk_popup->setFont(TDEGlobalSettings::menuFont()); connect( desk_popup, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( slotSendToDesktop(int) ) ); connect( desk_popup, TQT_SIGNAL( aboutToShow() ), @@ -258,10 +258,10 @@ void Workspace::closeActivePopup() */ void Workspace::initShortcuts() { - keys = new KGlobalAccel( this ); - // a separate KGlobalAccel is needed for the shortcut for disabling global shortcuts, + keys = new TDEGlobalAccel( this ); + // a separate TDEGlobalAccel is needed for the shortcut for disabling global shortcuts, // otherwise it would also disable itself - disable_shortcuts_keys = new KGlobalAccel( this ); + disable_shortcuts_keys = new TDEGlobalAccel( this ); disable_shortcuts_keys->disableBlocking( true ); #define IN_KWIN #include "twinbindings.cpp" diff --git a/twin/workspace.cpp b/twin/workspace.cpp index 16f722634..85491fe76 100644 --- a/twin/workspace.cpp +++ b/twin/workspace.cpp @@ -55,7 +55,7 @@ extern int screen_number; Workspace *Workspace::_self = 0; -KProcess* kompmgr = 0; +TDEProcess* kompmgr = 0; KSelectionOwner* kompmgr_selection; bool allowKompmgrRestart = TRUE; @@ -202,7 +202,7 @@ Workspace::Workspace( bool restore ) 1 ); - client_keys = new KGlobalAccel( this ); + client_keys = new TDEGlobalAccel( this ); initShortcuts(); tab_box = new TabBox( this ); popupinfo = new PopupInfo( this ); @@ -219,8 +219,8 @@ Workspace::Workspace( bool restore ) // start kompmgr - i wanted to put this into main.cpp, but that would prevent dcop support, as long as Application was no dcop_object if (options->useTranslucency) { - kompmgr = new KProcess; - connect(kompmgr, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), TQT_SLOT(handleKompmgrOutput(KProcess*, char*, int))); + kompmgr = new TDEProcess; + connect(kompmgr, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), TQT_SLOT(handleKompmgrOutput(TDEProcess*, char*, int))); *kompmgr << "kompmgr"; startKompmgr(); } @@ -523,7 +523,7 @@ Workspace::~Workspace() XDeleteProperty(tqt_xdisplay(), tqt_xrootwin(), atoms->twin_running); writeWindowRules(); - KGlobal::config()->sync(); + TDEGlobal::config()->sync(); delete rootInfo; delete supportWindow; @@ -1013,7 +1013,7 @@ void Workspace::slotReconfigure() kdDebug(1212) << "Workspace::slotReconfigure()" << endl; reconfigureTimer.stop(); - KGlobal::config()->reparseConfiguration(); + TDEGlobal::config()->reparseConfiguration(); unsigned long changed = options->updateSettings(); tab_box->reconfigure(); popupinfo->reconfigure(); @@ -1146,7 +1146,7 @@ void Workspace::slotReconfigure() void Workspace::loadDesktopSettings() { - KConfig* c = KGlobal::config(); + KConfig* c = TDEGlobal::config(); TQCString groupname; if (screen_number == 0) groupname = "Desktops"; @@ -1175,7 +1175,7 @@ void Workspace::loadDesktopSettings() void Workspace::saveDesktopSettings() { - KConfig* c = KGlobal::config(); + KConfig* c = TDEGlobal::config(); TQCString groupname; if (screen_number == 0) groupname = "Desktops"; @@ -2761,7 +2761,7 @@ void Workspace::helperDialog( const TQString& message, const Client* c ) } else assert( false ); - KProcess proc; + TDEProcess proc; proc << "kdialog" << args; if( !type.isEmpty()) { @@ -2773,7 +2773,7 @@ void Workspace::helperDialog( const TQString& message, const Client* c ) } if( c != NULL ) proc << "--embed" << TQString::number( c->window()); - proc.start( KProcess::DontCare ); + proc.start( TDEProcess::DontCare ); } @@ -2800,14 +2800,14 @@ void Workspace::startKompmgr() kompmgrReloadSettings(); return; } - if (!kompmgr->start(KProcess::OwnGroup, KProcess::Stderr)) + if (!kompmgr->start(TDEProcess::OwnGroup, TDEProcess::Stderr)) { options->useTranslucency = FALSE; - KProcess proc; + TDEProcess proc; proc << "kdialog" << "--error" << i18n("The Composite Manager could not be started.\\nMake sure you have \"kompmgr\" in a $PATH directory.") << "--title" << "Composite Manager Failure"; - proc.start(KProcess::DontCare); + proc.start(TDEProcess::DontCare); } else { @@ -2817,7 +2817,7 @@ void Workspace::startKompmgr() kompmgr_selection = new KSelectionOwner( selection_name ); connect( kompmgr_selection, TQT_SIGNAL( lostOwnership()), TQT_SLOT( stopKompmgr())); kompmgr_selection->claim( true ); - connect(kompmgr, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(restartKompmgr(KProcess*))); + connect(kompmgr, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(restartKompmgr(TDEProcess*))); options->useTranslucency = TRUE; //allowKompmgrRestart = FALSE; //TQTimer::singleShot( 60000, this, TQT_SLOT(unblockKompmgrRestart()) ); @@ -2836,7 +2836,7 @@ void Workspace::stopKompmgr() } delete kompmgr_selection; kompmgr_selection = NULL; - kompmgr->disconnect(this, TQT_SLOT(restartKompmgr(KProcess*))); + kompmgr->disconnect(this, TQT_SLOT(restartKompmgr(TDEProcess*))); options->useTranslucency = FALSE; if (popup){ delete popup; popup = 0L; } // to add/remove opacity slider kompmgr->kill(SIGKILL); @@ -2864,7 +2864,7 @@ void Workspace::unblockKompmgrRestart() allowKompmgrRestart = TRUE; } -void Workspace::restartKompmgr( KProcess *proc ) +void Workspace::restartKompmgr( TDEProcess *proc ) // this is for inernal purpose (crashhandling) only, usually you want to use workspace->stopKompmgr(); TQTimer::singleShot(200, workspace, TQT_SLOT(startKompmgr())); { bool crashed; @@ -2882,11 +2882,11 @@ void Workspace::restartKompmgr( KProcess *proc ) kompmgr_selection = NULL; options->useTranslucency = FALSE; if (crashed) { - KProcess proc; + TDEProcess proc; proc << "kdialog" << "--error" << i18n( "The Composite Manager crashed twice within a minute and is therefore disabled for this session.") << "--title" << i18n("Composite Manager Failure"); - proc.start(KProcess::DontCare); + proc.start(TDEProcess::DontCare); } return; } @@ -2895,21 +2895,21 @@ void Workspace::restartKompmgr( KProcess *proc ) // this should be useless, i keep it for maybe future need // if (!kcompmgr) // { -// kompmgr = new KProcess; +// kompmgr = new TDEProcess; // kompmgr->clearArguments(); // *kompmgr << "kompmgr"; // } // ------------------- - if (!kompmgr->start(KProcess::NotifyOnExit, KProcess::Stderr)) + if (!kompmgr->start(TDEProcess::NotifyOnExit, TDEProcess::Stderr)) { delete kompmgr_selection; kompmgr_selection = NULL; options->useTranslucency = FALSE; - KProcess proc; + TDEProcess proc; proc << "kdialog" << "--error" << i18n("The Composite Manager could not be started.\\nMake sure you have \"kompmgr\" in a $PATH directory.") << "--title" << i18n("Composite Manager Failure"); - proc.start(KProcess::DontCare); + proc.start(TDEProcess::DontCare); } else { @@ -2919,7 +2919,7 @@ void Workspace::restartKompmgr( KProcess *proc ) } } -void Workspace::handleKompmgrOutput( KProcess* , char *buffer, int buflen) +void Workspace::handleKompmgrOutput( TDEProcess* , char *buffer, int buflen) { TQString message; TQString output = TQString::fromLocal8Bit( buffer, buflen ); @@ -2941,14 +2941,14 @@ void Workspace::handleKompmgrOutput( KProcess* , char *buffer, int buflen) else return; //skip others // kompmgr startup failed or succeeded, release connection kompmgr->closeStderr(); - disconnect(kompmgr, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), this, TQT_SLOT(handleKompmgrOutput(KProcess*, char*, int))); + disconnect(kompmgr, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQT_SLOT(handleKompmgrOutput(TDEProcess*, char*, int))); if( !message.isEmpty()) { - KProcess proc; + TDEProcess proc; proc << "kdialog" << "--error" << message << "--title" << i18n("Composite Manager Failure"); - proc.start(KProcess::DontCare); + proc.start(TDEProcess::DontCare); } } diff --git a/twin/workspace.h b/twin/workspace.h index 0f019cbbf..386219e07 100644 --- a/twin/workspace.h +++ b/twin/workspace.h @@ -28,14 +28,14 @@ License. See the file "COPYING" for the exact licensing terms. class TQPopupMenu; class KConfig; -class KGlobalAccel; +class TDEGlobalAccel; class KShortcutDialog; class KStartupInfo; class KStartupInfoId; class KStartupInfoData; class TQSlider; class TQPushButton; -class KProcess; +class TDEProcess; namespace KWinInternal { @@ -411,8 +411,8 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin void resetClientOpacity(); void setTransButtonText(int value); void unblockKompmgrRestart(); - void restartKompmgr( KProcess *proc ); - void handleKompmgrOutput( KProcess *proc, char *buffer, int buflen); + void restartKompmgr( TDEProcess *proc ); + void handleKompmgrOutput( TDEProcess *proc, char *buffer, int buflen); void stopKompmgr(); void kompmgrReloadSettings(); // end @@ -584,11 +584,11 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin TQPopupMenu *desk_popup; int desk_popup_index; - KGlobalAccel *keys; - KGlobalAccel *client_keys; + TDEGlobalAccel *keys; + TDEGlobalAccel *client_keys; ShortcutDialog* client_keys_dialog; Client* client_keys_client; - KGlobalAccel *disable_shortcuts_keys; + TDEGlobalAccel *disable_shortcuts_keys; bool global_shortcuts_disabled; bool global_shortcuts_disabled_for_client; |