Rename KApplication to TDEApplication to avoid conflicts with KDE4

10 files changed, 31 insertions, 31 deletions

diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cc
index 1cd107d16..d9e62d28a 100644
--- a/konqueror/about/konq_aboutpage.cc
+++ b/konqueror/about/konq_aboutpage.cc
@@ -503,7 +503,7 @@ void KonqAboutPage::urlSelected( const TQString &url, int button, int state, con
         TQStringList args = TQStringList::split( TQChar( ' ' ), url.mid( 6 ) );
         TQString executable = args[ 0 ];
         args.remove( args.begin() );
-        KApplication::tdeinitExec( executable, args );
+        TDEApplication::tdeinitExec( executable, args );
         return;
     }
 
diff --git a/konqueror/client/kfmclient.cc b/konqueror/client/kfmclient.cc
index dd7e385e3..30f5b9c6a 100644
--- a/konqueror/client/kfmclient.cc
+++ b/konqueror/client/kfmclient.cc
@@ -167,7 +167,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
  The URL is safe, if the view used to view it is listed in the allowed KPart's.
  In order to find out the part, mimetype is needed, and KTrader is needed.
  If mimetype is not known, KMimeType is used (which doesn't work e.g. for remote
- URLs, but oh well). Since this function may be running without a KApplication
+ URLs, but oh well). Since this function may be running without a TDEApplication
  instance, I'm actually quite surprised it works, and it may sooner or later break.
  Nice, isn't it?
 
