Rename KApplication to TDEApplication to avoid conflicts with KDE4

36 files changed, 50 insertions, 50 deletions

diff --git a/cervisia/cervisiapart.cpp b/cervisia/cervisiapart.cpp
index 35024df0..da2d1556 100644
--- a/cervisia/cervisiapart.cpp
+++ b/cervisia/cervisiapart.cpp
@@ -111,7 +111,7 @@ CervisiaPart::CervisiaPart( TQWidget *parentWidget, const char *widgetName,
     // start the cvs DCOP service
     TQString error;
     TQCString appId;
-    if( KApplication::startServiceByDesktopName("cvsservice", TQStringList(), &error, &appId) )
+    if( TDEApplication::startServiceByDesktopName("cvsservice", TQStringList(), &error, &appId) )
     {
         KMessageBox::sorry(0, i18n("Starting cvsservice failed with message: ") +
             error, "Cervisia");
@@ -1642,14 +1642,14 @@ void CervisiaPart::slotConfigure()
 void CervisiaPart::slotHelp()
 {
     emit setStatusBarText( i18n("Invoking help on Cervisia") );
-    KApplication::startServiceByDesktopName("khelpcenter", TQString("help:/cervisia/index.html"));
+    TDEApplication::startServiceByDesktopName("khelpcenter", TQString("help:/cervisia/index.html"));
 }
 
 
 void CervisiaPart::slotCVSInfo()
 {
     emit setStatusBarText( i18n("Invoking help on CVS") );
-    KApplication::startServiceByDesktopName("khelpcenter", TQString("info:/cvs/Top"));
+    TDEApplication::startServiceByDesktopName("khelpcenter", TQString("info:/cvs/Top"));
 }
 
 
diff --git a/cervisia/cvsservice/DESIGN b/cervisia/cvsservice/DESIGN
index c258e911..02f0ed62 100644
--- a/cervisia/cvsservice/DESIGN
+++ b/cervisia/cvsservice/DESIGN
@@ -30,7 +30,7 @@ How-to use this service in C++ applications:
     QString error;
     QCString appId;
 
-    KApplication::startServiceByDesktopName("cvsservice", QStringList(), &error,
+    TDEApplication::startServiceByDesktopName("cvsservice", QStringList(), &error,
                                             &appId);
 
     // create stub for repository
diff --git a/cervisia/cvsservice/cvsaskpass.cpp b/cervisia/cvsservice/cvsaskpass.cpp
index eb581f34..ac6a6796 100644
--- a/cervisia/cvsservice/cvsaskpass.cpp
+++ b/cervisia/cvsservice/cvsaskpass.cpp
@@ -46,8 +46,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char** argv)
     TDECmdLineArgs::addCmdLineOptions(options);
 
     // no need to register with the dcop server
-    KApplication::disableAutoDcopRegistration();
-    KApplication app;
+    TDEApplication::disableAutoDcopRegistration();
+    TDEApplication app;
 
     // no need for session management
     app.disableSessionManagement();
diff --git a/cervisia/cvsservice/main.cpp b/cervisia/cvsservice/main.cpp
index 3264487c..bcb666a2 100644
--- a/cervisia/cvsservice/main.cpp
+++ b/cervisia/cvsservice/main.cpp
@@ -35,7 +35,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char** argv)
 
     TDECmdLineArgs::init(argc, argv, &about);
 
-    KApplication app;
+    TDEApplication app;
     
     // This app is started automatically, no need for session management
     app.disableSessionManagement();
diff --git a/cervisia/main.cpp b/cervisia/main.cpp
index 4a5bb5ad..1290995b 100644
--- a/cervisia/main.cpp
+++ b/cervisia/main.cpp
@@ -43,7 +43,7 @@ static CvsService_stub* StartDCOPService(const TQString& directory)
     // start the cvs DCOP service
     TQString error;
     TQCString appId;
-    if( KApplication::startServiceByDesktopName("cvsservice", TQStringList(),
+    if( TDEApplication::startServiceByDesktopName("cvsservice", TQStringList(),
                                                 &error, &appId) )
     {
         std::cerr << "Starting cvsservice failed with message: "
@@ -167,7 +167,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
     TDECmdLineArgs::init(argc, argv, &about);
     TDECmdLineArgs::addCmdLineOptions(options);
 
-    KApplication app;
+    TDEApplication app;
 
     TQString resolvefile = TDECmdLineArgs::parsedArgs()->getOption("resolve");
     if (!resolvefile.isEmpty())
diff --git a/kapptemplate/kapp/app_client.cpp b/kapptemplate/kapp/app_client.cpp
index 53de48f5..9694e457 100644
--- a/kapptemplate/kapp/app_client.cpp
+++ b/kapptemplate/kapp/app_client.cpp
@@ -7,7 +7,7 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}_client.cpp
 
 int main(int argc, char **argv)
 {
-    KApplication app(argc, argv, "${APP_NAME_LC}_client", false);
+    TDEApplication app(argc, argv, "${APP_NAME_LC}_client", false);
 
     // get our DCOP client and attach so that we may use it
     DCOPClient *client = app.dcopClient();
diff --git a/kapptemplate/kapp/main.cpp b/kapptemplate/kapp/main.cpp
index 69668df8..abf4cf92 100644
--- a/kapptemplate/kapp/main.cpp
+++ b/kapptemplate/kapp/main.cpp
@@ -24,7 +24,7 @@ int main(int argc, char **argv)
     about.addAuthor( "${AUTHOR}", 0, "${EMAIL}" );
     TDECmdLineArgs::init(argc, argv, &about);
     TDECmdLineArgs::addCmdLineOptions(options);
-    KApplication app;
+    TDEApplication app;
 
     // register ourselves as a dcop client
     app.dcopClient()->registerAs(app.name(), false);
diff --git a/kapptemplate/kpartapp/main.cpp b/kapptemplate/kpartapp/main.cpp
index 5e5276bc..55cb53d7 100644
--- a/kapptemplate/kpartapp/main.cpp
+++ b/kapptemplate/kpartapp/main.cpp
@@ -23,7 +23,7 @@ int main(int argc, char **argv)
     about.addAuthor( "${AUTHOR}", 0, "${EMAIL}" );
     TDECmdLineArgs::init(argc, argv, &about);
     TDECmdLineArgs::addCmdLineOptions( options );
-    KApplication app;
+    TDEApplication app;
 
     // see if we are starting with session management
     if (app.isRestored())
diff --git a/kbabel/addons/preview/pothumbcreator.cpp b/kbabel/addons/preview/pothumbcreator.cpp
index 22f6fb5e..3dbd6611 100644
--- a/kbabel/addons/preview/pothumbcreator.cpp
+++ b/kbabel/addons/preview/pothumbcreator.cpp
@@ -319,7 +319,7 @@ bool PoThumbCreator::create(const TQString &path, int width, int height, TQImage
 
         // very very seldom a babelfish lives in po files and even
         // in this seldom cases they are usually hidden ;-)
-        if(pix.width() > 40 && KApplication::random()%2000 == 0)
+        if(pix.width() > 40 && TDEApplication::random()%2000 == 0)
         {
            TQPixmap kbabelPix; 
            if(pix.width() < 80)
diff --git a/kbabel/catalogmanager/catalogmanagerapp.h b/kbabel/catalogmanager/catalogmanagerapp.h
index 3f7c0fa8..99e3e97e 100644
--- a/kbabel/catalogmanager/catalogmanagerapp.h
+++ b/kbabel/catalogmanager/catalogmanagerapp.h
@@ -53,7 +53,7 @@ public:
     virtual void updatedFile( TQCString url );
 };
 
-class CatalogManagerApp : public KApplication
+class CatalogManagerApp : public TDEApplication
 {
 public:
     CatalogManagerApp();
diff --git a/kbabel/catalogmanager/libcvs/cvshandler.cpp b/kbabel/catalogmanager/libcvs/cvshandler.cpp
index b0be0345..1cd78410 100644
--- a/kbabel/catalogmanager/libcvs/cvshandler.cpp
+++ b/kbabel/catalogmanager/libcvs/cvshandler.cpp
@@ -379,7 +379,7 @@ void CVSHandler::processDiff( TQString output )
   tmpFile.close();
 
   TQString error;
-  if ( KApplication::startServiceByName( "Kompare", tmpFile.name(), &error ) )
+  if ( TDEApplication::startServiceByName( "Kompare", tmpFile.name(), &error ) )
     KMessageBox::error( 0, error );
 }
 
diff --git a/kbabel/catalogmanager/libsvn/svnhandler.cpp b/kbabel/catalogmanager/libsvn/svnhandler.cpp
index d00c0858..bff097fd 100644
--- a/kbabel/catalogmanager/libsvn/svnhandler.cpp
+++ b/kbabel/catalogmanager/libsvn/svnhandler.cpp
@@ -487,7 +487,7 @@ void SVNHandler::processDiff( TQString output )
   tmpFile.close();
 
   TQString error;
-  if ( KApplication::startServiceByName( "Kompare", tmpFile.name(), &error ) )
+  if ( TDEApplication::startServiceByName( "Kompare", tmpFile.name(), &error ) )
     KMessageBox::error( 0, error );
 }
 
diff --git a/kbabel/catalogmanager/main.cpp b/kbabel/catalogmanager/main.cpp
index d071ecb6..ef17c176 100644
--- a/kbabel/catalogmanager/main.cpp
+++ b/kbabel/catalogmanager/main.cpp
@@ -61,7 +61,7 @@
 CatalogManager *CatalogManagerApp::_view = 0;
 
 CatalogManagerApp::CatalogManagerApp()
-    : KApplication()
+    : TDEApplication()
 {
     kbInterface = new CatalogManagerInterface;
     _view = 0;
@@ -222,7 +222,7 @@ int main(int argc, char **argv)
     TDECmdLineArgs::addCmdLineOptions( options );
 
     // Add options from other components
-    KApplication::addCmdLineOptions();
+    TDEApplication::addCmdLineOptions();
 
     CatalogManagerApp app;
 
diff --git a/kbabel/kbabel/kbabel.cpp b/kbabel/kbabel/kbabel.cpp
index 406e8509..91e591fb 100644
--- a/kbabel/kbabel/kbabel.cpp
+++ b/kbabel/kbabel/kbabel.cpp
@@ -1560,7 +1560,7 @@ void KBabelMW::enableStop(bool flag)
 void KBabelMW::gettextHelp()
 {
     TQString error;
-    KApplication::startServiceByDesktopName("khelpcenter",
+    TDEApplication::startServiceByDesktopName("khelpcenter",
                 TQString("info:/gettext"), &error);
 
     if(!error.isEmpty())
diff --git a/kbabel/kbabel/main.cpp b/kbabel/kbabel/main.cpp
index f52d0e06..1e8ca625 100644
--- a/kbabel/kbabel/main.cpp
+++ b/kbabel/kbabel/main.cpp
@@ -203,7 +203,7 @@ int KBabelApp::newInstance()
         }
         if(showSplash)
         {
-            KApplication::restoreOverrideCursor();
+            TDEApplication::restoreOverrideCursor();
             /*
             KMessageBox::information(0,
                     "This is a development version of KBabel!\n"
diff --git a/kbabel/kbabeldict/kbabeldictbox.cpp b/kbabel/kbabeldict/kbabeldictbox.cpp
index bd88e240..239801d3 100644
--- a/kbabel/kbabeldict/kbabeldictbox.cpp
+++ b/kbabel/kbabeldict/kbabeldictbox.cpp
@@ -1410,7 +1410,7 @@ void KBabelDictBox::copy()
    }
    else
    {
-      TQClipboard *cb = KApplication::clipboard();
+      TQClipboard *cb = TDEApplication::clipboard();
       cb->setText(translation());
    }
 }
diff --git a/kbabel/kbabeldict/main.cpp b/kbabel/kbabeldict/main.cpp
index e4de092a..fb783fa4 100644
--- a/kbabel/kbabeldict/main.cpp
+++ b/kbabel/kbabeldict/main.cpp
@@ -47,7 +47,7 @@
 #include "kbabelsplash.h"
 #include <version.h>
 
-class KBabelDictApplication : public KApplication
+class KBabelDictApplication : public TDEApplication
 {
 public:
     KBabelDictApplication();
@@ -58,7 +58,7 @@ private:
 };
 
 KBabelDictApplication::KBabelDictApplication()
-    : KApplication()
+    : TDEApplication()
     , topLevel(0)
 {
     TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
@@ -69,7 +69,7 @@ KBabelDictApplication::KBabelDictApplication()
     if(showSplash)
     {
         timer.start(2000,true);
-        KApplication::setOverrideCursor(KCursor::waitCursor());
+        TDEApplication::setOverrideCursor(KCursor::waitCursor());
         splash = new KBabelSplash();
 	splash->show();
     }
@@ -88,7 +88,7 @@ KBabelDictApplication::KBabelDictApplication()
     }
     if(showSplash)
     {
-        KApplication::restoreOverrideCursor();
+        TDEApplication::restoreOverrideCursor();
     }
 
     TQObject::connect( topLevel, TQT_SIGNAL( destroyed() ),
@@ -128,7 +128,7 @@ int main(int argc, char **argv)
     TDECmdLineArgs::addCmdLineOptions( options );
 
     // Add options from other components
-    KApplication::addCmdLineOptions();
+    TDEApplication::addCmdLineOptions();
     
     KBabelDictApplication app;
 
diff --git a/kbugbuster/main.cpp b/kbugbuster/main.cpp
index edf104be..e472dec7 100644
--- a/kbugbuster/main.cpp
+++ b/kbugbuster/main.cpp
@@ -54,7 +54,7 @@ int main(int argc, char *argv[])
     TDECmdLineArgs::init( argc, argv, &aboutData );
     TDECmdLineArgs::addCmdLineOptions( options );
 
-    KApplication app;
+    TDEApplication app;
 
     app.dcopClient()->attach();
 
diff --git a/kioslave/svn/svnhelper/kio_svn_helper.cpp b/kioslave/svn/svnhelper/kio_svn_helper.cpp
index 8c6131bd..64258fd9 100644
--- a/kioslave/svn/svnhelper/kio_svn_helper.cpp
+++ b/kioslave/svn/svnhelper/kio_svn_helper.cpp
@@ -46,7 +46,7 @@
 #include <tqtextbrowser.h>
 #include <tqtextcodec.h>
 
-SvnHelper::SvnHelper():KApplication() {
+SvnHelper::SvnHelper():TDEApplication() {
 	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 	KWinModule wm ( TQT_TQOBJECT(this) );
 	m_id = wm.activeWindow();
@@ -279,11 +279,11 @@ int main(int argc, char **argv) {
 
 	TDECmdLineArgs::addCmdLineOptions( options );
 	KGlobal::locale()->setMainCatalogue("kio_svn");
-	KApplication::addCmdLineOptions();
+	TDEApplication::addCmdLineOptions();
 
 	if ( TDECmdLineArgs::parsedArgs()->count()==0 )
 		TDECmdLineArgs::usage();
-	KApplication *app = new SvnHelper();
+	TDEApplication *app = new SvnHelper();
 
 //	app->dcopClient()->attach();
 	app->exec();
diff --git a/kioslave/svn/svnhelper/kio_svn_helper.h b/kioslave/svn/svnhelper/kio_svn_helper.h
index 2ea64996..4ee9239b 100644
--- a/kioslave/svn/svnhelper/kio_svn_helper.h
+++ b/kioslave/svn/svnhelper/kio_svn_helper.h
@@ -25,7 +25,7 @@
 #include <twinmodule.h>
 #include <tqstringlist.h>
 
-class SvnHelper:public KApplication {
+class SvnHelper:public TDEApplication {
 	Q_OBJECT
   
 
diff --git a/kmtrace/README b/kmtrace/README
index 67330fe4..6084b2b7 100644
--- a/kmtrace/README
+++ b/kmtrace/README
@@ -18,7 +18,7 @@ There are two ways to activate memory usage loggings by ktrace  :
 1) The LD_PRELOAD way
 
 This way, you can debug any application without having to recompile it,
-but you'll have to debug also the memory allocated by KApplication and
+but you'll have to debug also the memory allocated by TDEApplication and
 friends.
 
 You can activate malloc logging by starting yourApplication as:
@@ -57,8 +57,8 @@ to add any commandline options.
 TIPS
 ====
 
-* If you can't be bothered with the stuff that KApplication allocates for you
-you might want to put the ktrace() call after the KApplication constructor.
+* If you can't be bothered with the stuff that TDEApplication allocates for you
+you might want to put the ktrace() call after the TDEApplication constructor.
 This will lead to a lot of warnings like: 
 
 	Freeing unalloacted memory: 0x08056108
diff --git a/kompare/main.cpp b/kompare/main.cpp
index 1da6d6ba..659f91f7 100644
--- a/kompare/main.cpp
+++ b/kompare/main.cpp
@@ -60,7 +60,7 @@ int main(int argc, char *argv[])
 
 	TDECmdLineArgs::init(argc, argv, &aboutData);
 	TDECmdLineArgs::addCmdLineOptions( options );
-	KApplication app;
+	TDEApplication app;
 	bool difault = false;
 
 	// see if we are starting with session management
diff --git a/kspy/main.cpp b/kspy/main.cpp
index cb4dc5bf..ed52dff5 100644
--- a/kspy/main.cpp
+++ b/kspy/main.cpp
@@ -42,7 +42,7 @@ int main(int argc, char *argv[])
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
 
-  KApplication a;
+  TDEApplication a;
   Spy *spy = new Spy();
   a.setMainWidget(spy);
 
diff --git a/kstartperf/kstartperf.cpp b/kstartperf/kstartperf.cpp
index 4e536ccc..97940485 100644
--- a/kstartperf/kstartperf.cpp
+++ b/kstartperf/kstartperf.cpp
@@ -82,7 +82,7 @@ int main(int argc, char **argv)
     TDECmdLineArgs::addCmdLineOptions(options);
     TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
-    KApplication *app = new KApplication(false, false);
+    TDEApplication *app = new TDEApplication(false, false);
 
     // Check arguments
 
diff --git a/kuiviewer/main.cpp b/kuiviewer/main.cpp
index 7926dc01..998c539c 100644
--- a/kuiviewer/main.cpp
+++ b/kuiviewer/main.cpp
@@ -50,7 +50,7 @@ int main(int argc, char **argv)
 
     TDECmdLineArgs::init(argc, argv, &about);
     TDECmdLineArgs::addCmdLineOptions( options );
-    KApplication app;
+    TDEApplication app;
 
     // see if we are starting with session management
     if (app.isRestored())
diff --git a/kunittest/example/simple/maingui.cpp b/kunittest/example/simple/maingui.cpp
index 91dc646e..9c3d52ed 100644
--- a/kunittest/example/simple/maingui.cpp
+++ b/kunittest/example/simple/maingui.cpp
@@ -50,7 +50,7 @@ int main( int argc, char** argv )
     TDECmdLineArgs::init(argc, argv, &about);
     TDECmdLineArgs::addCmdLineOptions( options );
 
-    KApplication app;
+    TDEApplication app;
 
     KUnitTest::RunnerGUI runner(0);
     runner.show();
diff --git a/kunittest/guimodrunner.cpp b/kunittest/guimodrunner.cpp
index e3ef7c82..455cf45b 100644
--- a/kunittest/guimodrunner.cpp
+++ b/kunittest/guimodrunner.cpp
@@ -62,7 +62,7 @@ int main( int argc, char **argv )
     KUnitTest::Runner::loadModules(args->getOption("folder"), args->getOption("query"));
     KUnitTest::Runner::setDebugCapturingEnabled(args->isSet("enable-dbgcap"));
 
-    KApplication app;
+    TDEApplication app;
 
     KUnitTest::RunnerGUI runner(0);
     runner.show();
diff --git a/tdecachegrind/tdecachegrind/callgraphview.cpp b/tdecachegrind/tdecachegrind/callgraphview.cpp
index 35ccef87..9db08a7b 100644
--- a/tdecachegrind/tdecachegrind/callgraphview.cpp
+++ b/tdecachegrind/tdecachegrind/callgraphview.cpp
@@ -1149,7 +1149,7 @@ CanvasEdgeLabel::CanvasEdgeLabel(CallGraphView* v, CanvasEdge* ce,
 
     if (e->call() && (e->call()->isRecursion() || e->call()->inCycle())) {
 	TQString icon = "undo";
-	KIconLoader* loader = KApplication::kApplication()->iconLoader();
+	KIconLoader* loader = TDEApplication::kApplication()->iconLoader();
 	TQPixmap p= loader->loadIcon(icon, KIcon::Small, 0,
 				      KIcon::DefaultState, 0, true);
 	setPixmap(0, p);
diff --git a/tdecachegrind/tdecachegrind/callitem.cpp b/tdecachegrind/tdecachegrind/callitem.cpp
index ebca4903..1d6a9702 100644
--- a/tdecachegrind/tdecachegrind/callitem.cpp
+++ b/tdecachegrind/tdecachegrind/callitem.cpp
@@ -146,7 +146,7 @@ void CallItem::updateCost()
     if (sameCycle && !selectedIsCycle && !shownIsCycle) {
 
 	TQString icon = "undo";
-	KIconLoader* loader = KApplication::kApplication()->iconLoader();
+	KIconLoader* loader = TDEApplication::kApplication()->iconLoader();
 	p= loader->loadIcon(icon, KIcon::Small, 0,
 			    KIcon::DefaultState, 0, true);
     }
diff --git a/tdecachegrind/tdecachegrind/instritem.cpp b/tdecachegrind/tdecachegrind/instritem.cpp
index 6815b00a..327d541e 100644
--- a/tdecachegrind/tdecachegrind/instritem.cpp
+++ b/tdecachegrind/tdecachegrind/instritem.cpp
@@ -178,7 +178,7 @@ void InstrItem::updateCost()
     TQPixmap p;
 
     TQString icon = "undo";
-    KIconLoader* loader = KApplication::kApplication()->iconLoader();
+    KIconLoader* loader = TDEApplication::kApplication()->iconLoader();
     p= loader->loadIcon(icon, KIcon::Small, 0,
                         KIcon::DefaultState, 0, true);
     if (p.isNull())
diff --git a/tdecachegrind/tdecachegrind/main.cpp b/tdecachegrind/tdecachegrind/main.cpp
index aff3e4e7..eae60329 100644
--- a/tdecachegrind/tdecachegrind/main.cpp
+++ b/tdecachegrind/tdecachegrind/main.cpp
@@ -56,7 +56,7 @@ int main( int argc, char ** argv )
   TDECmdLineArgs::init(argc, argv, &aboutData);
   TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication a;
+  TDEApplication a;
   TopLevel* t;
   Loader::initLoaders();
 
diff --git a/tdecachegrind/tdecachegrind/sourceitem.cpp b/tdecachegrind/tdecachegrind/sourceitem.cpp
index 101d0087..0d71ef34 100644
--- a/tdecachegrind/tdecachegrind/sourceitem.cpp
+++ b/tdecachegrind/tdecachegrind/sourceitem.cpp
@@ -162,7 +162,7 @@ void SourceItem::updateCost()
     TQPixmap p;
 
     TQString icon = "undo";
-    KIconLoader* loader = KApplication::kApplication()->iconLoader();
+    KIconLoader* loader = TDEApplication::kApplication()->iconLoader();
     p= loader->loadIcon(icon, KIcon::Small, 0,
                         KIcon::DefaultState, 0, true);
     if (p.isNull())
diff --git a/umbrello/umbrello/main.cpp b/umbrello/umbrello/main.cpp
index 8690f0fb..891fabee 100644
--- a/umbrello/umbrello/main.cpp
+++ b/umbrello/umbrello/main.cpp
@@ -99,7 +99,7 @@ int main(int argc, char *argv[]) {
     TDECmdLineArgs::init( argc, argv, &aboutData );
     TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
 
-    KApplication app;
+    TDEApplication app;
     if( app.isRestored() ) {
         RESTORE( UMLApp );
     } else {
diff --git a/umbrello/umbrello/plugin.cpp b/umbrello/umbrello/plugin.cpp
index a682db06..fddbb6e9 100644
--- a/umbrello/umbrello/plugin.cpp
+++ b/umbrello/umbrello/plugin.cpp
@@ -150,7 +150,7 @@ Plugin::configure()
         loadPlugins(conf, "Load");
 
         // only load GUI plugins if this is not a terminal app
-        if(KApplication::kApplication()->type() != TQApplication::Tty) {
+        if(TDEApplication::kApplication()->type() != TQApplication::Tty) {
             loadPlugins(conf, "LoadGUI");
         }
     }
diff --git a/umbrello/umbrello/uml.h b/umbrello/umbrello/uml.h
index 8a9a8c95..2c4f59c8 100644
--- a/umbrello/umbrello/uml.h
+++ b/umbrello/umbrello/uml.h
@@ -68,7 +68,7 @@ class TQCustomEvent;
  * UMLApp reimplements the methods that KMainWindow provides for main window handling and supports
  * full session management as well as using KActions.
  * @see KMainWindow
- * @see KApplication
+ * @see TDEApplication
  * @see KConfig
  *
  * @author Paul Hensgen <phensgen@techie.com>
@@ -399,7 +399,7 @@ protected:
      * Saves the window properties for each open window
      * during session end to the session config file,
      * including saving the currently opened file by a
-     * temporary filename provided by KApplication.
+     * temporary filename provided by TDEApplication.
      * @see KMainWindow#saveProperties
      */
     virtual void saveProperties(KConfig *_cfg);
diff --git a/umbrello/umbrello/umldoc.h b/umbrello/umbrello/umldoc.h
index 184fdf8c..cdfbd72a 100644
--- a/umbrello/umbrello/umldoc.h
+++ b/umbrello/umbrello/umldoc.h
@@ -64,7 +64,7 @@ class UMLFolder;
   * The UMLDoc class provides a document object that can be used
   * in conjunction with the classes UMLApp and UMLView to create
   * a document-view model for standard TDE applications based on
-  * KApplication and KMainWindow. Thereby, the document object
+  * TDEApplication and KMainWindow. Thereby, the document object
   * is created by the UMLApp instance and contains the document
   * structure with the according methods for manipulation of the
   * document data by UMLView objects. Also, UMLDoc contains the