diff --git a/acinclude.m4 b/acinclude.m4
index b0102a8..0ea3119 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1994,20 +1994,20 @@ cat > conftest.$ac_ext <<EOF
 #include <kapp.h>
 
 int main() {
-    printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data());
-    printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data());
-    printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data());
-    printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data());
-    printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data());
-    printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data());
-    printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data());
-    printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data());
-    printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data());
-    printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data());
+    printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
+    printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
+    printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
+    printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
+    printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
+    printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
+    printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
+    printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
+    printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
+    printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
     printf("kde_wallpaperdir=\\"%s\\"\n",
-	KApplication::kde_wallpaperdir().data());
-    printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data());
-    printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data());
+	TDEApplication::kde_wallpaperdir().data());
+    printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
+    printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
     printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
     printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
     printf("kde_moduledir=\\"/tmp/dummy\\"\n");
diff --git a/konversation/src/channel.cpp b/konversation/src/channel.cpp
index b7063c0..177da6c 100644
--- a/konversation/src/channel.cpp
+++ b/konversation/src/channel.cpp
@@ -2611,7 +2611,7 @@ void Channel::processPendingNicks()
     // Remove possible mode characters from nickname and store the resulting mode
     m_server->mangleNicknameWithModes(nickname, admin, owner, op, halfop, voice);
 
-    // TODO: make these an enumeration in KApplication or somewhere, we can use them as well
+    // TODO: make these an enumeration in TDEApplication or somewhere, we can use them as well
     unsigned int mode = (admin  ? 16 : 0) +
                         (owner  ?  8 : 0) +
                         (op     ?  4 : 0) +
diff --git a/konversation/src/channeloptionsdialog.cpp b/konversation/src/channeloptionsdialog.cpp
index 7cb34cd..1c13f42 100644
--- a/konversation/src/channeloptionsdialog.cpp
+++ b/konversation/src/channeloptionsdialog.cpp
@@ -448,7 +448,7 @@ namespace Konversation
         {
             TQKeyEvent e(TQEvent::KeyPress, TQt::Key_Escape, 27, Qt::NoButton);
 
-            KApplication::sendEvent(m_widget->banList->renameLineEdit(), &e);
+            TDEApplication::sendEvent(m_widget->banList->renameLineEdit(), &e);
         }
 
         topicBeingEdited(false);
@@ -461,7 +461,7 @@ namespace Konversation
         {
             TQKeyEvent e(TQEvent::KeyPress, TQt::Key_Return, 13, Qt::NoButton);
 
-            KApplication::sendEvent(m_widget->banList->renameLineEdit(), &e);
+            TDEApplication::sendEvent(m_widget->banList->renameLineEdit(), &e);
         }
     }
 
