Rename KApplication to TDEApplication to avoid conflicts with KDE4

doc/faq/filemng.docbook

@@ -137,8 +137,8 @@ of <guilabel>Services Preference Order.</guilabel></para></listitem>
 </question>
 <answer>
 <para>They are used by all &tde; applications (since they are implemented in
-<classname>KApplication</classname> and all good &tde; programs create a
-<classname>KApplication</classname> object before they even look at the
+<classname>TDEApplication</classname> and all good &tde; programs create a
+<classname>TDEApplication</classname> object before they even look at the
 command line arguments).</para> <para>A standard line for a &tde;
 application looks like this: <userinput><command>foo</command>
 <option>... %i %m -caption \"%c\"</option></userinput>. Pretty confusing,

drkonqi/crashtest.cpp

@@ -77,7 +77,7 @@ int main(int argc, char *argv[])
   TDECmdLineArgs::init(argc, argv, &aboutData);
   TDECmdLineArgs::addCmdLineOptions(options);
 
-  KApplication app(false, false);
+  TDEApplication app(false, false);
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
   TQCString type = args->count() ? args->arg(0) : "";
   int crashtype = Crash;

drkonqi/main.cpp

@@ -80,9 +80,9 @@ int main( int argc, char* argv[] )
   TDECmdLineArgs::init(argc, argv, &aboutData);
   TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication::disableAutoDcopRegistration();
+  TDEApplication::disableAutoDcopRegistration();
 
-  KApplication a;
+  TDEApplication a;
 
   KrashConfig krashconf;
 

kappfinder/main.cpp

@@ -43,7 +43,7 @@ int main( int argc, char *argv[] )
   TDECmdLineArgs::addCmdLineOptions( options );
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
-  KApplication app;
+  TDEApplication app;
 
   TopLevel *dlg = new TopLevel( args->getOption( "dir" ) );
   app.setMainWidget( dlg );

kate/ChangeLog

@@ -208,7 +208,7 @@
   * QPopupMenu for filelist
 
 2001-03-20 Christoph Cullmann <cullmann@kde.org>
-  * kate is now a normal KApplication
+  * kate is now a normal TDEApplication
 
 2001-03-18 Christoph Cullmann <cullmann@kde.org>
   * big location changes of source files

kate/app/kateapp.cpp

@@ -52,7 +52,7 @@
 #include <sys/types.h>
 
 KateApp::KateApp (TDECmdLineArgs *args)
- : KApplication ()
+ : TDEApplication ()
  , m_args (args)
  , m_shouldExit (false)
 {

kate/app/kateapp.h

@@ -39,7 +39,7 @@ class TDECmdLineArgs;
  * Kate Application
  * This class represents the core kate application object
  */
-class KDE_EXPORT KateApp : public KApplication
+class KDE_EXPORT KateApp : public TDEApplication
 {
   Q_OBJECT
 

kate/app/kwritemain.cpp

@@ -591,7 +591,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication a;
+  TDEApplication a;
 
   KGlobal::locale()->insertCatalogue("katepart");
 

kcminit/main.cpp

@@ -241,7 +241,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
   TDECmdLineArgs::init(argc, argv, &aboutData);
   TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
 
-  KApplication app;
+  TDEApplication app;
   app.dcopClient()->registerAs( "kcminit", false );
   KLocale::setMainCatalogue(0);
   KCMInit kcminit( TDECmdLineArgs::parsedArgs());

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);

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) );
 

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)

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();

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()

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") );

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*/,

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()

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();

kcontrol/kfontinst/viewpart/FontViewerApp.h

@@ -55,7 +55,7 @@ class CFontViewerAppMainWindow : public KParts::MainWindow
 
 };
 
-class CFontViewerApp : public KApplication
+class CFontViewerApp : public TDEApplication
 {
     public:
 

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*/,

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";

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";

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";

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";

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);
 }

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;

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 );
 }

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();
 	}

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;
 

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);

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());

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);
 

kdcop/kdcop.cpp

@@ -27,7 +27,7 @@ int main( int argc, char ** argv )
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication a;
+  TDEApplication a;
 
   KDCOPWindow* kdcopwindow = new KDCOPWindow;
   a.setMainWidget( kdcopwindow );

