From c1e3b95ae6a113ba6548f2ac4d63f739a4f7055f Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 9 Nov 2024 22:58:31 +0900 Subject: Rename KUniqueApplication to TDEUniqueApplication Signed-off-by: Michele Calgaro --- kate/app/katemainwindow.cpp | 1 - kcontrol/access/kaccess.cpp | 2 +- kcontrol/access/kaccess.h | 4 ++-- kcontrol/hwmanager/hwdevicetray_app.h | 4 ++-- kcontrol/input/tdesyndaemon.cpp | 2 +- kcontrol/kcontrol/main.cpp | 6 +++--- kcontrol/kcontrol/main.h | 4 ++-- kcontrol/randr/tderandrapp.h | 4 ++-- kdesktop/kdesktopapp.cpp | 6 +++--- kdesktop/kdesktopapp.h | 4 ++-- kdesktop/main.cpp | 4 ++-- khelpcenter/application.cpp | 4 ++-- khelpcenter/application.h | 4 ++-- khelpcenter/khc_indexbuilder.cpp | 4 ++-- khelpcenter/khc_indexbuilder.h | 4 ++-- khotkeys/app/app.cpp | 4 ++-- khotkeys/app/app.h | 4 ++-- kicker/DESIGN | 2 +- kicker/kicker/core/kicker.cpp | 2 +- kicker/kicker/core/kicker.h | 4 ++-- klipper/applet.cpp | 4 ++-- klipper/main.cpp | 8 ++++---- klipper/toplevel.cpp | 6 +++--- kmenuedit/kcontrol_main.cpp | 8 ++++---- kmenuedit/main.cpp | 10 +++++----- konqueror/keditbookmarks/main.cpp | 2 +- konsole/konsole/kwrited.cpp | 3 +-- kpager/main.cpp | 12 ++++++------ ktip/ktipwindow.cpp | 8 ++++---- kxkb/kxkb.cpp | 2 +- kxkb/kxkb.h | 4 ++-- kxkb/kxkbtraywindow.cpp | 7 ------- tdedebugdialog/main.cpp | 6 +++--- tdepasswd/tdepasswd.cpp | 8 ++++---- tdeprint/kjobviewer/kjobviewer.cpp | 2 +- tdeprint/kjobviewer/kjobviewer.h | 4 ++-- twin/activation.cpp | 2 +- 37 files changed, 80 insertions(+), 89 deletions(-) diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp index 00f01dfe6..b188e502e 100644 --- a/kate/app/katemainwindow.cpp +++ b/kate/app/katemainwindow.cpp @@ -70,7 +70,6 @@ #include #include #include -#include #include #include #include diff --git a/kcontrol/access/kaccess.cpp b/kcontrol/access/kaccess.cpp index 3b79f8ce7..4d989149b 100644 --- a/kcontrol/access/kaccess.cpp +++ b/kcontrol/access/kaccess.cpp @@ -92,7 +92,7 @@ static ModifierKey modifierKeys[] = { KAccessApp::KAccessApp(bool allowStyles, bool GUIenabled) - : KUniqueApplication(allowStyles, GUIenabled), _artsBellBlocked(false), + : TDEUniqueApplication(allowStyles, GUIenabled), _artsBellBlocked(false), overlay(0), wm(0, KWinModule::INFO_DESKTOP) { _activeWindow = wm.activeWindow(); diff --git a/kcontrol/access/kaccess.h b/kcontrol/access/kaccess.h index fbfa0d783..0bb22f8e7 100644 --- a/kcontrol/access/kaccess.h +++ b/kcontrol/access/kaccess.h @@ -6,7 +6,7 @@ #include -#include +#include #include @@ -19,7 +19,7 @@ class KDialogBase; class TQLabel; class KComboBox; -class KAccessApp : public KUniqueApplication +class KAccessApp : public TDEUniqueApplication { TQ_OBJECT diff --git a/kcontrol/hwmanager/hwdevicetray_app.h b/kcontrol/hwmanager/hwdevicetray_app.h index 8c4a4ae06..b4e03973f 100644 --- a/kcontrol/hwmanager/hwdevicetray_app.h +++ b/kcontrol/hwmanager/hwdevicetray_app.h @@ -21,11 +21,11 @@ #define TDEHWDEVICEAPP_H #include -#include +#include class HwDeviceSystemTray; -class HwDeviceApp : public KUniqueApplication +class HwDeviceApp : public TDEUniqueApplication { TQ_OBJECT diff --git a/kcontrol/input/tdesyndaemon.cpp b/kcontrol/input/tdesyndaemon.cpp index 2be3e992c..c7e0a445c 100644 --- a/kcontrol/input/tdesyndaemon.cpp +++ b/kcontrol/input/tdesyndaemon.cpp @@ -27,7 +27,7 @@ // TDE #include #include -#include +#include #include #include #include diff --git a/kcontrol/kcontrol/main.cpp b/kcontrol/kcontrol/main.cpp index 2e7fac8be..ec824396b 100644 --- a/kcontrol/kcontrol/main.cpp +++ b/kcontrol/kcontrol/main.cpp @@ -50,7 +50,7 @@ #include "version.h" KControlApp::KControlApp() - : KUniqueApplication() + : TDEUniqueApplication() , toplevel(0) { toplevel = new TopLevel(); @@ -58,7 +58,7 @@ KControlApp::KControlApp() setMainWidget(toplevel); TDEGlobal::setActiveInstance(this); - // KUniqueApplication does dcop regitration for us + // TDEUniqueApplication does dcop regitration for us ModuleIface *modIface = new ModuleIface(toplevel, "moduleIface"); connect (modIface, TQ_SIGNAL(helpClicked()), toplevel, TQ_SLOT(slotHelpRequest())); @@ -121,7 +121,7 @@ extern "C" TDE_EXPORT int kdemain(int argc, char *argv[]) aboutData->addAuthor("Waldo Bastian",0, "bastian@kde.org"); TDECmdLineArgs::init( argc, argv, aboutData ); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); KCGlobal::init(); diff --git a/kcontrol/kcontrol/main.h b/kcontrol/kcontrol/main.h index aaeabbe15..e39a7f7cc 100644 --- a/kcontrol/kcontrol/main.h +++ b/kcontrol/kcontrol/main.h @@ -21,11 +21,11 @@ #ifndef __main_h__ #define __main_h__ -#include +#include class TopLevel; -class KControlApp : public KUniqueApplication +class KControlApp : public TDEUniqueApplication { TQ_OBJECT diff --git a/kcontrol/randr/tderandrapp.h b/kcontrol/randr/tderandrapp.h index 422c0f568..4a2856ad4 100644 --- a/kcontrol/randr/tderandrapp.h +++ b/kcontrol/randr/tderandrapp.h @@ -20,11 +20,11 @@ #define TDERANDRAPP_H #include -#include +#include class KRandRSystemTray; -class KRandRApp : public KUniqueApplication +class KRandRApp : public TDEUniqueApplication { TQ_OBJECT diff --git a/kdesktop/kdesktopapp.cpp b/kdesktop/kdesktopapp.cpp index 35f763f9c..b19817bbd 100644 --- a/kdesktop/kdesktopapp.cpp +++ b/kdesktop/kdesktopapp.cpp @@ -20,7 +20,7 @@ #include KDesktopApp::KDesktopApp(): -KUniqueApplication() +TDEUniqueApplication() { #ifdef COMPOSITE initCmBackground(); @@ -28,7 +28,7 @@ KUniqueApplication() } KDesktopApp::KDesktopApp(Display * dpy, TQt::HANDLE visual, TQt::HANDLE colormap): -KUniqueApplication(dpy, visual, colormap) +TDEUniqueApplication(dpy, visual, colormap) { #ifdef COMPOSITE initCmBackground(); @@ -87,7 +87,7 @@ bool KDesktopApp::x11EventFilter (XEvent * xevent) emit cmBackgroundChanged(supported); } } - return KUniqueApplication::x11EventFilter (xevent); + return TDEUniqueApplication::x11EventFilter (xevent); } #endif diff --git a/kdesktop/kdesktopapp.h b/kdesktop/kdesktopapp.h index 1f45ec0a3..4ce52c3a2 100644 --- a/kdesktop/kdesktopapp.h +++ b/kdesktop/kdesktopapp.h @@ -21,7 +21,7 @@ #define __kdesktopapp_h__ #include -#include +#include #if defined(TQ_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300 #define COMPOSITE @@ -33,7 +33,7 @@ # include #endif -class KDesktopApp : public KUniqueApplication +class KDesktopApp : public TDEUniqueApplication { TQ_OBJECT public: diff --git a/kdesktop/main.cpp b/kdesktop/main.cpp index 5a04c9bed..5df394478 100644 --- a/kdesktop/main.cpp +++ b/kdesktop/main.cpp @@ -18,7 +18,7 @@ */ #include -#include +#include #include #include #include @@ -184,7 +184,7 @@ extern "C" TDE_EXPORT int kdemain( int argc, char **argv ) TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); - if (!KUniqueApplication::start()) { + if (!TDEUniqueApplication::start()) { fprintf(stderr, "kdesktop is already running!\n"); exit(0); } diff --git a/khelpcenter/application.cpp b/khelpcenter/application.cpp index 628b844a5..196df322c 100644 --- a/khelpcenter/application.cpp +++ b/khelpcenter/application.cpp @@ -27,7 +27,7 @@ using namespace KHC; -Application::Application() : KUniqueApplication(), mMainWindow( 0 ) +Application::Application() : TDEUniqueApplication(), mMainWindow( 0 ) { } @@ -49,7 +49,7 @@ int Application::newInstance() mMainWindow->openUrl( url ); - return KUniqueApplication::newInstance(); + return TDEUniqueApplication::newInstance(); } static TDECmdLineOptions options[] = diff --git a/khelpcenter/application.h b/khelpcenter/application.h index b908e2b09..aae52d199 100644 --- a/khelpcenter/application.h +++ b/khelpcenter/application.h @@ -20,13 +20,13 @@ #ifndef APPLICATION_H #define APPLICATION_H -#include +#include namespace KHC { class MainWindow; -class Application : public KUniqueApplication +class Application : public TDEUniqueApplication { public: Application(); diff --git a/khelpcenter/khc_indexbuilder.cpp b/khelpcenter/khc_indexbuilder.cpp index dd0ee5811..0d0b4be94 100644 --- a/khelpcenter/khc_indexbuilder.cpp +++ b/khelpcenter/khc_indexbuilder.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include @@ -181,7 +181,7 @@ int main( int argc, char **argv ) TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); TDEApplication app; diff --git a/khelpcenter/khc_indexbuilder.h b/khelpcenter/khc_indexbuilder.h index 8cbaf6b00..4f1c7e0f8 100644 --- a/khelpcenter/khc_indexbuilder.h +++ b/khelpcenter/khc_indexbuilder.h @@ -21,9 +21,9 @@ #ifndef KHC_INDEXBUILDER_H #define KHC_INDEXBUILDER_H -#include - #include +#include +#include #include class TDEProcess; diff --git a/khotkeys/app/app.cpp b/khotkeys/app/app.cpp index 8da646ef6..54d25b465 100644 --- a/khotkeys/app/app.cpp +++ b/khotkeys/app/app.cpp @@ -39,7 +39,7 @@ namespace KHotKeys // KhotKeysApp KHotKeysApp::KHotKeysApp() - : KUniqueApplication( false, true ), // no styles + : TDEUniqueApplication( false, true ), // no styles delete_helper( new TQObject ) { init_global_data( true, delete_helper ); // grab keys @@ -129,7 +129,7 @@ int TDE_EXPORT kdemain( int argc, char** argv ) // no need to i18n these, no GUI TDECmdLineArgs::init( argc, argv, "khotkeys", I18N_NOOP( "KHotKeys" ), I18N_NOOP( "KHotKeys daemon" ), KHOTKEYS_VERSION ); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); if( !KHotKeysApp::start()) // already running { return 0; diff --git a/khotkeys/app/app.h b/khotkeys/app/app.h index e0b3566ab..56c590886 100644 --- a/khotkeys/app/app.h +++ b/khotkeys/app/app.h @@ -11,7 +11,7 @@ #ifndef _KHOTKEYS_APP_H_ #define _KHOTKEYS_APP_H_ -#include +#include namespace KHotKeys { @@ -19,7 +19,7 @@ namespace KHotKeys class Action_data_group; class KHotKeysApp - : public KUniqueApplication + : public TDEUniqueApplication { TQ_OBJECT K_DCOP diff --git a/kicker/DESIGN b/kicker/DESIGN index d589ab833..2bdc65706 100644 --- a/kicker/DESIGN +++ b/kicker/DESIGN @@ -16,7 +16,7 @@ Contents NOTE: This is the design which we are working towards, not the design as it currently is, but there's no point in documenting yesterday. -The class Kicker is a subclass of KUniqueApplication and is where all the +The class Kicker is a subclass of TDEUniqueApplication and is where all the fun begins. It is always available via the static Kicker::kicker() method. Upon creation, Kicker::kicker() ensures that its resources are added to the standard dirs. This includes tile, background and various plugin directories. diff --git a/kicker/kicker/core/kicker.cpp b/kicker/kicker/core/kicker.cpp index 19c348851..b5d21c28e 100644 --- a/kicker/kicker/core/kicker.cpp +++ b/kicker/kicker/core/kicker.cpp @@ -62,7 +62,7 @@ Kicker* Kicker::the() { return static_cast(kapp); } Kicker::Kicker() - : KUniqueApplication(), + : TDEUniqueApplication(), keys(0), m_twinModule(0), m_configDialog(0), diff --git a/kicker/kicker/core/kicker.h b/kicker/kicker/core/kicker.h index 1868c0bbe..5a76570a5 100644 --- a/kicker/kicker/core/kicker.h +++ b/kicker/kicker/core/kicker.h @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include -#include +#include #include class KCMultiDialog; @@ -36,7 +36,7 @@ class KWinModule; class PanelKMenu; class PanelPopupButton; -class Kicker : public KUniqueApplication +class Kicker : public TDEUniqueApplication { TQ_OBJECT K_DCOP diff --git a/klipper/applet.cpp b/klipper/applet.cpp index d4add1609..bd8e28317 100644 --- a/klipper/applet.cpp +++ b/klipper/applet.cpp @@ -116,7 +116,7 @@ void KlipperAppletWidget::init() // call() - wait for finishing kapp->dcopClient()->call("klipper", "klipper", "quitProcess()", arg1, str, arg2 ); // register ourselves, so if klipper process is started, - // it will quit immediately (KUniqueApplication) + // it will quit immediately (TDEUniqueApplication) s_dcop = new DCOPClient; s_dcop->registerAs( "klipper", false ); } @@ -129,7 +129,7 @@ KlipperAppletWidget::~KlipperAppletWidget() DCOPClient* KlipperAppletWidget::s_dcop = 0; -// this is just to make klipper process think we're KUniqueApplication +// this is just to make klipper process think we're TDEUniqueApplication // (AKA ugly hack) int KlipperAppletWidget::newInstance() { diff --git a/klipper/main.cpp b/klipper/main.cpp index 813102af0..8a1057156 100644 --- a/klipper/main.cpp +++ b/klipper/main.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include "toplevel.h" #include "version.h" @@ -38,13 +38,13 @@ extern "C" int TDE_EXPORT kdemain(int argc, char *argv[]) { Klipper::createAboutData(); TDECmdLineArgs::init( argc, argv, Klipper::aboutData()); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); - if (!KUniqueApplication::start()) { + if (!TDEUniqueApplication::start()) { fprintf(stderr, "Klipper is already running!\n"); exit(0); } - KUniqueApplication app; + TDEUniqueApplication app; app.disableSessionManagement(); Klipper *toplevel = new Klipper(); diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp index b76c7472b..473b3ff53 100644 --- a/klipper/toplevel.cpp +++ b/klipper/toplevel.cpp @@ -1184,11 +1184,11 @@ Klipper::Klipper( TQWidget* parent ) { } -// this sucks ... KUniqueApplication registers itself as 'klipper' +// this sucks ... TDEUniqueApplication registers itself as 'klipper' // for the unique-app detection calls (and it shouldn't use that name IMHO) -// but in Klipper it's not KUniqueApplication class who handles +// but in Klipper it's not TDEUniqueApplication class who handles // the DCOP calls, but an instance of class Klipper, registered as 'klipper' -// this below avoids a warning when KUniqueApplication wouldn't otherwise +// this below avoids a warning when TDEUniqueApplication wouldn't otherwise // find newInstance() (which doesn't do anything in Klipper anyway) int Klipper::newInstance() { diff --git a/kmenuedit/kcontrol_main.cpp b/kmenuedit/kcontrol_main.cpp index 31f6b002e..0a6169d24 100644 --- a/kmenuedit/kcontrol_main.cpp +++ b/kmenuedit/kcontrol_main.cpp @@ -21,7 +21,7 @@ #include -#include +#include #include #include #include @@ -43,12 +43,12 @@ extern "C" int TDE_EXPORT kdemain( int argc, char **argv ) aboutData.addAuthor("Matthias Elter", I18N_NOOP("Original Author"), "elter@kde.org"); TDECmdLineArgs::init( argc, argv, &aboutData ); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); - if (!KUniqueApplication::start()) + if (!TDEUniqueApplication::start()) return 1; - KUniqueApplication app; + TDEUniqueApplication app; KMenuEdit *menuEdit = new KMenuEdit(true); menuEdit->show(); diff --git a/kmenuedit/main.cpp b/kmenuedit/main.cpp index 4d55eb4e2..69440e946 100644 --- a/kmenuedit/main.cpp +++ b/kmenuedit/main.cpp @@ -20,7 +20,7 @@ #include -#include +#include #include #include #include @@ -40,7 +40,7 @@ static const TDECmdLineOptions options[] = static KMenuEdit *menuEdit = 0; -class KMenuApplication : public KUniqueApplication +class KMenuApplication : public TDEUniqueApplication { public: KMenuApplication() { } @@ -57,7 +57,7 @@ public: menuEdit->selectMenuEntry(TQString::fromLocal8Bit(args->arg(1))); } } - return KUniqueApplication::newInstance(); + return TDEUniqueApplication::newInstance(); } }; @@ -72,10 +72,10 @@ extern "C" int TDE_EXPORT kdemain( int argc, char **argv ) aboutData.addAuthor("Matthias Elter", I18N_NOOP("Original Author"), "elter@kde.org"); TDECmdLineArgs::init( argc, argv, &aboutData ); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); TDECmdLineArgs::addCmdLineOptions( options ); - if (!KUniqueApplication::start()) + if (!TDEUniqueApplication::start()) return 1; KMenuApplication app; diff --git a/konqueror/keditbookmarks/main.cpp b/konqueror/keditbookmarks/main.cpp index 27c5b2ad5..1355874de 100644 --- a/konqueror/keditbookmarks/main.cpp +++ b/konqueror/keditbookmarks/main.cpp @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include diff --git a/konsole/konsole/kwrited.cpp b/konsole/konsole/kwrited.cpp index d3ccf6acc..d889ace7b 100644 --- a/konsole/konsole/kwrited.cpp +++ b/konsole/konsole/kwrited.cpp @@ -34,8 +34,7 @@ #include #include -// KDE -#include +// TDE #include #include #include diff --git a/kpager/main.cpp b/kpager/main.cpp index 20c8e268d..10c4b2780 100644 --- a/kpager/main.cpp +++ b/kpager/main.cpp @@ -21,7 +21,7 @@ ***************************************************************************/ -#include +#include #include #include #include @@ -40,10 +40,10 @@ static TDECmdLineOptions pagerOpts[] = bool closed_by_sm = false; -class KPagerApplication : public KUniqueApplication +class KPagerApplication : public TDEUniqueApplication { public: - KPagerApplication() : KUniqueApplication() {} + KPagerApplication() : TDEUniqueApplication() {} void commitData(TQSessionManager& sm) { if (mainWidget()->isHidden()) { @@ -51,7 +51,7 @@ public: return; } closed_by_sm = true; - KUniqueApplication::commitData( sm ); + TDEUniqueApplication::commitData( sm ); closed_by_sm = false; } @@ -78,9 +78,9 @@ int main(int argc, char **argv) TDECmdLineArgs::init(argc, argv, aboutdata); TDECmdLineArgs::addCmdLineOptions(pagerOpts); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); - if (!KUniqueApplication::start()) + if (!TDEUniqueApplication::start()) { kdError() << "kpager is already running!" << endl; return 0; diff --git a/ktip/ktipwindow.cpp b/ktip/ktipwindow.cpp index c4cfb2383..74a0d51d6 100644 --- a/ktip/ktipwindow.cpp +++ b/ktip/ktipwindow.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include @@ -37,12 +37,12 @@ int main(int argc, char *argv[]) "0.3", description, TDEAboutData::License_GPL, "(c) 1998-2002, KDE Developers"); TDECmdLineArgs::init( argc, argv, &aboutData ); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); - if (!KUniqueApplication::start()) + if (!TDEUniqueApplication::start()) exit(-1); - KUniqueApplication app; + TDEUniqueApplication app; KTipDialog *tipDialog = new KTipDialog(new KTipDatabase(locate("data", TQString("tdewizard/tips")))); TQ_CHECK_PTR(tipDialog); diff --git a/kxkb/kxkb.cpp b/kxkb/kxkb.cpp index 1d899299f..2b6cbb486 100644 --- a/kxkb/kxkb.cpp +++ b/kxkb/kxkb.cpp @@ -62,7 +62,7 @@ DESCRIPTION KXKBApp::KXKBApp(bool allowStyles, bool GUIenabled) - : KUniqueApplication(allowStyles, GUIenabled), + : TDEUniqueApplication(allowStyles, GUIenabled), m_prevWinId(X11Helper::UNKNOWN_WINDOW_ID), m_rules(NULL), m_tray(NULL), diff --git a/kxkb/kxkb.h b/kxkb/kxkb.h index ddde9a6c4..c4d5bf334 100644 --- a/kxkb/kxkb.h +++ b/kxkb/kxkb.h @@ -31,7 +31,7 @@ DESCRIPTION #include #include -#include +#include #include "kxkbtraywindow.h" #include "kxkbconfig.h" @@ -47,7 +47,7 @@ class LayoutMap; and switching layouts */ -class KXKBApp : public KUniqueApplication +class KXKBApp : public TDEUniqueApplication { TQ_OBJECT K_DCOP diff --git a/kxkb/kxkbtraywindow.cpp b/kxkb/kxkbtraywindow.cpp index 573b0b4ef..2d45922b6 100644 --- a/kxkb/kxkbtraywindow.cpp +++ b/kxkb/kxkbtraywindow.cpp @@ -17,7 +17,6 @@ #include #include #include -#include #include "kxkbtraywindow.h" #include "pixmap.h" @@ -67,19 +66,13 @@ void KxkbLabelController::setError(const TQString& layoutInfo) void KxkbLabelController::initLayoutList(const TQValueList& layouts, const XkbRules& rules) { TDEPopupMenu* menu = contextMenu; -// TQPopupMenu* menu = contextMenu; -// int index = menu->indexOf(0); m_descriptionMap.clear(); -// menu->clear(); -// menu->insertTitle( kapp->miniIcon(), kapp->caption() ); for(int ii=0; iiremoveItem(START_MENU_ID + ii); kdDebug() << "remove item: " << START_MENU_ID + ii << endl; } -/* menu->removeItem(CONFIG_MENU_ID); - menu->removeItem(HELP_MENU_ID);*/ TDEIconEffect iconeffect; diff --git a/tdedebugdialog/main.cpp b/tdedebugdialog/main.cpp index f1c463dce..d88e7e5a5 100644 --- a/tdedebugdialog/main.cpp +++ b/tdedebugdialog/main.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include @@ -84,8 +84,8 @@ int main(int argc, char ** argv) data.addAuthor("David Faure", I18N_NOOP("Original maintainer/developer"), "faure@kde.org"); TDECmdLineArgs::init( argc, argv, &data ); TDECmdLineArgs::addCmdLineOptions( options ); - KUniqueApplication::addCmdLineOptions(); - KUniqueApplication app; + TDEUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication app; TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); TQStringList areaList ( readAreaList() ); diff --git a/tdepasswd/tdepasswd.cpp b/tdepasswd/tdepasswd.cpp index 398d6d6bf..150a2948a 100644 --- a/tdepasswd/tdepasswd.cpp +++ b/tdepasswd/tdepasswd.cpp @@ -8,7 +8,7 @@ #include -#include +#include #include #include #include @@ -36,15 +36,15 @@ int main(int argc, char **argv) TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::addCmdLineOptions(options); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); - if (!KUniqueApplication::start()) { + if (!TDEUniqueApplication::start()) { kdDebug() << "tdepasswd is already running" << endl; return 0; } - KUniqueApplication app; + TDEUniqueApplication app; KUser ku; TQString user; diff --git a/tdeprint/kjobviewer/kjobviewer.cpp b/tdeprint/kjobviewer/kjobviewer.cpp index 814cda92a..28d7e02f9 100644 --- a/tdeprint/kjobviewer/kjobviewer.cpp +++ b/tdeprint/kjobviewer/kjobviewer.cpp @@ -89,7 +89,7 @@ void JobTray::mousePressEvent(TQMouseEvent *e) //------------------------------------------------------------- -KJobViewerApp::KJobViewerApp() : KUniqueApplication() +KJobViewerApp::KJobViewerApp() : TDEUniqueApplication() { m_views.setAutoDelete(true); m_tray = 0; diff --git a/tdeprint/kjobviewer/kjobviewer.h b/tdeprint/kjobviewer/kjobviewer.h index af606b551..611c04ba3 100644 --- a/tdeprint/kjobviewer/kjobviewer.h +++ b/tdeprint/kjobviewer/kjobviewer.h @@ -20,7 +20,7 @@ #ifndef KJOBVIEWER_H #define KJOBVIEWER_H -#include +#include #include #include @@ -28,7 +28,7 @@ class KMJobViewer; class KMTimer; class JobTray; -class KJobViewerApp : public KUniqueApplication, public KPReloadObject +class KJobViewerApp : public TDEUniqueApplication, public KPReloadObject { TQ_OBJECT friend class JobTray; diff --git a/twin/activation.cpp b/twin/activation.cpp index 47e0f9a34..69af35576 100644 --- a/twin/activation.cpp +++ b/twin/activation.cpp @@ -166,7 +166,7 @@ namespace KWinInternal be used, and it's old; also, creation timestamp is changed to the time the instance starts (re-)initializing the window, this ensures creation timestamp will still work somewhat even in this case - - KUniqueApplication - when the window is already visible, and the new instance + - TDEUniqueApplication - when the window is already visible, and the new instance wants it to activate - without focus stealing prevention - _NET_ACTIVE_WINDOW - no problem - with ASN - ASN is forwarded, and set on the already visible window, KWin -- cgit v1.2.3