diff options
Diffstat (limited to 'kpersonalizer')
-rw-r--r-- | kpersonalizer/kcountrypage.cpp | 8 | ||||
-rw-r--r-- | kpersonalizer/keyecandypage.cpp | 18 | ||||
-rw-r--r-- | kpersonalizer/kospage.cpp | 6 | ||||
-rw-r--r-- | kpersonalizer/kpersonalizer.cpp | 8 | ||||
-rw-r--r-- | kpersonalizer/main.cpp | 4 | ||||
-rw-r--r-- | kpersonalizer/tdestylepage.cpp | 4 |
6 files changed, 24 insertions, 24 deletions
diff --git a/kpersonalizer/kcountrypage.cpp b/kpersonalizer/kcountrypage.cpp index e56e05ff5..66d56cc73 100644 --- a/kpersonalizer/kcountrypage.cpp +++ b/kpersonalizer/kcountrypage.cpp @@ -163,18 +163,18 @@ bool KCountryPage::save(KLanguageButton *comboCountry, KLanguageButton *comboLan TQByteArray data, da; TQDataStream stream( data, IO_WriteOnly ); stream << comboLang->current(); - if ( !kapp->dcopClient()->isAttached() ) - kapp->dcopClient()->attach(); + if ( !tdeApp->dcopClient()->isAttached() ) + tdeApp->dcopClient()->attach(); // tdesycoca needs to be rebuilt TDEProcess proc; proc << TQString::fromLatin1("tdebuildsycoca"); proc.start(TDEProcess::DontCare); kdDebug() << "TDELocaleConfig::save : sending signal to kdesktop" << endl; // inform kicker and kdeskop about the new language - kapp->dcopClient()->send( "kicker", "Panel", "restart()", TQString::null); + tdeApp->dcopClient()->send( "kicker", "Panel", "restart()", TQString::null); // call, not send, so that we know it's done before coming back // (we both access kdeglobals...) - kapp->dcopClient()->call( "kdesktop", "KDesktopIface", "languageChanged(TQString)", data, replyType, replyData ); + tdeApp->dcopClient()->call( "kdesktop", "KDesktopIface", "languageChanged(TQString)", data, replyType, replyData ); } // KPersonalizer::next() probably waits for a return-value return true; diff --git a/kpersonalizer/keyecandypage.cpp b/kpersonalizer/keyecandypage.cpp index 9c1fb7765..b0c9e8767 100644 --- a/kpersonalizer/keyecandypage.cpp +++ b/kpersonalizer/keyecandypage.cpp @@ -416,7 +416,7 @@ void KEyeCandyPage::enableIconEffectSizePanel(bool enable){ else stream << panelsize; - kapp->dcopClient()->send( "kicker", "Panel", "setPanelSize(int)",data); + tdeApp->dcopClient()->send( "kicker", "Panel", "setPanelSize(int)",data); } /** No descriptions */ @@ -623,13 +623,13 @@ void KEyeCandyPage::save(bool currSettings){ kdesktopconf->sync(); TDEGlobal::config()->sync(); // restart twin for window effects - kapp->dcopClient()->send("knotify", "Notify", "reconfigure()", TQString("")); - kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString("")); + tdeApp->dcopClient()->send("knotify", "Notify", "reconfigure()", TQString("")); + tdeApp->dcopClient()->send("twin*", "", "reconfigure()", TQString("")); // set the display options (style effects) KIPC::sendMessageAll(KIPC::SettingsChanged); TQApplication::syncX(); // kicker stuff: Iconzooming etc. - kapp->dcopClient()->send( "kicker", "Panel", "configure()", TQString("") ); + tdeApp->dcopClient()->send( "kicker", "Panel", "configure()", TQString("") ); // Icon stuff for (int i=0; i<TDEIcon::LastGroup; i++) { KIPC::sendMessageAll(KIPC::IconChanged, i); @@ -637,10 +637,10 @@ void KEyeCandyPage::save(bool currSettings){ // font stuff KIPC::sendMessageAll(KIPC::FontChanged); // unfortunately, the konqiconview does not re-read the configuration to restructure the previews and the background picture - kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", TQString("") ); - kapp->dcopClient()->send( "kdesktop", "KDesktopIface", "configure()", TQString("") ); - kapp->dcopClient()->send( "kdesktop", "KBackgroundIface", "configure()", TQString("") ); - kapp->dcopClient()->send( "kdesktop", "KDesktopIface", "lineupIcons()", TQString("") ); + tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", TQString("") ); + tdeApp->dcopClient()->send( "kdesktop", "KDesktopIface", "configure()", TQString("") ); + tdeApp->dcopClient()->send( "kdesktop", "KBackgroundIface", "configure()", TQString("") ); + tdeApp->dcopClient()->send( "kdesktop", "KDesktopIface", "lineupIcons()", TQString("") ); } void KEyeCandyPage::slotEyeCandyShowDetails(bool details){ @@ -677,7 +677,7 @@ void KEyeCandyPage::getUserDefaults(){ TQByteArray replydata; TQByteArray data; TQCString replytype; - kapp->dcopClient()->call( "kicker", "Panel", "panelSize()",data, replytype, replydata); + tdeApp->dcopClient()->call( "kicker", "Panel", "panelSize()",data, replytype, replydata); TQDataStream stream( replydata, IO_ReadOnly ); stream >> panelsize; diff --git a/kpersonalizer/kospage.cpp b/kpersonalizer/kospage.cpp index 017b95fe7..bd7f1a7c2 100644 --- a/kpersonalizer/kospage.cpp +++ b/kpersonalizer/kospage.cpp @@ -90,14 +90,14 @@ void KOSPage::save(bool currSettings){ TQApplication::syncX(); // enable/disable the mac menu, call dcop // Tell kdesktop about the new config file - kapp->dcopClient()->send("kdesktop", "KDesktopIface", "configure()", TQByteArray()); + tdeApp->dcopClient()->send("kdesktop", "KDesktopIface", "configure()", TQByteArray()); /////////////////////////////////////////// /// restart twin for window effects - kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString("")); + tdeApp->dcopClient()->send("twin*", "", "reconfigure()", TQString("")); /////////////////////////////////////////// // Make the kaccess daemon read the changed config file - kapp->startServiceByDesktopName("kaccess"); + tdeApp->startServiceByDesktopName("kaccess"); } diff --git a/kpersonalizer/kpersonalizer.cpp b/kpersonalizer/kpersonalizer.cpp index cef8619ea..d30b163a2 100644 --- a/kpersonalizer/kpersonalizer.cpp +++ b/kpersonalizer/kpersonalizer.cpp @@ -57,11 +57,11 @@ KPersonalizer::KPersonalizer(TQWidget *parent, const char *name) : KWizard(parent, name, true) { // first, reset the startup from true (see desktop file in share/autostart) to false - setCaption(kapp->caption()); - kapp->config()->setGroup("General"); + setCaption(tdeApp->caption()); + tdeApp->config()->setGroup("General"); os_dirty = eye_dirty = style_dirty=false; - kapp->config()->writeEntry("FirstLogin", false); - kapp->config()->sync(); + tdeApp->config()->writeEntry("FirstLogin", false); + tdeApp->config()->sync(); countrypage= new KCountryPage(this); addPage( countrypage, i18n( "Step 1: Introduction" ) ); diff --git a/kpersonalizer/main.cpp b/kpersonalizer/main.cpp index e03c19038..7c83315c1 100644 --- a/kpersonalizer/main.cpp +++ b/kpersonalizer/main.cpp @@ -48,8 +48,8 @@ int main(int argc, char *argv[]) TDELocale::setMainCatalogue("kpersonalizer"); TDEApplication a; - if ( !kapp->dcopClient()->isAttached() ) - kapp->dcopClient()->attach(); + if ( !tdeApp->dcopClient()->isAttached() ) + tdeApp->dcopClient()->attach(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/kpersonalizer/tdestylepage.cpp b/kpersonalizer/tdestylepage.cpp index 2fd4a8419..f82525617 100644 --- a/kpersonalizer/tdestylepage.cpp +++ b/kpersonalizer/tdestylepage.cpp @@ -522,9 +522,9 @@ void TDEStylePage::liveUpdate() { // color palette changes KIPC::sendMessageAll(KIPC::PaletteChanged); // twin-style - kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString("")); + tdeApp->dcopClient()->send("twin*", "", "reconfigure()", TQString("")); // kdesktop-background - kapp->dcopClient()->send("kdesktop", "KBackgroundIface", "configure()", TQString("")); + tdeApp->dcopClient()->send("kdesktop", "KBackgroundIface", "configure()", TQString("")); } /** show the previewWidget styled with the selected one */ |