Rename KApplication to TDEApplication to avoid conflicts with KDE4

115 files changed, 155 insertions, 155 deletions

diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp
index ab0e430e2..7a14c2891 100644
--- a/akregator/src/akregator_view.cpp
+++ b/akregator/src/akregator_view.cpp
@@ -1143,7 +1143,7 @@ void View::slotRemoveTag(const Tag& tag)
 */
 void View::slotNewTag()
 {
-    Tag tag(KApplication::randomString(8), "New Tag");
+    Tag tag(TDEApplication::randomString(8), "New Tag");
     Kernel::self()->tagSet()->insert(tag);
     TagNode* node = m_tagNodeList->findByTagID(tag.id());
     if (node)
diff --git a/akregator/src/articlefilter.cpp b/akregator/src/articlefilter.cpp
index a8bf8a365..080d61e7d 100644
--- a/akregator/src/articlefilter.cpp
+++ b/akregator/src/articlefilter.cpp
@@ -506,14 +506,14 @@ class ArticleFilter::ArticleFilterPrivate : public Shared
 
 ArticleFilter::ArticleFilter() : d(new ArticleFilterPrivate)
 {
-    d->id = KApplication::random();
+    d->id = TDEApplication::random();
     d->action = 0;
     d->matcher = 0;
 }
 
 ArticleFilter::ArticleFilter(const AbstractMatcher& matcher, const AbstractAction& action) : d(new ArticleFilterPrivate)
 {
-    d->id = KApplication::random();
+    d->id = TDEApplication::random();
     d->matcher = matcher.clone();
     d->action = action.clone();
 }
diff --git a/akregator/src/librss/testlibrss.cpp b/akregator/src/librss/testlibrss.cpp
index f66a53d9b..721c11234 100644
--- a/akregator/src/librss/testlibrss.cpp
+++ b/akregator/src/librss/testlibrss.cpp
@@ -61,7 +61,7 @@ int main( int argc, char **argv )
 	KAboutData aboutData( "testlibrss", "testlibrss", "0.1" );
 	TDECmdLineArgs::init( argc, argv, &aboutData );
     TDECmdLineArgs::addCmdLineOptions( options );
-	KApplication app;
+	TDEApplication app;
 
         TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
         if ( args->count() != 1 ) args->usage();
diff --git a/akregator/src/nodelist.cpp b/akregator/src/nodelist.cpp
index e79acb20d..4af5def2b 100644
--- a/akregator/src/nodelist.cpp
+++ b/akregator/src/nodelist.cpp
@@ -210,7 +210,7 @@ NodeList::~NodeList()
 
 int NodeList::generateID()
 {
-    return KApplication::random();
+    return TDEApplication::random();
 }
 
 void NodeList::slotNodeAdded(TreeNode* node)
diff --git a/akregator/src/speechclient.cpp b/akregator/src/speechclient.cpp
index 8665213d9..6b96fe1e0 100644
--- a/akregator/src/speechclient.cpp
+++ b/akregator/src/speechclient.cpp
@@ -170,7 +170,7 @@ void SpeechClient::setupSpeechSystem()
         else
         {
             TQString error;
-            if (KApplication::startServiceByDesktopName("kttsd", TQStringList(), &error))
+            if (TDEApplication::startServiceByDesktopName("kttsd", TQStringList(), &error))
             {
                 kdDebug() << "Starting KTTSD failed with message " << error << endl;
                 d->isTextSpeechInstalled = false;
diff --git a/akregator/src/tagnodelist.cpp b/akregator/src/tagnodelist.cpp
index 46acb9d1b..becd5b96b 100644
--- a/akregator/src/tagnodelist.cpp
+++ b/akregator/src/tagnodelist.cpp
@@ -90,7 +90,7 @@ TagNode* TagNodeList::findByTagID(const TQString& tagID)
 
 bool TagNodeList::insert(TagNode* tagNode)
 {
-    tagNode->setId(KApplication::random());
+    tagNode->setId(TDEApplication::random());
     TQString id = tagNode->tag().id();
     if (!containsTagId(id))
     {
diff --git a/akregator/src/trayicon.cpp b/akregator/src/trayicon.cpp
index 67c3903fe..0ba92b09a 100644
--- a/akregator/src/trayicon.cpp
+++ b/akregator/src/trayicon.cpp
@@ -109,14 +109,14 @@ TQPixmap TrayIcon::takeScreenshot() const
     const int WIDTH   = 3;
     int ax = g.x() - x - MARGINS -1;
     int ay = g.y() - y - MARGINS -1;
-    painter.setPen( TQPen(TQt::red/*KApplication::palette().active().highlight()*/, WIDTH) );
+    painter.setPen( TQPen(TQt::red/*TDEApplication::palette().active().highlight()*/, WIDTH) );
     painter.drawArc(ax, ay, tw + 2*MARGINS, th + 2*MARGINS, 0, 16*360);
     painter.end();
 
     // Paint the border
     const int BORDER = 1;
     TQPixmap finalShot(w + 2*BORDER, h + 2*BORDER);
-    finalShot.fill(KApplication::palette().active().foreground());
+    finalShot.fill(TDEApplication::palette().active().foreground());
     painter.begin(&finalShot);
     painter.drawPixmap(BORDER, BORDER, shot);
     painter.end();
diff --git a/certmanager/lib/tests/test_cryptoconfig.cpp b/certmanager/lib/tests/test_cryptoconfig.cpp
index 8eb998915..e11ca2ab1 100644
--- a/certmanager/lib/tests/test_cryptoconfig.cpp
+++ b/certmanager/lib/tests/test_cryptoconfig.cpp
@@ -44,7 +44,7 @@ int main( int argc, char** argv ) {
 
   KAboutData aboutData( "test_cryptoconfig", "CryptoConfig Test", "0.1" );
   TDECmdLineArgs::init( argc, argv, &aboutData );
-  KApplication app( false, false );
+  TDEApplication app( false, false );
 
   Kleo::CryptoConfig * config = new QGpgMECryptoConfig();
 
diff --git a/certmanager/lib/tests/test_gnupgprocessbase.cpp b/certmanager/lib/tests/test_gnupgprocessbase.cpp
index c1ac90b96..35a350ad3 100644
--- a/certmanager/lib/tests/test_gnupgprocessbase.cpp
+++ b/certmanager/lib/tests/test_gnupgprocessbase.cpp
@@ -121,7 +121,7 @@ int main( int argc, char** argv ) {
   }
   KAboutData aboutData( "test_gnupgprocessbase", "GnuPGProcessBase Test", "0.1" );
   TDECmdLineArgs::init( &aboutData );
-  KApplication app;
+  TDEApplication app;
 
   Kleo::GnuPGProcessBase gpg;
   for ( int i = 1 ; i < argc ; ++i )
diff --git a/certmanager/lib/tests/test_jobs.cpp b/certmanager/lib/tests/test_jobs.cpp
index ba07792f8..92aaf9b42 100644
--- a/certmanager/lib/tests/test_jobs.cpp
+++ b/certmanager/lib/tests/test_jobs.cpp
@@ -102,7 +102,7 @@ int main( int argc, char** argv ) {
   }
   KAboutData aboutData( "test_jobs", "Signing Job Test", "0.1" );
   TDECmdLineArgs::init( argc, argv, &aboutData );
-  KApplication app;
+  TDEApplication app;
 
   testSign();
 }
diff --git a/certmanager/lib/tests/test_keygen.cpp b/certmanager/lib/tests/test_keygen.cpp
index a17404fa3..4ec5c29ea 100644
--- a/certmanager/lib/tests/test_keygen.cpp
+++ b/certmanager/lib/tests/test_keygen.cpp
@@ -148,7 +148,7 @@ int main( int argc, char** argv ) {
   }
   KAboutData aboutData( "test_keygen", "KeyGenerationJob Test", "0.1" );
   TDECmdLineArgs::init( argc, argv, &aboutData );
-  KApplication app;
+  TDEApplication app;
 
   KeyGenerator * keygen = new KeyGenerator( 0, "KeyGenerator top-level" );
   app.setMainWidget( keygen );
diff --git a/certmanager/lib/tests/test_keylister.cpp b/certmanager/lib/tests/test_keylister.cpp
index 1947d1d66..904671fbe 100644
--- a/certmanager/lib/tests/test_keylister.cpp
+++ b/certmanager/lib/tests/test_keylister.cpp
@@ -132,7 +132,7 @@ int main( int argc, char** argv ) {
 
   KAboutData aboutData( "test_keylister", "KeyLister Test", "0.1" );
   TDECmdLineArgs::init( argc, argv, &aboutData );
-  KApplication app;
+  TDEApplication app;
 
   CertListView * clv = new CertListView( 0, "CertListView top-level" );
   app.setMainWidget( clv );
diff --git a/certmanager/lib/tests/test_keyselectiondialog.cpp b/certmanager/lib/tests/test_keyselectiondialog.cpp
index 1af2184a1..eacbb5f63 100644
--- a/certmanager/lib/tests/test_keyselectiondialog.cpp
+++ b/certmanager/lib/tests/test_keyselectiondialog.cpp
@@ -46,7 +46,7 @@
 int main( int argc, char ** argv ) {
   KAboutData aboutData( "test_keyselectiondialog", "KeySelectionDialog Test", "0.1" );
   TDECmdLineArgs::init( argc, argv, &aboutData );
-  KApplication app;
+  TDEApplication app;
 
   KGlobal::iconLoader()->addAppDir( "libkleopatra" );
 
diff --git a/certmanager/lib/tests/test_verify.cpp b/certmanager/lib/tests/test_verify.cpp
index 15eacfec7..469d18952 100644
--- a/certmanager/lib/tests/test_verify.cpp
+++ b/certmanager/lib/tests/test_verify.cpp
@@ -55,7 +55,7 @@ int main( int argc, char **argv )
 
   KAboutData aboutData( "test_verify", "verify job test", "0.1" );
   TDECmdLineArgs::init( argc, argv, &aboutData );
-  KApplication app( false, false );
+  TDEApplication app( false, false );
 
   const TQString sigFileName = TDESRCDIR "/test.data.sig";
   const TQString dataFileName = TDESRCDIR "/test.data";
diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp
index 640f2e967..5bd858ffd 100644
--- a/certmanager/lib/ui/keyselectiondialog.cpp
+++ b/certmanager/lib/ui/keyselectiondialog.cpp
@@ -396,7 +396,7 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection
   le->setText( initialQuery );
   TQToolButton *clearButton = new TQToolButton( page );
   clearButton->setIconSet( KGlobal::iconLoader()->loadIconSet(
-              KApplication::reverseLayout() ? "clear_left":"locationbar_erase", KIcon::Small, 0 ) );
+              TDEApplication::reverseLayout() ? "clear_left":"locationbar_erase", KIcon::Small, 0 ) );
   hlay->addWidget( clearButton );
   hlay->addWidget( new TQLabel( le, i18n("&Search for:"), page ) );
   hlay->addWidget( le, 1 );
diff --git a/certmanager/main.cpp b/certmanager/main.cpp
index 4db304c24..def899b73 100644
--- a/certmanager/main.cpp
+++ b/certmanager/main.cpp
@@ -59,7 +59,7 @@ int main( int argc, char** argv )
   };
   TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication app;
+  TDEApplication app;
 
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
diff --git a/kabc/frontend/main.cpp b/kabc/frontend/main.cpp
index 9f35c359b..169e52a37 100644
--- a/kabc/frontend/main.cpp
+++ b/kabc/frontend/main.cpp
@@ -11,7 +11,7 @@ int main( int argc, char ** argv )
   KAboutData aboutData("testkabc",I18N_NOOP("TestKabc"),"0.1");
   TDECmdLineArgs::init(argc,argv,&aboutData);
 
-  KApplication app;
+  TDEApplication app;
 
   MainWindow *w = new MainWindow;
   w->show();
diff --git a/kabc/kabc2mutt/main.cpp b/kabc/kabc2mutt/main.cpp
index 4a406a393..f9f41f8ae 100644
--- a/kabc/kabc2mutt/main.cpp
+++ b/kabc/kabc2mutt/main.cpp
@@ -43,11 +43,11 @@ static KCmdLineOptions k2moptions[] =
 
 int main( int argc, char **argv )
 {
-  KApplication::disableAutoDcopRegistration();
+  TDEApplication::disableAutoDcopRegistration();
   TDECmdLineArgs::init( argc, argv, appName, programName, description, version );
   TDECmdLineArgs::addCmdLineOptions( k2moptions );
 
-  KApplication app( false, false );
+  TDEApplication app( false, false );
 
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
diff --git a/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp b/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp
index 33dcd9156..78fa54ee7 100644
--- a/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp
+++ b/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp
@@ -50,7 +50,7 @@ void convertDistributionLists()
     const TQStringList entries = TQStringList::split( ',', it.data(), true );
 
     KPIM::DistributionList distList;
-    distList.setUid( KApplication::randomString( 10 ) );
+    distList.setUid( TDEApplication::randomString( 10 ) );
     distList.setName( listName );
 
     if ( entries.count() > 1 ) {
@@ -70,7 +70,7 @@ void convertDistributionLists()
 
 int main( int argc, char **argv )
 {
-  KApplication::disableAutoDcopRegistration();
+  TDEApplication::disableAutoDcopRegistration();
 
   KAboutData aboutData( "kabcdistlistupdater", "Converter tool for distribution lists", "0.1" );
   aboutData.addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" );
@@ -78,7 +78,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();
 
diff --git a/kaddressbook/distributionlisteditor.cpp b/kaddressbook/distributionlisteditor.cpp
index 0084fe86b..09da74d78 100644
--- a/kaddressbook/distributionlisteditor.cpp
+++ b/kaddressbook/distributionlisteditor.cpp
@@ -74,7 +74,7 @@ KPIM::DistributionListEditor::Line::Line( KABC::AddressBook* book, TQWidget* par
              this, TQT_SLOT( textChanged( const TQString& ) ) );
     layout->addWidget( m_lineEdit );
     m_clearButton = new TQToolButton( this );
-    m_clearButton->setIconSet( KApplication::reverseLayout() ? SmallIconSet("locationbar_erase") : SmallIconSet( "clear_left" ) );
+    m_clearButton->setIconSet( TDEApplication::reverseLayout() ? SmallIconSet("locationbar_erase") : SmallIconSet( "clear_left" ) );
     m_clearButton->setEnabled( false );
     layout->addWidget( m_clearButton );
     connect( m_clearButton, TQT_SIGNAL( clicked() ), m_lineEdit, TQT_SLOT( clear() ) );
@@ -119,7 +119,7 @@ KABC::Addressee KPIM::DistributionListEditor::Line::findAddressee( const TQStrin
     }
     // no entry found, create new addressee:
     KABC::Addressee addressee;
-    addressee.setUid( KApplication::randomString( 10 ) );
+    addressee.setUid( TDEApplication::randomString( 10 ) );
     addressee.setFormattedName( name );
     addressee.setEmails( email );
     m_addressBook->insertAddressee( addressee );
@@ -272,7 +272,7 @@ void KPIM::DistributionListEditor::EditorWidget::slotOk()
     }
 
     KPIM::DistributionList list;
-    list.setUid( d->distListUid.isNull() ? KApplication::randomString( 10 ) :d->distListUid );
+    list.setUid( d->distListUid.isNull() ? TDEApplication::randomString( 10 ) :d->distListUid );
     list.setName( name );
     list.setResource( d->resource );
     typedef TQValueList<KPIM::DistributionListEditor::Line*>::ConstIterator ListIterator;
diff --git a/kaddressbook/distributionlistpicker.cpp b/kaddressbook/distributionlistpicker.cpp
index d82dc69f1..d3aef15ee 100644
--- a/kaddressbook/distributionlistpicker.cpp
+++ b/kaddressbook/distributionlistpicker.cpp
@@ -103,7 +103,7 @@ void KPIM::DistributionListPickerDialog::slotUser1()
         {
             KPIM::DistributionList list;
             list.setName( name );
-            list.setUid( KApplication::randomString( 10 ) );
+            list.setUid( TDEApplication::randomString( 10 ) );
             m_book->insertAddressee( list );
 
             m_listBox->insertItem( name );
diff --git a/kaddressbook/interfaces/xxport.cpp b/kaddressbook/interfaces/xxport.cpp
index 6b4340fdf..ea4a93cec 100644
--- a/kaddressbook/interfaces/xxport.cpp
+++ b/kaddressbook/interfaces/xxport.cpp
@@ -37,7 +37,7 @@ class XXPort::XXPortPrivate
   public:
     TQSignalMapper *mExportMapper;
     TQSignalMapper *mImportMapper;
-    KApplication *mKApp;
+    TDEApplication *mKApp;
 };
 
 XXPort::XXPort( KABC::AddressBook *ab, TQWidget *parent,
@@ -104,7 +104,7 @@ TQWidget *XXPort::parentWidget() const
   return mParentWidget;
 }
 
-void XXPort::setKApplication( KApplication *app )
+void XXPort::setTDEApplication( TDEApplication *app )
 {
   d->mKApp = app;
 }
diff --git a/kaddressbook/interfaces/xxport.h b/kaddressbook/interfaces/xxport.h
index 7307524df..021275d5a 100644
--- a/kaddressbook/interfaces/xxport.h
+++ b/kaddressbook/interfaces/xxport.h
@@ -34,7 +34,7 @@
 
 #define KAB_XXPORT_PLUGIN_VERSION 1
 
-class KApplication;
+class TDEApplication;
 
 /**
   K_EXPORT_KADDRESSBOOK_XXFILTER_CATALOG() creates the stub for a KAddressbook import/export filter.
@@ -87,13 +87,13 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient
     virtual bool requiresSorting() const { return false; }
 
     /**
-      set the KApplication pointer.
+      set the TDEApplication pointer.
       @see: processEvents()
      */
-    void setKApplication( KApplication *app );
+    void setTDEApplication( TDEApplication *app );
 
     /**
-      Processes outstanding KApplication events. It should be called
+      Processes outstanding TDEApplication events. It should be called
       occasionally when the import/export filter is busy performing
       a long operation (e.g. reading from slow external devices).
       @see: TQApplication::processEvents()
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 43f5e5bcd..6e3c3510e 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -725,7 +725,7 @@ void KABCore::newDistributionList()
     }
   }
   KPIM::DistributionList list;
-  list.setUid( KApplication::randomString( 10 ) );
+  list.setUid( TDEApplication::randomString( 10 ) );
   list.setName( name );
   list.setResource( resource );
   editDistributionList( list );
diff --git a/kaddressbook/ldapsearchdialog.cpp b/kaddressbook/ldapsearchdialog.cpp
index 0ba765df3..5a171e53d 100644
--- a/kaddressbook/ldapsearchdialog.cpp
+++ b/kaddressbook/ldapsearchdialog.cpp
@@ -572,7 +572,7 @@ KABC::Addressee::List LDAPSearchDialog::importContactsUnlessTheyExist( const TQV
       const KABC::Addressee::List existing = mCore->addressBook()->findByEmail( addr.preferredEmail() );
 
       if ( existing.isEmpty() ) {
-        addr.setUid( KApplication::randomString( 10 ) );
+        addr.setUid( TDEApplication::randomString( 10 ) );
         addr.setNote( i18n( "arguments are host name, datetime", "Imported from LDAP directory %1 on %2" ).arg( d->itemToServer[cli], KGlobal::locale()->formatDateTime( now ) ) );
         addr.setResource( resource );
         mCore->addressBook()->insertAddressee( addr );
diff --git a/kaddressbook/undocmds.cpp b/kaddressbook/undocmds.cpp
index a249c2953..e781a72e7 100644
--- a/kaddressbook/undocmds.cpp
+++ b/kaddressbook/undocmds.cpp
@@ -147,7 +147,7 @@ void PasteCommand::execute()
          We have to set a new uid for the contact, otherwise insertAddressee()
          ignore it.
       */
-      (*it).setUid( KApplication::randomString( 10 ) );
+      (*it).setUid( TDEApplication::randomString( 10 ) );
       uids.append( (*it).uid() );
       addressBook()->insertAddressee( *it );
     }
@@ -337,7 +337,7 @@ void CopyToCommand::execute()
       KABC::Addressee newAddr( addr );
       // We need to set a new uid, otherwise the insert below is
       // ignored. This is bad for syncing, but unavoidable, afaiks
-      newAddr.setUid( KApplication::randomString( 10 ) );
+      newAddr.setUid( TDEApplication::randomString( 10 ) );
       newAddr.setResource( mResource );
       if ( resourceExist( newAddr.resource() ) )
         addressBook()->insertAddressee( newAddr );
@@ -384,7 +384,7 @@ void MoveToCommand::moveContactTo( KABC::Resource *resource )
             KABC::Addressee newAddr( addr );
       // We need to set a new uid, otherwise the insert below is
       // ignored. This is bad for syncing, but unavoidable, afaiks
-            TQString uid = KApplication::randomString( 10 );
+            TQString uid = TDEApplication::randomString( 10 );
             newAddr.setUid( uid );
             newAddr.setResource( resource );
             if ( resourceExist( newAddr.resource() ) )
diff --git a/kaddressbook/xxportmanager.cpp b/kaddressbook/xxportmanager.cpp
index 3c10fc967..6d6b74e55 100644
--- a/kaddressbook/xxportmanager.cpp
+++ b/kaddressbook/xxportmanager.cpp
@@ -151,7 +151,7 @@ void XXPortManager::loadPlugins()
       connect( obj, TQT_SIGNAL( importActivated( const TQString&, const TQString& ) ),
                this, TQT_SLOT( slotImport( const TQString&, const TQString& ) ) );
 
-      obj->setKApplication( kapp );
+      obj->setTDEApplication( kapp );
     }
   }
 }
diff --git a/kalarm/daemon.cpp b/kalarm/daemon.cpp
index 4ad785552..29ac67d4a 100644
--- a/kalarm/daemon.cpp
+++ b/kalarm/daemon.cpp
@@ -141,7 +141,7 @@ bool Daemon::start()
 				kdError() << "Daemon::startApp(): " DAEMON_APP_NAME " not found" << endl;
 				return false;
 			}
-			KApplication::tdeinitExec(execStr);
+			TDEApplication::tdeinitExec(execStr);
 			kdDebug(5950) << "Daemon::start(): Alarm daemon started" << endl;
 			mStartTimeout = 5000/startCheckInterval + 1;    // check daemon status for 5 seconds before giving up
 			mStartTimer = new TQTimer(mInstance);
diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp
index e1e897e37..e5dc5fa38 100644
--- a/kalarm/functions.cpp
+++ b/kalarm/functions.cpp
@@ -721,7 +721,7 @@ bool runProgram(const TQCString& program, const TQCString& windowName, TQCString
 	if (!kapp->dcopClient()->isApplicationRegistered(program))
 	{
 		// KOrganizer is not already running, so start it
-		if (KApplication::startServiceByDesktopName(TQString::fromLatin1(program), TQString(), &errorMessage, &dcopName))
+		if (TDEApplication::startServiceByDesktopName(TQString::fromLatin1(program), TQString(), &errorMessage, &dcopName))
 		{
 			kdError(5950) << "runProgram(): couldn't start " << program << " (" << errorMessage << ")\n";
 			return false;
@@ -747,7 +747,7 @@ bool readConfigWindowSize(const char* window, TQSize& result)
 {
 	KConfig* config = KGlobal::config();
 	config->setGroup(TQString::fromLatin1(window));
-	TQWidget* desktop = TQT_TQWIDGET(KApplication::desktop());
+	TQWidget* desktop = TQT_TQWIDGET(TDEApplication::desktop());
 	TQSize s = TQSize(config->readNumEntry(TQString::fromLatin1("Width %1").arg(desktop->width()), 0),
 	                config->readNumEntry(TQString::fromLatin1("Height %1").arg(desktop->height()), 0));
 	if (s.isEmpty())
@@ -764,7 +764,7 @@ void writeConfigWindowSize(const char* window, const TQSize& size)
 {
 	KConfig* config = KGlobal::config();
 	config->setGroup(TQString::fromLatin1(window));
-	TQWidget* desktop = TQT_TQWIDGET(KApplication::desktop());
+	TQWidget* desktop = TQT_TQWIDGET(TDEApplication::desktop());
 	config->writeEntry(TQString::fromLatin1("Width %1").arg(desktop->width()), size.width());
 	config->writeEntry(TQString::fromLatin1("Height %1").arg(desktop->height()), size.height());
 	config->sync();
diff --git a/kalarm/kalarmd/alarmdaemon.cpp b/kalarm/kalarmd/alarmdaemon.cpp
index 85d214656..e1bbe0bb5 100644
--- a/kalarm/kalarmd/alarmdaemon.cpp
+++ b/kalarm/kalarmd/alarmdaemon.cpp
@@ -120,7 +120,7 @@ void AlarmDaemon::autostartKAlarm()
 	kdDebug(5900) << "AlarmDaemon::autostartKAlarm(): starting KAlarm\n";
 	TQStringList args;
 	args << TQString::fromLatin1("--tray");
-	int ret = KApplication::tdeinitExec(TQString::fromLatin1("kalarm"), args);
+	int ret = TDEApplication::tdeinitExec(TQString::fromLatin1("kalarm"), args);
 	if (ret)
 		kdError(5900) << "AlarmDaemon::autostartKAlarm(): error=" << ret << endl;
 	else
diff --git a/kandy/src/kandy_client.cpp b/kandy/src/kandy_client.cpp
index 2aba3b355..b27e5de69 100644
--- a/kandy/src/kandy_client.cpp
+++ b/kandy/src/kandy_client.cpp
@@ -29,7 +29,7 @@
 
 int main(int argc, char **argv)
 {
-    KApplication app(argc, argv, "kandy_client", false);
+    TDEApplication app(argc, argv, "kandy_client", false);
 
     // get our DCOP client and attach so that we may use it
     DCOPClient *client = app.dcopClient();
diff --git a/kandy/src/main.cpp b/kandy/src/main.cpp
index b3f6aa82e..0ba62eb69 100644
--- a/kandy/src/main.cpp
+++ b/kandy/src/main.cpp
@@ -95,7 +95,7 @@ int main(int argc, char **argv)
   TDECmdLineArgs::init(argc,argv,&about);
   TDECmdLineArgs::addCmdLineOptions(options);
 
-  KApplication app;
+  TDEApplication app;
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
   // register ourselves as a dcop client
diff --git a/karm/main.cpp b/karm/main.cpp
index e8ebc7e1c..f2fab8fcf 100644
--- a/karm/main.cpp
+++ b/karm/main.cpp
@@ -49,7 +49,7 @@ int main( int argc, char *argv[] )
 
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( options );
-  KApplication myApp;
+  TDEApplication myApp;
 
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
diff --git a/karm/taskview.cpp b/karm/taskview.cpp
index 3852fda9d..eb63da482 100644
--- a/karm/taskview.cpp
+++ b/karm/taskview.cpp
@@ -820,16 +820,16 @@ void TaskView::clipTotals()
         i18n("Copy This Task"), i18n("Copy All Tasks") );
     if (response == KMessageBox::Yes) // This task only
     {
-      KApplication::clipboard()->setText(t.totalsAsText(this, true, TimeKard::TotalTime));
+      TDEApplication::clipboard()->setText(t.totalsAsText(this, true, TimeKard::TotalTime));
     }
     else // All tasks
     {
-      KApplication::clipboard()->setText(t.totalsAsText(this, false, TimeKard::TotalTime));
+      TDEApplication::clipboard()->setText(t.totalsAsText(this, false, TimeKard::TotalTime));
     }
   }
   else
   {
-    KApplication::clipboard()->setText(t.totalsAsText(this, true, TimeKard::TotalTime));
+    TDEApplication::clipboard()->setText(t.totalsAsText(this, true, TimeKard::TotalTime));
   }
 }
 
@@ -844,16 +844,16 @@ void TaskView::clipSession()
         i18n("Copy This Task"), i18n("Copy All Tasks") );
     if (response == KMessageBox::Yes) // this task only
     {
-      KApplication::clipboard()->setText(t.totalsAsText(this, true, TimeKard::SessionTime));
+      TDEApplication::clipboard()->setText(t.totalsAsText(this, true, TimeKard::SessionTime));
     }
     else // only task
     {
-      KApplication::clipboard()->setText(t.totalsAsText(this, false, TimeKard::SessionTime));
+      TDEApplication::clipboard()->setText(t.totalsAsText(this, false, TimeKard::SessionTime));
     }
   }
   else
   {
-    KApplication::clipboard()->setText(t.totalsAsText(this, true, TimeKard::SessionTime));
+    TDEApplication::clipboard()->setText(t.totalsAsText(this, true, TimeKard::SessionTime));
   }
 }
 
@@ -863,7 +863,7 @@ void TaskView::clipHistory()
   if (dialog.exec()== TQDialog::Accepted)
   {
     TimeKard t;
-    KApplication::clipboard()->
+    TDEApplication::clipboard()->
       setText( t.historyAsText(this, dialog.from(), dialog.to(), !dialog.allTasks(), dialog.perWeek(), dialog.totalsOnly() ) );
   }
 }
