diff options
Diffstat (limited to 'kcontrol')
63 files changed, 207 insertions, 207 deletions
diff --git a/kcontrol/access/kaccess.cpp b/kcontrol/access/kaccess.cpp index 4d989149b..874df3b67 100644 --- a/kcontrol/access/kaccess.cpp +++ b/kcontrol/access/kaccess.cpp @@ -574,7 +574,7 @@ void KAccessApp::createDialogContents() { lay->setSpacing(KDialog::spacingHint()); TQLabel *label1 = new TQLabel( contents); - TQPixmap pixmap = TDEApplication::kApplication()->iconLoader()->loadIcon("messagebox_warning", TDEIcon::NoGroup, TDEIcon::SizeMedium, TDEIcon::DefaultState, 0, true); + TQPixmap pixmap = tdeApp->iconLoader()->loadIcon("messagebox_warning", TDEIcon::NoGroup, TDEIcon::SizeMedium, TDEIcon::DefaultState, 0, true); if (pixmap.isNull()) pixmap = TQMessageBox::standardIcon(TQMessageBox::Warning); label1->setPixmap(pixmap); @@ -751,7 +751,7 @@ void KAccessApp::xkbControlsNotify(XkbControlsNotifyEvent *event) +" "+i18n("These AccessX settings are needed for some users with motion impairments and can be configured in the Trinity Control Center. You can also turn them on and off with standardized keyboard gestures.\n\nIf you do not need them, you can select \"Deactivate all AccessX features and gestures\".") ); KWin::setState( dialog->winId(), NET::KeepAbove ); - kapp->updateUserTimestamp(); + tdeApp->updateUserTimestamp(); dialog->show(); } } diff --git a/kcontrol/access/kcmaccess.cpp b/kcontrol/access/kcmaccess.cpp index e8c41accc..7346dd398 100644 --- a/kcontrol/access/kcmaccess.cpp +++ b/kcontrol/access/kcmaccess.cpp @@ -717,7 +717,7 @@ void KAccessConfig::save() // When turning things off, it needs to be done by kaccess, // so don't actually kill it *shrug*. if ( true /*needToRunKAccessDaemon( config )*/ ) - kapp->startServiceByDesktopName("kaccess"); + tdeApp->startServiceByDesktopName("kaccess"); else // don't need it -> kill it { @@ -814,7 +814,7 @@ extern "C" delete config; if (run) - kapp->startServiceByDesktopName("kaccess"); + tdeApp->startServiceByDesktopName("kaccess"); } } diff --git a/kcontrol/arts/arts.cpp b/kcontrol/arts/arts.cpp index 1aad88a23..27c024df0 100644 --- a/kcontrol/arts/arts.cpp +++ b/kcontrol/arts/arts.cpp @@ -74,7 +74,7 @@ static bool startArts() delete config; if (startServer) - kapp->tdeinitExec(startRealtime?"artswrapper":"artsd", + tdeApp->tdeinitExec(startRealtime?"artswrapper":"artsd", TQStringList::split(" ",args)); return startServer; } @@ -600,7 +600,7 @@ void KArtsModule::restartServer() } // Restart knotify - kapp->startServiceByDesktopName("knotify"); + tdeApp->startServiceByDesktopName("knotify"); } bool KArtsModule::artsdIsRunning() diff --git a/kcontrol/background/bgrender.cpp b/kcontrol/background/bgrender.cpp index 478cc4c45..fe74e00ef 100644 --- a/kcontrol/background/bgrender.cpp +++ b/kcontrol/background/bgrender.cpp @@ -402,7 +402,7 @@ wp_load: // HACK: Use KFileMetaInfo only when we're attached to DCOP. // KFileMetaInfo needs tdesycoca and so on, but this code is // used also in krootimage (which in turn is used by tdm). - if( kapp->dcopClient()->isAttached()) { + if( tdeApp->dcopClient()->isAttached()) { KFileMetaInfo metaInfo(file); if (metaInfo.isValid() && metaInfo.item("Orientation").isValid()) { switch (metaInfo.item("Orientation").string().toInt()) { diff --git a/kcontrol/background/bgsettings.cpp b/kcontrol/background/bgsettings.cpp index 278a250c9..87d9479de 100644 --- a/kcontrol/background/bgsettings.cpp +++ b/kcontrol/background/bgsettings.cpp @@ -1275,6 +1275,6 @@ void TDEGlobalBackgroundSettings::writeSettings() // tell kdesktop to get it's butt in gear and pick up the new settings TQByteArray data; - kapp->dcopClient()->send("kdesktop", "KDesktopIface", "configure()", data); + tdeApp->dcopClient()->send("kdesktop", "KDesktopIface", "configure()", data); } diff --git a/kcontrol/background/main.cpp b/kcontrol/background/main.cpp index e27aa50ac..23478b5e1 100644 --- a/kcontrol/background/main.cpp +++ b/kcontrol/background/main.cpp @@ -100,7 +100,7 @@ void KBackground::save() m_base->save(); // reconfigure kdesktop. kdesktop will notify all clients - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); if (!client->isAttached()) client->attach(); diff --git a/kcontrol/bell/bell.cpp b/kcontrol/bell/bell.cpp index 0b956523b..b2ff888b4 100644 --- a/kcontrol/bell/bell.cpp +++ b/kcontrol/bell/bell.cpp @@ -50,7 +50,7 @@ extern "C" XKeyboardState kbd; XKeyboardControl kbdc; - XGetKeyboardControl(kapp->getDisplay(), &kbd); + XGetKeyboardControl(tdeApp->getDisplay(), &kbd); TDEConfig config("kcmbellrc", true, false); config.setGroup("General"); @@ -58,7 +58,7 @@ extern "C" kbdc.bell_percent = config.readNumEntry("Volume", kbd.bell_percent); kbdc.bell_pitch = config.readNumEntry("Pitch", kbd.bell_pitch); kbdc.bell_duration = config.readNumEntry("Duration", kbd.bell_duration); - XChangeKeyboardControl(kapp->getDisplay(), + XChangeKeyboardControl(tdeApp->getDisplay(), KBBellPercent | KBBellPitch | KBBellDuration, &kbdc); } @@ -154,7 +154,7 @@ void KBellConfig::load() void KBellConfig::load( bool useDefaults ) { XKeyboardState kbd; - XGetKeyboardControl(kapp->getDisplay(), &kbd); + XGetKeyboardControl(tdeApp->getDisplay(), &kbd); m_volume->setValue(kbd.bell_percent); m_pitch->setValue(kbd.bell_pitch); @@ -179,7 +179,7 @@ void KBellConfig::save() kbd.bell_percent = bellVolume; kbd.bell_pitch = bellPitch; kbd.bell_duration = bellDuration; - XChangeKeyboardControl(kapp->getDisplay(), + XChangeKeyboardControl(tdeApp->getDisplay(), KBBellPercent | KBBellPitch | KBBellDuration, &kbd); @@ -216,7 +216,7 @@ void KBellConfig::ringBell() // store the old state XKeyboardState old_state; - XGetKeyboardControl(kapp->getDisplay(), &old_state); + XGetKeyboardControl(tdeApp->getDisplay(), &old_state); // switch to the test state XKeyboardControl kbd; @@ -226,17 +226,17 @@ void KBellConfig::ringBell() kbd.bell_duration = m_duration->value(); else kbd.bell_duration = 0; - XChangeKeyboardControl(kapp->getDisplay(), + XChangeKeyboardControl(tdeApp->getDisplay(), KBBellPercent | KBBellPitch | KBBellDuration, &kbd); // ring bell - XBell(kapp->getDisplay(),0); + XBell(tdeApp->getDisplay(),0); // restore old state kbd.bell_percent = old_state.bell_percent; kbd.bell_pitch = old_state.bell_pitch; kbd.bell_duration = old_state.bell_duration; - XChangeKeyboardControl(kapp->getDisplay(), + XChangeKeyboardControl(tdeApp->getDisplay(), KBBellPercent | KBBellPitch | KBBellDuration, &kbd); } diff --git a/kcontrol/clock/main.cpp b/kcontrol/clock/main.cpp index 7d791b9f7..e7dcf872f 100644 --- a/kcontrol/clock/main.cpp +++ b/kcontrol/clock/main.cpp @@ -89,7 +89,7 @@ void KclockModule::save() #endif // Tell the clock applet about the change so that it can update its timezone - kapp->dcopClient()->send( "kicker", "ClockApplet", "reconfigure()", TQByteArray() ); + tdeApp->dcopClient()->send( "kicker", "ClockApplet", "reconfigure()", TQByteArray() ); } void KclockModule::load() diff --git a/kcontrol/colors/widgetcanvas.cpp b/kcontrol/colors/widgetcanvas.cpp index 81399b438..addf82baa 100644 --- a/kcontrol/colors/widgetcanvas.cpp +++ b/kcontrol/colors/widgetcanvas.cpp @@ -433,7 +433,7 @@ void WidgetCanvas::drawSampleWidgets() // Menu bar //qDrawShadePanel ( &paint, 25, 55, width()-52, 28, cg, FALSE, 2, &brush); - kapp->style().drawPrimitive(TQStyle::PE_PanelMenuBar, &paint, + tdeApp->style().drawPrimitive(TQStyle::PE_PanelMenuBar, &paint, TQRect(TQPoint(25, 55), TQSize(width()-52, 28)), cg); paint.setFont( menuFont ); @@ -441,7 +441,7 @@ void WidgetCanvas::drawSampleWidgets() TQString file = i18n("File"); textLen = paint.fontMetrics().width( file ); //qDrawShadePanel ( &paint, 30, 59, textLen + 10, 21, cg, FALSE, 2, &brush); - kapp->style().drawPrimitive(TQStyle::PE_Panel, &paint, + tdeApp->style().drawPrimitive(TQStyle::PE_Panel, &paint, TQRect(30, 59, textLen + 10, 21), cg); paint.drawText( 35, 74, file ); @@ -526,7 +526,7 @@ void WidgetCanvas::drawSampleWidgets() cg2.setColor(TQColorGroup::Button, button); cg2.setColor(TQColorGroup::Background, window); //qDrawWinButton(&paint, xpos, ypos, textLen+32, 28, cg, false, &brush); - kapp->style().drawPrimitive(TQStyle::PE_ButtonCommand, &paint, + tdeApp->style().drawPrimitive(TQStyle::PE_ButtonCommand, &paint, TQRect(xpos, ypos, textLen+32, 28), cg2, TQStyle::Style_Enabled | TQStyle::Style_Raised); paint.setPen(buttonTxt); paint.drawText(xpos, ypos, textLen+32, 28, AlignCenter, diff --git a/kcontrol/componentchooser/componentchooser.cpp b/kcontrol/componentchooser/componentchooser.cpp index 2eec97caa..d858dac40 100644 --- a/kcontrol/componentchooser/componentchooser.cpp +++ b/kcontrol/componentchooser/componentchooser.cpp @@ -203,7 +203,7 @@ void CfgEmailClient::save(TDEConfig *) if (!cfgName.isEmpty()) ::chmod(TQFile::encodeName(cfgName), 0600); - kapp->dcopClient()->emitDCOPSignal("KDE_emailSettingsChanged()", TQByteArray()); + tdeApp->dcopClient()->emitDCOPSignal("KDE_emailSettingsChanged()", TQByteArray()); emit changed(false); } @@ -298,7 +298,7 @@ void CfgTerminalEmulator::save(TDEConfig *) { delete config; KIPC::sendMessageAll(KIPC::SettingsChanged); - kapp->dcopClient()->send("tdelauncher", "tdelauncher","reparseConfiguration()", TQString::null); + tdeApp->dcopClient()->send("tdelauncher", "tdelauncher","reparseConfiguration()", TQString::null); emit changed(false); } diff --git a/kcontrol/css/kcmcss.cpp b/kcontrol/css/kcmcss.cpp index d22c90e3e..9bae3214d 100644 --- a/kcontrol/css/kcmcss.cpp +++ b/kcontrol/css/kcmcss.cpp @@ -193,7 +193,7 @@ void CSSConfig::save() { CSSTemplate css(templ); - dest = kapp->dirs()->saveLocation("data", "kcmcss"); + dest = tdeApp->dirs()->saveLocation("data", "kcmcss"); dest += "/override.css"; css.expand(dest, cssDict()); diff --git a/kcontrol/dnssd/kcmdnssd.cpp b/kcontrol/dnssd/kcmdnssd.cpp index ee0688a4f..f634e6bc2 100644 --- a/kcontrol/dnssd/kcmdnssd.cpp +++ b/kcontrol/dnssd/kcmdnssd.cpp @@ -122,7 +122,7 @@ void KCMDnssd::load() TQProcess avahiStatus(TQString("/usr/share/avahi/avahi_status"), this, "avahiStatus"); avahiStatus.start(); while (avahiStatus.isRunning()) { - kapp->processEvents(); + tdeApp->processEvents(); } int exitStatus = avahiStatus.exitStatus(); if (exitStatus == 0) { // disabled diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp index 507af5993..3013dfc8f 100644 --- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp @@ -223,7 +223,7 @@ void FilterOptions::save() // kdDebug () << "Engine: " << m_defaultEngineMap[engine] << endl; int changedProviderCount = 0; - TQString path = kapp->dirs()->saveLocation("services", "searchproviders/"); + TQString path = tdeApp->dirs()->saveLocation("services", "searchproviders/"); m_favoriteEngines.clear(); @@ -291,7 +291,7 @@ void FilterOptions::save() for (TQStringList::ConstIterator it = m_deletedProviders.begin(); it != m_deletedProviders.end(); ++it) { - TQStringList matches = kapp->dirs()->findAllResources("services", "searchproviders/" + *it + ".desktop"); + TQStringList matches = tdeApp->dirs()->findAllResources("services", "searchproviders/" + *it + ".desktop"); // Shouldn't happen if (!matches.count()) diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp index ae86c5836..8d327dc0d 100644 --- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp @@ -449,7 +449,7 @@ void KURISearchFilterEngine::loadConfig() // contains the sycoca based search provider configuration (malte). // TODO: Remove in KDE 4 !!! This has been here a sufficient amount of time... { - KSimpleConfig oldConfig(kapp->dirs()->saveLocation("config") + TQString(name()) + "rc"); + KSimpleConfig oldConfig(tdeApp->dirs()->saveLocation("config") + TQString(name()) + "rc"); oldConfig.setGroup("General"); if (oldConfig.hasKey("SearchEngines")) @@ -498,7 +498,7 @@ void KURISearchFilterEngine::loadConfig() delete provider; } - KSimpleConfig desktop(kapp->dirs()->saveLocation("services", "searchproviders/") + name + ".desktop"); + KSimpleConfig desktop(tdeApp->dirs()->saveLocation("services", "searchproviders/") + name + ".desktop"); desktop.setGroup("Desktop Entry"); desktop.writeEntry("Type", "Service"); desktop.writeEntry("X-TDE-ServiceTypes", "SearchProvider"); diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp index b6029cf36..bf295462f 100644 --- a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp @@ -43,7 +43,7 @@ SearchProviderDialog::SearchProviderDialog(SearchProvider *provider, enableButtonSeparator(true); - m_dlg->leQuery->setMinimumWidth(kapp->fontMetrics().maxWidth() * 40); + m_dlg->leQuery->setMinimumWidth(tdeApp->fontMetrics().maxWidth() * 40); connect(m_dlg->leName, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(slotChanged())); connect(m_dlg->leQuery, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(slotChanged())); diff --git a/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp b/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp index cae4c5abb..598cee24e 100644 --- a/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp +++ b/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp @@ -379,7 +379,7 @@ bool TDEShortURIFilter::filterURI( KURIFilterData& data ) const u.setRef(ref); u.setQuery(query); - if (kapp && !kapp->authorizeURLAction( TQString::fromLatin1("open"), KURL(), u)) + if (tdeApp && !tdeApp->authorizeURLAction( TQString::fromLatin1("open"), KURL(), u)) { // No authorisation, we pretend it's a file will get // an access denied error later on. @@ -514,7 +514,7 @@ bool TDEShortURIFilter::filterURI( KURIFilterData& data ) const u.setPath(path); u.setRef(ref); - if (kapp && !kapp->authorizeURLAction( TQString::fromLatin1("open"), KURL(), u)) + if (tdeApp && !tdeApp->authorizeURLAction( TQString::fromLatin1("open"), KURL(), u)) { // No authorisation, we pretend it exists and will get // an access denied error later on. diff --git a/kcontrol/fonts/fonts.cpp b/kcontrol/fonts/fonts.cpp index d6ec1ae62..489d479b7 100644 --- a/kcontrol/fonts/fonts.cpp +++ b/kcontrol/fonts/fonts.cpp @@ -757,7 +757,7 @@ void TDEFonts::save() KIPC::sendMessageAll(KIPC::FontChanged); - kapp->processEvents(); // Process font change ourselves + tdeApp->processEvents(); // Process font change ourselves bool aaSave = false; // Don't overwrite global settings unless explicitly asked for - e.g. the system diff --git a/kcontrol/hwmanager/hwdevicetray.cpp b/kcontrol/hwmanager/hwdevicetray.cpp index 22c647db0..7bfd54264 100644 --- a/kcontrol/hwmanager/hwdevicetray.cpp +++ b/kcontrol/hwmanager/hwdevicetray.cpp @@ -166,7 +166,7 @@ HwDeviceSystemTray::HwDeviceSystemTray(TQWidget *parent, const char *name) globalKeys->setEnabled(true); globalKeys->updateConnections(); - connect(kapp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int))); + connect(tdeApp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int))); TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); doDiskNotifications(true); @@ -760,7 +760,7 @@ void HwDeviceSystemTray::devicePopupClicked(KPassivePopup* popup, TQPoint point, } void HwDeviceSystemTray::slotHelpContents() { - kapp->invokeHelp(TQString::null, "hwdevicetray"); + tdeApp->invokeHelp(TQString::null, "hwdevicetray"); } #include "hwdevicetray.moc" diff --git a/kcontrol/icons/icons.cpp b/kcontrol/icons/icons.cpp index 57fe2669f..ce8968198 100644 --- a/kcontrol/icons/icons.cpp +++ b/kcontrol/icons/icons.cpp @@ -477,8 +477,8 @@ void TDEIconConfig::save() g.writeEntry("IconUseRoundedRect", mpRoundedCheck->isChecked(), true, true); g.writeEntry("ShowKonqIconActivationEffect", mpActiveEffectCheck->isChecked(), true, true); - kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", TQString("") ); - kapp->dcopClient()->send( "kdesktop", "KDesktopIface", "configure()", TQString("") ); + tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", TQString("") ); + tdeApp->dcopClient()->send( "kdesktop", "KDesktopIface", "configure()", TQString("") ); mpConfig->sync(); mpSystrayConfig->sync(); @@ -497,10 +497,10 @@ void TDEIconConfig::save() } // Signal kicker to reload icon configuration - kapp->dcopClient()->send("kicker", "kicker", "configure()", TQByteArray()); + tdeApp->dcopClient()->send("kicker", "kicker", "configure()", TQByteArray()); // Signal system tray to reload icon configuration - kapp->dcopClient()->send("kicker", "SystemTrayApplet", "iconSizeChanged()", TQByteArray()); + tdeApp->dcopClient()->send("kicker", "SystemTrayApplet", "iconSizeChanged()", TQByteArray()); } void TDEIconConfig::defaults() diff --git a/kcontrol/icons/iconthemes.cpp b/kcontrol/icons/iconthemes.cpp index 86d782a1b..4d54fae0d 100644 --- a/kcontrol/icons/iconthemes.cpp +++ b/kcontrol/icons/iconthemes.cpp @@ -214,7 +214,7 @@ bool IconThemesConfig::installThemes(const TQStringList &themes, const TQString KTar archive(archiveName); archive.open(IO_ReadOnly); - kapp->processEvents(); + tdeApp->processEvents(); const KArchiveDirectory* rootDir = archive.directory(); @@ -225,7 +225,7 @@ bool IconThemesConfig::installThemes(const TQStringList &themes, const TQString progressDiag.setLabel( i18n("<qt>Installing <strong>%1</strong> theme</qt>") .arg(*it)); - kapp->processEvents(); + tdeApp->processEvents(); if (progressDiag.wasCancelled()) break; diff --git a/kcontrol/input/mouse.cpp b/kcontrol/input/mouse.cpp index 523696761..aa7008f56 100644 --- a/kcontrol/input/mouse.cpp +++ b/kcontrol/input/mouse.cpp @@ -161,7 +161,7 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name) connect( tab1->cbAutoSelect, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotClick() ) ); unsigned char map[20]; - int buttonCount = XGetPointerMapping(kapp->getDisplay(), map, 20); + int buttonCount = XGetPointerMapping(tdeApp->getDisplay(), map, 20); // Only allow setting reversing scroll polarity if we have scroll buttons tab1->cbScrollPolarity->setEnabled(buttonCount >= 5); @@ -624,7 +624,7 @@ void MouseConfig::save() themetab->save(); // restart kaccess - kapp->startServiceByDesktopName("kaccess"); + tdeApp->startServiceByDesktopName("kaccess"); TDECModule::changed(false); @@ -686,14 +686,14 @@ void MouseSettings::load(TDEConfig *config) { int accel_num, accel_den, threshold; double accel; - XGetPointerControl( kapp->getDisplay(), + XGetPointerControl( tdeApp->getDisplay(), &accel_num, &accel_den, &threshold ); accel = float(accel_num) / float(accel_den); // get settings from X server int h = RIGHT_HANDED; unsigned char map[20]; - num_buttons = XGetPointerMapping(kapp->getDisplay(), map, 20); + num_buttons = XGetPointerMapping(tdeApp->getDisplay(), map, 20); handedEnabled = true; @@ -781,14 +781,14 @@ void MouseConfig::slotWheelScrollLinesChanged(int value) void MouseSettings::apply(bool force) { - XChangePointerControl( kapp->getDisplay(), + XChangePointerControl( tdeApp->getDisplay(), true, true, int(tqRound(accelRate*10)), 10, thresholdMove); // 256 might seems extreme, but X has already been known to return 32, // and we don't want to truncate things. Xlib limits the table to 256 bytes, // so it's a good uper bound.. unsigned char map[256]; - num_buttons = XGetPointerMapping(kapp->getDisplay(), map, 256); + num_buttons = XGetPointerMapping(tdeApp->getDisplay(), map, 256); int remap=(num_buttons>=1); if (handedEnabled && (m_handedNeedsApply || force)) { @@ -857,7 +857,7 @@ void MouseSettings::apply(bool force) } int retval; if (remap) - while ((retval=XSetPointerMapping(kapp->getDisplay(), map, + while ((retval=XSetPointerMapping(tdeApp->getDisplay(), map, num_buttons)) == MappingBusy) /* keep trying until the pointer is free */ { }; diff --git a/kcontrol/input/tdesyndaemon.cpp b/kcontrol/input/tdesyndaemon.cpp index c7e0a445c..d81371e51 100644 --- a/kcontrol/input/tdesyndaemon.cpp +++ b/kcontrol/input/tdesyndaemon.cpp @@ -90,7 +90,7 @@ TDESynDaemon::~TDESynDaemon() void TDESynDaemon::stop() { - kapp->quit(); + tdeApp->quit(); } void TDESynDaemon::poll() diff --git a/kcontrol/input/touchpad_settings.cpp b/kcontrol/input/touchpad_settings.cpp index ff15e4c21..ba910c607 100644 --- a/kcontrol/input/touchpad_settings.cpp +++ b/kcontrol/input/touchpad_settings.cpp @@ -345,7 +345,7 @@ void TouchpadSettings::apply(bool force) if (offWhileTyping) { - kapp->tdeinitExec("tdesyndaemon"); + tdeApp->tdeinitExec("tdesyndaemon"); } } diff --git a/kcontrol/kcontrol/aboutwidget.cpp b/kcontrol/kcontrol/aboutwidget.cpp index 485f11442..ff02be68c 100644 --- a/kcontrol/kcontrol/aboutwidget.cpp +++ b/kcontrol/kcontrol/aboutwidget.cpp @@ -112,7 +112,7 @@ void AboutWidget::updatePixmap() TQString res = t.read(); res = res.arg( locate( "data", "tdeui/about/kde_infopage.css" ) ); - if ( kapp->reverseLayout() ) + if ( tdeApp->reverseLayout() ) res = res.arg( "@import \"%1\";" ).arg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) ); else res = res.arg( "" ); diff --git a/kcontrol/kcontrol/dockcontainer.cpp b/kcontrol/kcontrol/dockcontainer.cpp index 67584a74d..f59b95624 100644 --- a/kcontrol/kcontrol/dockcontainer.cpp +++ b/kcontrol/kcontrol/dockcontainer.cpp @@ -95,7 +95,7 @@ void ModuleTitle::clear() { m_icon->setPixmap( TQPixmap() ); m_name->setText( TQString::null ); - kapp->processEvents(); + tdeApp->processEvents(); } ModuleWidget::ModuleWidget( TQWidget *parent, const char *name ) @@ -214,7 +214,7 @@ i18n("There are unsaved changes in the active module.\n" } raiseWidget( _busyw ); - kapp->processEvents(); + tdeApp->processEvents(); deleteModule(); if (!module) return true; diff --git a/kcontrol/kcontrol/helpwidget.cpp b/kcontrol/kcontrol/helpwidget.cpp index 82c400822..af20e8870 100644 --- a/kcontrol/kcontrol/helpwidget.cpp +++ b/kcontrol/kcontrol/helpwidget.cpp @@ -80,7 +80,7 @@ bool HelpWidget::clicked(const TQString & _url) } if ( textUrl.find('@') > -1 ) { - kapp->invokeMailer(textUrl); + tdeApp->invokeMailer(textUrl); return true; } diff --git a/kcontrol/kcontrol/modules.cpp b/kcontrol/kcontrol/modules.cpp index d8e89a192..b96b92bd6 100644 --- a/kcontrol/kcontrol/modules.cpp +++ b/kcontrol/kcontrol/modules.cpp @@ -101,7 +101,7 @@ void ConfigModule::deleteClient() _embedStack = 0; delete _embedFrame; _embedFrame = 0; - kapp->syncX(); + tdeApp->syncX(); if(_module) _module->close(true); @@ -282,7 +282,7 @@ bool ConfigModuleList::readDesktopEntriesRecursive(const TQString &path) if (p->isType(KST_KService)) { KService *s = static_cast<KService*>(p); - if (!kapp->authorizeControlModule(s->menuId())) + if (!tdeApp->authorizeControlModule(s->menuId())) continue; ConfigModule *module = new ConfigModule(s); diff --git a/kcontrol/kcontrol/proxywidget.cpp b/kcontrol/kcontrol/proxywidget.cpp index 05040b3dd..159f93a01 100644 --- a/kcontrol/kcontrol/proxywidget.cpp +++ b/kcontrol/kcontrol/proxywidget.cpp @@ -169,7 +169,7 @@ ProxyWidget::ProxyWidget(TDECModule *client, TQString title, const char *name, TQCString replyType; TQByteArray replyData; - if (kapp->dcopClient()->call("kcontrol", "moduleIface", "getPalette()", TQByteArray(), + if (tdeApp->dcopClient()->call("kcontrol", "moduleIface", "getPalette()", TQByteArray(), replyType, replyData)) if ( replyType == "TQPalette") { TQDataStream reply( replyData, IO_ReadOnly ); @@ -178,7 +178,7 @@ ProxyWidget::ProxyWidget(TDECModule *client, TQString title, const char *name, setPalette(pal); } /* // Doesn't work ... - if (kapp->dcopClient()->call("kcontrol", "moduleIface", "getStyle()", TQByteArray(), + if (tdeApp->dcopClient()->call("kcontrol", "moduleIface", "getStyle()", TQByteArray(), replyType, replyData)) if ( replyType == "TQString") { TQDataStream reply( replyData, IO_ReadOnly ); @@ -187,7 +187,7 @@ ProxyWidget::ProxyWidget(TDECModule *client, TQString title, const char *name, setStyle(style); } */ - if (kapp->dcopClient()->call("kcontrol", "moduleIface", "getFont()", TQByteArray(), + if (tdeApp->dcopClient()->call("kcontrol", "moduleIface", "getFont()", TQByteArray(), replyType, replyData)) if ( replyType == "TQFont") { TQDataStream reply( replyData, IO_ReadOnly ); @@ -273,7 +273,7 @@ void ProxyWidget::handbookClicked() if (getuid()!=0) emit handbookRequest(); else - kapp->dcopClient()->send("kcontrol", "moduleIface", "invokeHandbook()", TQByteArray()); + tdeApp->dcopClient()->send("kcontrol", "moduleIface", "invokeHandbook()", TQByteArray()); } void ProxyWidget::helpClicked() @@ -281,7 +281,7 @@ void ProxyWidget::helpClicked() if (getuid()!=0) emit helpRequest(); else - kapp->dcopClient()->send("kcontrol", "moduleIface", "invokeHelp()", TQByteArray()); + tdeApp->dcopClient()->send("kcontrol", "moduleIface", "invokeHelp()", TQByteArray()); } void ProxyWidget::defaultClicked() diff --git a/kcontrol/kded/kcmkded.cpp b/kcontrol/kded/kcmkded.cpp index bbae08ad6..e7fe16170 100644 --- a/kcontrol/kded/kcmkded.cpp +++ b/kcontrol/kded/kcmkded.cpp @@ -229,7 +229,7 @@ void KDEDConfig::getServiceStatus() TQByteArray replyData; - if (!kapp->dcopClient()->call( "kded", "kded", "loadedModules()", TQByteArray(), + if (!tdeApp->dcopClient()->call( "kded", "kded", "loadedModules()", TQByteArray(), replyType, replyData ) ) { _lvLoD->setEnabled( false ); @@ -310,7 +310,7 @@ void KDEDConfig::slotStartService() TQCString replyType; TQDataStream arg( data, IO_WriteOnly ); arg << service; - if (kapp->dcopClient()->call( "kded", "kded", "loadModule(TQCString)", data, replyType, replyData ) ) { + if (tdeApp->dcopClient()->call( "kded", "kded", "loadModule(TQCString)", data, replyType, replyData ) ) { TQDataStream reply(replyData, IO_ReadOnly); if ( replyType == "bool" ) { @@ -337,7 +337,7 @@ void KDEDConfig::slotStopService() TQDataStream arg( data, IO_WriteOnly ); arg << service; - if (kapp->dcopClient()->send( "kded", "kded", "unloadModule(TQCString)", data ) ) { + if (tdeApp->dcopClient()->send( "kded", "kded", "unloadModule(TQCString)", data ) ) { slotServiceRunningToggled(); } else { diff --git a/kcontrol/keys/keyconfig.cpp b/kcontrol/keys/keyconfig.cpp index 90fa59f82..b0eaf1305 100644 --- a/kcontrol/keys/keyconfig.cpp +++ b/kcontrol/keys/keyconfig.cpp @@ -206,12 +206,12 @@ void KKeyModule::load() kc->commitChanges(); actions.writeActions( KeySet, 0, true, true ); if ( KeyType == "global" ) { - if ( !kapp->dcopClient()->isAttached() ) - kapp->dcopClient()->attach(); + if ( !tdeApp->dcopClient()->isAttached() ) + tdeApp->dcopClient()->attach(); // TODO: create a reconfigureKeys() method. - kapp->dcopClient()->send("twin", "", "reconfigure()", ""); - kapp->dcopClient()->send("kdesktop", "", "configure()", ""); - kapp->dcopClient()->send("kicker", "Panel", "configure()", ""); + tdeApp->dcopClient()->send("twin", "", "reconfigure()", ""); + tdeApp->dcopClient()->send("kdesktop", "", "configure()", ""); + tdeApp->dcopClient()->send("kicker", "Panel", "configure()", ""); } }*/ diff --git a/kcontrol/keys/modifiers.cpp b/kcontrol/keys/modifiers.cpp index bc182f944..f8c887c45 100644 --- a/kcontrol/keys/modifiers.cpp +++ b/kcontrol/keys/modifiers.cpp @@ -116,7 +116,7 @@ void ModifiersModule::save() if( bMacSwap ) setupMacModifierKeys(); else - kapp->tdeinitExec("kxkb"); + tdeApp->tdeinitExec("kxkb"); m_bMacSwapOrig = bMacSwap; updateWidgets(); } diff --git a/kcontrol/kicker/main.cpp b/kcontrol/kicker/main.cpp index db7d5339f..291b47071 100644 --- a/kcontrol/kicker/main.cpp +++ b/kcontrol/kicker/main.cpp @@ -63,10 +63,10 @@ KickerConfig::KickerConfig(TQWidget *parent, const char *name) init(); - kapp->dcopClient()->setNotifications(true); + tdeApp->dcopClient()->setNotifications(true); connectDCOPSignal("kicker", "kicker", "configSwitchToPanel(TQString)", "jumpToPanel(TQString)", false); - kapp->dcopClient()->send("kicker", "kicker", "configLaunched()", TQByteArray()); + tdeApp->dcopClient()->send("kicker", "kicker", "configLaunched()", TQByteArray()); connect(this, TQ_SIGNAL(hidingPanelChanged(int)), this, TQ_SLOT(setCurrentPanelIndex(int))); @@ -135,13 +135,13 @@ void KickerConfig::init() void KickerConfig::restartKicker() { // Tell kicker to restart - if (!kapp->dcopClient()->isAttached()) + if (!tdeApp->dcopClient()->isAttached()) { - kapp->dcopClient()->attach(); + tdeApp->dcopClient()->attach(); } TQCString appname; appname = "kicker"; - kapp->dcopClient()->send(appname, appname, "restart", TQString("")); + tdeApp->dcopClient()->send(appname, appname, "restart", TQString("")); } void KickerConfig::notifyKicker() @@ -151,9 +151,9 @@ void KickerConfig::notifyKicker() emit aboutToNotifyKicker(); // Tell kicker about the new config file. - if (!kapp->dcopClient()->isAttached()) + if (!tdeApp->dcopClient()->isAttached()) { - kapp->dcopClient()->attach(); + tdeApp->dcopClient()->attach(); } TQByteArray data; @@ -168,7 +168,7 @@ void KickerConfig::notifyKicker() appname.sprintf("kicker-screen-%d", m_screenNumber); } - kapp->dcopClient()->send(appname, appname, "configure()", data); + tdeApp->dcopClient()->send(appname, appname, "configure()", data); } void KickerConfig::setupExtensionInfo(TDEConfig& config, bool checkExists, bool reloadIfExists) diff --git a/kcontrol/kicker/positiontab_impl.cpp b/kcontrol/kicker/positiontab_impl.cpp index b8a2d7ea9..ee44badaa 100644 --- a/kcontrol/kicker/positiontab_impl.cpp +++ b/kcontrol/kicker/positiontab_impl.cpp @@ -72,7 +72,7 @@ PositionTab::PositionTab(TQWidget *parent, const char* name) /* * set the tooltips on the buttons properly for RTL langs */ - if (kapp->reverseLayout()) + if (tdeApp->reverseLayout()) { TQToolTip::add(locationTopRight, i18n("Top left")); TQToolTip::add(locationTop, i18n("Top center")); @@ -229,7 +229,7 @@ void PositionTab::movePanel(int whichButton) setPositionButtons(); return; } - m_panelAlign = kapp->reverseLayout() ? AlignRight : AlignLeft; + m_panelAlign = tdeApp->reverseLayout() ? AlignRight : AlignLeft; m_panelPos = PosTop; } else if (pushed == locationTop) @@ -249,38 +249,38 @@ void PositionTab::movePanel(int whichButton) setPositionButtons(); return; } - m_panelAlign = kapp->reverseLayout() ? AlignLeft : AlignRight; + m_panelAlign = tdeApp->reverseLayout() ? AlignLeft : AlignRight; m_panelPos = PosTop; } else if (pushed == locationLeftTop) { - if (!(m_panelInfo->_allowedPosition[kapp->reverseLayout() ? PosRight : PosLeft])) + if (!(m_panelInfo->_allowedPosition[tdeApp->reverseLayout() ? PosRight : PosLeft])) { setPositionButtons(); return; } m_panelAlign = AlignLeft; - m_panelPos = kapp->reverseLayout() ? PosRight : PosLeft; + m_panelPos = tdeApp->reverseLayout() ? PosRight : PosLeft; } else if (pushed == locationLeft) { - if (!(m_panelInfo->_allowedPosition[kapp->reverseLayout() ? PosRight : PosLeft])) + if (!(m_panelInfo->_allowedPosition[tdeApp->reverseLayout() ? PosRight : PosLeft])) { setPositionButtons(); return; } m_panelAlign = AlignCenter; - m_panelPos = kapp->reverseLayout() ? PosRight : PosLeft; + m_panelPos = tdeApp->reverseLayout() ? PosRight : PosLeft; } else if (pushed == locationLeftBottom) { - if (!(m_panelInfo->_allowedPosition[kapp->reverseLayout() ? PosRight : PosLeft])) + if (!(m_panelInfo->_allowedPosition[tdeApp->reverseLayout() ? PosRight : PosLeft])) { setPositionButtons(); return; } m_panelAlign = AlignRight; - m_panelPos = kapp->reverseLayout() ? PosRight : PosLeft; + m_panelPos = tdeApp->reverseLayout() ? PosRight : PosLeft; } else if (pushed == locationBottomLeft) { @@ -289,7 +289,7 @@ void PositionTab::movePanel(int whichButton) setPositionButtons(); return; } - m_panelAlign = kapp->reverseLayout() ? AlignRight : AlignLeft; + m_panelAlign = tdeApp->reverseLayout() ? AlignRight : AlignLeft; m_panelPos = PosBottom; } else if (pushed == locationBottom) @@ -309,38 +309,38 @@ void PositionTab::movePanel(int whichButton) setPositionButtons(); return; } - m_panelAlign = kapp->reverseLayout() ? AlignLeft : AlignRight; + m_panelAlign = tdeApp->reverseLayout() ? AlignLeft : AlignRight; m_panelPos = PosBottom; } else if (pushed == locationRightTop) { - if (!(m_panelInfo->_allowedPosition[kapp->reverseLayout() ? PosLeft : PosRight])) + if (!(m_panelInfo->_allowedPosition[tdeApp->reverseLayout() ? PosLeft : PosRight])) { setPositionButtons(); return; } m_panelAlign = AlignLeft; - m_panelPos = kapp->reverseLayout() ? PosLeft : PosRight; + m_panelPos = tdeApp->reverseLayout() ? PosLeft : PosRight; } else if (pushed == locationRight) { - if (!(m_panelInfo->_allowedPosition[kapp->reverseLayout() ? PosLeft : PosRight])) + if (!(m_panelInfo->_allowedPosition[tdeApp->reverseLayout() ? PosLeft : PosRight])) { setPositionButtons(); return; } m_panelAlign = AlignCenter; - m_panelPos = kapp->reverseLayout() ? PosLeft : PosRight; + m_panelPos = tdeApp->reverseLayout() ? PosLeft : PosRight; } else if (pushed == locationRightBottom) { - if (!(m_panelInfo->_allowedPosition[kapp->reverseLayout() ? PosLeft : PosRight])) + if (!(m_panelInfo->_allowedPosition[tdeApp->reverseLayout() ? PosLeft : PosRight])) { setPositionButtons(); return; } m_panelAlign = AlignRight; - m_panelPos = kapp->reverseLayout() ? PosLeft : PosRight; + m_panelPos = tdeApp->reverseLayout() ? PosLeft : PosRight; } lengthenPanel(-1); @@ -582,47 +582,47 @@ void PositionTab::setPositionButtons() { if (m_panelPos == PosTop) { if (m_panelAlign == AlignLeft) - kapp->reverseLayout() ? locationTopRight->setOn(true) : + tdeApp->reverseLayout() ? locationTopRight->setOn(true) : locationTopLeft->setOn(true); else if (m_panelAlign == AlignCenter) locationTop->setOn(true); else // if (m_panelAlign == AlignRight - kapp->reverseLayout() ? locationTopLeft->setOn(true) : + tdeApp->reverseLayout() ? locationTopLeft->setOn(true) : locationTopRight->setOn(true); } else if (m_panelPos == PosRight) { if (m_panelAlign == AlignLeft) - kapp->reverseLayout() ? locationLeftTop->setOn(true) : + tdeApp->reverseLayout() ? locationLeftTop->setOn(true) : locationRightTop->setOn(true); else if (m_panelAlign == AlignCenter) - kapp->reverseLayout() ? locationLeft->setOn(true) : + tdeApp->reverseLayout() ? locationLeft->setOn(true) : locationRight->setOn(true); else // if (m_panelAlign == AlignRight - kapp->reverseLayout() ? locationLeftBottom->setOn(true) : + tdeApp->reverseLayout() ? locationLeftBottom->setOn(true) : locationRightBottom->setOn(true); } else if (m_panelPos == PosBottom) { if (m_panelAlign == AlignLeft) - kapp->reverseLayout() ? locationBottomRight->setOn(true) : + tdeApp->reverseLayout() ? locationBottomRight->setOn(true) : locationBottomLeft->setOn(true); else if (m_panelAlign == AlignCenter) locationBottom->setOn(true); else // if (m_panelAlign == AlignRight - kapp->reverseLayout() ? locationBottomLeft->setOn(true) : + tdeApp->reverseLayout() ? locationBottomLeft->setOn(true) : locationBottomRight->setOn(true); } else // if (m_panelPos == PosLeft { if (m_panelAlign == AlignLeft) - kapp->reverseLayout() ? locationRightTop->setOn(true) : + tdeApp->reverseLayout() ? locationRightTop->setOn(true) : locationLeftTop->setOn(true); else if (m_panelAlign == AlignCenter) - kapp->reverseLayout() ? locationRight->setOn(true) : + tdeApp->reverseLayout() ? locationRight->setOn(true) : locationLeft->setOn(true); else // if (m_panelAlign == AlignRight - kapp->reverseLayout() ? locationRightBottom->setOn(true) : + tdeApp->reverseLayout() ? locationRightBottom->setOn(true) : locationLeftBottom->setOn(true); } diff --git a/kcontrol/knotify/knotify.cpp b/kcontrol/knotify/knotify.cpp index 6e198659a..5565a05d8 100644 --- a/kcontrol/knotify/knotify.cpp +++ b/kcontrol/knotify/knotify.cpp @@ -298,7 +298,7 @@ void PlayerSettingsDialog::slotApply() save(); dataChanged = false; enableButton(Apply, false); - kapp->dcopClient()->send("knotify", "", "reconfigure()", TQString("")); + tdeApp->dcopClient()->send("knotify", "", "reconfigure()", TQString("")); KDialogBase::slotApply(); } diff --git a/kcontrol/konq/behaviour.cpp b/kcontrol/konq/behaviour.cpp index 55eb642fe..0c002b5fa 100644 --- a/kcontrol/konq/behaviour.cpp +++ b/kcontrol/konq/behaviour.cpp @@ -285,7 +285,7 @@ void KBehaviourOptions::save() config.sync(); // Tell the running server - if ( kapp->dcopClient()->isApplicationRegistered( "tdeio_uiserver" ) ) + if ( tdeApp->dcopClient()->isApplicationRegistered( "tdeio_uiserver" ) ) { UIServer_stub uiserver( "tdeio_uiserver", "UIServer" ); uiserver.setListMode( cbListProgress->isChecked() ); @@ -293,10 +293,10 @@ void KBehaviourOptions::save() // Send signal to konqueror TQByteArray data; - if ( !kapp->dcopClient()->isAttached() ) - kapp->dcopClient()->attach(); - kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); - kapp->dcopClient()->send( "kdesktop", "KDesktopIface", "configure()", data ); + if ( !tdeApp->dcopClient()->isAttached() ) + tdeApp->dcopClient()->attach(); + tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); + tdeApp->dcopClient()->send( "kdesktop", "KDesktopIface", "configure()", data ); } TQString KBehaviourOptions::handbookSection() const diff --git a/kcontrol/konq/desktop.cpp b/kcontrol/konq/desktop.cpp index 6ea6178db..65212f68f 100644 --- a/kcontrol/konq/desktop.cpp +++ b/kcontrol/konq/desktop.cpp @@ -221,11 +221,11 @@ void KDesktopConfig::save() delete config; // Tell kdesktop about the new config file - if ( !kapp->dcopClient()->isAttached() ) - kapp->dcopClient()->attach(); + if ( !tdeApp->dcopClient()->isAttached() ) + tdeApp->dcopClient()->attach(); TQByteArray data; - kapp->dcopClient()->send( appname, "KDesktopIface", "configure()", data ); + tdeApp->dcopClient()->send( appname, "KDesktopIface", "configure()", data ); emit changed(false); } diff --git a/kcontrol/konq/desktopbehavior_impl.cpp b/kcontrol/konq/desktopbehavior_impl.cpp index 3d149ef39..16f8688d7 100644 --- a/kcontrol/konq/desktopbehavior_impl.cpp +++ b/kcontrol/konq/desktopbehavior_impl.cpp @@ -418,8 +418,8 @@ void DesktopBehavior::save() g_pConfig->sync(); // Tell kdesktop about the new config file - if ( !kapp->dcopClient()->isAttached() ) - kapp->dcopClient()->attach(); + if ( !tdeApp->dcopClient()->isAttached() ) + tdeApp->dcopClient()->attach(); TQByteArray data; int konq_screen_number = TDEApplication::desktop()->primaryScreen(); @@ -428,11 +428,11 @@ void DesktopBehavior::save() appname = "kdesktop"; else appname.sprintf("kdesktop-screen-%d", konq_screen_number); - kapp->dcopClient()->send( appname, "KDesktopIface", "configure()", data ); + tdeApp->dcopClient()->send( appname, "KDesktopIface", "configure()", data ); // for the standalone menubar setting - kapp->dcopClient()->send( "menuapplet*", "menuapplet", "configure()", data ); - kapp->dcopClient()->send( "kicker", "kicker", "configureMenubar()", data ); - kapp->dcopClient()->send( "twin*", "", "reconfigure()", data ); + tdeApp->dcopClient()->send( "menuapplet*", "menuapplet", "configure()", data ); + tdeApp->dcopClient()->send( "kicker", "kicker", "configureMenubar()", data ); + tdeApp->dcopClient()->send( "twin*", "", "reconfigure()", data ); } void DesktopBehavior::enableChanged() diff --git a/kcontrol/konq/fontopts.cpp b/kcontrol/konq/fontopts.cpp index e8a99297d..ae03a0534 100644 --- a/kcontrol/konq/fontopts.cpp +++ b/kcontrol/konq/fontopts.cpp @@ -330,9 +330,9 @@ void KonqFontOptions::save() // Send signal to konqueror // Warning. In case something is added/changed here, keep kfmclient in sync TQByteArray data; - if ( !kapp->dcopClient()->isAttached() ) - kapp->dcopClient()->attach(); - kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); + if ( !tdeApp->dcopClient()->isAttached() ) + tdeApp->dcopClient()->attach(); + tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); // Tell kdesktop about the new config file int konq_screen_number = TDEApplication::desktop()->primaryScreen(); @@ -341,7 +341,7 @@ void KonqFontOptions::save() appname = "kdesktop"; else appname.sprintf("kdesktop-screen-%d", konq_screen_number); - kapp->dcopClient()->send( appname, "KDesktopIface", "configure()", data ); + tdeApp->dcopClient()->send( appname, "KDesktopIface", "configure()", data ); } TQString KonqFontOptions::handbookSection() const diff --git a/kcontrol/konq/previews.cpp b/kcontrol/konq/previews.cpp index 309651dbb..2e85ab609 100644 --- a/kcontrol/konq/previews.cpp +++ b/kcontrol/konq/previews.cpp @@ -206,9 +206,9 @@ void KPreviewOptions::save() // Send signal to konqueror // Warning. In case something is added/changed here, keep kfmclient in sync TQByteArray data; - if ( !kapp->dcopClient()->isAttached() ) - kapp->dcopClient()->attach(); - kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); + if ( !tdeApp->dcopClient()->isAttached() ) + tdeApp->dcopClient()->attach(); + tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); } TQString KPreviewOptions::handbookSection() const diff --git a/kcontrol/konq/rootopts.cpp b/kcontrol/konq/rootopts.cpp index be73dcb7a..f83d68fe3 100644 --- a/kcontrol/konq/rootopts.cpp +++ b/kcontrol/konq/rootopts.cpp @@ -512,8 +512,8 @@ void DesktopPathConfig::save() } // Tell kdesktop about the new config file - if ( !kapp->dcopClient()->isAttached() ) - kapp->dcopClient()->attach(); + if ( !tdeApp->dcopClient()->isAttached() ) + tdeApp->dcopClient()->attach(); TQByteArray data; int konq_screen_number = TDEApplication::desktop()->primaryScreen(); @@ -524,7 +524,7 @@ void DesktopPathConfig::save() else { appname.sprintf("kdesktop-screen-%d", konq_screen_number); } - kapp->dcopClient()->send( appname, "KDesktopIface", "configure()", data ); + tdeApp->dcopClient()->send( appname, "KDesktopIface", "configure()", data ); } bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const TQString & type ) diff --git a/kcontrol/konqhtml/appearance.cpp b/kcontrol/konqhtml/appearance.cpp index 6e92d8ffe..d06ef054f 100644 --- a/kcontrol/konqhtml/appearance.cpp +++ b/kcontrol/konqhtml/appearance.cpp @@ -408,9 +408,9 @@ void KAppearanceOptions::save() m_pConfig->sync(); TQByteArray data; - if ( !kapp->dcopClient()->isAttached() ) - kapp->dcopClient()->attach(); - kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); + if ( !tdeApp->dcopClient()->isAttached() ) + tdeApp->dcopClient()->attach(); + tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); emit changed(false); } diff --git a/kcontrol/konqhtml/htmlopts.cpp b/kcontrol/konqhtml/htmlopts.cpp index 14cf39a36..5b5af6555 100644 --- a/kcontrol/konqhtml/htmlopts.cpp +++ b/kcontrol/konqhtml/htmlopts.cpp @@ -362,9 +362,9 @@ void KMiscHTMLOptions::save() kdeglobals.sync(); TQByteArray data; - if ( !kapp->dcopClient()->isAttached() ) - kapp->dcopClient()->attach(); - kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); + if ( !tdeApp->dcopClient()->isAttached() ) + tdeApp->dcopClient()->attach(); + tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); emit changed(false); } diff --git a/kcontrol/konqhtml/main.cpp b/kcontrol/konqhtml/main.cpp index 3f407fa23..8ee037a8d 100644 --- a/kcontrol/konqhtml/main.cpp +++ b/kcontrol/konqhtml/main.cpp @@ -149,9 +149,9 @@ void KJSParts::save() // Send signal to konqueror // Warning. In case something is added/changed here, keep kfmclient in sync TQByteArray data; - if ( !kapp->dcopClient()->isAttached() ) - kapp->dcopClient()->attach(); - kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); + if ( !tdeApp->dcopClient()->isAttached() ) + tdeApp->dcopClient()->attach(); + tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); } diff --git a/kcontrol/konqhtml/pluginopts.cpp b/kcontrol/konqhtml/pluginopts.cpp index 9bb43849f..b80aab5f4 100644 --- a/kcontrol/konqhtml/pluginopts.cpp +++ b/kcontrol/konqhtml/pluginopts.cpp @@ -230,9 +230,9 @@ void KPluginOptions::save() // instantly TQByteArray data; - if ( !kapp->dcopClient()->isAttached() ) - kapp->dcopClient()->attach(); - kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); + if ( !tdeApp->dcopClient()->isAttached() ) + tdeApp->dcopClient()->attach(); + tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); /*****************************************************************************/ diff --git a/kcontrol/konqhtml/userInterOpts_impl.cpp b/kcontrol/konqhtml/userInterOpts_impl.cpp index 26eac0f60..f61f16488 100644 --- a/kcontrol/konqhtml/userInterOpts_impl.cpp +++ b/kcontrol/konqhtml/userInterOpts_impl.cpp @@ -104,9 +104,9 @@ void userInterOpts::save() else m_pConfig->writeEntry( "MultipleTabConfirm", true ); TQByteArray data; - if ( !TDEApplication::kApplication()->dcopClient()->isAttached() ) - kapp->dcopClient()->attach(); - TDEApplication::kApplication()->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); + if ( !tdeApp->dcopClient()->isAttached() ) + tdeApp->dcopClient()->attach(); + tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); if ( m_pPermanentCloseButton->isChecked() ) m_pHoverCloseButton->setEnabled(false); diff --git a/kcontrol/konsole/kcmkonsole.cpp b/kcontrol/konsole/kcmkonsole.cpp index 87487fbe0..28cec6825 100644 --- a/kcontrol/konsole/kcmkonsole.cpp +++ b/kcontrol/konsole/kcmkonsole.cpp @@ -165,7 +165,7 @@ void KCMKonsole::save() emit changed(false); - DCOPClient *dcc = kapp->dcopClient(); + DCOPClient *dcc = tdeApp->dcopClient(); dcc->send("konsole-*", "konsole", "reparseConfiguration()", TQByteArray()); dcc->send("kdesktop", "default", "configure()", TQByteArray()); dcc->send("tdelauncher", "tdelauncher", "reparseConfiguration()", TQByteArray()); diff --git a/kcontrol/konsole/schemaeditor.cpp b/kcontrol/konsole/schemaeditor.cpp index 801880b8b..8f56905f3 100644 --- a/kcontrol/konsole/schemaeditor.cpp +++ b/kcontrol/konsole/schemaeditor.cpp @@ -77,7 +77,7 @@ SchemaEditor::SchemaEditor(TQWidget * parent, const char *name) connect(spix, TQ_SIGNAL(done(bool)), TQ_SLOT(previewLoaded(bool))); - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); if (!client->isAttached()) client->attach(); TQByteArray data; @@ -666,7 +666,7 @@ void SchemaEditor::readSchema(int num) continue; if (!(0 <= bo && bo <= 1)) continue; - color[fi] = kapp->palette().active().text(); + color[fi] = tdeApp->palette().active().text(); transparent[fi] = tr; bold[fi] = bo; type[fi] = 1; @@ -681,7 +681,7 @@ void SchemaEditor::readSchema(int num) continue; if (!(0 <= bo && bo <= 1)) continue; - color[fi] = kapp->palette().active().base(); + color[fi] = tdeApp->palette().active().base(); transparent[fi] = tr; bold[fi] = bo; type[fi] = 2; diff --git a/kcontrol/krdb/krdb.cpp b/kcontrol/krdb/krdb.cpp index 09dc7955f..5ea6bdab2 100644 --- a/kcontrol/krdb/krdb.cpp +++ b/kcontrol/krdb/krdb.cpp @@ -94,7 +94,7 @@ static void applyGtkStyles(bool active, int version) TQByteArray params; TQDataStream stream(params, IO_WriteOnly); stream << name << value; - kapp->dcopClient()->send("tdelauncher", "tdelauncher", "setLaunchEnv(TQCString,TQCString)", params); + tdeApp->dcopClient()->send("tdelauncher", "tdelauncher", "setLaunchEnv(TQCString,TQCString)", params); } // ----------------------------------------------------------------------------- @@ -168,9 +168,9 @@ static void applyQtSettings( TDEConfig& kglobals, TQSettings& settings ) TQMap <TQString, bool> pathDb; // OK, this isn't fun at all. - // KApp adds paths ending with /, QApp those without slash, and if + // TDEApp adds paths ending with /, QApp those without slash, and if // one gives it something that is other way around, it will complain and scare - // users. So we need to know whether a path being added is from KApp, and in this case + // users. So we need to know whether a path being added is from TDEApp, and in this case // end it with.. So keep a TQMap to bool, specifying whether the path is KDE-specified.. TQString qversion = tqVersion(); diff --git a/kcontrol/kthememanager/ktheme.cpp b/kcontrol/kthememanager/ktheme.cpp index 1068eb325..f4b471a52 100644 --- a/kcontrol/kthememanager/ktheme.cpp +++ b/kcontrol/kthememanager/ktheme.cpp @@ -436,7 +436,7 @@ void KTheme::apply() desktopConf.sync(); // TODO sync and signal only if <desktop> elem present // reconfigure kdesktop. kdesktop will notify all clients - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); if ( !client->isAttached() ) { client->attach(); } diff --git a/kcontrol/launch/kcmlaunch.cpp b/kcontrol/launch/kcmlaunch.cpp index 06c41eaba..db3461714 100644 --- a/kcontrol/launch/kcmlaunch.cpp +++ b/kcontrol/launch/kcmlaunch.cpp @@ -212,11 +212,11 @@ LaunchConfig::save() emit changed( false ); - if (!kapp->dcopClient()->isAttached()) - kapp->dcopClient()->attach(); + if (!tdeApp->dcopClient()->isAttached()) + tdeApp->dcopClient()->attach(); TQByteArray data; - kapp->dcopClient()->send( "kicker", "Panel", "restart()", data ); - kapp->dcopClient()->send( "kdesktop", "", "configure()", data ); + tdeApp->dcopClient()->send( "kicker", "Panel", "restart()", data ); + tdeApp->dcopClient()->send( "kdesktop", "", "configure()", data ); } void diff --git a/kcontrol/privacy/kprivacymanager.cpp b/kcontrol/privacy/kprivacymanager.cpp index 288e3074c..3e4d18d1c 100644 --- a/kcontrol/privacy/kprivacymanager.cpp +++ b/kcontrol/privacy/kprivacymanager.cpp @@ -36,8 +36,8 @@ KPrivacyManager::KPrivacyManager() { - if (!kapp->dcopClient()->isAttached()) - kapp->dcopClient()->attach(); + if (!tdeApp->dcopClient()->isAttached()) + tdeApp->dcopClient()->attach(); m_error = false; } @@ -75,12 +75,12 @@ bool KPrivacyManager::clearThumbnails() bool KPrivacyManager::clearRunCommandHistory() const { - return kapp->dcopClient()->send( "kdesktop", "KDesktopIface", "clearCommandHistory()", TQString("") ); + return tdeApp->dcopClient()->send( "kdesktop", "KDesktopIface", "clearCommandHistory()", TQString("") ); } bool KPrivacyManager::clearAllCookies() const { - return kapp->dcopClient()->send( "kded", "kcookiejar", "deleteAllCookies()", TQString("") ); + return tdeApp->dcopClient()->send( "kded", "kcookiejar", "deleteAllCookies()", TQString("") ); } bool KPrivacyManager::clearSavedClipboardContents() @@ -98,7 +98,7 @@ bool KPrivacyManager::clearSavedClipboardContents() return true; } - return kapp->dcopClient()->send( "klipper", "klipper", "clearClipboardHistory()", TQString("") ); + return tdeApp->dcopClient()->send( "klipper", "klipper", "clearClipboardHistory()", TQString("") ); } bool KPrivacyManager::clearFormCompletion() const @@ -123,7 +123,7 @@ bool KPrivacyManager::clearRecentDocuments() const bool KPrivacyManager::clearQuickStartMenu() const { - return kapp->dcopClient()->send( "kicker", "kicker", "clearQuickStartMenu()", TQString("") ); + return tdeApp->dcopClient()->send( "kicker", "kicker", "clearQuickStartMenu()", TQString("") ); } bool KPrivacyManager::clearWebHistory() @@ -134,10 +134,10 @@ bool KPrivacyManager::clearWebHistory() if(!isApplicationRegistered("konqueror")) { kdDebug() << "couldn't find Konqueror instance, preloading." << endl; - kapp->tdeinitExec("konqueror", args, 0,0); + tdeApp->tdeinitExec("konqueror", args, 0,0); } - return kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager", + return tdeApp->dcopClient()->send( "konqueror*", "KonqHistoryManager", "notifyClear(TQCString)", TQString("") ); } @@ -170,7 +170,7 @@ bool KPrivacyManager::clearKPDFDocData() bool KPrivacyManager::isApplicationRegistered(const TQString &appName) { - QCStringList regApps = kapp->dcopClient()->registeredApplications(); + QCStringList regApps = tdeApp->dcopClient()->registeredApplications(); for ( QCStringList::Iterator it = regApps.begin(); it != regApps.end(); ++it ) if((*it).find(appName.latin1()) != -1) return true; diff --git a/kcontrol/randr/tderandrpassivepopup.cpp b/kcontrol/randr/tderandrpassivepopup.cpp index b0e78087c..8dad337b7 100644 --- a/kcontrol/randr/tderandrpassivepopup.cpp +++ b/kcontrol/randr/tderandrpassivepopup.cpp @@ -88,7 +88,7 @@ void KRandrPassivePopup::startWatchingWidget( TQWidget* widget_P ) } } if( x11_events ) - kapp->installX11EventFilter( this ); + tdeApp->installX11EventFilter( this ); } bool KRandrPassivePopup::eventFilter( TQObject* o, TQEvent* e ) diff --git a/kcontrol/randr/tderandrtray.cpp b/kcontrol/randr/tderandrtray.cpp index c9be62354..0283a294b 100644 --- a/kcontrol/randr/tderandrtray.cpp +++ b/kcontrol/randr/tderandrtray.cpp @@ -75,10 +75,10 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name) globalKeys->setEnabled(true); globalKeys->updateConnections(); - connect(kapp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int))); + connect(tdeApp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int))); #if (TQT_VERSION-0 >= 0x030200) // XRANDR support -// connect(this, TQ_SIGNAL(screenSizeChanged(int, int)), kapp->desktop(), TQ_SLOT( desktopResized())); +// connect(this, TQ_SIGNAL(screenSizeChanged(int, int)), tdeApp->desktop(), TQ_SLOT( desktopResized())); #endif randr_display = XOpenDisplay(NULL); @@ -924,6 +924,6 @@ void KRandRSystemTray::deviceChanged (TDEGenericDevice* device) { void KRandRSystemTray::slotHelpContents() { - kapp->invokeHelp(TQString::null, "tderandrtray"); + tdeApp->invokeHelp(TQString::null, "tderandrtray"); } diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp index 2b78e26ff..d98787da6 100644 --- a/kcontrol/screensaver/scrnsave.cpp +++ b/kcontrol/screensaver/scrnsave.cpp @@ -497,7 +497,7 @@ void KScreenSaver::save() // TODO (GJ): When you changed anything, these two lines will give a segfault // on exit. I don't know why yet. - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); client->send("kdesktop", "KScreensaverIface", "configure()", TQString("")); mChanged = false; @@ -842,7 +842,7 @@ void KScreenSaver::slotSetup() } mSetupBt->setEnabled( false ); - kapp->flushX(); + tdeApp->flushX(); mSetupProc->start(); } @@ -886,8 +886,8 @@ void KScreenSaver::slotTest() { mTestWin = new TestWin(); mTestWin->setBackgroundMode(TQWidget::NoBackground); - mTestWin->setGeometry(0, 0, kapp->desktop()->width(), - kapp->desktop()->height()); + mTestWin->setGeometry(0, 0, tdeApp->desktop()->width(), + tdeApp->desktop()->height()); } mTestWin->show(); diff --git a/kcontrol/smartcard/smartcard.cpp b/kcontrol/smartcard/smartcard.cpp index 8c58b1e8f..8425d9124 100644 --- a/kcontrol/smartcard/smartcard.cpp +++ b/kcontrol/smartcard/smartcard.cpp @@ -50,7 +50,7 @@ KSmartcardConfig::KSmartcardConfig(TQWidget *parent, const char *name) TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); config = new TDEConfig("ksmartcardrc", false, false); - DCOPClient *dc = TDEApplication::kApplication()->dcopClient(); + DCOPClient *dc = tdeApp->dcopClient(); _ok = false; dc->remoteInterfaces("kded", "kardsvc", &_ok); @@ -189,7 +189,7 @@ void KSmartcardConfig::loadReadersTab( TQStringList lr){ // New view items TDEListViewItem * temp; - kapp->dcopClient()->call("kded", "kded", "unloadModule(TQCString)", + tdeApp->dcopClient()->call("kded", "kded", "unloadModule(TQCString)", data, rettype, retval); (void) new TDEListViewItem(base->_readerHostsListView, @@ -217,7 +217,7 @@ void KSmartcardConfig::loadReadersTab( TQStringList lr){ TQDataStream argATR(dataATR,IO_WriteOnly); argATR << *_slot; - kapp->dcopClient()->call("kded", "kardsvc", "getCardATR(TQString)", + tdeApp->dcopClient()->call("kded", "kardsvc", "getCardATR(TQString)", dataATR, rettype, retval); @@ -304,7 +304,7 @@ void KSmartcardConfig::load(bool useDefaults ) } // We call kardsvc to retrieve the current readers - kapp->dcopClient()->call("kded", "kardsvc", "getSlotList ()", + tdeApp->dcopClient()->call("kded", "kardsvc", "getSlotList ()", data, rettype, retval); TQStringList readers; readers.clear(); @@ -337,17 +337,17 @@ if (_ok) { // Start or stop the server as needed if (base->enableSupport->isChecked()) { - kapp->dcopClient()->call("kded", "kded", "loadModule(TQCString)", + tdeApp->dcopClient()->call("kded", "kded", "loadModule(TQCString)", data, rettype, retval); config->sync(); - kapp->dcopClient()->call("kded", "kardsvc", "reconfigure()", + tdeApp->dcopClient()->call("kded", "kardsvc", "reconfigure()", data, rettype, retval); } else { - kapp->dcopClient()->call("kded", "kded", "unloadModule(TQCString)", + tdeApp->dcopClient()->call("kded", "kded", "unloadModule(TQCString)", data, rettype, retval); } @@ -389,7 +389,7 @@ extern "C" TQDataStream arg(data, IO_WriteOnly); TQCString modName = "kardsvc"; arg << modName; - kapp->dcopClient()->call("kded", "kded", "loadModule(TQCString)", + tdeApp->dcopClient()->call("kded", "kded", "loadModule(TQCString)", data, rettype, retval); } } diff --git a/kcontrol/smserver/kcmsmserver.cpp b/kcontrol/smserver/kcmsmserver.cpp index 3d165a577..c5e0ad784 100644 --- a/kcontrol/smserver/kcmsmserver.cpp +++ b/kcontrol/smserver/kcmsmserver.cpp @@ -135,7 +135,7 @@ void SMServerConfig::save() // update the k menu if necessary TQByteArray data; - kapp->dcopClient()->send( "kicker", "kicker", "configure()", data ); + tdeApp->dcopClient()->send( "kicker", "kicker", "configure()", data ); } void SMServerConfig::defaults() diff --git a/kcontrol/spellchecking/spellchecking.cpp b/kcontrol/spellchecking/spellchecking.cpp index 0b9611575..5b08f56cf 100644 --- a/kcontrol/spellchecking/spellchecking.cpp +++ b/kcontrol/spellchecking/spellchecking.cpp @@ -56,9 +56,9 @@ void KSpellCheckingConfig::save() { spellConfig->writeGlobalSettings(); TQByteArray data; - if ( !kapp->dcopClient()->isAttached() ) - kapp->dcopClient()->attach(); - kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); + if ( !tdeApp->dcopClient()->isAttached() ) + tdeApp->dcopClient()->attach(); + tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); } void KSpellCheckingConfig::defaults() diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp index c03157c40..d9efc8807 100644 --- a/kcontrol/style/kcmstyle.cpp +++ b/kcontrol/style/kcmstyle.cpp @@ -95,7 +95,7 @@ extern "C" TQByteArray properties; TQDataStream d(properties, IO_WriteOnly); d.setVersion( 3 ); // Qt2 apps need this. - d << kapp->palette() << TDEGlobalSettings::generalFont(); + d << tdeApp->palette() << TDEGlobalSettings::generalFont(); Atom a = XInternAtom(tqt_xdisplay(), "_QT_DESKTOP_PROPERTIES", false); // do it for all root windows - multihead support @@ -668,12 +668,12 @@ void KCMStyle::save() if (m_bEffectsDirty) { KIPC::sendMessageAll(KIPC::SettingsChanged); - kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString("")); + tdeApp->dcopClient()->send("twin*", "", "reconfigure()", TQString("")); } //update kicker to re-used tooltips kicker parameter otherwise, it overwritted //by style tooltips parameters. TQByteArray data; - kapp->dcopClient()->send( "kicker", "kicker", "configure()", data ); + tdeApp->dcopClient()->send( "kicker", "kicker", "configure()", data ); // Clean up m_bEffectsDirty = false; diff --git a/kcontrol/taskbar/kcmtaskbar.cpp b/kcontrol/taskbar/kcmtaskbar.cpp index 2eb7cf376..ab584c629 100644 --- a/kcontrol/taskbar/kcmtaskbar.cpp +++ b/kcontrol/taskbar/kcmtaskbar.cpp @@ -292,7 +292,7 @@ TaskbarConfig::~TaskbarConfig() void TaskbarConfig::slotEditGlobalConfiguration() { TQByteArray data; - kapp->dcopClient()->send("kicker", "kicker", "reshowTaskBarConfig()", data); + tdeApp->dcopClient()->send("kicker", "kicker", "reshowTaskBarConfig()", data); } void TaskbarConfig::processLockouts() @@ -445,7 +445,7 @@ void TaskbarConfig::load() m_widget->showAllScreens->setChecked(!m_settingsObject->showCurrentScreenOnly()); int iconSize = m_settingsObject->iconSize(); - if(kapp->iconLoader()->currentSize(TDEIcon::Small) != iconSize) + if(tdeApp->iconLoader()->currentSize(TDEIcon::Small) != iconSize) { m_widget->smallIcons->setChecked(false); } @@ -457,11 +457,11 @@ void TaskbarConfig::save() if(m_widget->smallIcons->isChecked()) { - m_settingsObject->setIconSize(kapp->iconLoader()->currentSize(TDEIcon::Small)); + m_settingsObject->setIconSize(tdeApp->iconLoader()->currentSize(TDEIcon::Small)); } else { - m_settingsObject->setIconSize(kapp->iconLoader()->currentSize(TDEIcon::Panel)); + m_settingsObject->setIconSize(tdeApp->iconLoader()->currentSize(TDEIcon::Panel)); } m_settingsObject->setShowCurrentScreenOnly(!m_widget->showAllScreens->isChecked()); @@ -474,7 +474,7 @@ void TaskbarConfig::save() m_settingsObject->writeConfig(); TQByteArray data; - kapp->dcopClient()->emitDCOPSignal("kdeTaskBarConfigChanged()", data); + tdeApp->dcopClient()->emitDCOPSignal("kdeTaskBarConfigChanged()", data); } void TaskbarConfig::defaults() diff --git a/kcontrol/tdefontinst/viewpart/FontPreview.cpp b/kcontrol/tdefontinst/viewpart/FontPreview.cpp index ff2eaae77..7b5a7a5bf 100644 --- a/kcontrol/tdefontinst/viewpart/FontPreview.cpp +++ b/kcontrol/tdefontinst/viewpart/FontPreview.cpp @@ -88,7 +88,7 @@ void CFontPreview::paintEvent(TQPaintEvent *) { if(!itsCurrentUrl.isEmpty()) { - paint.setPen(kapp->palette().active().text()); + paint.setPen(tdeApp->palette().active().text()); paint.drawText(rect(), AlignCenter, i18n(" No preview available")); } } diff --git a/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp b/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp index d5ca2eba5..057b54831 100644 --- a/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp +++ b/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp @@ -50,7 +50,7 @@ CFontViewerAppMainWindow::CFontViewerAppMainWindow() if(factory) { KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); - KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); + KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection()); itsPreview=(KParts::ReadOnlyPart *)factory->create(this, "fontvier", "KParts::ReadOnlyPart"); @@ -72,9 +72,9 @@ CFontViewerAppMainWindow::CFontViewerAppMainWindow() itsPreview->openURL(openURL); TQSize defSize(450, 380); - TDEConfigGroupSaver saver(kapp->config(), CFG_GROUP); + TDEConfigGroupSaver saver(tdeApp->config(), CFG_GROUP); - resize(kapp->config()->readSizeEntry(CFG_SIZE_KEY, &defSize)); + resize(tdeApp->config()->readSizeEntry(CFG_SIZE_KEY, &defSize)); show(); } else @@ -83,9 +83,9 @@ CFontViewerAppMainWindow::CFontViewerAppMainWindow() CFontViewerAppMainWindow::~CFontViewerAppMainWindow() { - TDEConfigGroupSaver saver(kapp->config(), CFG_GROUP); - kapp->config()->writeEntry(CFG_SIZE_KEY, size()); - kapp->config()->sync(); + TDEConfigGroupSaver saver(tdeApp->config(), CFG_GROUP); + tdeApp->config()->writeEntry(CFG_SIZE_KEY, size()); + tdeApp->config()->sync(); } void CFontViewerAppMainWindow::fileOpen() diff --git a/kcontrol/tdeio/socks.cpp b/kcontrol/tdeio/socks.cpp index 8ac02dcfd..40dbf24dd 100644 --- a/kcontrol/tdeio/socks.cpp +++ b/kcontrol/tdeio/socks.cpp @@ -194,7 +194,7 @@ void KSocksConfig::libSelection() void KSocksConfig::load() { - TDEConfigGroup config(kapp->config(), "Socks"); + TDEConfigGroup config(tdeApp->config(), "Socks"); base->_c_enableSocks->setChecked(config.readBoolEntry("SOCKS_enable", false)); int id = config.readNumEntry("SOCKS_method", 1); base->bg->setButton(id); @@ -228,7 +228,7 @@ void KSocksConfig::load() void KSocksConfig::save() { - TDEConfigGroup config(kapp->config(), "Socks"); + TDEConfigGroup config(tdeApp->config(), "Socks"); config.writeEntry("SOCKS_enable",base-> _c_enableSocks->isChecked(), true, true); config.writeEntry("SOCKS_method", base->bg->id(base->bg->selected()), true, true); config.writePathEntry("SOCKS_lib", base->_c_customPath->url(), true, true); @@ -241,7 +241,7 @@ void KSocksConfig::save() } config.writePathEntry("SOCKS_lib_path", libs, ',', true, true); - kapp->config()->sync(); + tdeApp->config()->sync(); emit changed(false); } diff --git a/kcontrol/xinerama/kcmxinerama.cpp b/kcontrol/xinerama/kcmxinerama.cpp index 4456a6d84..32380a591 100644 --- a/kcontrol/xinerama/kcmxinerama.cpp +++ b/kcontrol/xinerama/kcmxinerama.cpp @@ -175,9 +175,9 @@ void KCMXinerama::save() { config->writeEntry("Unmanaged", item == _displays ? -3 : item); config->sync(); - if (!kapp->dcopClient()->isAttached()) - kapp->dcopClient()->attach(); - kapp->dcopClient()->send("twin", "", "reconfigure()", TQString("")); + if (!tdeApp->dcopClient()->isAttached()) + tdeApp->dcopClient()->attach(); + tdeApp->dcopClient()->send("twin", "", "reconfigure()", TQString("")); ksplashrc->setGroup("Xinerama"); ksplashrc->writeEntry("KSplashScreen", xw->_enableXinerama->isChecked() ? xw->_ksplashDisplay->currentItem() : -2 /* ignore Xinerama */); |