diff --git a/konversation/src/config/preferences.cpp b/konversation/src/config/preferences.cpp
index 5534ac8..8762662 100644
--- a/konversation/src/config/preferences.cpp
+++ b/konversation/src/config/preferences.cpp
@@ -526,7 +526,7 @@ void Preferences::setAutoUserhost(bool state)
 
 bool Preferences::dialogFlag(const TQString& flagName)
 {
-    KConfig* config=KApplication::kApplication()->config();
+    KConfig* config=TDEApplication::kApplication()->config();
 
     config->setGroup("Notification self()->Messages");
 
@@ -538,7 +538,7 @@ bool Preferences::dialogFlag(const TQString& flagName)
 
 void Preferences::setDialogFlag(const TQString& flagName,bool state)
 {
-    KConfig* config=KApplication::kApplication()->config();
+    KConfig* config=TDEApplication::kApplication()->config();
 
     config->setGroup("Notification self()->Messages");
 
diff --git a/konversation/src/highlight_preferences.cpp b/konversation/src/highlight_preferences.cpp
index b87adbe..6fa017a 100644
--- a/konversation/src/highlight_preferences.cpp
+++ b/konversation/src/highlight_preferences.cpp
@@ -314,7 +314,7 @@ TQStringList Highlight_Config::currentHighlightList()
 
 void Highlight_Config::playSound()
 {
-  KonversationApplication *konvApp=static_cast<KonversationApplication *>(KApplication::kApplication());
+  KonversationApplication *konvApp=static_cast<KonversationApplication *>(TDEApplication::kApplication());
   konvApp->sound()->play(KURL(soundURL->url()));
 }
 
diff --git a/konversation/src/inputfilter.cpp b/konversation/src/inputfilter.cpp
index e1fb804..2bb52f4 100644
--- a/konversation/src/inputfilter.cpp
+++ b/konversation/src/inputfilter.cpp
@@ -113,7 +113,7 @@ void InputFilter::parseLine(const TQString& a_newLine)
 
 void InputFilter::parseClientCommand(const TQString &prefix, const TQString &command, const TQStringList &parameterList, const TQString &_trailing)
 {
-    KonversationApplication* konv_app = static_cast<KonversationApplication *>(KApplication::kApplication());
+    KonversationApplication* konv_app = static_cast<KonversationApplication *>(TDEApplication::kApplication());
     Q_ASSERT(konv_app);
     Q_ASSERT(server);
     // Extract nickname from prefix
diff --git a/konversation/src/ircinput.cpp b/konversation/src/ircinput.cpp
index 7766351..289719a 100644
--- a/konversation/src/ircinput.cpp
+++ b/konversation/src/ircinput.cpp
@@ -44,7 +44,7 @@ IRCInput::IRCInput(TQWidget* parent) : KTextEdit(parent)
     //nor in compensating for it if my guess is incorrect. so, cache it.
     m_qtBoxPadding=m_lastHeight-fontMetrics().lineSpacing();
 
-    connect(KApplication::kApplication(), TQT_SIGNAL(appearanceChanged()), this, TQT_SLOT(updateAppearance()));
+    connect(TDEApplication::kApplication(), TQT_SIGNAL(appearanceChanged()), this, TQT_SLOT(updateAppearance()));
     m_multiRow = Preferences::useMultiRowInputBox();
 
     m_useSelection = false;
@@ -371,7 +371,7 @@ void IRCInput::paste(bool useSelection)
 
 void IRCInput::paste()
 {
-    TQClipboard *cb = KApplication::kApplication()->clipboard();
+    TQClipboard *cb = TDEApplication::kApplication()->clipboard();
     setFocus();
 
     // Copy text from the clipboard (paste)
diff --git a/konversation/src/ircview.cpp b/konversation/src/ircview.cpp
index b2711ff..57ca95f 100644
--- a/konversation/src/ircview.cpp
+++ b/konversation/src/ircview.cpp
@@ -304,7 +304,7 @@ void IRCView::openLink(const TQString& url, bool newTab)
                 TQCString foundApp, foundObj;
                 TQByteArray data;
                 TQDataStream str(data, IO_WriteOnly);
-                if( KApplication::dcopClient()->findObject("konqueror*", "konqueror-mainwindow*",
+                if( TDEApplication::dcopClient()->findObject("konqueror*", "konqueror-mainwindow*",
                     "windowCanBeUsedForTab()", data, foundApp, foundObj, false, 3000))
                 {
                     DCOPRef ref(foundApp, foundObj);
@@ -1344,7 +1344,7 @@ bool IRCView::contextMenu(TQContextMenuEvent* ce)
                 break;
             case CopyUrl:
             {
-                TQClipboard *cb = KApplication::kApplication()->clipboard();
+                TQClipboard *cb = TDEApplication::kApplication()->clipboard();
                 cb->setText(m_urlToCopy,TQClipboard::Selection);
                 cb->setText(m_urlToCopy,TQClipboard::Clipboard);
                 break;
diff --git a/konversation/src/konversationapplication.cpp b/konversation/src/konversationapplication.cpp
index c8763a7..de1ecf7 100644
--- a/konversation/src/konversationapplication.cpp
+++ b/konversation/src/konversationapplication.cpp
@@ -207,7 +207,7 @@ int KonversationApplication::newInstance()
 
 KonversationApplication* KonversationApplication::instance()
 {
-    return static_cast<KonversationApplication*>(KApplication::kApplication());
+    return static_cast<KonversationApplication*>(TDEApplication::kApplication());
 }
 
 void KonversationApplication::prepareShutdown()
diff --git a/konversation/src/main.cpp b/konversation/src/main.cpp
index ef70143..953d699 100644
--- a/konversation/src/main.cpp
+++ b/konversation/src/main.cpp
@@ -93,7 +93,7 @@ int main(int argc, char* argv[])
 
     TDECmdLineArgs::init(argc, argv, &aboutData);
     TDECmdLineArgs::addCmdLineOptions(options);
-    KApplication::addCmdLineOptions();
+    TDEApplication::addCmdLineOptions();
 
     if (!KUniqueApplication::start()) return 0;
 
diff --git a/konversation/src/osd.cpp b/konversation/src/osd.cpp
index 9935576..30a075c 100644
--- a/konversation/src/osd.cpp
+++ b/konversation/src/osd.cpp
@@ -407,7 +407,7 @@ OSDWidget::KDesktopLockStatus OSDWidget::isKDesktopLockRunning()
     if (!Preferences::oSDCheckDesktopLock())
 	return NotLocked;
 
-    DCOPClient *dcopptr = KApplication::kApplication()->dcopClient();
+    DCOPClient *dcopptr = TDEApplication::kApplication()->dcopClient();
 
     // Can't tell, very weird
     if (!dcopptr || !dcopptr->isAttached())
diff --git a/konversation/src/osd_preferences.cpp b/konversation/src/osd_preferences.cpp
index 61e8115..663750a 100644
--- a/konversation/src/osd_preferences.cpp
+++ b/konversation/src/osd_preferences.cpp
@@ -86,7 +86,7 @@ void OSD_Config::restorePageToDefaults()
 void OSD_Config::saveSettings()
 {
     //Update the current OSD.
-    KonversationApplication *konvApp=static_cast<KonversationApplication *>(KApplication::kApplication());
+    KonversationApplication *konvApp=static_cast<KonversationApplication *>(TDEApplication::kApplication());
 
     konvApp->osd->setEnabled(kcfg_UseOSD->isChecked());
     if (kcfg_UseOSD->isChecked())
diff --git a/konversation/src/outputfilter.cpp b/konversation/src/outputfilter.cpp
index f691a6d..2e82a27 100644
--- a/konversation/src/outputfilter.cpp
+++ b/konversation/src/outputfilter.cpp
@@ -326,7 +326,7 @@ namespace Konversation
 
     OutputFilterResult OutputFilter::parseShowTuner(const TQString &parameter)
     {
-        KonversationApplication *konvApp = static_cast<KonversationApplication*>(KApplication::kApplication());
+        KonversationApplication *konvApp = static_cast<KonversationApplication*>(TDEApplication::kApplication());
         OutputFilterResult result;
 
         if(parameter.isEmpty() || parameter == "on")
diff --git a/konversation/src/topiclabel.cpp b/konversation/src/topiclabel.cpp
index 5b03382..7b52690 100644
--- a/konversation/src/topiclabel.cpp
+++ b/konversation/src/topiclabel.cpp
@@ -199,7 +199,7 @@ namespace Konversation
                     break;
                 case CopyUrl:
                 {
-                    TQClipboard *cb = KApplication::kApplication()->clipboard();
+                    TQClipboard *cb = TDEApplication::kApplication()->clipboard();
                     cb->setText(m_urlToCopy,TQClipboard::Selection);
                     cb->setText(m_urlToCopy,TQClipboard::Clipboard);
                     break;
diff --git a/konversation/src/urlcatcher.cpp b/konversation/src/urlcatcher.cpp
index 0fe0732..306f468 100644
--- a/konversation/src/urlcatcher.cpp
+++ b/konversation/src/urlcatcher.cpp
@@ -167,7 +167,7 @@ void UrlCatcher::copyUrlClicked()
     TQListViewItem* item=urlListView->selectedItem();
     if(item)
     {
-        TQClipboard *cb=KApplication::kApplication()->clipboard();
+        TQClipboard *cb=TDEApplication::kApplication()->clipboard();
         cb->setText(item->text(1),TQClipboard::Selection);
         cb->setText(item->text(1),TQClipboard::Clipboard);
     }
diff --git a/konversation/src/viewcontainer.cpp b/konversation/src/viewcontainer.cpp
index cbb0ba6..7210ae8 100644
--- a/konversation/src/viewcontainer.cpp
+++ b/konversation/src/viewcontainer.cpp
@@ -1990,7 +1990,7 @@ void ViewContainer::addUrlCatcher()
     {
         m_urlCatcherPanel=new UrlCatcher(m_tabWidget);
         addView(m_urlCatcherPanel, i18n("URL Catcher"));
-        KonversationApplication *konvApp=static_cast<KonversationApplication *>(KApplication::kApplication());
+        KonversationApplication *konvApp=static_cast<KonversationApplication *>(TDEApplication::kApplication());
         connect(konvApp,TQT_SIGNAL(catchUrl(const TQString&,const TQString&)),
             m_urlCatcherPanel, TQT_SLOT(addUrl(const TQString&,const TQString&)) );
         connect(m_urlCatcherPanel, TQT_SIGNAL(deleteUrl(const TQString&,const TQString&)),
@@ -2071,7 +2071,7 @@ void ViewContainer::addDccChat(const TQString& myNick,const TQString& nick,const
 {
     if (!listen) // Someone else initiated dcc chat
     {
-        KonversationApplication* konv_app=static_cast<KonversationApplication*>(KApplication::kApplication());
+        KonversationApplication* konv_app=static_cast<KonversationApplication*>(TDEApplication::kApplication());
         konv_app->notificationHandler()->dccChat(m_frontView, nick);
     }
 
diff --git a/konversation/src/viewtree.cpp b/konversation/src/viewtree.cpp
index 67efaf5..5e9131c 100644
--- a/konversation/src/viewtree.cpp
+++ b/konversation/src/viewtree.cpp
@@ -127,7 +127,7 @@ void ViewTree::updateAppearance()
         fg = KGlobalSettings::textColor();
     }
 
-    setPalette(KApplication::palette());
+    setPalette(TDEApplication::palette());
     setPaletteForegroundColor(fg);
     setPaletteBackgroundColor(bg);
 }
@@ -674,13 +674,13 @@ void ViewTree::keyPressEvent(TQKeyEvent* e)
         ViewTreeItem* item = static_cast<ViewTreeItem*>(selectedItem());
         if (item && item->getView() && item->getView()->isInsertSupported())
         {
-            KApplication::sendEvent(item->getView()->getTextView(), e);
+            TDEApplication::sendEvent(item->getView()->getTextView(), e);
             item->getView()->adjustFocus();
         }
         else if (item && item->getView() && item->getView()->getType() == ChatWindow::Konsole)
         {
             KonsolePanel* panel = static_cast<KonsolePanel*>(item->getView());
-            KApplication::sendEvent(panel->getWidget(), e);
+            TDEApplication::sendEvent(panel->getWidget(), e);
             item->getView()->adjustFocus();
         }
     }