diff --git a/karm/test/locking.cpp b/karm/test/locking.cpp
index 6f9cd1834..ac1de23e3 100644
--- a/karm/test/locking.cpp
+++ b/karm/test/locking.cpp
@@ -136,11 +136,11 @@ int main( int argc, char *argv[] )
   setenv( "TDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup
 
   // Copied from Till's test in libkcal.  Not sure what this is for.
-  KApplication::disableAutoDcopRegistration();
+  TDEApplication::disableAutoDcopRegistration();
 
   TDECmdLineArgs::init(argc,argv,"testresourcelocking", 0, 0, 0, 0);
 
-  KApplication app( false, false );
+  TDEApplication app( false, false );
 
   // basic libkcal locking stuff
   if ( !rval ) rval = test1();
diff --git a/kmail/ChangeLog b/kmail/ChangeLog
index 4af2bcb1e..1873a13df 100644
--- a/kmail/ChangeLog
+++ b/kmail/ChangeLog
@@ -354,7 +354,7 @@ please visit http://webcvs.kde.org
 
 	* Removed hardcoded localtdedir()
 
-	* Let KApplication() do the job of creating ~/.kde/share/config
+	* Let TDEApplication() do the job of creating ~/.kde/share/config
 
 1998-10-31  Stefan Taferner  <taferner@kde.org> (KMail-1.0.6)
 
diff --git a/kmail/antispamwizard.cpp b/kmail/antispamwizard.cpp
index a63ecae94..951a33798 100644
--- a/kmail/antispamwizard.cpp
+++ b/kmail/antispamwizard.cpp
@@ -517,7 +517,7 @@ void AntiSpamWizard::checkToolAvailability()
     }
     else {
       // check the availability of the application
-      KApplication::kApplication()->processEvents( 200 );
+      TDEApplication::kApplication()->processEvents( 200 );
       if ( !checkForProgram( (*it).getExecutable() ) ) {
         mInfoPage->addAvailableTool( (*it).getVisibleName() );
         found = true;
diff --git a/kmail/dcoptest.cpp b/kmail/dcoptest.cpp
index 0e5b14d80..04ba43b92 100644
--- a/kmail/dcoptest.cpp
+++ b/kmail/dcoptest.cpp
@@ -18,7 +18,7 @@ int main(int argc,char **argv)
   KAboutData aboutData( "testKMailDCOP",
    "Test for KMail DCOP interface", "0.0" );
   TDECmdLineArgs::init(argc, argv, &aboutData);
-  KApplication app;
+  TDEApplication app;
   app.dcopClient()->attach();
 
   KMailIface_stub kmailStub("kmail","KMailIface");
diff --git a/kmail/foldertreebase.cpp b/kmail/foldertreebase.cpp
index 4355c9df2..2584f9258 100644
--- a/kmail/foldertreebase.cpp
+++ b/kmail/foldertreebase.cpp
@@ -75,9 +75,9 @@ int FolderTreeBase::dndMode(bool alwaysAsk)
 {
   int action = -1;
   int keybstate = kapp->keyboardModifiers();
-  if ( keybstate & KApplication::ControlModifier ) {
+  if ( keybstate & TDEApplication::ControlModifier ) {
     action = DRAG_COPY;
-  } else if ( keybstate & KApplication::ShiftModifier ) {
+  } else if ( keybstate & TDEApplication::ShiftModifier ) {
     action = DRAG_MOVE;
   } else {
     if ( GlobalSettings::self()->showPopupAfterDnD() || alwaysAsk ) {
diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp
index 3194b0ca7..d2d9ca374 100644
--- a/kmail/kmcommands.cpp
+++ b/kmail/kmcommands.cpp
@@ -1743,7 +1743,7 @@ KMCommand::Result KMFilterActionCommand::execute()
       TQString statusMsg = i18n("Filtering message %1 of %2");
       statusMsg = statusMsg.arg( msgCount ).arg( msgCountToFilter );
       KPIM::BroadcastStatus::instance()->setStatusMsg( statusMsg );
-      KApplication::kApplication()->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 50 );
+      TDEApplication::kApplication()->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 50 );
     }
 
     int filterResult = kmkernel->filterMgr()->process( serNum, mFilter );
diff --git a/kmail/kmfoldermaildir.cpp b/kmail/kmfoldermaildir.cpp
index 2b4d155db..c12a58915 100644
--- a/kmail/kmfoldermaildir.cpp
+++ b/kmail/kmfoldermaildir.cpp
@@ -1040,7 +1040,7 @@ TQString KMFolderMaildir::constructValidFileName( const TQString & filename,
   if (aFileName.isEmpty())
   {
     aFileName.sprintf("%ld.%d.", (long)time(0), getpid());
-    aFileName += KApplication::randomString(5);
+    aFileName += TDEApplication::randomString(5);
   }
 
   if (!suffix_regex)
diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp
index 0b10d3d4d..aaa4669f7 100644
--- a/kmail/kmheaders.cpp
+++ b/kmail/kmheaders.cpp
@@ -1453,7 +1453,7 @@ void KMHeaders::applyFiltersOnMsg()
         TQString statusMsg = i18n("Filtering message %1 of %2");
         statusMsg = statusMsg.arg( msgCount ).arg( msgCountToFilter );
         KPIM::BroadcastStatus::instance()->setStatusMsg( statusMsg );
-        KApplication::kApplication()->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 50 );
+        TDEApplication::kApplication()->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 50 );
       }
 
       KMFolder *folder = 0;
diff --git a/kmail/main.cpp b/kmail/main.cpp
index e76b303f6..628ae97ad 100644
--- a/kmail/main.cpp
+++ b/kmail/main.cpp
@@ -48,7 +48,7 @@ public:
 void KMailApplication::commitData(TQSessionManager& sm) {
   kmkernel->dumpDeadLetters();
   kmkernel->setShuttingDown( true ); // Prevent further dumpDeadLetters calls
-  KApplication::commitData( sm );
+  TDEApplication::commitData( sm );
 }
 
 
diff --git a/kmail/recipientseditor.cpp b/kmail/recipientseditor.cpp
index 8d87d2d40..f2cf1f745 100644
--- a/kmail/recipientseditor.cpp
+++ b/kmail/recipientseditor.cpp
@@ -177,7 +177,7 @@ RecipientLine::RecipientLine( TQWidget *parent )
            this, TQT_SLOT( slotTypeModified() ) );
 
   mRemoveButton = new TQPushButton( this );