kdcop/kdcopwindow.cpp

@@ -157,7 +157,7 @@ DCOPBrowserApplicationItem::setOpen(bool o)
   void
 DCOPBrowserApplicationItem::populate()
 {
-  KApplication::setOverrideCursor(tqwaitCursor);
+  TDEApplication::setOverrideCursor(tqwaitCursor);
 
   bool ok = false;
   bool isDefault = false;
@@ -175,7 +175,7 @@ DCOPBrowserApplicationItem::populate()
     isDefault = false;
   }
 
-  KApplication::restoreOverrideCursor();
+  TDEApplication::restoreOverrideCursor();
 }
 
 void DCOPBrowserApplicationItem::slotGotWindowName(int /*callId*/, const TQCString& /*replyType*/, const TQByteArray &replyData)
@@ -240,7 +240,7 @@ DCOPBrowserInterfaceItem::setOpen(bool o)
   void
 DCOPBrowserInterfaceItem::populate()
 {
-  KApplication::setOverrideCursor(tqwaitCursor);
+  TDEApplication::setOverrideCursor(tqwaitCursor);
 
   bool ok = false;
 
@@ -250,7 +250,7 @@ DCOPBrowserInterfaceItem::populate()
     if ((*it) != "QCStringList functions()")
       new DCOPBrowserFunctionItem(this, app_, object_, *it);
 
-  KApplication::restoreOverrideCursor();
+  TDEApplication::restoreOverrideCursor();
 }
 
 // ------------------------------------------------------------------------
@@ -902,7 +902,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
 
 void KDCOPWindow::slotFillApplications()
 {
-  KApplication::setOverrideCursor(tqwaitCursor);
+  TDEApplication::setOverrideCursor(tqwaitCursor);
 
   QCStringList apps = dcopClient->registeredApplications();
   TQCString appId = dcopClient->appId();
@@ -917,7 +917,7 @@ void KDCOPWindow::slotFillApplications()
     }
   }
 
-  KApplication::restoreOverrideCursor();
+  TDEApplication::restoreOverrideCursor();
 }
 
 bool KDCOPWindow::demarshal

kdesktop/bgmanager.cc

@@ -72,7 +72,7 @@ KBackgroundManager::KBackgroundManager(TQWidget *desktop, KWinModule* twinModule
 
     m_pDesktop = desktop;
     if (desktop == 0L)
-        desktop = TQT_TQWIDGET(KApplication::desktop()->screen());
+        desktop = TQT_TQWIDGET(TDEApplication::desktop()->screen());
 
     m_Renderer.resize( 1 );
     m_Cache.resize( 1 );
@@ -529,14 +529,14 @@ void KBackgroundManager::setPixmap(KPixmap *pm, int hash, int desk)
           root_cleared = true;
 	  TQTimer::singleShot( 0, this, TQT_SLOT( clearRoot()));
           // but make the pixmap visible until m_pDesktop is visible
-          TQT_TQWIDGET(KApplication::desktop()->screen())->setErasePixmap(*ep);
-          TQT_TQWIDGET(KApplication::desktop()->screen())->erase();
+          TQT_TQWIDGET(TDEApplication::desktop()->screen())->setErasePixmap(*ep);
+          TQT_TQWIDGET(TDEApplication::desktop()->screen())->erase();
        }
     }
     else
     {
-        TQT_TQWIDGET(KApplication::desktop()->screen())->setErasePixmap(*ep);
-        TQT_TQWIDGET(KApplication::desktop()->screen())->erase();
+        TQT_TQWIDGET(TDEApplication::desktop()->screen())->setErasePixmap(*ep);
+        TQT_TQWIDGET(TDEApplication::desktop()->screen())->erase();
     }
 
      // and export it via Esetroot-style for gnome/GTK apps to share in the pretties