@@ -234,7 +234,7 @@ static int currentScreen()
 {
     if( tqt_xdisplay() != NULL )
         return tqt_xscreen();
-    // case when there's no KApplication instance
+    // case when there's no TDEApplication instance
     const char* env = getenv( "DISPLAY" );
     if( env == NULL )
         return 0;
@@ -271,7 +271,7 @@ static TQCString konqyToReuse( const TQString& url, const TQString& mimetype, co
     TQByteArray data;
     TQDataStream str( data, IO_WriteOnly );
     str << currentScreen();
-    if( !KApplication::dcopClient()->findObject( "konqueror*", "KonquerorIface",
+    if( !TDEApplication::dcopClient()->findObject( "konqueror*", "KonquerorIface",
              "processCanBeReused( int )", data, ret, appObj, false, 3000 ) )
         return "";
     return ret;
@@ -337,7 +337,7 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co
         TQCString foundApp, foundObj;
         TQByteArray data;
         TQDataStream str( data, IO_WriteOnly );
-        if( KApplication::dcopClient()->findObject( "konqueror*", "konqueror-mainwindow*",
+        if( TDEApplication::dcopClient()->findObject( "konqueror*", "konqueror-mainwindow*",
             "windowCanBeUsedForTab()", data, foundApp, foundObj, false, 3000 ) )
         {
             DCOPRef ref( foundApp, foundObj );
@@ -361,7 +361,7 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co
     {
         TQString error;
         /* Well, we can't pass a mimetype through startServiceByDesktopPath !
-        if ( KApplication::startServiceByDesktopPath( TQString::fromLatin1("konqueror.desktop"),
+        if ( TDEApplication::startServiceByDesktopPath( TQString::fromLatin1("konqueror.desktop"),
                                                       url.url(), &error ) > 0 )
         {
             kdError() << "Couldn't start konqueror from konqueror.desktop: " << error << endl;
@@ -391,7 +391,7 @@ bool clientApp::openProfile( const TQString & profileName, const TQString & url,
   if( appId.isEmpty())
   {
     TQString error;
-    if ( KApplication::startServiceByDesktopPath( TQString::fromLatin1("konqueror.desktop"),
+    if ( TDEApplication::startServiceByDesktopPath( TQString::fromLatin1("konqueror.desktop"),
         TQString::fromLatin1("--silent"), &error, &appId, NULL, startup_id_str ) > 0 )
     {
       kdError() << "Couldn't start konqueror from konqueror.desktop: " << error << endl;
@@ -460,10 +460,10 @@ bool clientApp::doIt()
   if ( command == "openURL" || command == "newTab" )
   {
     KInstance inst(appName);
-    if( !KApplication::dcopClient()->attach())
+    if( !TDEApplication::dcopClient()->attach())
     {
-	KApplication::startKdeinit();
-	KApplication::dcopClient()->attach();
+	TDEApplication::startKdeinit();
+	TDEApplication::dcopClient()->attach();
     }
     checkArgumentCount(argc, 1, 3);
     bool tempFile = TDECmdLineArgs::isTempFileSet();
@@ -485,10 +485,10 @@ bool clientApp::doIt()
   else if ( command == "openProfile" )
   {
     KInstance inst(appName);
-    if( !KApplication::dcopClient()->attach())
+    if( !TDEApplication::dcopClient()->attach())
     {
-	KApplication::startKdeinit();
-	KApplication::dcopClient()->attach();
+	TDEApplication::startKdeinit();
+	TDEApplication::dcopClient()->attach();
     }
     checkArgumentCount(argc, 2, 3);
     TQString url;
@@ -497,7 +497,7 @@ bool clientApp::doIt()
     return openProfile( TQString::fromLocal8Bit(args->arg(1)), url );
   }
 
-  // the following commands need KApplication
+  // the following commands need TDEApplication
   clientApp app;
 
   if ( command == "openProperties" )
diff --git a/konqueror/client/kfmclient.h b/konqueror/client/kfmclient.h
index dea4ee883..01f5f16b4 100644
--- a/konqueror/client/kfmclient.h
+++ b/konqueror/client/kfmclient.h
@@ -23,7 +23,7 @@
 #include <kapplication.h>
 #include <krun.h>
 
-class clientApp : public KApplication
+class clientApp : public TDEApplication
 {
   Q_OBJECT
 public:
diff --git a/konqueror/keditbookmarks/kbookmarkmerger.cpp b/konqueror/keditbookmarks/kbookmarkmerger.cpp
index bea3c0e26..b5dfe553f 100644
--- a/konqueror/keditbookmarks/kbookmarkmerger.cpp
+++ b/konqueror/keditbookmarks/kbookmarkmerger.cpp
@@ -70,9 +70,9 @@ int main( int argc, char**argv )
 	TDECmdLineArgs::addCmdLineOptions( cmdLineOptions );
 
 	if ( !kdeRunning ) {
-		KApplication::disableAutoDcopRegistration();
+		TDEApplication::disableAutoDcopRegistration();
 	}
-	KApplication app( false, false );
+	TDEApplication app( false, false );
 	app.disableSessionManagement();
 
 	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
diff --git a/konqueror/keditbookmarks/main.cpp b/konqueror/keditbookmarks/main.cpp
index b99313159..50b7d2046 100644
--- a/konqueror/keditbookmarks/main.cpp
+++ b/konqueror/keditbookmarks/main.cpp
@@ -83,7 +83,7 @@ static void continueInWindow(TQString _wname) {
 }
 
 // TODO - make this register() or something like that and move dialog into main
-static int askUser(KApplication &app, TQString filename, bool &readonly) {
+static int askUser(TDEApplication &app, TQString filename, bool &readonly) {
     TQCString requestedName("keditbookmarks");
 
     if (!filename.isEmpty())
@@ -122,7 +122,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) {
     aboutData.addAuthor("Alexander Kellett", I18N_NOOP("Author"), "[email protected]");
 
     TDECmdLineArgs::init(argc, argv, &aboutData);
-    KApplication::addCmdLineOptions();
+    TDEApplication::addCmdLineOptions();
     TDECmdLineArgs::addCmdLineOptions(options);
 
     TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
@@ -133,8 +133,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) {
 
     bool browser = args->isSet("browser");
 
-    KApplication::disableAutoDcopRegistration(); 
-    KApplication app(isGui, isGui);
+    TDEApplication::disableAutoDcopRegistration(); 
+    TDEApplication app(isGui, isGui);
 
     bool gotArg = (args->count() == 1);
 
diff --git a/konqueror/kfmclient.desktop b/konqueror/kfmclient.desktop
index aeed1da6c..7407c5953 100644
--- a/konqueror/kfmclient.desktop
+++ b/konqueror/kfmclient.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-# This desktop file is the one used by KApplication::invokeBrowser
+# This desktop file is the one used by TDEApplication::invokeBrowser
 Type=Application
 Exec=kfmclient openURL %u
 Icon=konqueror
diff --git a/konqueror/konq_main.h b/konqueror/konq_main.h
index 92dbdd3b2..21f09f212 100644
--- a/konqueror/konq_main.h
+++ b/konqueror/konq_main.h
@@ -6,16 +6,16 @@
 // This is used to know if we are being closed by session management
 // or by the user. See KonqMainWindow::~KonqMainWindow.
 // Credits to Matthias Ettrich for the idea.
-class KonquerorApplication : public KApplication
+class KonquerorApplication : public TDEApplication
 {
 public:
-  KonquerorApplication() : KApplication(),
+  KonquerorApplication() : TDEApplication(),
       closed_by_sm( false ) {}
 
   bool closedByUser() const { return !closed_by_sm; }
   void commitData(TQSessionManager& sm) {
     closed_by_sm = true;
-    KApplication::commitData( sm );
+    TDEApplication::commitData( sm );
     closed_by_sm = false;
   }
  
diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc
index 767b13817..b1597eccd 100644
--- a/konqueror/konq_mainwindow.cc
+++ b/konqueror/konq_mainwindow.cc
@@ -1145,7 +1145,7 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs
       req.newTabInFront = KonqSettings::newTabsInFront();
       req.openAfterCurrentPage = KonqSettings::openAfterCurrentPage();
 
-      if (KApplication::keyboardMouseState() & TQt::ShiftButton)
+      if (TDEApplication::keyboardMouseState() & TQt::ShiftButton)
         req.newTabInFront = !req.newTabInFront;
       req.args = args;
       openURL( 0L, url, TQString::null, req );
@@ -2016,7 +2016,7 @@ void KonqMainWindow::slotConfigure()
 
 void KonqMainWindow::slotConfigureSpellChecking()
 {
-    KApplication::startServiceByDesktopName("spellchecking");
+    TDEApplication::startServiceByDesktopName("spellchecking");
 }
 
 void KonqMainWindow::slotConfigureToolbars()
@@ -2739,7 +2739,7 @@ void KonqMainWindow::slotPopupNewTab()
     bool openAfterCurrentPage = KonqSettings::openAfterCurrentPage();
     bool newTabsInFront = KonqSettings::newTabsInFront();
 
-    if (KApplication::keyboardMouseState() & TQt::ShiftButton)
+    if (TDEApplication::keyboardMouseState() & TQt::ShiftButton)
       newTabsInFront = !newTabsInFront;
 
     popupNewTab(newTabsInFront, openAfterCurrentPage);
@@ -2749,7 +2749,7 @@ void KonqMainWindow::slotPopupNewTabRight()
 {
     bool newTabsInFront = KonqSettings::newTabsInFront();
 
-    if (KApplication::keyboardMouseState() & ShiftButton)
+    if (TDEApplication::keyboardMouseState() & ShiftButton)
       newTabsInFront = !newTabsInFront;
 
     popupNewTab(newTabsInFront, false);
diff --git a/konqueror/konq_view.cc b/konqueror/konq_view.cc
index 52fdd0b20..58ed78b38 100644
--- a/konqueror/konq_view.cc
+++ b/konqueror/konq_view.cc
@@ -77,7 +77,7 @@ KonqView::KonqView( KonqViewFactory &viewFactory,
   m_pPart = 0L;
   m_dcopObject = 0L;
 
-  m_randID = KApplication::random();
+  m_randID = TDEApplication::random();
 
   m_service = service;
   m_partServiceOffers = partServiceOffers;
diff --git a/konqueror/listview/konq_listview.kcfg b/konqueror/listview/konq_listview.kcfg
index cd7d2bc68..883bfe2bb 100644
--- a/konqueror/listview/konq_listview.kcfg
+++ b/konqueror/listview/konq_listview.kcfg
@@ -20,7 +20,7 @@
       <whatsthis></whatsthis>
     </entry>
     <entry key="FileNameColumnWidth" type="Int">
-      <default code="true">25 * KApplication::kApplication()->fontMetrics().width( "m" )</default>
+      <default code="true">25 * TDEApplication::kApplication()->fontMetrics().width( "m" )</default>
       <label>Width of the FileName Column</label>
       <whatsthis></whatsthis>
     </entry>