-  mRemoveButton->setIconSet( KApplication::reverseLayout() ? SmallIconSet("locationbar_erase") : SmallIconSet( "clear_left" ) );
+  mRemoveButton->setIconSet( TDEApplication::reverseLayout() ? SmallIconSet("locationbar_erase") : SmallIconSet( "clear_left" ) );
   topLayout->addWidget( mRemoveButton );
   connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotPropagateDeletion() ) );
   TQToolTip::add( mRemoveButton, i18n("Remove recipient line") );
diff --git a/kmail/recipientseditortest.cpp b/kmail/recipientseditortest.cpp
index e347fe5cf..54141bb5a 100644
--- a/kmail/recipientseditortest.cpp
+++ b/kmail/recipientseditortest.cpp
@@ -94,7 +94,7 @@ int main( int argc, char **argv )
    "Test Recipient Editor", "0.1" );
   TDECmdLineArgs::init( argc, argv, &aboutData );
 
-  KApplication app;
+  TDEApplication app;
 
   TQObject::connect( &app, TQT_SIGNAL( lastWindowClosed() ), &app, TQT_SLOT( quit() ) );
 
diff --git a/kmail/recipientspicker.cpp b/kmail/recipientspicker.cpp
index 01c3c5097..d6181a083 100644
--- a/kmail/recipientspicker.cpp
+++ b/kmail/recipientspicker.cpp
@@ -373,7 +373,7 @@ RecipientsPicker::RecipientsPicker( TQWidget *parent )
 
   TQToolButton *button = new TQToolButton( this );
   button->setIconSet( KGlobal::iconLoader()->loadIconSet(
-              KApplication::reverseLayout() ? "clear_left":"locationbar_erase", KIcon::Small, 0 ) );
+              TDEApplication::reverseLayout() ? "clear_left":"locationbar_erase", KIcon::Small, 0 ) );
   searchLayout->addWidget( button );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( resetSearch() ) );
 