@@ -556,8 +556,8 @@ void KBackgroundManager::setPixmap(KPixmap *pm, int hash, int desk)
 
 void KBackgroundManager::clearRoot()
 {
-    TQT_TQWIDGET(KApplication::desktop()->screen())->setErasePixmap( TQPixmap());
-    TQT_TQWIDGET(KApplication::desktop()->screen())->erase();
+    TQT_TQWIDGET(TDEApplication::desktop()->screen())->setErasePixmap( TQPixmap());
+    TQT_TQWIDGET(TDEApplication::desktop()->screen())->erase();
 }
 
 /*
@@ -925,7 +925,7 @@ void KBackgroundManager::repaintBackground()
     if (m_pDesktop)
        m_pDesktop->repaint();
     else
-        TQT_TQWIDGET(KApplication::desktop()->screen())->erase();
+        TQT_TQWIDGET(TDEApplication::desktop()->screen())->erase();
 }
 
 void KBackgroundManager::desktopResized()

kdesktop/desktop.cc

@@ -794,13 +794,13 @@ void KDesktop::configure()
 void KDesktop::slotSettingsChanged(int category)
 {
     //kdDebug(1204) << "KDesktop::slotSettingsChanged" << endl;
-    if (category == KApplication::SETTINGS_PATHS)
+    if (category == TDEApplication::SETTINGS_PATHS)
     {
         kdDebug(1204) << "KDesktop::slotSettingsChanged SETTINGS_PATHS" << endl;
         if (m_pIconView)
             m_pIconView->recheckDesktopURL();
     }
-    else if (category == KApplication::SETTINGS_SHORTCUTS)
+    else if (category == TDEApplication::SETTINGS_SHORTCUTS)
     {
         kdDebug(1204) << "KDesktop::slotSettingsChanged SETTINGS_SHORTCUTS" << endl;
         keys->readSettings();
@@ -1021,12 +1021,12 @@ void KDesktop::slotNewWallpaper(const KURL &url)
 // for dcop interface backward compatibility
 void KDesktop::logout()
 {
-    logout( KApplication::ShutdownConfirmDefault,
-            KApplication::ShutdownTypeNone );
+    logout( TDEApplication::ShutdownConfirmDefault,
+            TDEApplication::ShutdownTypeNone );
 }
 
-void KDesktop::logout( KApplication::ShutdownConfirm confirm,
-                       KApplication::ShutdownType sdtype )
+void KDesktop::logout( TDEApplication::ShutdownConfirm confirm,
+                       TDEApplication::ShutdownType sdtype )
 {
     if( !kapp->requestShutDown( confirm, sdtype ) )
         // this i18n string is also in kicker/applets/run/runapplet
@@ -1038,26 +1038,26 @@ void KDesktop::logout( KApplication::ShutdownConfirm confirm,
 
 void KDesktop::slotLogout()
 {
-    logout( KApplication::ShutdownConfirmDefault,
-            KApplication::ShutdownTypeDefault );
+    logout( TDEApplication::ShutdownConfirmDefault,
+            TDEApplication::ShutdownTypeDefault );
 }
 
 void KDesktop::slotLogoutNoCnf()
 {
-    logout( KApplication::ShutdownConfirmNo,
-            KApplication::ShutdownTypeNone );
+    logout( TDEApplication::ShutdownConfirmNo,
+            TDEApplication::ShutdownTypeNone );
 }
 
 void KDesktop::slotHaltNoCnf()
 {
-    logout( KApplication::ShutdownConfirmNo,
-            KApplication::ShutdownTypeHalt );
+    logout( TDEApplication::ShutdownConfirmNo,
+            TDEApplication::ShutdownTypeHalt );
 }
 
 void KDesktop::slotRebootNoCnf()
 {
-    logout( KApplication::ShutdownConfirmNo,
-            KApplication::ShutdownTypeReboot );
+    logout( TDEApplication::ShutdownConfirmNo,
+            TDEApplication::ShutdownTypeReboot );
 }
 
 void KDesktop::setVRoot( bool enable )

kdesktop/desktop.h

@@ -94,7 +94,7 @@ public:
 
   virtual void desktopIconsAreaChanged(const TQRect &area, int screen);
 
-  void logout( KApplication::ShutdownConfirm confirm, KApplication::ShutdownType sdtype );
+  void logout( TDEApplication::ShutdownConfirm confirm, TDEApplication::ShutdownType sdtype );
 
   KWinModule* twinModule() const { return m_pKwinmodule; }
 

kdesktop/kdiconview.cc

@@ -780,7 +780,7 @@ void KDIconView::saveMediaListView()
 
     // Reload kdesktop configuration to apply changes
     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";

kdesktop/krootwm.cc

@@ -523,7 +523,7 @@ void KRootWm::slotToggleAutoAlign( bool b )
     KDesktopSettings::writeConfig();
 
     // Also save it globally...
-    int desktop = KApplication::desktop()->primaryScreen();
+    int desktop = TDEApplication::desktop()->primaryScreen();
     TQCString cfilename;
     if (desktop == 0)
         cfilename = "kdesktoprc";
@@ -627,7 +627,7 @@ void KRootWm::mousePressed( const TQPoint& _global, int _button )
 void KRootWm::slotWindowList() {
 //  kdDebug() << "KRootWm::slotWindowList" << endl;
 // Popup at the center of the screen, this is from keyboard shortcut.
-  TQDesktopWidget* desktop = KApplication::desktop();
+  TQDesktopWidget* desktop = TDEApplication::desktop();
   TQRect r;
   if (desktop->numScreens() < 2)
       r = desktop->geometry();
@@ -647,7 +647,7 @@ void KRootWm::slotSwitchUser() {
 //  kdDebug() << "KRootWm::slotSwitchUser" << endl;
   if (!sessionsMenu)
     return;
-  TQDesktopWidget* desktop = KApplication::desktop();
+  TQDesktopWidget* desktop = TDEApplication::desktop();
   TQRect r;
   if (desktop->numScreens() < 2)
       r = desktop->geometry();
@@ -830,7 +830,7 @@ void KRootWm::slotSave() {
 
 
 void KRootWm::slotLogout() {
-    m_pDesktop->logout(KApplication::ShutdownConfirmDefault, KApplication::ShutdownTypeDefault);
+    m_pDesktop->logout(TDEApplication::ShutdownConfirmDefault, TDEApplication::ShutdownTypeDefault);
 }
 
 void KRootWm::slotPopulateSessions()

kdesktop/kwebdesktop/kwebdesktop.cpp

@@ -97,7 +97,7 @@ int main( int argc, char **argv )
 
     TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
 
-    KApplication app;
+    TDEApplication app;
 
     TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
     if ( args->count() != 3 && args->count() != 4 )

kdesktop/kxdglauncher.cpp

@@ -94,7 +94,7 @@ int main( int argc, char **argv)
 	TDECmdLineArgs::addCmdLineOptions( options );
 	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
-	KApplication app;
+	TDEApplication app;
 	app.disableSessionManagement();
 
 	if (args->isSet( "xdgname" ) == true) {

kdesktop/lock/lockprocess.cc

@@ -776,7 +776,7 @@ void LockProcess::startSecureDialog()
 	}
 	if (ret == 3) {
 		trinity_desktop_lock_closing_windows = 1;
-		DCOPRef("ksmserver","ksmserver").send("logout", (int)KApplication::ShutdownConfirmYes, (int)KApplication::ShutdownTypeNone, (int)KApplication::ShutdownModeInteractive);
+		DCOPRef("ksmserver","ksmserver").send("logout", (int)TDEApplication::ShutdownConfirmYes, (int)TDEApplication::ShutdownTypeNone, (int)TDEApplication::ShutdownModeInteractive);
 		kapp->quit();
 	}
 	// FIXME

kdesktop/lock/main.cc

@@ -149,7 +149,7 @@ bool MyApp::x11EventFilter( XEvent *ev )
         }
     }
 #endif
-    return KApplication::x11EventFilter( ev );
+    return TDEApplication::x11EventFilter( ev );
 }
 
 
@@ -213,7 +213,7 @@ int main( int argc, char **argv )
 
     putenv(strdup("SESSION_MANAGER="));
 
-    KApplication::disableAutoDcopRegistration(); // not needed
+    TDEApplication::disableAutoDcopRegistration(); // not needed
 
     XSetErrorHandler(trapXErrors);
 

kdesktop/lock/main.h

@@ -24,10 +24,10 @@
 
 #include <time.h>
 
-class MyApp : public KApplication {
+class MyApp : public TDEApplication {
     Q_OBJECT
 public:
-    MyApp() : KApplication(), lastTick( 0 ) {}
+    MyApp() : TDEApplication(), lastTick( 0 ) {}
 protected:
     bool x11EventFilter( XEvent * );
 signals:

kdesktop/minicli.cpp

@@ -650,7 +650,7 @@ void Minicli::notifyServiceStarted(KService::Ptr service)
     TQDataStream stream(params, IO_WriteOnly);
     stream << "minicli" << service->storageId();
     kdDebug() << "minicli appLauncher dcop signal: " << service->storageId() << endl;
-    KApplication::kApplication()->dcopClient()->emitDCOPSignal("appLauncher",
+    TDEApplication::kApplication()->dcopClient()->emitDCOPSignal("appLauncher",
         "serviceStartedByStorageId(TQString,TQString)", params);
 }
 

kdialog/kdialog.cpp

@@ -311,9 +311,9 @@ static int directCommand(TDECmdLineArgs *args)
 	    int w, h;
 	    int m = XParseGeometry( kapp->geometryArgument().latin1(), &x, &y, (unsigned int*)&w, (unsigned int*)&h);
 	    if ( (m & XNegative) )
-		x = KApplication::desktop()->width()  + x - w;
+		x = TDEApplication::desktop()->width()  + x - w;
 	    if ( (m & YNegative) )
-		y = KApplication::desktop()->height() + y - h;
+		y = TDEApplication::desktop()->height() + y - h;
 	    popup->setAnchor( TQPoint(x, y) );
 	}
 #endif
@@ -691,7 +691,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();
 

kdialog/widgets.cpp

@@ -47,9 +47,9 @@ void Widgets::handleXGeometry(TQWidget * dlg)
 	int w, h;
 	int m = XParseGeometry( kapp->geometryArgument().latin1(), &x, &y, (unsigned int*)&w, (unsigned int*)&h);
 	if ( (m & XNegative) )
-	    x = KApplication::desktop()->width()  + x - w;
+	    x = TDEApplication::desktop()->width()  + x - w;
 	if ( (m & YNegative) )
-	    y = KApplication::desktop()->height() + y - h;
+	    y = TDEApplication::desktop()->height() + y - h;
 	dlg->setGeometry(x, y, w, h);
 	// kdDebug() << "x: " << x << "  y: " << y << "  w: " << w << "  h: " << h << endl;
     }

kfind/main.cpp

@@ -45,7 +45,7 @@ int main( int argc, char ** argv )
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication app;
+  TDEApplication app;
 
   TDECmdLineArgs *args= TDECmdLineArgs::parsedArgs();
 

khelpcenter/application.cpp

@@ -76,7 +76,7 @@ extern "C" int KDE_EXPORT kdemain( int argc, char **argv )
 
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( options );
-  KApplication::addCmdLineOptions();
+  TDEApplication::addCmdLineOptions();
 
   KHC::Application app;
 

khelpcenter/docentry.cpp

@@ -113,7 +113,7 @@ void DocEntry::setIdentifier( const TQString &identifier )
 
 TQString DocEntry::identifier() const
 {
-  if ( mIdentifier.isEmpty() ) mIdentifier = KApplication::randomString( 15 );
+  if ( mIdentifier.isEmpty() ) mIdentifier = TDEApplication::randomString( 15 );
   return mIdentifier;
 }
 

khelpcenter/htmlsearch/index.cpp

@@ -23,7 +23,7 @@ int main(int argc, char *argv[])
   TDECmdLineArgs::addCmdLineOptions( options );
 
   KGlobal::locale()->setMainCatalogue("htmlsearch");
-  KApplication app;
+  TDEApplication app;
   HTMLSearch search;
 
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();

khelpcenter/khc_indexbuilder.cpp

@@ -183,7 +183,7 @@ int main( int argc, char **argv )
   TDECmdLineArgs::addCmdLineOptions( options );
   KUniqueApplication::addCmdLineOptions();
 
-  KApplication app;
+  TDEApplication app;
 
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 

khelpcenter/navigator.cpp

@@ -100,7 +100,7 @@ Navigator::Navigator( View *view, TQWidget *parent, 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 );
     connect( clearButton, TQT_SIGNAL( clicked() ), TQT_SLOT( clearSearch() ) );

khelpcenter/testmetainfo.cpp

@@ -91,7 +91,7 @@ int main(int argc,char **argv)
   KAboutData aboutData("testmetainfo","TestDocMetaInfo","0.1");
   TDECmdLineArgs::init(argc,argv,&aboutData);
 
-  KApplication app;
+  TDEApplication app;
 
   kdDebug() << "Scanning Meta Info" << endl;
 

khotkeys/kcontrol/kcmkhotkeys.cpp

@@ -133,7 +133,7 @@ void Module::save()
         if( !kapp->dcopClient()->isApplicationRegistered( "khotkeys" ))
             {
             kdDebug( 1217 ) << "launching new khotkeys daemon" << endl;
-            KApplication::tdeinitExec( "khotkeys" );
+            TDEApplication::tdeinitExec( "khotkeys" );
             }
         else
             {

khotkeys/kcontrol/menuedit.cpp

@@ -194,7 +194,7 @@ void khotkeys_send_reread_config()
     if( !kapp->dcopClient()->isApplicationRegistered( "khotkeys" ))
         {
         kdDebug( 1217 ) << "launching new khotkeys daemon" << endl;
-        KApplication::tdeinitExec( "khotkeys" );
+        TDEApplication::tdeinitExec( "khotkeys" );
         }
     else
         {

khotkeys/update/update.cpp

@@ -37,7 +37,7 @@ int main( int argc, char* argv[] )
     TDECmdLineArgs::init( argc, argv, "khotkeys_update", "KHotKeys Update",
 	"KHotKeys update utility", "1.0" );
     TDECmdLineArgs::addCmdLineOptions( options );
-    KApplication app( false, true ); // X11 connection is necessary for KKey* stuff :-/
+    TDEApplication app( false, true ); // X11 connection is necessary for KKey* stuff :-/
     TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
     TQCString id = args->getOption( "id" );
     TQString file = locate( "data", "khotkeys/" + id + ".khotkeys" );

kicker/applets/clock/clock.cpp

@@ -86,23 +86,23 @@ KConfigDialogSingle::KConfigDialogSingle(Zone *zone, TQWidget *parent,
     settings = new SettingsWidgetImp(prefs, zone, 0, "General");
     connect(TQT_TQOBJECT(settings->kcfg_Type), TQT_SIGNAL(activated(int)), TQT_SLOT(selectPage(int)));
 
-    settings->kcfg_PlainBackgroundColor->setDefaultColor(KApplication::palette().active().background());
-    settings->kcfg_DateBackgroundColor->setDefaultColor(KApplication::palette().active().background());
+    settings->kcfg_PlainBackgroundColor->setDefaultColor(TDEApplication::palette().active().background());
+    settings->kcfg_DateBackgroundColor->setDefaultColor(TDEApplication::palette().active().background());
 
     // Digital
     digitalPage = new DigitalWidget(0, "DigitalClock");
     settings->widgetStack->addWidget(digitalPage, 1);
-    digitalPage->kcfg_DigitalBackgroundColor->setDefaultColor(KApplication::palette().active().background());
+    digitalPage->kcfg_DigitalBackgroundColor->setDefaultColor(TDEApplication::palette().active().background());
 
     // Analog
     analogPage = new AnalogWidget(0, "AnalogClock");
     settings->widgetStack->addWidget(analogPage, 2);
-    analogPage->kcfg_AnalogBackgroundColor->setDefaultColor(KApplication::palette().active().background());
+    analogPage->kcfg_AnalogBackgroundColor->setDefaultColor(TDEApplication::palette().active().background());
 
     // Fuzzy
     fuzzyPage = new FuzzyWidget(0, "FuzzyClock");
     settings->widgetStack->addWidget(fuzzyPage, 3);
-    fuzzyPage->kcfg_FuzzyBackgroundColor->setDefaultColor(KApplication::palette().active().background());
+    fuzzyPage->kcfg_FuzzyBackgroundColor->setDefaultColor(TDEApplication::palette().active().background());