Rename KApplication to TDEApplication to avoid conflicts with KDE4

23 files changed, 40 insertions, 40 deletions

diff --git a/kcontrol/access/kaccess.cpp b/kcontrol/access/kaccess.cpp
index a69c47304..d119ed683 100644
--- a/kcontrol/access/kaccess.cpp
+++ b/kcontrol/access/kaccess.cpp
@@ -357,7 +357,7 @@ bool KAccessApp::x11EventFilter(XEvent *event)
     }
 
   // process other events as usual
-  return KApplication::x11EventFilter(event);
+  return TDEApplication::x11EventFilter(event);
 }
 
 
@@ -574,7 +574,7 @@ void KAccessApp::createDialogContents() {
       lay->setSpacing(KDialog::spacingHint());
 
       TQLabel *label1 = new TQLabel( contents);
-      TQPixmap pixmap = KApplication::kApplication()->iconLoader()->loadIcon("messagebox_warning", KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true);
+      TQPixmap pixmap = TDEApplication::kApplication()->iconLoader()->loadIcon("messagebox_warning", KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true);
       if (pixmap.isNull())
          pixmap = TQMessageBox::standardIcon(TQMessageBox::Warning);
       label1->setPixmap(pixmap);
diff --git a/kcontrol/background/bgrender.cpp b/kcontrol/background/bgrender.cpp
index d65d9b038..51d114582 100644
--- a/kcontrol/background/bgrender.cpp
+++ b/kcontrol/background/bgrender.cpp
@@ -54,7 +54,7 @@ KBackgroundRenderer::KBackgroundRenderer(int desk, int screen, bool drawBackgrou
     m_isBusyCursor = false;
     m_enableBusyCursor = false;
     m_pDirs = KGlobal::dirs();
-    m_rSize = m_Size = drawBackgroundPerScreen ? KApplication::desktop()->screenGeometry(screen).size() : KApplication::desktop()->geometry().size();
+    m_rSize = m_Size = drawBackgroundPerScreen ? TDEApplication::desktop()->screenGeometry(screen).size() : TDEApplication::desktop()->geometry().size();
     m_pProc = 0L;
     m_Tempfile = 0L;
     m_bPreview = false;
@@ -85,7 +85,7 @@ void KBackgroundRenderer::setSize(const TQSize &size)
 void KBackgroundRenderer::desktopResized()
 {
     m_State = 0;
-    m_rSize = drawBackgroundPerScreen() ? KApplication::desktop()->screenGeometry(screen()).size() : KApplication::desktop()->geometry().size();
+    m_rSize = drawBackgroundPerScreen() ? TDEApplication::desktop()->screenGeometry(screen()).size() : TDEApplication::desktop()->geometry().size();
     if( !m_bPreview )
         m_Size = m_rSize;
 }
@@ -1046,7 +1046,7 @@ KVirtualBGRenderer::KVirtualBGRenderer( int desk, KConfig *config )
     }
 
     initRenderers();
-    m_size = KApplication::desktop()->geometry().size();
+    m_size = TDEApplication::desktop()->geometry().size();
 }
 
 KVirtualBGRenderer::~KVirtualBGRenderer()
