diff --git a/atlantikdesigner/designer/main.cpp b/atlantikdesigner/designer/main.cpp index 5dbf334..19e62ec 100644 --- a/atlantikdesigner/designer/main.cpp +++ b/atlantikdesigner/designer/main.cpp @@ -22,7 +22,7 @@ int main(int argc, char *argv[]) TDECmdLineArgs::init(argc, argv, &aboutData); - KApplication kapplication; + TDEApplication kapplication; if (kapplication.isRestored()) RESTORE(AtlanticDesigner) diff --git a/kfile-plugins/lnk/lnkforward.h b/kfile-plugins/lnk/lnkforward.h index c256e35..14b3e76 100644 --- a/kfile-plugins/lnk/lnkforward.h +++ b/kfile-plugins/lnk/lnkforward.h @@ -28,7 +28,7 @@ #ifndef _LNKFORWARDER_H_ #define _LNKFORWARDER_H_ -class LNKForwarder : public KApplication +class LNKForwarder : public TDEApplication { Q_OBJECT diff --git a/kicker-applets/kbinaryclock/kbinaryclock.cpp b/kicker-applets/kbinaryclock/kbinaryclock.cpp index 9eafcc4..73319c5 100644 --- a/kicker-applets/kbinaryclock/kbinaryclock.cpp +++ b/kicker-applets/kbinaryclock/kbinaryclock.cpp @@ -180,7 +180,7 @@ void KBinaryClock::loadSettings(){ int darkFactor = prefs->darkFactor(); TQColor backgroundColor = prefs->background(); bool modifyBackground = false; - if(backgroundColor != KApplication::palette().active().background()){ + if(backgroundColor != TDEApplication::palette().active().background()){ setPaletteBackgroundColor(backgroundColor); modifyBackground = true; } diff --git a/kicker-applets/kbinaryclock/kbinaryclock.kcfg b/kicker-applets/kbinaryclock/kbinaryclock.kcfg index b5a5fb3..c118b7a 100644 --- a/kicker-applets/kbinaryclock/kbinaryclock.kcfg +++ b/kicker-applets/kbinaryclock/kbinaryclock.kcfg @@ -35,7 +35,7 @@ - KApplication::palette().active().background() + TDEApplication::palette().active().background() diff --git a/kicker-applets/kolourpicker/simplebutton.cpp b/kicker-applets/kolourpicker/simplebutton.cpp index 0bc34b5..2706af2 100644 --- a/kicker-applets/kolourpicker/simplebutton.cpp +++ b/kicker-applets/kolourpicker/simplebutton.cpp @@ -47,7 +47,7 @@ SimpleButton::SimpleButton(TQWidget *parent, const char *name) kapp->addKipcEventMask( KIPC::SettingsChanged ); kapp->addKipcEventMask( KIPC::IconChanged ); - slotSettingsChanged( KApplication::SETTINGS_MOUSE ); + slotSettingsChanged( TDEApplication::SETTINGS_MOUSE ); } void SimpleButton::setPixmap(const TQPixmap &pix) @@ -142,7 +142,7 @@ void SimpleButton::generateIcons() void SimpleButton::slotSettingsChanged(int category) { - if (category != KApplication::SETTINGS_MOUSE) + if (category != TDEApplication::SETTINGS_MOUSE) { return; } diff --git a/kicker-applets/mediacontrol/playerInterface.cpp b/kicker-applets/mediacontrol/playerInterface.cpp index 9517aa8..564f783 100644 --- a/kicker-applets/mediacontrol/playerInterface.cpp +++ b/kicker-applets/mediacontrol/playerInterface.cpp @@ -26,7 +26,7 @@ PlayerInterface::~PlayerInterface() { } // Destructor void PlayerInterface::startPlayer(const TQString &desktopname) { - if (KApplication::startServiceByDesktopName(desktopname, TQStringList(), + if (TDEApplication::startServiceByDesktopName(desktopname, TQStringList(), 0, 0, 0, "", false) > 0) { KMessageBox::error(0, i18n("Could not start media player.")); diff --git a/kicker-applets/mediacontrol/simplebutton.cpp b/kicker-applets/mediacontrol/simplebutton.cpp index 0bc34b5..2706af2 100644 --- a/kicker-applets/mediacontrol/simplebutton.cpp +++ b/kicker-applets/mediacontrol/simplebutton.cpp @@ -47,7 +47,7 @@ SimpleButton::SimpleButton(TQWidget *parent, const char *name) kapp->addKipcEventMask( KIPC::SettingsChanged ); kapp->addKipcEventMask( KIPC::IconChanged ); - slotSettingsChanged( KApplication::SETTINGS_MOUSE ); + slotSettingsChanged( TDEApplication::SETTINGS_MOUSE ); } void SimpleButton::setPixmap(const TQPixmap &pix) @@ -142,7 +142,7 @@ void SimpleButton::generateIcons() void SimpleButton::slotSettingsChanged(int category) { - if (category != KApplication::SETTINGS_MOUSE) + if (category != TDEApplication::SETTINGS_MOUSE) { return; } diff --git a/konq-plugins/fsview/fsview.cpp b/konq-plugins/fsview/fsview.cpp index 931c43f..49cc4ff 100644 --- a/konq-plugins/fsview/fsview.cpp +++ b/konq-plugins/fsview/fsview.cpp @@ -428,7 +428,7 @@ void FSView::saveFSOptions() void FSView::quit() { saveFSOptions(); - KApplication::kApplication()->quit(); + TDEApplication::kApplication()->quit(); } void FSView::doRedraw() diff --git a/konq-plugins/fsview/fsview_part.cpp b/konq-plugins/fsview/fsview_part.cpp index 3995a47..205d994 100644 --- a/konq-plugins/fsview/fsview_part.cpp +++ b/konq-plugins/fsview/fsview_part.cpp @@ -144,7 +144,7 @@ FSViewPart::FSViewPart(TQWidget *parentWidget, const char *widgetName, TQObject::connect (_colorMenu->popupMenu(), TQT_SIGNAL (aboutToShow()), TQT_SLOT (slotShowColorMenu())); - slotSettingsChanged(KApplication::SETTINGS_MOUSE); + slotSettingsChanged(TDEApplication::SETTINGS_MOUSE); if (kapp) connect( kapp, TQT_SIGNAL( settingsChanged(int) ), TQT_SLOT( slotSettingsChanged(int) ) ); @@ -178,7 +178,7 @@ FSViewPart::~FSViewPart() void FSViewPart::slotSettingsChanged(int category) { - if (category != KApplication::SETTINGS_MOUSE) return; + if (category != TDEApplication::SETTINGS_MOUSE) return; TQObject::disconnect(_view,TQT_SIGNAL(clicked(TreeMapItem*)), _ext,TQT_SLOT(selected(TreeMapItem*))); @@ -206,7 +206,7 @@ void FSViewPart::showInfo() void FSViewPart::showHelp() { - KApplication::startServiceByDesktopName("khelpcenter", + TDEApplication::startServiceByDesktopName("khelpcenter", TQString("help:/konq-plugins/fsview/index.html")); } diff --git a/konq-plugins/fsview/main.cpp b/konq-plugins/fsview/main.cpp index 151fe83..105f4c4 100644 --- a/konq-plugins/fsview/main.cpp +++ b/konq-plugins/fsview/main.cpp @@ -29,7 +29,7 @@ int main(int argc, char* argv[]) I18N_NOOP("(c) 2002, Josef Weidendorfer")); TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::addCmdLineOptions(options); - KApplication a; + TDEApplication a; KConfigGroup gconfig(KGlobal::config(), TQCString("General")); TQString path = gconfig.readPathEntry("Path", "."); diff --git a/konq-plugins/searchbar/searchbar.cpp b/konq-plugins/searchbar/searchbar.cpp index c31de51..9460927 100644 --- a/konq-plugins/searchbar/searchbar.cpp +++ b/konq-plugins/searchbar/searchbar.cpp @@ -285,7 +285,7 @@ void SearchBarPlugin::startSearch(const TQString &_search) KURIFilter::self()->filterURI( data, list ); } - if(KApplication::keyboardMouseState() & TQt::ControlButton) + if(TDEApplication::keyboardMouseState() & TQt::ControlButton) { KParts::URLArgs args; args.setNewTab(true); diff --git a/konq-plugins/sidebar/newsticker/sidebar_news.cpp b/konq-plugins/sidebar/newsticker/sidebar_news.cpp index cf560ac..de6788f 100644 --- a/konq-plugins/sidebar/newsticker/sidebar_news.cpp +++ b/konq-plugins/sidebar/newsticker/sidebar_news.cpp @@ -126,7 +126,7 @@ namespace KSB_News { int err = 0; if (! kapp->dcopClient()->isApplicationRegistered("rssservice")) - if (KApplication::startServiceByDesktopName("rssservice", TQString(), + if (TDEApplication::startServiceByDesktopName("rssservice", TQString(), &rdfservice_error) > 0) err = 1; diff --git a/ksig/main.cpp b/ksig/main.cpp index 96fa9fb..c7c6bf2 100644 --- a/ksig/main.cpp +++ b/ksig/main.cpp @@ -47,7 +47,7 @@ int main(int argc, char *argv[]) TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if(args->isSet("random") || args->isSet("daily")) { - KApplication a(false, false); + TDEApplication a(false, false); SigGenerator generator; TQTextStream output(stdout, IO_WriteOnly); @@ -59,7 +59,7 @@ int main(int argc, char *argv[]) return(0); } else { - KApplication a; + TDEApplication a; KSig *ksig = new KSig(); a.setMainWidget(ksig); diff --git a/ksig/siggenerator.cpp b/ksig/siggenerator.cpp index 42f6141..0bfc4c1 100644 --- a/ksig/siggenerator.cpp +++ b/ksig/siggenerator.cpp @@ -55,7 +55,7 @@ TQString SigGenerator::random() const if(signatures.count() <= 0) return(TQString()); - int i = KApplication::random() % signatures.count(); + int i = TDEApplication::random() % signatures.count(); TQString text; SigListViewItem::nodeToText(signatures.item(i), text); diff --git a/noatun-plugins/nexscope/nex.cpp b/noatun-plugins/nexscope/nex.cpp index 958ae13..0bcafbe 100644 --- a/noatun-plugins/nexscope/nex.cpp +++ b/noatun-plugins/nexscope/nex.cpp @@ -577,7 +577,7 @@ int main(int argc, char **argv) "charles@kde.org"); TDECmdLineArgs::init( argc, argv, &aboutData ); - KApplication app; + TDEApplication app; (new Control)->show(); diff --git a/noatun-plugins/noatunmadness/madness.cpp b/noatun-plugins/noatunmadness/madness.cpp index 6936889..32014f6 100644 --- a/noatun-plugins/noatunmadness/madness.cpp +++ b/noatun-plugins/noatunmadness/madness.cpp @@ -99,8 +99,8 @@ void Madness::scopeEvent(float *d, int size) int y=area.y(); - int dx=(int)((delta*lightness*(area.height()/10)/100))*(KApplication::random()%2 ? -1 : 1); - int dy=(int)((delta*lightness*(area.width()/10)/100))*(KApplication::random()%2 ? -1 : 1); + int dx=(int)((delta*lightness*(area.height()/10)/100))*(TDEApplication::random()%2 ? -1 : 1); + int dy=(int)((delta*lightness*(area.width()/10)/100))*(TDEApplication::random()%2 ? -1 : 1); if (dx < 0 && (x - dx < mWorkArea.left())) dx = -dx; diff --git a/noatun-plugins/oblique/selector.cpp b/noatun-plugins/oblique/selector.cpp index f28c333..b4af114 100644 --- a/noatun-plugins/oblique/selector.cpp +++ b/noatun-plugins/oblique/selector.cpp @@ -179,7 +179,7 @@ Item *RandomSelector::next() for (int tries=15; tries; tries--) { - int randomIndex = KApplication::random() % (mTree->playableItemCount()); + int randomIndex = TDEApplication::random() % (mTree->playableItemCount()); TreeItem *nowCurrent = randomItem(randomIndex, mTree->firstChild()); if (!nowCurrent) continue;