diff --git a/kmailcvt/filters.cxx b/kmailcvt/filters.cxx
index 7f9a5f97b..78728d2c3 100644
--- a/kmailcvt/filters.cxx
+++ b/kmailcvt/filters.cxx
@@ -136,7 +136,7 @@ bool Filter::addMessage( FilterInfo* info, const TQString& folderName,
   msgURL.setPath( msgPath );
 
   if ( !kapp->dcopClient()->isApplicationRegistered( "kmail" ) )
-    KApplication::startServiceByDesktopName( "kmail", TQString() ); // Will wait until kmail is started
+    TDEApplication::startServiceByDesktopName( "kmail", TQString() ); // Will wait until kmail is started
 
   DCOPReply reply = DCOPRef( "kmail", "KMailIface" ).call( "dcopAddMessage", folderName, msgURL, msgStatusFlags );
 
@@ -172,7 +172,7 @@ bool Filter::addMessage_fastImport( FilterInfo* info, const TQString& folderName
   msgURL.setPath( msgPath );
 
   if ( !kapp->dcopClient()->isApplicationRegistered( "kmail" ) )
-    KApplication::startServiceByDesktopName( "kmail", TQString() ); // Will wait until kmail is started
+    TDEApplication::startServiceByDesktopName( "kmail", TQString() ); // Will wait until kmail is started
 
   DCOPReply reply = DCOPRef( "kmail", "KMailIface" ).call( "dcopAddMessage_fastImport", folderName, msgURL, msgStatusFlags );
   if ( !reply.isValid() )
@@ -200,7 +200,7 @@ bool Filter::addMessage_fastImport( FilterInfo* info, const TQString& folderName
 void Filter::showKMailImportArchiveDialog( FilterInfo* info )
 {
   if ( !kapp->dcopClient()->isApplicationRegistered( "kmail" ) )
-    KApplication::startServiceByDesktopName( "kmail", TQString() ); // Will wait until kmail is started
+    TDEApplication::startServiceByDesktopName( "kmail", TQString() ); // Will wait until kmail is started
 
   DCOPReply reply = DCOPRef( "kmail", "KMailIface" ).call( "showImportArchiveDialog" );
   if ( !reply.isValid() )
diff --git a/kmailcvt/kmailcvt.cpp b/kmailcvt/kmailcvt.cpp
index e24f9a205..4599fe250 100644
--- a/kmailcvt/kmailcvt.cpp
+++ b/kmailcvt/kmailcvt.cpp
@@ -41,7 +41,7 @@ KMailCVT::~KMailCVT() {
 
 void KMailCVT::endImport() {
   if ( !kapp->dcopClient()->isApplicationRegistered( "kmail" ) )
-    KApplication::startServiceByDesktopName( "kmail", TQString() ); // Will wait until kmail is started
+    TDEApplication::startServiceByDesktopName( "kmail", TQString() ); // Will wait until kmail is started
 
   DCOPReply reply = DCOPRef( "kmail", "KMailIface" ).call(  "dcopAddMessage", TQString(), TQString(), TQString());
   if ( !reply.isValid() )
diff --git a/kmailcvt/main.cpp b/kmailcvt/main.cpp
index 9121acfaa..f8ad5e222 100644
--- a/kmailcvt/main.cpp
+++ b/kmailcvt/main.cpp
@@ -41,7 +41,7 @@ int main(int argc, char *argv[])
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
 
-  KApplication a;
+  TDEApplication a;
   KMailCVT *kmailcvt = new KMailCVT();
   a.setMainWidget(kmailcvt);
   kmailcvt->show();  
diff --git a/kmobile/testlibkmobile.cpp b/kmobile/testlibkmobile.cpp
index e8ff85580..1f43cc9bf 100644
--- a/kmobile/testlibkmobile.cpp
+++ b/kmobile/testlibkmobile.cpp
@@ -13,7 +13,7 @@ int main(int argc, char **argv)
 {
     bool ok;
 
-    KApplication app(argc, argv, "kmobile_client", false);
+    TDEApplication app(argc, argv, "kmobile_client", false);
 
     // get our DCOP client and attach so that we may use it
     DCOPClient *client = app.dcopClient();
diff --git a/knode/knmainwidget.cpp b/knode/knmainwidget.cpp
index 5b43de69d..7b7b56101 100644
--- a/knode/knmainwidget.cpp
+++ b/knode/knmainwidget.cpp
@@ -367,8 +367,8 @@ void KNMainWidget::updateCaption()
 
 void KNMainWidget::setCursorBusy(bool b)
 {
-  if(b) KApplication::setOverrideCursor(waitCursor);
-  else  KApplication::restoreOverrideCursor();
+  if(b) TDEApplication::setOverrideCursor(waitCursor);
+  else  TDEApplication::restoreOverrideCursor();
 }
 
 
diff --git a/knotes/ChangeLog b/knotes/ChangeLog
index 532a92792..7050d7f72 100644
--- a/knotes/ChangeLog
+++ b/knotes/ChangeLog
@@ -898,7 +898,7 @@ Tue Feb 16 09:34:25 1999  David Faure  <faure@kde.org>
     * renaming: missing slash broke renaming.
         * set atomic flag in cleanup(). Hope to have avoided occasional crash
         leading to data loss.
-    * Replaced ~/.kde with KApplication::localtdedir()
+    * Replaced ~/.kde with TDEApplication::localtdedir()
         * option menu: disabled illogical switch between "3D frame" and
         "no frame" label. It is a checkable entry!
 
diff --git a/knotes/knotesapp.cpp b/knotes/knotesapp.cpp
index 964309c5b..25a57a42c 100644
--- a/knotes/knotesapp.cpp
+++ b/knotes/knotesapp.cpp
@@ -266,7 +266,7 @@ TQString KNotesApp::newNote( const TQString& name, const TQString& text )
 
 TQString KNotesApp::newNoteFromClipboard( const TQString& name )
 {
-    const TQString& text = KApplication::clipboard()->text();
+    const TQString& text = TDEApplication::clipboard()->text();
     return newNote( name, text );
 }
 
diff --git a/kode/kodemain.cpp b/kode/kodemain.cpp
index 081bba5f1..d8a1113ee 100644
--- a/kode/kodemain.cpp
+++ b/kode/kodemain.cpp
@@ -419,7 +419,7 @@ int create( TDECmdLineArgs *args )
     code += "TDECmdLineArgs::init(argc,argv,&aboutData);";
     code += "TDECmdLineArgs::addCmdLineOptions( options );";
     code += "";
-    code += "KApplication app;";
+    code += "TDEApplication app;";
     code += "";
     code += "TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();";
     code += "";
@@ -615,7 +615,7 @@ int main(int argc,char **argv)
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication app;
+  TDEApplication app;
 
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
diff --git a/kode/kwsdl/kung/main.cpp b/kode/kwsdl/kung/main.cpp
index 155a10b01..797186169 100644
--- a/kode/kwsdl/kung/main.cpp
+++ b/kode/kwsdl/kung/main.cpp
@@ -53,7 +53,7 @@ int main( int argc, char **argv )
     return 1;
   }
 
-  KApplication app;
+  TDEApplication app;
 
   Loader loader;
   loader.setWSDLUrl( args->url( 0 ).path() );
diff --git a/kode/kwsdl/main.cpp b/kode/kwsdl/main.cpp
index 697465902..97e7ad5af 100644
--- a/kode/kwsdl/main.cpp
+++ b/kode/kwsdl/main.cpp
@@ -59,7 +59,7 @@ int main( int argc, char **argv )
     return 1;
   }
 
-  KApplication app( false, false );
+  TDEApplication app( false, false );
 
   TQString outputDirectory = TQFile::decodeName( args->getOption( "directory" ) );
   if ( outputDirectory.isEmpty() )
diff --git a/kode/kwsdl/tests/google/main.cc b/kode/kwsdl/tests/google/main.cc
index 19f6ba3f4..01f54d28e 100644
--- a/kode/kwsdl/tests/google/main.cc
+++ b/kode/kwsdl/tests/google/main.cc
@@ -12,7 +12,7 @@ int main( int argc, char **argv )
 
   TDECmdLineArgs::init( argc, argv, &aboutData );
 
-  KApplication app( false, false );
+  TDEApplication app( false, false );
 
   GoogleSearch search;
 
diff --git a/konsolekalendar/main.cpp b/konsolekalendar/main.cpp
index 60b45dde3..8439f3447 100644
--- a/konsolekalendar/main.cpp
+++ b/konsolekalendar/main.cpp
@@ -196,7 +196,7 @@ int main( int argc, char *argv[] )
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
 
-  KApplication app(
+  TDEApplication app(
     false, //do not allowstyles - disable the loading on plugin based styles
     false  //GUI is not enabled - disable all GUI stuff
     );
diff --git a/kontact/interfaces/uniqueapphandler.cpp b/kontact/interfaces/uniqueapphandler.cpp
index 38ae51b3b..04e5a9e23 100644
--- a/kontact/interfaces/uniqueapphandler.cpp
+++ b/kontact/interfaces/uniqueapphandler.cpp
@@ -197,7 +197,7 @@ void Kontact::UniqueAppHandler::loadKontactCommandLineOptions()
 {
   TDECmdLineArgs::addCmdLineOptions( options );
   KUniqueApplication::addCmdLineOptions();
-  KApplication::addCmdLineOptions();
+  TDEApplication::addCmdLineOptions();
 }
 
 #include "uniqueapphandler.moc"
diff --git a/kontact/plugins/knotes/knotes_part.cpp b/kontact/plugins/knotes/knotes_part.cpp
index a66aa4c1b..0e5d806ba 100644
--- a/kontact/plugins/knotes/knotes_part.cpp
+++ b/kontact/plugins/knotes/knotes_part.cpp
@@ -201,7 +201,7 @@ TQString KNotesPart::newNote( const TQString& name, const TQString& text )
 
 TQString KNotesPart::newNoteFromClipboard( const TQString& name )
 {
-  const TQString& text = KApplication::clipboard()->text();
+  const TQString& text = TDEApplication::clipboard()->text();
   return newNote( name, text );
 }
 
diff --git a/kontact/plugins/kpilot/summarywidget.cpp b/kontact/plugins/kpilot/summarywidget.cpp
index d2180a634..b31849431 100644
--- a/kontact/plugins/kpilot/summarywidget.cpp
+++ b/kontact/plugins/kpilot/summarywidget.cpp
@@ -222,7 +222,7 @@ void SummaryWidget::startKPilot()
 {
   TQString error;
   TQCString appID;
-  if ( !KApplication::tdeinitExec( "kpilotDaemon", TQString( "--fail-silently" ) ) ) {
+  if ( !TDEApplication::tdeinitExec( "kpilotDaemon", TQString( "--fail-silently" ) ) ) {
     kdDebug(5602) << "No service available..." << endl;
     mStartedDaemon = true;
   }
diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp
index 50aa975fe..cfcbc43d2 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.cpp
+++ b/kontact/plugins/newsticker/kcmkontactknt.cpp
@@ -394,7 +394,7 @@ bool KCMKontactKNT::dcopActive() const
   bool isGood = true;
   DCOPClient *client = kapp->dcopClient();
   if ( !client->isApplicationRegistered( "rssservice" ) ) {
-    if ( KApplication::startServiceByDesktopName( "rssservice", TQStringList(), &error, &appID ) )
+    if ( TDEApplication::startServiceByDesktopName( "rssservice", TQStringList(), &error, &appID ) )
       isGood = false;
   }
 
diff --git a/kontact/plugins/newsticker/summarywidget.cpp b/kontact/plugins/newsticker/summarywidget.cpp
index ecd70a1e1..92207c1ed 100644
--- a/kontact/plugins/newsticker/summarywidget.cpp
+++ b/kontact/plugins/newsticker/summarywidget.cpp
@@ -58,7 +58,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
 
   bool dcopAvailable = true;
   if ( !kapp->dcopClient()->isApplicationRegistered( "rssservice" ) ) {
-    if ( KApplication::startServiceByDesktopName( "rssservice", TQStringList(), &error, &appID ) ) {
+    if ( TDEApplication::startServiceByDesktopName( "rssservice", TQStringList(), &error, &appID ) ) {
       TQLabel *label = new TQLabel( i18n( "No rss dcop service available.\nYou need rssservice to use this plugin." ), this );
       vlay->addWidget( label, TQt::AlignHCenter );
       dcopAvailable = false;
diff --git a/kontact/plugins/weather/summarywidget.cpp b/kontact/plugins/weather/summarywidget.cpp
index fb8bd9510..63c7c8977 100644
--- a/kontact/plugins/weather/summarywidget.cpp
+++ b/kontact/plugins/weather/summarywidget.cpp
@@ -53,7 +53,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
   TQCString appID;
   bool serviceAvailable = true;
   if ( !kapp->dcopClient()->isApplicationRegistered( "KWeatherService" ) ) {
-    if ( KApplication::startServiceByDesktopName( "kweatherservice", TQStringList(), &error, &appID ) ) {
+    if ( TDEApplication::startServiceByDesktopName( "kweatherservice", TQStringList(), &error, &appID ) ) {
       TQLabel *label = new TQLabel( i18n( "No weather dcop service available;\nyou need KWeather to use this plugin." ), this );
       mLayout->addWidget( label, TQt::AlignHCenter | AlignVCenter );
       serviceAvailable = false;
diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp
index 41e026a69..307f1c4b8 100644
--- a/kontact/src/mainwindow.cpp
+++ b/kontact/src/mainwindow.cpp
@@ -787,12 +787,12 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin )
     return;
   }
 
-  KApplication::setOverrideCursor( TQCursor( TQt::WaitCursor ) );
+  TDEApplication::setOverrideCursor( TQCursor( TQt::WaitCursor ) );
 
   KParts::Part *part = plugin->part();
 
   if ( !part ) {
-    KApplication::restoreOverrideCursor();
+    TDEApplication::restoreOverrideCursor();
     KMessageBox::error( this, i18n( "Cannot load part for %1." )
                               .arg( plugin->title() )
                         + "\n" + lastErrorMessage() );
@@ -894,7 +894,7 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin )
     }
   }
 
-  KApplication::restoreOverrideCursor();
+  TDEApplication::restoreOverrideCursor();
 }
 
 void MainWindow::selectPlugin( const TQString &pluginName )
@@ -1027,14 +1027,14 @@ void MainWindow::updateConfig()
 
 void MainWindow::showAboutDialog()
 {
-  KApplication::setOverrideCursor( TQCursor( TQt::WaitCursor ) );
+  TDEApplication::setOverrideCursor( TQCursor( TQt::WaitCursor ) );
 
   if ( !mAboutDialog )
     mAboutDialog = new AboutDialog( this );
 
   mAboutDialog->show();
   mAboutDialog->raise();
-  KApplication::restoreOverrideCursor();
+  TDEApplication::restoreOverrideCursor();
 }
 
 void MainWindow::configureShortcuts()
diff --git a/kontact/src/profilemanager.cpp b/kontact/src/profilemanager.cpp
index 67f1bd198..d929bcb3a 100644
--- a/kontact/src/profilemanager.cpp
+++ b/kontact/src/profilemanager.cpp
@@ -331,7 +331,7 @@ TQString Kontact::ProfileManager::generateNewId() const
 {
     while ( true )
     {
-        const TQString newId = KApplication::randomString( 10 );
+        const TQString newId = TDEApplication::randomString( 10 );
         if ( !m_profiles.contains( newId ) )
             return newId;
     }
diff --git a/korganizer/komailclient.cpp b/korganizer/komailclient.cpp
index 1081f62a5..a6edc6486 100644
--- a/korganizer/komailclient.cpp
+++ b/korganizer/komailclient.cpp
@@ -243,7 +243,7 @@ bool KOMailClient::send(const TQString &from,const TQString &_to,const TQString
     pclose(fd);
   } else {
     if (!kapp->dcopClient()->isApplicationRegistered("kmail")) {
-      if (KApplication::startServiceByDesktopName("kmail")) {
+      if (TDEApplication::startServiceByDesktopName("kmail")) {
         KMessageBox::error(0,i18n("No running instance of KMail found."));
         return false;
       }
diff --git a/korganizer/korgac/testalarmdlg.cpp b/korganizer/korgac/testalarmdlg.cpp
index 73d512d9a..e7be364b7 100644
--- a/korganizer/korgac/testalarmdlg.cpp
+++ b/korganizer/korgac/testalarmdlg.cpp
@@ -39,7 +39,7 @@ int main(int argc,char **argv)
   KAboutData aboutData("testkabc",I18N_NOOP("TestKabc"),"0.1");
   TDECmdLineArgs::init(argc,argv,&aboutData);
 
-  KApplication app;
+  TDEApplication app;
 
   KConfig c( locate( "config", "korganizerrc" ) );
   c.setGroup( "Time & Date" );
diff --git a/korganizer/korgplugins.cpp b/korganizer/korgplugins.cpp
index 0763fdbb0..e5fd0358d 100644
--- a/korganizer/korgplugins.cpp
+++ b/korganizer/korgplugins.cpp
@@ -37,7 +37,7 @@ int main(int argc,char **argv)
   KAboutData aboutData("korgplugins",I18N_NOOP("KOrgPlugins"),"0.1");
   TDECmdLineArgs::init(argc,argv,&aboutData);
 
-  KApplication app;
+  TDEApplication app;
   
   KTrader::OfferList plugins = KOCore::self()->availablePlugins();
   KTrader::OfferList::ConstIterator it;
diff --git a/korganizer/timezone.cpp b/korganizer/timezone.cpp
index 66d0f2aea..9d3c42d60 100644
--- a/korganizer/timezone.cpp
+++ b/korganizer/timezone.cpp
@@ -39,7 +39,7 @@ int main(int argc,char **argv)
   KAboutData aboutData("timezone",I18N_NOOP("KOrganizer Timezone Test"),"0.1");
   TDECmdLineArgs::init(argc,argv,&aboutData);
 
-  KApplication app;
+  TDEApplication app;
 
   kdDebug(5850) << "KOrganizer TimezoneId: " << KOPrefs::instance()->mTimeZoneId
             << endl;
diff --git a/korganizer/urihandler.cpp b/korganizer/urihandler.cpp
index 080ecd8d6..6b454e63b 100644
--- a/korganizer/urihandler.cpp
+++ b/korganizer/urihandler.cpp
@@ -91,13 +91,13 @@ bool UriHandler::process( TQWidget *parent, const TQString &uri )
 
   } else if ( uri.startsWith( "mailto:" ) ) {
 
-    KApplication::kApplication()->invokeMailer( uri.mid(7), TQString() );
+    TDEApplication::kApplication()->invokeMailer( uri.mid(7), TQString() );
     return true;
 
   } else if ( uri.startsWith( "uid:" ) ) {
 
     TQString uid = uidFromUri( uri );
-    DCOPClient *client = KApplication::kApplication()->dcopClient();
+    DCOPClient *client = TDEApplication::kApplication()->dcopClient();
     const TQByteArray noParamData;
     const TQByteArray paramData;
     TQByteArray replyData;
diff --git a/kresources/featureplan/benchmarkfeaturelist.cpp b/kresources/featureplan/benchmarkfeaturelist.cpp
index 1ce299980..106d80013 100644
--- a/kresources/featureplan/benchmarkfeaturelist.cpp
+++ b/kresources/featureplan/benchmarkfeaturelist.cpp
@@ -75,7 +75,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();
 
diff --git a/kresources/featureplan/dumpfeaturelist.cpp b/kresources/featureplan/dumpfeaturelist.cpp
index 19e9a3fb2..efab2cae6 100644
--- a/kresources/featureplan/dumpfeaturelist.cpp
+++ b/kresources/featureplan/dumpfeaturelist.cpp
@@ -74,7 +74,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();
 
diff --git a/kresources/groupwise/soap/ksslsocket.cpp b/kresources/groupwise/soap/ksslsocket.cpp
index e38f00d04..cd66fc500 100644
--- a/kresources/groupwise/soap/ksslsocket.cpp
+++ b/kresources/groupwise/soap/ksslsocket.cpp
@@ -183,7 +183,7 @@ int KSSLSocket::messageBox( KIO::SlaveBase::MessageBoxType type, const TQString
 	}
 	if (!d->dcc->isApplicationRegistered("kio_uiserver"))
 	{
-		KApplication::startServiceByDesktopPath("kio_uiserver.desktop",TQStringList());
+		TDEApplication::startServiceByDesktopPath("kio_uiserver.desktop",TQStringList());
 	}
 
 	d->dcc->call("kio_uiserver", "UIServer",
diff --git a/kresources/groupwise/soap/soapdebug.cpp b/kresources/groupwise/soap/soapdebug.cpp
index 036ed5e79..e47dd7476 100644
--- a/kresources/groupwise/soap/soapdebug.cpp
+++ b/kresources/groupwise/soap/soapdebug.cpp
@@ -52,7 +52,7 @@ int main( int argc, char **argv )
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication app;
+  TDEApplication app;
 
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
diff --git a/kresources/scalix/kioslave/scalix.cpp b/kresources/scalix/kioslave/scalix.cpp
index 208fd3523..52384afad 100644
--- a/kresources/scalix/kioslave/scalix.cpp
+++ b/kresources/scalix/kioslave/scalix.cpp
@@ -49,11 +49,11 @@ static const KCmdLineOptions options[] =
 int kdemain( int argc, char **argv )
 {
   putenv( strdup( "SESSION_MANAGER=" ) );
-  KApplication::disableAutoDcopRegistration();
+  TDEApplication::disableAutoDcopRegistration();
 
   TDECmdLineArgs::init( argc, argv, "kio_scalix", 0, 0, 0, 0 );
   TDECmdLineArgs::addCmdLineOptions( options );
-  KApplication app( false, false );
+  TDEApplication app( false, false );
 
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
   Scalix slave( args->arg( 0 ), args->arg( 1 ), args->arg( 2 ) );
diff --git a/kresources/scalix/scalixadmin/main.cpp b/kresources/scalix/scalixadmin/main.cpp
index 133da8ec7..b455d963d 100644
--- a/kresources/scalix/scalixadmin/main.cpp
+++ b/kresources/scalix/scalixadmin/main.cpp
@@ -40,7 +40,7 @@ int main( int argc, char **argv )
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication app;
+  TDEApplication app;
 
   KGlobal::locale()->insertCatalogue( "scalixadmin" );
 
diff --git a/kresources/slox/testsloxaccounts.cpp b/kresources/slox/testsloxaccounts.cpp
index 55011f2fe..77a91d718 100644
--- a/kresources/slox/testsloxaccounts.cpp
+++ b/kresources/slox/testsloxaccounts.cpp
@@ -41,7 +41,7 @@ int main(int argc,char **argv)
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication app;
+  TDEApplication app;
 
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
diff --git a/ktnef/gui/main.cpp b/ktnef/gui/main.cpp
index 27ad32a2d..8f655e678 100644
--- a/ktnef/gui/main.cpp
+++ b/ktnef/gui/main.cpp
@@ -42,9 +42,9 @@ int main(int argc, char *argv[])
   aboutData.addAuthor("Michael Goffioul",0, "tdeprint@swing.be");
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
-  KApplication::addCmdLineOptions();
+  TDEApplication::addCmdLineOptions();
 
-  KApplication a;
+  TDEApplication a;
   KTNEFMain *tnef = new KTNEFMain();
   a.setMainWidget(tnef);
   tnef->show();
diff --git a/libemailfunctions/tests/testemail.cpp b/libemailfunctions/tests/testemail.cpp
index 4976764b1..5b2f5bcb2 100644
--- a/libemailfunctions/tests/testemail.cpp
+++ b/libemailfunctions/tests/testemail.cpp
@@ -161,9 +161,9 @@ static bool checkQuoteIfNecessary( const TQString& input, const TQString& expRes
 
 int main(int argc, char *argv[])
 {
-  KApplication::disableAutoDcopRegistration();
+  TDEApplication::disableAutoDcopRegistration();
   TDECmdLineArgs::init( argc, argv, "testemail", 0, 0, 0, 0 );
-  KApplication app( false, false );
+  TDEApplication app( false, false );
 
   // Empty input
   checkGetNameAndEmail( TQString(), TQString(), TQString(), false );
diff --git a/libkcal/calformat.cpp b/libkcal/calformat.cpp
index e506b8dfe..c29437ac5 100644
--- a/libkcal/calformat.cpp
+++ b/libkcal/calformat.cpp
@@ -71,7 +71,7 @@ TQString CalFormat::createUniqueId()
                  TQTime::currentTime().msec();
   TQString uidStr = TQString("%1-%2.%3")
                            .arg(mApplication)
-                           .arg(KApplication::random())
+                           .arg(TDEApplication::random())
                            .arg(hashTime);
   return uidStr;
 }
diff --git a/libkcal/convertqtopia.cpp b/libkcal/convertqtopia.cpp
index b1af7f8c2..2a8712c89 100644
--- a/libkcal/convertqtopia.cpp
+++ b/libkcal/convertqtopia.cpp
@@ -56,7 +56,7 @@ int main(int argc,char **argv)
   TDECmdLineArgs::init(argc,argv,&aboutData);
   TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication app;
+  TDEApplication app;
 
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
diff --git a/libkcal/tests/readandwrite.cpp b/libkcal/tests/readandwrite.cpp
index 1f53a450d..0c8f55861 100644
--- a/libkcal/tests/readandwrite.cpp
+++ b/libkcal/tests/readandwrite.cpp
@@ -50,7 +50,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();
 
diff --git a/libkcal/tests/testcalendar.cpp b/libkcal/tests/testcalendar.cpp
index e6eb6973b..323d9175c 100644
--- a/libkcal/tests/testcalendar.cpp
+++ b/libkcal/tests/testcalendar.cpp
@@ -41,8 +41,8 @@ int main(int argc,char **argv)
   TDECmdLineArgs::init(argc,argv,&aboutData);
   TDECmdLineArgs::addCmdLineOptions( options );
 
-//  KApplication app( false, false );
-  KApplication app;
+//  TDEApplication app( false, false );
+  TDEApplication app;
 
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
diff --git a/libkcal/tests/testcalselectdialog.cpp b/libkcal/tests/testcalselectdialog.cpp
index 65004d34f..976a6ffea 100644
--- a/libkcal/tests/testcalselectdialog.cpp
+++ b/libkcal/tests/testcalselectdialog.cpp
@@ -30,7 +30,7 @@ int main( int argc, char **argv )
   TDECmdLineArgs::init( argc, argv, "testcalselectdialog", 0,
                       "KCalSelectDialogTest", "1.0",
                       "kcalselectedialog test app" );
-  KApplication app;
+  TDEApplication app;
   TQStringList cals;
   cals << "standard" << "shared" << "mine" << "yours";
   TQString cal = CalSelectDialog::getItem( i18n( "Calendar Selection" ),
diff --git a/libkcal/tests/testfields.cpp b/libkcal/tests/testfields.cpp
index e24baec54..9f57d3b20 100644
--- a/libkcal/tests/testfields.cpp
+++ b/libkcal/tests/testfields.cpp
@@ -43,8 +43,8 @@ int main(int argc,char **argv)
   TDECmdLineArgs::init(argc,argv,&aboutData);
   TDECmdLineArgs::addCmdLineOptions( options );
 
-//  KApplication app( false, false );
-  KApplication app;
+//  TDEApplication app( false, false );
+  TDEApplication app;
 
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
diff --git a/libkcal/tests/testincidence.cpp b/libkcal/tests/testincidence.cpp
index c6a5ef572..4647c2b5c 100644
--- a/libkcal/tests/testincidence.cpp
+++ b/libkcal/tests/testincidence.cpp
@@ -43,7 +43,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();
 
diff --git a/libkcal/tests/testrecurprevious.cpp b/libkcal/tests/testrecurprevious.cpp
index 3d2216b7e..0b1e756c4 100644
--- a/libkcal/tests/testrecurprevious.cpp
+++ b/libkcal/tests/testrecurprevious.cpp
@@ -53,7 +53,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();
 
diff --git a/libkcal/tests/testrecurrence.cpp b/libkcal/tests/testrecurrence.cpp
index 14d470cf3..9b1652979 100644
--- a/libkcal/tests/testrecurrence.cpp
+++ b/libkcal/tests/testrecurrence.cpp
@@ -53,7 +53,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();
 
diff --git a/libkcal/tests/testrecurrencetype.cpp b/libkcal/tests/testrecurrencetype.cpp
index 14d470cf3..9b1652979 100644
--- a/libkcal/tests/testrecurrencetype.cpp
+++ b/libkcal/tests/testrecurrencetype.cpp
@@ -53,7 +53,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();
 
diff --git a/libkcal/tests/testrecurson.cpp b/libkcal/tests/testrecurson.cpp
index cd5edf76b..a1df982a6 100644
--- a/libkcal/tests/testrecurson.cpp
+++ b/libkcal/tests/testrecurson.cpp
@@ -53,7 +53,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();
 
diff --git a/libkcal/tests/testresource.cpp b/libkcal/tests/testresource.cpp
index 6fc8fc2a4..b7f2f24c4 100644
--- a/libkcal/tests/testresource.cpp
+++ b/libkcal/tests/testresource.cpp
@@ -59,11 +59,11 @@ int main(int argc, char *argv[])
     setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.tde-testresource" ), true );
     setenv( "TDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup
 
-    KApplication::disableAutoDcopRegistration();
+    TDEApplication::disableAutoDcopRegistration();
     TDECmdLineArgs::init(argc,argv,"testresource", 0, 0, 0, 0);
     TDECmdLineArgs::addCmdLineOptions( options );
  
-    KApplication app;
+    TDEApplication app;
     TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
     TQString type = TQString();
     if ( args->getOption( "resource" ) )
diff --git a/libkcal/tests/testvcalexport.cpp b/libkcal/tests/testvcalexport.cpp
index 16a15afaf..8d32e9407 100644
--- a/libkcal/tests/testvcalexport.cpp
+++ b/libkcal/tests/testvcalexport.cpp
@@ -54,7 +54,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();
 
diff --git a/libtdepim/cfgc/autoexample.cpp b/libtdepim/cfgc/autoexample.cpp
index 85ce92ed7..fa9e9b528 100644
--- a/libtdepim/cfgc/autoexample.cpp
+++ b/libtdepim/cfgc/autoexample.cpp
@@ -43,7 +43,7 @@ int main( int argc, char **argv )
 
   TDECmdLineArgs::init( argc, argv, &aboutData );
 
-  KApplication app;
+  TDEApplication app;
 
   // Create a new dialog with the same name as the above checking code.
   KAutoConfigDialog *dialog = new KAutoConfigDialog(0, "settings");
diff --git a/libtdepim/cfgc/example.cpp b/libtdepim/cfgc/example.cpp
index bb3bd3947..183b4f267 100644
--- a/libtdepim/cfgc/example.cpp
+++ b/libtdepim/cfgc/example.cpp
@@ -39,7 +39,7 @@ int main( int argc, char **argv )
 
   TDECmdLineArgs::init( argc, argv, &aboutData );
 
-  KApplication app;
+  TDEApplication app;
 
   ExamplePrefsBase *prefs = ExamplePrefsBase::self();
 
diff --git a/libtdepim/komposer/core/pluginmanager.h b/libtdepim/komposer/core/pluginmanager.h
index 442914508..eae6d49a6 100644
--- a/libtdepim/komposer/core/pluginmanager.h
+++ b/libtdepim/komposer/core/pluginmanager.h
@@ -208,7 +208,7 @@ namespace Komposer
     void slotShutdownTimeout();
 
     /**
-     * Common entry point to deref() the KApplication. Used both by the clean
+     * Common entry point to deref() the TDEApplication. Used both by the clean
      * shutdown and the timeout condition of slotShutdownTimeout()
      */
     void slotShutdownDone();
diff --git a/libtdepim/komposer/core/tests/main.cpp b/libtdepim/komposer/core/tests/main.cpp
index 2d394a228..80bf8fc95 100644
--- a/libtdepim/komposer/core/tests/main.cpp
+++ b/libtdepim/komposer/core/tests/main.cpp
@@ -42,7 +42,7 @@ int main( int argc, char** argv )
     TDECmdLineArgs::init( argc, argv, &aboutData );
     TDECmdLineArgs::addCmdLineOptions( options );
 
-    KApplication app;
+    TDEApplication app;
 
     TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
     Q_UNUSED( args );
diff --git a/libtdepim/komposer/core/tests/testkomposer.cpp b/libtdepim/komposer/core/tests/testkomposer.cpp
index 31462a7e3..efacb460f 100644
--- a/libtdepim/komposer/core/tests/testkomposer.cpp
+++ b/libtdepim/komposer/core/tests/testkomposer.cpp
@@ -8,7 +8,7 @@
 int main( int argc, char **argv )
 {
   TDECmdLineArgs::init( argc, argv, "test", "test", "test", "0.1" );
-  KApplication app;
+  TDEApplication app;
 
   Komposer::Core *core = new Komposer::Core();
   app.setMainWidget( core );
diff --git a/libtdepim/komposer/core/tests/testmanager.cpp b/libtdepim/komposer/core/tests/testmanager.cpp
index a9b06171d..b883997f3 100644
--- a/libtdepim/komposer/core/tests/testmanager.cpp
+++ b/libtdepim/komposer/core/tests/testmanager.cpp
@@ -45,7 +45,7 @@ void TestManager::slotPluginLoaded( Plugin *plugin )
 int main( int argc, char **argv )
 {
   TDECmdLineArgs::init( argc, argv, "test", "test", "test", "0.1" );
-  KApplication app;
+  TDEApplication app;
 
   TestManager manager( &app );
 
diff --git a/libtdepim/ksubscription.cpp b/libtdepim/ksubscription.cpp
index f61b633ca..2a2347edc 100644
--- a/libtdepim/ksubscription.cpp
+++ b/libtdepim/ksubscription.cpp
@@ -224,7 +224,7 @@ KSubscription::KSubscription( TQWidget *parent, const TQString &caption,
 
   TQToolButton *clearButton = new TQToolButton( page );
   clearButton->setIconSet( KGlobal::iconLoader()->loadIconSet(
-              KApplication::reverseLayout() ? "clear_left":"locationbar_erase", KIcon::Small, 0 ) );
+              TDEApplication::reverseLayout() ? "clear_left":"locationbar_erase", KIcon::Small, 0 ) );
   filterEdit = new KLineEdit(page);
   TQLabel *l = new TQLabel(filterEdit,i18n("S&earch:"), page);
   connect( clearButton, TQT_SIGNAL( clicked() ), filterEdit, TQT_SLOT( clear() ) );
diff --git a/libtdepim/tests/testaddresseelineedit.cpp b/libtdepim/tests/testaddresseelineedit.cpp
index 201a1128d..b02998397 100644
--- a/libtdepim/tests/testaddresseelineedit.cpp
+++ b/libtdepim/tests/testaddresseelineedit.cpp
@@ -32,7 +32,7 @@ int main(int argc, char* argv[])
   KAboutData aboutData("testaddresseelineedit","Test AddresseeLineEdit","0.1");
   TDECmdLineArgs::init(argc,argv,&aboutData);
 
-  KApplication app;
+  TDEApplication app;
 
   KPIM::AddresseeLineEdit *kale = new KPIM::AddresseeLineEdit(0);
   kale->resize( 400, 20 );
diff --git a/libtdepim/tests/testaddresseeselector.cpp b/libtdepim/tests/testaddresseeselector.cpp
index 7f1ae17d4..af5a1dd4f 100644
--- a/libtdepim/tests/testaddresseeselector.cpp
+++ b/libtdepim/tests/testaddresseeselector.cpp
@@ -33,7 +33,7 @@ int main( int argc, char **argv )
   KAboutData aboutData( "testaddresseeseletor", "Test AddresseeSelector", "0.1" );
   TDECmdLineArgs::init( argc, argv, &aboutData );
 
-  KApplication app;
+  TDEApplication app;
 
   KPIM::AddresseeEmailSelection selection;
 
diff --git a/libtdepim/tests/testdateedit.cpp b/libtdepim/tests/testdateedit.cpp
index 97f8408ab..612aca177 100644
--- a/libtdepim/tests/testdateedit.cpp
+++ b/libtdepim/tests/testdateedit.cpp
@@ -56,7 +56,7 @@ int main(int argc,char **argv)
   KAboutData aboutData( "testdateedit", "Test KDateEdit", "0.1" );
   TDECmdLineArgs::init( argc, argv, &aboutData );
 
-  KApplication app;
+  TDEApplication app;
 
   DateEdit dateEdit;
   app.setMainWidget( &dateEdit );
diff --git a/libtdepim/tests/testdistrlist.cpp b/libtdepim/tests/testdistrlist.cpp
index ae27b0547..7572c8478 100644
--- a/libtdepim/tests/testdistrlist.cpp
+++ b/libtdepim/tests/testdistrlist.cpp
@@ -46,9 +46,9 @@ int main(int argc, char *argv[])
     setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.tde-testdistrlist" ), true );
     setenv( "TDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup
 
-    KApplication::disableAutoDcopRegistration();
+    TDEApplication::disableAutoDcopRegistration();
     TDECmdLineArgs::init(argc,argv,"testdistrlist", 0, 0, 0, 0);
-    KApplication app( false, false );
+    TDEApplication app( false, false );
 
     TestDistrList test;
     test.setup();
diff --git a/libtdepim/tests/testkincidencechooser.cpp b/libtdepim/tests/testkincidencechooser.cpp
index eea14019e..539508253 100644
--- a/libtdepim/tests/testkincidencechooser.cpp
+++ b/libtdepim/tests/testkincidencechooser.cpp
@@ -32,7 +32,7 @@ int main( int argc, char **argv )
   TDECmdLineArgs::init( argc, argv, "testkincidencechooser", 0,
                       "KIncidenceChooserTest", "1.0",
                       "kincidencechooser test app" );
-  KApplication app;
+  TDEApplication app;
   KIncidenceChooser *chooser = new KIncidenceChooser();
 
   Event event;
diff --git a/libtdepim/tests/testlinklocator.cpp b/libtdepim/tests/testlinklocator.cpp
index 1744904dd..0ed3f1f95 100644
--- a/libtdepim/tests/testlinklocator.cpp
+++ b/libtdepim/tests/testlinklocator.cpp
@@ -59,9 +59,9 @@ static bool checkGetEmailAddress( const TQString & input,
 
 int main(int argc, char *argv[])
 {
-  KApplication::disableAutoDcopRegistration();
+  TDEApplication::disableAutoDcopRegistration();
   TDECmdLineArgs::init( argc, argv, "testlinklocator", 0, 0, 0, 0 );
-  KApplication app( false, false );
+  TDEApplication app( false, false );
 
   // empty input
   checkGetEmailAddress( TQString(), 0, TQString(), true );
diff --git a/libtdepim/tests/testwizard.cpp b/libtdepim/tests/testwizard.cpp
index 236636995..03ee4ac43 100644
--- a/libtdepim/tests/testwizard.cpp
+++ b/libtdepim/tests/testwizard.cpp
@@ -87,7 +87,7 @@ int main(int argc,char **argv)
   TDECmdLineArgs::init(argc,argv,&aboutData);
   TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication app;
+  TDEApplication app;
 
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
diff --git a/plugins/kmail/bodypartformatter/text_calendar.cpp b/plugins/kmail/bodypartformatter/text_calendar.cpp
index f31ed3a48..2acfdc2d2 100644
--- a/plugins/kmail/bodypartformatter/text_calendar.cpp
+++ b/plugins/kmail/bodypartformatter/text_calendar.cpp
@@ -823,7 +823,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
             summary = i18n( "Re: %1" ).arg( summary );
           }
 
-          KApplication::kApplication()->invokeMailer( incidence->organizer().email(), summary );
+          TDEApplication::kApplication()->invokeMailer( incidence->organizer().email(), summary );
           //fall through
         case KMessageBox::Yes: // means "do not send"
           if ( saveFile( "Receiver Not Searched", iCal, TQString( "reply" ) ) ) {
diff --git a/wizards/egroupwaremain.cpp b/wizards/egroupwaremain.cpp
index 010a87edb..72d66fe5a 100644
--- a/wizards/egroupwaremain.cpp
+++ b/wizards/egroupwaremain.cpp
@@ -42,7 +42,7 @@ int main(int argc,char **argv)
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication app;
+  TDEApplication app;
 
   KGlobal::locale()->insertCatalogue( "libtdepim" );
 
diff --git a/wizards/exchangemain.cpp b/wizards/exchangemain.cpp
index eb5393293..7d7bc8943 100644
--- a/wizards/exchangemain.cpp
+++ b/wizards/exchangemain.cpp
@@ -42,7 +42,7 @@ int main(int argc,char **argv)
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication app;
+  TDEApplication app;
 
   KGlobal::locale()->insertCatalogue( "libtdepim" );
 
diff --git a/wizards/groupwisemain.cpp b/wizards/groupwisemain.cpp
index 301972c64..e305e2143 100644
--- a/wizards/groupwisemain.cpp
+++ b/wizards/groupwisemain.cpp
@@ -43,7 +43,7 @@ int main(int argc,char **argv)
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication app;
+  TDEApplication app;
 
   KGlobal::locale()->insertCatalogue( "libtdepim" );
 
diff --git a/wizards/kolabmain.cpp b/wizards/kolabmain.cpp
index a09cb0053..3b5715aa1 100644
--- a/wizards/kolabmain.cpp
+++ b/wizards/kolabmain.cpp
@@ -42,7 +42,7 @@ int main(int argc,char **argv)
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication app;
+  TDEApplication app;
 
   KGlobal::locale()->insertCatalogue( "libtdepim" );
 
diff --git a/wizards/main.cpp b/wizards/main.cpp
index 811878c8e..c45fdd52b 100644
--- a/wizards/main.cpp
+++ b/wizards/main.cpp
@@ -21,7 +21,7 @@ int main( int argc, char **argv )
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication app;
+  TDEApplication app;
 
   KGlobal::locale()->insertCatalogue( "libtdepim" );
 
diff --git a/wizards/scalixmain.cpp b/wizards/scalixmain.cpp
index 7afbb7824..1ae125fc6 100644
--- a/wizards/scalixmain.cpp
+++ b/wizards/scalixmain.cpp
@@ -42,7 +42,7 @@ int main(int argc,char **argv)
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication app;
+  TDEApplication app;
 
   KGlobal::locale()->insertCatalogue( "libtdepim" );
 
diff --git a/wizards/sloxmain.cpp b/wizards/sloxmain.cpp
index 52fac9777..93500b3cc 100644
--- a/wizards/sloxmain.cpp
+++ b/wizards/sloxmain.cpp
@@ -42,7 +42,7 @@ int main(int argc,char **argv)
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication app;
+  TDEApplication app;
 
   KGlobal::locale()->insertCatalogue( "libtdepim" );