@@ -1153,7 +1153,7 @@ void KVirtualBGRenderer::setEnabled(bool enable)
 
 void KVirtualBGRenderer::desktopResized()
 {
-    m_size = KApplication::desktop()->geometry().size();
+    m_size = TDEApplication::desktop()->geometry().size();
 
     if (m_pPixmap)
     {
@@ -1194,7 +1194,7 @@ void KVirtualBGRenderer::setPreview(const TQSize & size)
 
 TQSize KVirtualBGRenderer::renderSize(int screen)
 {
-    return m_bDrawBackgroundPerScreen ? KApplication::desktop()->screenGeometry(screen).size() : KApplication::desktop()->geometry().size();
+    return m_bDrawBackgroundPerScreen ? TDEApplication::desktop()->screenGeometry(screen).size() : TDEApplication::desktop()->geometry().size();
 }
 
 
@@ -1205,7 +1205,7 @@ void KVirtualBGRenderer::initRenderers()
 
     m_bCommonScreen = m_pConfig->readBoolEntry("CommonScreen", _defCommonScreen);
 
-    m_numRenderers = m_bDrawBackgroundPerScreen ? KApplication::desktop()->numScreens() : 1;
+    m_numRenderers = m_bDrawBackgroundPerScreen ? TDEApplication::desktop()->numScreens() : 1;
 
     m_bFinished.resize(m_numRenderers);
     m_bFinished.fill(false);
@@ -1264,11 +1264,11 @@ void KVirtualBGRenderer::screenDone(int _desk, int _screen)
         // There's more than one renderer, so we are drawing each output to our own pixmap
 
         TQRect overallGeometry;
-        for (int i=0; i < KApplication::desktop()->numScreens(); ++i) {
-            overallGeometry |= KApplication::desktop()->screenGeometry(i);
+        for (int i=0; i < TDEApplication::desktop()->numScreens(); ++i) {
+            overallGeometry |= TDEApplication::desktop()->screenGeometry(i);
         }
 
-        TQPoint drawPos = KApplication::desktop()->screenGeometry(screen).topLeft() - overallGeometry.topLeft();
+        TQPoint drawPos = TDEApplication::desktop()->screenGeometry(screen).topLeft() - overallGeometry.topLeft();
         drawPos.setX( int(drawPos.x() * m_scaleX) );
         drawPos.setY( int(drawPos.y() * m_scaleY) );
 
diff --git a/kcontrol/filetypes/keditfiletype.cpp b/kcontrol/filetypes/keditfiletype.cpp
index 40013c166..4e9f50121 100644
--- a/kcontrol/filetypes/keditfiletype.cpp
+++ b/kcontrol/filetypes/keditfiletype.cpp
@@ -120,7 +120,7 @@ int main(int argc, char ** argv)
 
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
-  KApplication app;
+  TDEApplication app;
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
   if (args->count() == 0)
diff --git a/kcontrol/icons/testicons.cpp b/kcontrol/icons/testicons.cpp
index d47f8af72..64f326ebf 100644
--- a/kcontrol/icons/testicons.cpp
+++ b/kcontrol/icons/testicons.cpp
@@ -5,7 +5,7 @@
 
 int main(int argc, char **argv)
 {
-    KApplication app(argc, argv, "testicons");
+    TDEApplication app(argc, argv, "testicons");
     KIconConfig *w = new KIconConfig(0L, "testicons");
     app.setMainWidget(w);
     w->show();
diff --git a/kcontrol/input/mouse.cpp b/kcontrol/input/mouse.cpp
index bcf7c69bf..6f29c2c8b 100644
--- a/kcontrol/input/mouse.cpp
+++ b/kcontrol/input/mouse.cpp
@@ -827,7 +827,7 @@ void MouseSettings::save(KConfig *config)
   }
 #endif
   config->sync();
-  KIPC::sendMessageAll(KIPC::SettingsChanged, KApplication::SETTINGS_MOUSE);
+  KIPC::sendMessageAll(KIPC::SettingsChanged, TDEApplication::SETTINGS_MOUSE);
 }
 
 void MouseConfig::slotScrollPolarityChanged()
diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp
index cd096fa76..0c2c9a68e 100644
--- a/kcontrol/kcontrol/toplevel.cpp
+++ b/kcontrol/kcontrol/toplevel.cpp
@@ -99,7 +99,7 @@ TopLevel::TopLevel(const char* name)
   searchLayout->setMargin( 6 );
 
   TQPushButton *clearButton = new TQPushButton( mSearchFrame );
-  clearButton->setIconSet( KApplication::reverseLayout() ?
+  clearButton->setIconSet( TDEApplication::reverseLayout() ?
     SmallIconSet( "clear_left" ) : SmallIconSet("locationbar_erase") );
   searchLayout->addWidget( clearButton );
   TQToolTip::add( clearButton, i18n("Clear search") );
diff --git a/kcontrol/keys/commandShortcuts.cpp b/kcontrol/keys/commandShortcuts.cpp
index c31aaf85f..9f5a49040 100644
--- a/kcontrol/keys/commandShortcuts.cpp
+++ b/kcontrol/keys/commandShortcuts.cpp
@@ -130,7 +130,7 @@ void CommandShortcutsModule::initGUI()
 
 void CommandShortcutsModule::launchMenuEditor()
 {
-    if ( KApplication::startServiceByDesktopName( "kmenuedit",
+    if ( TDEApplication::startServiceByDesktopName( "kmenuedit",
                                                   TQString() /*url*/,
                                                   0 /*error*/,
                                                   0 /*dcopservice*/,
diff --git a/kcontrol/keys/shortcuts.cpp b/kcontrol/keys/shortcuts.cpp
index a854479e8..265f25564 100644
--- a/kcontrol/keys/shortcuts.cpp
+++ b/kcontrol/keys/shortcuts.cpp
@@ -81,7 +81,7 @@ void ShortcutsModule::save()
 	m_actionsGeneral.writeActions( "Global Shortcuts", 0, true, true );
 	m_actionsSequence.writeActions( "Global Shortcuts", 0, true, true );
 
-	KIPC::sendMessageAll( KIPC::SettingsChanged, KApplication::SETTINGS_SHORTCUTS );
+	KIPC::sendMessageAll( KIPC::SettingsChanged, TDEApplication::SETTINGS_SHORTCUTS );
 }
 
 void ShortcutsModule::defaults()
diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp b/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
index 1ba7822ec..df1bbe746 100644
--- a/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
@@ -188,7 +188,7 @@ void CKFileFontView::slotActivate(TQListViewItem *item)
 
 void CKFileFontView::selected(TQListViewItem *item)
 {
-    if (item && !(KApplication::keyboardMouseState() & (ShiftButton|ControlButton)) &&
+    if (item && !(TDEApplication::keyboardMouseState() & (ShiftButton|ControlButton)) &&
          KGlobalSettings::singleClick())
     {
         const KFileItem *fi = ((CFontListViewItem*)item)->fileInfo();
diff --git a/kcontrol/kfontinst/viewpart/FontViewerApp.h b/kcontrol/kfontinst/viewpart/FontViewerApp.h
index 70543a8f3..0364e0bbd 100644
--- a/kcontrol/kfontinst/viewpart/FontViewerApp.h
+++ b/kcontrol/kfontinst/viewpart/FontViewerApp.h
@@ -55,7 +55,7 @@ class CFontViewerAppMainWindow : public KParts::MainWindow
 
 };
 
-class CFontViewerApp : public KApplication
+class CFontViewerApp : public TDEApplication
 {
     public:
 
diff --git a/kcontrol/kicker/menutab_impl.cpp b/kcontrol/kicker/menutab_impl.cpp
index 63adf48d5..8380efbdd 100644
--- a/kcontrol/kicker/menutab_impl.cpp
+++ b/kcontrol/kicker/menutab_impl.cpp
@@ -289,7 +289,7 @@ void MenuTab::defaults()
 
 void MenuTab::launchMenuEditor()
 {
-    if ( KApplication::startServiceByDesktopName( "kmenuedit",
+    if ( TDEApplication::startServiceByDesktopName( "kmenuedit",
                                                   TQString::null /*url*/,
                                                   0 /*error*/,
                                                   0 /*dcopservice*/,
diff --git a/kcontrol/konq/desktopbehavior_impl.cpp b/kcontrol/konq/desktopbehavior_impl.cpp
index a66597f8d..307a04a6d 100644
--- a/kcontrol/konq/desktopbehavior_impl.cpp
+++ b/kcontrol/konq/desktopbehavior_impl.cpp
@@ -400,7 +400,7 @@ void DesktopBehavior::save()
        kapp->dcopClient()->attach();
     TQByteArray data;
 
-    int konq_screen_number = KApplication::desktop()->primaryScreen();
+    int konq_screen_number = TDEApplication::desktop()->primaryScreen();
     TQCString appname;
     if (konq_screen_number == 0)
         appname = "kdesktop";
diff --git a/kcontrol/konq/fontopts.cpp b/kcontrol/konq/fontopts.cpp
index 07ee4663e..37ab6f71c 100644
--- a/kcontrol/konq/fontopts.cpp
+++ b/kcontrol/konq/fontopts.cpp
@@ -335,7 +335,7 @@ void KonqFontOptions::save()
     kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
 
     // Tell kdesktop about the new config file
-    int konq_screen_number = KApplication::desktop()->primaryScreen();
+    int konq_screen_number = TDEApplication::desktop()->primaryScreen();
     TQCString appname;
     if (konq_screen_number == 0)
         appname = "kdesktop";
diff --git a/kcontrol/konq/main.cpp b/kcontrol/konq/main.cpp
index e79fbd9ce..e0a0d0780 100644
--- a/kcontrol/konq/main.cpp
+++ b/kcontrol/konq/main.cpp
@@ -35,7 +35,7 @@
 
 static TQCString configname()
 {
-	int desktop = KApplication::desktop()->primaryScreen();
+	int desktop = TDEApplication::desktop()->primaryScreen();
 	TQCString name;
 	if (desktop == 0)
 		name = "kdesktoprc";
diff --git a/kcontrol/konq/rootopts.cpp b/kcontrol/konq/rootopts.cpp
index 4110762cb..589ad0e3a 100644
--- a/kcontrol/konq/rootopts.cpp
+++ b/kcontrol/konq/rootopts.cpp
@@ -251,7 +251,7 @@ void DesktopPathConfig::save()
     if (pathChanged)
     {
         kdDebug() << "DesktopPathConfig::save sending message SettingsChanged" << endl;
-        KIPC::sendMessageAll(KIPC::SettingsChanged, KApplication::SETTINGS_PATHS);
+        KIPC::sendMessageAll(KIPC::SettingsChanged, TDEApplication::SETTINGS_PATHS);
     }
 
     // Tell kdesktop about the new config file
@@ -259,7 +259,7 @@ void DesktopPathConfig::save()
        kapp->dcopClient()->attach();
     TQByteArray data;
 
-    int konq_screen_number = KApplication::desktop()->primaryScreen();
+    int konq_screen_number = TDEApplication::desktop()->primaryScreen();
     TQCString appname;
     if (konq_screen_number == 0)
         appname = "kdesktop";
diff --git a/kcontrol/konqhtml/advancedTabDialog.cpp b/kcontrol/konqhtml/advancedTabDialog.cpp
index 681863cb6..c2c411b3e 100644
--- a/kcontrol/konqhtml/advancedTabDialog.cpp
+++ b/kcontrol/konqhtml/advancedTabDialog.cpp
@@ -106,9 +106,9 @@ void advancedTabDialog::save()
     else m_pConfig->writeEntry( "MultipleTabConfirm", true );
 
     TQByteArray data;
-    if ( !KApplication::kApplication()->dcopClient()->isAttached() )
+    if ( !TDEApplication::kApplication()->dcopClient()->isAttached() )
       kapp->dcopClient()->attach();
-    KApplication::kApplication()->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
+    TDEApplication::kApplication()->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
 
     actionButton(Apply)->setEnabled(false);
 }
diff --git a/kcontrol/krdb/krdb.cpp b/kcontrol/krdb/krdb.cpp
index 3b88ec5b2..af817b4f5 100644
--- a/kcontrol/krdb/krdb.cpp
+++ b/kcontrol/krdb/krdb.cpp
@@ -422,7 +422,7 @@ static void createGtkrc( bool exportColors, const TQColorGroup& cg, int version
 void runRdb( uint flags )
 {
   // Obtain the application palette that is about to be set.
-  TQPalette newPal = KApplication::createApplicationPalette();
+  TQPalette newPal = TDEApplication::createApplicationPalette();
   bool exportColors      = flags & KRdbExportColors;
   bool exportQtColors    = flags & KRdbExportQtColors;
   bool exportQtSettings  = flags & KRdbExportQtSettings;
diff --git a/kcontrol/randr/krandrapp.cpp b/kcontrol/randr/krandrapp.cpp
index eab459e8e..f5cfbbde1 100644
--- a/kcontrol/randr/krandrapp.cpp
+++ b/kcontrol/randr/krandrapp.cpp
@@ -43,5 +43,5 @@ bool KRandRApp::x11EventFilter(XEvent* e)
 	if (e->type == m_tray->screenChangeNotifyEvent()) {
 		m_eventMergingTimer.start(1000, TRUE);
 	}
-	return KApplication::x11EventFilter( e );
+	return TDEApplication::x11EventFilter( e );
 }
diff --git a/kcontrol/randr/krandrtray.cpp b/kcontrol/randr/krandrtray.cpp
index 89315f75c..2cdcdb636 100644
--- a/kcontrol/randr/krandrtray.cpp
+++ b/kcontrol/randr/krandrtray.cpp
@@ -537,7 +537,7 @@ void KRandRSystemTray::slotDisplayConfig()
 
 void KRandRSystemTray::slotSettingsChanged(int category)
 {
-	if ( category == (int) KApplication::SETTINGS_SHORTCUTS ) {
+	if ( category == (int) TDEApplication::SETTINGS_SHORTCUTS ) {
 		globalKeys->readSettings();
 		globalKeys->updateConnections();
 	}
diff --git a/kcontrol/randr/main.cpp b/kcontrol/randr/main.cpp
index 39903351b..c1a9e6a41 100644
--- a/kcontrol/randr/main.cpp
+++ b/kcontrol/randr/main.cpp
@@ -44,7 +44,7 @@ int main(int argc, char **argv)
 
 	TDECmdLineArgs::init(argc,argv,&aboutData);
 	TDECmdLineArgs::addCmdLineOptions(options);
-	KApplication::addCmdLineOptions();
+	TDEApplication::addCmdLineOptions();
 
 	KRandRApp app;
 
diff --git a/kcontrol/smartcard/smartcard.cpp b/kcontrol/smartcard/smartcard.cpp
index b1678d2ea..4d4f7b071 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 KConfig("ksmartcardrc", false, false);
 
-  DCOPClient *dc = KApplication::kApplication()->dcopClient();
+  DCOPClient *dc = TDEApplication::kApplication()->dcopClient();
 
   _ok = false;
   dc->remoteInterfaces("kded", "kardsvc", &_ok);
diff --git a/kcontrol/smserver/kcmsmserver.cpp b/kcontrol/smserver/kcmsmserver.cpp
index 5ea993964..1a312034d 100644
--- a/kcontrol/smserver/kcmsmserver.cpp
+++ b/kcontrol/smserver/kcmsmserver.cpp
@@ -79,11 +79,11 @@ void SMServerConfig::load(bool useDefaults )
   else // "restorePreviousLogout"
       dialog->previousSessionRadio->setChecked(true);
 
-  switch (c->readNumEntry("shutdownType", int(KApplication::ShutdownTypeNone))) {
-  case int(KApplication::ShutdownTypeHalt):
+  switch (c->readNumEntry("shutdownType", int(TDEApplication::ShutdownTypeNone))) {
+  case int(TDEApplication::ShutdownTypeHalt):
     dialog->haltRadio->setChecked(true);
     break;
-  case int(KApplication::ShutdownTypeReboot):
+  case int(TDEApplication::ShutdownTypeReboot):
     dialog->rebootRadio->setChecked(true);
     break;
   default:
@@ -116,10 +116,10 @@ void SMServerConfig::save()
 
   c->writeEntry( "shutdownType",
                  dialog->haltRadio->isChecked() ?
-                   int(KApplication::ShutdownTypeHalt) :
+                   int(TDEApplication::ShutdownTypeHalt) :
                    dialog->rebootRadio->isChecked() ?
-                     int(KApplication::ShutdownTypeReboot) :
-                     int(KApplication::ShutdownTypeNone));
+                     int(TDEApplication::ShutdownTypeReboot) :
+                     int(TDEApplication::ShutdownTypeNone));
   c->writeEntry("excludeApps", dialog->excludeLineedit->text());
   c->setGroup("Logout");
   c->writeEntry( "showLogoutStatusDlg", dialog->showLogoutStatusDialog->isChecked());
diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp
index f20477246..78126222e 100644
--- a/kcontrol/style/kcmstyle.cpp
+++ b/kcontrol/style/kcmstyle.cpp
@@ -648,7 +648,7 @@ void KCMStyle::save()
 
 	if ( m_bToolbarsDirty )
 		// ##### FIXME - Doesn't apply all settings correctly due to bugs in
-		// KApplication/KToolbar
+		// TDEApplication/KToolbar
 		KIPC::sendMessageAll(KIPC::ToolbarStyleChanged);
 
 	if (m_bEffectsDirty) {
@@ -866,7 +866,7 @@ void KCMStyle::setStyleRecursive(TQWidget* w, TQStyle* s)
 	// for other styles being previewed. (e.g SGI style)
 	w->unsetPalette();
 
-	TQPalette newPalette(KApplication::createApplicationPalette());
+	TQPalette newPalette(TDEApplication::createApplicationPalette());
 	s->polish( newPalette );
 	w->setPalette(newPalette);