Rename many classes and header files to avoid conflicts with KDE4

69 files changed, 114 insertions, 114 deletions

diff --git a/konversation/src/alias_preferences.cpp b/konversation/src/alias_preferences.cpp
index e30f887..5d4e4c7 100644
--- a/konversation/src/alias_preferences.cpp
+++ b/konversation/src/alias_preferences.cpp
@@ -22,7 +22,7 @@
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 
 Alias_Config::Alias_Config(TQWidget* parent, const char* name)
diff --git a/konversation/src/alias_preferencesui.ui b/konversation/src/alias_preferencesui.ui
index f173c4f..9f86107 100644
--- a/konversation/src/alias_preferencesui.ui
+++ b/konversation/src/alias_preferencesui.ui
@@ -169,6 +169,6 @@
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/konversation/src/autoreplace_preferences.cpp b/konversation/src/autoreplace_preferences.cpp
index 5cb2075..d1fde5e 100644
--- a/konversation/src/autoreplace_preferences.cpp
+++ b/konversation/src/autoreplace_preferences.cpp
@@ -25,7 +25,7 @@
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tdeparts/componentfactory.h>
 #include <kregexpeditorinterface.h>
 
diff --git a/konversation/src/autoreplace_preferencesui.ui b/konversation/src/autoreplace_preferencesui.ui
index 5c1d185..b19f5eb 100644
--- a/konversation/src/autoreplace_preferencesui.ui
+++ b/konversation/src/autoreplace_preferencesui.ui
@@ -285,7 +285,7 @@
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
 </includehints>
diff --git a/konversation/src/awaymanager.cpp b/konversation/src/awaymanager.cpp
index 99a5751..3f91de6 100644
--- a/konversation/src/awaymanager.cpp
+++ b/konversation/src/awaymanager.cpp
@@ -20,7 +20,7 @@
 #include <tqtimer.h>
 
 #include <dcopref.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 
 #include <kdebug.h>
diff --git a/konversation/src/channel.h b/konversation/src/channel.h
index e177ce2..e7a2c86 100644
--- a/konversation/src/channel.h
+++ b/konversation/src/channel.h
@@ -129,7 +129,7 @@ class Channel : public ChatWindow
         virtual void serverOnline(bool online);
 
 
-//Nicklist
+//Nictdelist
     public:
         ChannelNickPtr getOwnChannelNick();
         ChannelNickPtr getChannelNick(const TQString &ircnick);
diff --git a/konversation/src/channellistpanel.cpp b/konversation/src/channellistpanel.cpp
index 44a1ae0..7bbf891 100644
--- a/konversation/src/channellistpanel.cpp
+++ b/konversation/src/channellistpanel.cpp
@@ -31,13 +31,13 @@
 #include <tqwhatsthis.h>
 
 #include <krun.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tdeversion.h>
 
 
diff --git a/konversation/src/channellistviewitem.h b/konversation/src/channellistviewitem.h
index aa2fae0..523bf33 100644
--- a/konversation/src/channellistviewitem.h
+++ b/konversation/src/channellistviewitem.h
@@ -17,7 +17,7 @@
 
 #include <tqstring.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 
 class ChannelListViewItem : public TDEListViewItem
diff --git a/konversation/src/channeloptionsdialog.cpp b/konversation/src/channeloptionsdialog.cpp
index 58711d4..fd5007c 100644
--- a/konversation/src/channeloptionsdialog.cpp
+++ b/konversation/src/channeloptionsdialog.cpp
@@ -23,11 +23,11 @@
 #include <tqtoolbutton.h>
 
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <ktextedit.h>
 #include <klineedit.h>
 #include <knuminput.h>
-#include <klistviewsearchline.h>
+#include <tdelistviewsearchline.h>
 #include <kiconloader.h>
 
 
diff --git a/konversation/src/channeloptionsdialog.h b/konversation/src/channeloptionsdialog.h
index f5763a9..2ecf53e 100644
--- a/konversation/src/channeloptionsdialog.h
+++ b/konversation/src/channeloptionsdialog.h
@@ -17,7 +17,7 @@
 #include <tqstringlist.h>
 
 #include <kdialogbase.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 
 namespace Konversation
diff --git a/konversation/src/channeloptionsui.ui b/konversation/src/channeloptionsui.ui
index 535aec0..aa54230 100644
--- a/konversation/src/channeloptionsui.ui
+++ b/konversation/src/channeloptionsui.ui
@@ -546,14 +546,14 @@ the Free Software Foundation; either version 2 of the License, or
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>ktextedit.h</includehint>
     <includehint>ktextedit.h</includehint>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
     <includehint>klineedit.h</includehint>
-    <includehint>klistview.h</includehint>
-    <includehint>klistview.h</includehint>
-    <includehint>klistviewsearchline.h</includehint>
+    <includehint>tdelistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
+    <includehint>tdelistviewsearchline.h</includehint>
 </includehints>
 </UI>
diff --git a/konversation/src/chatwindow.cpp b/konversation/src/chatwindow.cpp
index d394189..68740a4 100644
--- a/konversation/src/chatwindow.cpp
+++ b/konversation/src/chatwindow.cpp
@@ -27,8 +27,8 @@
 #include <klocale.h>
 #include <kdialog.h>
 #include <kdebug.h>
-#include <kactioncollection.h>
-#include <kaction.h>
+#include <tdeactioncollection.h>
+#include <tdeaction.h>
 
 
 ChatWindow::ChatWindow(TQWidget* parent) : TQVBox(parent)
diff --git a/konversation/src/config/preferences.cpp b/konversation/src/config/preferences.cpp
index 06d1fd8..9a0e1ee 100644
--- a/konversation/src/config/preferences.cpp
+++ b/konversation/src/config/preferences.cpp
@@ -20,7 +20,7 @@
 #include "commit.h"
 #include "version.h"
 
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kstandarddirs.h>
 #include <kstaticdeleter.h>
 #include <kdebug.h>
diff --git a/konversation/src/dccchat.cpp b/konversation/src/dccchat.cpp
index 290acd1..99e37d8 100644
--- a/konversation/src/dccchat.cpp
+++ b/konversation/src/dccchat.cpp
@@ -40,7 +40,7 @@
 #include <kserversocket.h>
 #include <tdesocketaddress.h>
 #include <kstreamsocket.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #define DCCCHAT_BUFFER_SIZE 1024
 
diff --git a/konversation/src/dcctransferpanel.cpp b/konversation/src/dcctransferpanel.cpp
index 7233405..3a419a1 100644
--- a/konversation/src/dcctransferpanel.cpp
+++ b/konversation/src/dcctransferpanel.cpp
@@ -32,10 +32,10 @@
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <krun.h>
 #include <kapplication.h>
 
diff --git a/konversation/src/dcctransferpanelitem.h b/konversation/src/dcctransferpanelitem.h
index 9820b69..a4ef8d2 100644
--- a/konversation/src/dcctransferpanelitem.h
+++ b/konversation/src/dcctransferpanelitem.h
@@ -20,7 +20,7 @@
 
 #include <tqdatetime.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kurl.h>
 #include <tdeio/global.h>
 
diff --git a/konversation/src/fontappearance_preferences.ui b/konversation/src/fontappearance_preferences.ui
index 1e288a2..5813b14 100644
--- a/konversation/src/fontappearance_preferences.ui
+++ b/konversation/src/fontappearance_preferences.ui
@@ -153,8 +153,8 @@ the Free Software Foundation; either version 2 of the License, or
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
-    <includehint>kfontrequester.h</includehint>
-    <includehint>kfontrequester.h</includehint>
-    <includehint>kfontrequester.h</includehint>
+    <includehint>tdefontrequester.h</includehint>
+    <includehint>tdefontrequester.h</includehint>
+    <includehint>tdefontrequester.h</includehint>
 </includehints>
 </UI>
diff --git a/konversation/src/highlight_preferences.cpp b/konversation/src/highlight_preferences.cpp
index ccbdc0a..c810be7 100644
--- a/konversation/src/highlight_preferences.cpp
+++ b/konversation/src/highlight_preferences.cpp
@@ -26,7 +26,7 @@
 #include <kstandarddirs.h>
 #include <kurlrequester.h>
 #include <tdefiledialog.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klineedit.h>
 #include <kcolorbutton.h>
 #include <klocale.h>
diff --git a/konversation/src/highlight_preferencesui.ui b/konversation/src/highlight_preferencesui.ui
index d44ec8c..a37ca8b 100644
--- a/konversation/src/highlight_preferencesui.ui
+++ b/konversation/src/highlight_preferencesui.ui
@@ -437,7 +437,7 @@
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/konversation/src/highlightviewitem.cpp b/konversation/src/highlightviewitem.cpp
index 3339db0..75d10f5 100644
--- a/konversation/src/highlightviewitem.cpp
+++ b/konversation/src/highlightviewitem.cpp
@@ -16,7 +16,7 @@
 #include "highlightviewitem.h"
 
 #include <kurl.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 
 HighlightViewItem::HighlightViewItem(TDEListView* parent, Highlight* passed_Highlight)
diff --git a/konversation/src/ignore_preferences.cpp b/konversation/src/ignore_preferences.cpp
index ea4281e..52c3890 100644
--- a/konversation/src/ignore_preferences.cpp
+++ b/konversation/src/ignore_preferences.cpp
@@ -16,7 +16,7 @@
 #include "preferences.h"
 
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqlistview.h>
 #include <tqlineedit.h>
 #include <tqheader.h>
diff --git a/konversation/src/ignore_preferencesui.ui b/konversation/src/ignore_preferencesui.ui
index d310614..0ec6558 100644
--- a/konversation/src/ignore_preferencesui.ui
+++ b/konversation/src/ignore_preferencesui.ui
@@ -211,7 +211,7 @@ the Free Software Foundation; either version 2 of the License, or
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/konversation/src/ignorelistviewitem.h b/konversation/src/ignorelistviewitem.h
index 7718811..c7df811 100644
--- a/konversation/src/ignorelistviewitem.h
+++ b/konversation/src/ignorelistviewitem.h
@@ -16,7 +16,7 @@
 
 #include <tqstring.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 
 class IgnoreListViewItem : public TDEListViewItem
diff --git a/konversation/src/ircview.cpp b/konversation/src/ircview.cpp
index cad6dfd..7f5f2af 100644
--- a/konversation/src/ircview.cpp
+++ b/konversation/src/ircview.cpp
@@ -57,14 +57,14 @@
 #include <kprocess.h>
 #include <kiconloader.h>
 #include <kshell.h>
-#include <kpopupmenu.h>
-#include <kaction.h>
+#include <tdepopupmenu.h>
+#include <tdeaction.h>
 #include <kglobalsettings.h>
 #include <kdebug.h>
 #include <kmenubar.h>
 #include <tdefiledialog.h>
 #include <tdeio/job.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kglobal.h>
 
 
diff --git a/konversation/src/konversationapplication.cpp b/konversation/src/konversationapplication.cpp
index e2529c8..ec267aa 100644
--- a/konversation/src/konversationapplication.cpp
+++ b/konversation/src/konversationapplication.cpp
@@ -545,7 +545,7 @@ void KonversationApplication::saveOptions(bool updateGUI)
 {
     TDEConfig* config=kapp->config();
 
-//    Should be handled in NicklistBehaviorConfigController now
+//    Should be handled in NictdelistBehaviorConfigController now
 //    config->setGroup("Sort Nicknames");
 
     // Clean up identity list
diff --git a/konversation/src/konversationmainwindow.cpp b/konversation/src/konversationmainwindow.cpp
index 2d644e7..87ca976 100644
--- a/konversation/src/konversationmainwindow.cpp
+++ b/konversation/src/konversationmainwindow.cpp
@@ -34,10 +34,10 @@
 #include <tqsignalmapper.h>
 #include <tqobjectlist.h>
 
-#include <kaccel.h>
-#include <kaccelmanager.h>
+#include <tdeaccel.h>
+#include <tdeaccelmanager.h>
 #include <kstdaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
@@ -45,7 +45,7 @@
 #include <kkeydialog.h>
 #include <tdeversion.h>
 #include <kedittoolbar.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <twin.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
@@ -289,8 +289,8 @@ KonversationMainWindow::KonversationMainWindow() : TDEMainWindow(0,"main_window"
     action = new TDEAction(i18n("Close &All Open Queries"), 0, TDEShortcut("F11"), m_viewContainer, TQT_SLOT(closeQueries()), actionCollection(), "close_queries");
     action->setEnabled(false);
 
-    TDEToggleAction* toggleChannelNickListsAction = new TDEToggleAction(i18n("Hide Nicklist"), 0,
-        TDEShortcut("Ctrl+H"), m_viewContainer, TQT_SLOT(toggleChannelNicklists()), actionCollection(), "hide_nicknamelist");
+    TDEToggleAction* toggleChannelNickListsAction = new TDEToggleAction(i18n("Hide Nictdelist"), 0,
+        TDEShortcut("Ctrl+H"), m_viewContainer, TQT_SLOT(toggleChannelNictdelists()), actionCollection(), "hide_nicknamelist");
     if (!Preferences::showNickList())
         toggleChannelNickListsAction->setChecked(true);
 
diff --git a/konversation/src/konversationmainwindow.h b/konversation/src/konversationmainwindow.h
index a891778..bddac8d 100644
--- a/konversation/src/konversationmainwindow.h
+++ b/konversation/src/konversationmainwindow.h
@@ -24,8 +24,8 @@
 
 #include <tqstringlist.h>
 
-#include <kmainwindow.h>
-#include <kaction.h>
+#include <tdemainwindow.h>
+#include <tdeaction.h>
 
 
 class TDEToggleAction;
diff --git a/konversation/src/konvibookmarkhandler.cpp b/konversation/src/konvibookmarkhandler.cpp
index af645a8..1d32ca6 100644
--- a/konversation/src/konvibookmarkhandler.cpp
+++ b/konversation/src/konvibookmarkhandler.cpp
@@ -23,7 +23,7 @@ Copyright (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org>
 
 #include <tqstring.h>
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 
 
diff --git a/konversation/src/konvibookmarkmenu.cpp b/konversation/src/konvibookmarkmenu.cpp
index 14687b4..9a03fd6 100644
--- a/konversation/src/konvibookmarkmenu.cpp
+++ b/konversation/src/konvibookmarkmenu.cpp
@@ -20,8 +20,8 @@ Copyright (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org>
 
 #include <tqregexp.h>
 
-#include <kpopupmenu.h>
-#include <kaction.h>
+#include <tdepopupmenu.h>
+#include <tdeaction.h>
 
 
 KonviBookmarkMenu::KonviBookmarkMenu( KBookmarkManager* mgr,
diff --git a/konversation/src/konvisettingsdialog.cpp b/konversation/src/konvisettingsdialog.cpp
index b2549fc..c726aff 100644
--- a/konversation/src/konvisettingsdialog.cpp
+++ b/konversation/src/konvisettingsdialog.cpp
@@ -40,7 +40,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 
 KonviSettingsDialog::KonviSettingsDialog( TQWidget *parent) :
@@ -80,8 +80,8 @@ KonviSettingsDialog::KonviSettingsDialog( TQWidget *parent) :
   //Interface/Themes
   m_confThemeWdg = new Theme_Config( this, "Theme" );
   pagePath.clear();
-  pagePath << i18n("Interface") << i18n("Nicklist Themes");
-  addPage ( m_confThemeWdg, pagePath, "iconthemes", i18n("Nicklist Themes") );
+  pagePath << i18n("Interface") << i18n("Nictdelist Themes");
+  addPage ( m_confThemeWdg, pagePath, "iconthemes", i18n("Nictdelist Themes") );
   m_indexToPageMapping.insert(lastAddedIndex(), m_confThemeWdg);
   connect(m_confThemeWdg, TQT_SIGNAL(modified()), this, TQT_SLOT(modifiedSlot()));
 
@@ -130,12 +130,12 @@ KonviSettingsDialog::KonviSettingsDialog( TQWidget *parent) :
   addPage ( m_confChatwindowBehaviourWdg, pagePath, "view_text", i18n("Chat Window") );
 
   //Behaviour/Nickname List
-  m_confNicklistBehaviorWdg = new NicklistBehavior_Config( this, "NicklistBehavior" );
+  m_confNictdelistBehaviorWdg = new NictdelistBehavior_Config( this, "NictdelistBehavior" );
   pagePath.clear();
   pagePath << i18n("Behavior") << i18n("Nickname List");
-  addPage ( m_confNicklistBehaviorWdg, pagePath, "player_playlist", i18n("Nickname List") );
-  connect(m_confNicklistBehaviorWdg, TQT_SIGNAL(modified()), this, TQT_SLOT(modifiedSlot()));
-  m_indexToPageMapping.insert(lastAddedIndex(), m_confNicklistBehaviorWdg);
+  addPage ( m_confNictdelistBehaviorWdg, pagePath, "player_playlist", i18n("Nickname List") );
+  connect(m_confNictdelistBehaviorWdg, TQT_SIGNAL(modified()), this, TQT_SLOT(modifiedSlot()));
+  m_indexToPageMapping.insert(lastAddedIndex(), m_confNictdelistBehaviorWdg);
 
   //Behaviour/Command Aliases
   m_confAliasWdg = new Alias_Config( this, "Alias" );
diff --git a/konversation/src/konvisettingsdialog.h b/konversation/src/konvisettingsdialog.h
index 4a34225..7ae3087 100644
--- a/konversation/src/konvisettingsdialog.h
+++ b/konversation/src/konvisettingsdialog.h
@@ -29,7 +29,7 @@ class ColorsAppearance_Config;
 class GeneralBehavior_Config;
 class ConnectionBehavior_Config;
 class ChatwindowBehaviour_Config;
-class NicklistBehavior_Config;
+class NictdelistBehavior_Config;
 class Tabs_Config;
 class Alias_Config;
 class QuickButtons_Config;
@@ -56,7 +56,7 @@ class TDEUI_EXPORT KonviSettingsDialog : public KonviConfigDialog
 	GeneralBehavior_Config* m_confGeneralBehaviorWdg;
 	ConnectionBehavior_Config* m_confConnectionBehaviorWdg;
 	ChatwindowBehaviour_Config* m_confChatwindowBehaviourWdg;
-	NicklistBehavior_Config* m_confNicklistBehaviorWdg;
+	NictdelistBehavior_Config* m_confNictdelistBehaviorWdg;
 	Tabs_Config* m_confTabBarWdg;
 	Alias_Config* m_confAliasWdg;
 	QuickButtons_Config* m_confQuickButtonsWdg;
diff --git a/konversation/src/linkaddressbook/addresseeitem.h b/konversation/src/linkaddressbook/addresseeitem.h
index 702a487..e7518b1 100644
--- a/konversation/src/linkaddressbook/addresseeitem.h
+++ b/konversation/src/linkaddressbook/addresseeitem.h
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include <kdialogbase.h>
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include <kabc/addressbook.h>
 
diff --git a/konversation/src/linkaddressbook/linkaddressbookui.cpp b/konversation/src/linkaddressbook/linkaddressbookui.cpp
index ea13141..225c1db 100644
--- a/konversation/src/linkaddressbook/linkaddressbookui.cpp
+++ b/konversation/src/linkaddressbook/linkaddressbookui.cpp
@@ -41,8 +41,8 @@ Kopete    (c) 2002-2004 by the Kopete developers  <kopete-devel@kde.org>
 #include <kpushbutton.h>
 #include <kactivelabel.h>
 #include <kdebug.h>
-#include <klistview.h>
-#include <klistviewsearchline.h>
+#include <tdelistview.h>
+#include <tdelistviewsearchline.h>
 #include <kabc/addressbook.h>
 #include <kabc/stdaddressbook.h>
 
diff --git a/konversation/src/linkaddressbook/linkaddressbookui_base.ui b/konversation/src/linkaddressbook/linkaddressbookui_base.ui
index 7ff10a2..ee1334f 100644
--- a/konversation/src/linkaddressbook/linkaddressbookui_base.ui
+++ b/konversation/src/linkaddressbook/linkaddressbookui_base.ui
@@ -165,10 +165,10 @@
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kactivelabel.h</includehint>
-    <includehint>klistview.h</includehint>
-    <includehint>klistviewsearchline.h</includehint>
+    <includehint>tdelistview.h</includehint>
+    <includehint>tdelistviewsearchline.h</includehint>
 </includehints>
 <includes>
-    <include>klistviewsearchline.h</include>
+    <include>tdelistviewsearchline.h</include>
 </includes>
 </UI>
diff --git a/konversation/src/linkaddressbook/nictdelisttooltip.cpp b/konversation/src/linkaddressbook/nicklisttooltip.cpp
index 732b32e..732b32e 100644
--- a/konversation/src/linkaddressbook/nictdelisttooltip.cpp
+++ b/konversation/src/linkaddressbook/nicklisttooltip.cpp
diff --git a/konversation/src/linkaddressbook/nictdelisttooltip.h b/konversation/src/linkaddressbook/nicklisttooltip.h
index 728f9c6..728f9c6 100644
--- a/konversation/src/linkaddressbook/nictdelisttooltip.h
+++ b/konversation/src/linkaddressbook/nicklisttooltip.h
diff --git a/konversation/src/linkaddressbook/nicksonlinetooltip.cpp b/konversation/src/linkaddressbook/nicksonlinetooltip.cpp
index 8a16628..30cc808 100644
--- a/konversation/src/linkaddressbook/nicksonlinetooltip.cpp
+++ b/konversation/src/linkaddressbook/nicksonlinetooltip.cpp
@@ -22,7 +22,7 @@
 #include <klocale.h>
 #include <tqtooltip.h>
 #include <tqlistview.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 
 class NickListView;
diff --git a/konversation/src/logfilereader.cpp b/konversation/src/logfilereader.cpp
index 2e6e2bc..f3f03e6 100644
--- a/konversation/src/logfilereader.cpp
+++ b/konversation/src/logfilereader.cpp
@@ -29,7 +29,7 @@
 #include <tqwhatsthis.h>
 
 #include <kdialog.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kmessagebox.h>
 #include <tdefiledialog.h>
 #include <klocale.h>
diff --git a/konversation/src/main.cpp b/konversation/src/main.cpp
index d088790..dab67de 100644
--- a/konversation/src/main.cpp
+++ b/konversation/src/main.cpp
@@ -61,7 +61,7 @@ int main(int argc, char* argv[])
     aboutData.addAuthor("Eike Hein",I18N_NOOP("Maintainer, Release Manager, User interface, Protocol handling"),"hein@kde.org");
     aboutData.addAuthor("Shintaro Matsuoka",I18N_NOOP("DCC, Encoding handling, OSD positioning"),"shin@shoegazed.org");
     aboutData.addAuthor("Eli MacKenzie",I18N_NOOP("Protocol handling, Input line"),"argonel@gmail.com");
-    aboutData.addAuthor("İsmail Dönmez",I18N_NOOP("Blowfish, SSL support, KNetwork port, Colored nicks, Nicklist themes"),"ismail@kde.org");
+    aboutData.addAuthor("İsmail Dönmez",I18N_NOOP("Blowfish, SSL support, KNetwork port, Colored nicks, Nictdelist themes"),"ismail@kde.org");
     aboutData.addAuthor("John Tapsell",I18N_NOOP("Refactoring, KAddressBook/Kontact integration"), "john@geola.co.uk");
 
     aboutData.addCredit("Olivier Bédard",I18N_NOOP("Website hosting"));
diff --git a/konversation/src/nick.cpp b/konversation/src/nick.cpp
index 0bfa9cb..dddb473 100644
--- a/konversation/src/nick.cpp
+++ b/konversation/src/nick.cpp
@@ -17,7 +17,7 @@
 #include <tqtextstream.h>
 
 #include <kdebug.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kabc/phonenumber.h>
 
diff --git a/konversation/src/nick.h b/konversation/src/nick.h
index c7f1a5c..4b96f0c 100644
--- a/konversation/src/nick.h
+++ b/konversation/src/nick.h
@@ -16,7 +16,7 @@
 #define NICK_H
 
 #include <tqobject.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include "channelnick.h"
 
diff --git a/konversation/src/nictdelistbehavior_preferences.cpp b/konversation/src/nicklistbehavior_preferences.cpp
index 711d8c7..a439696 100644
--- a/konversation/src/nictdelistbehavior_preferences.cpp
+++ b/konversation/src/nicklistbehavior_preferences.cpp
@@ -21,8 +21,8 @@
 #include <klocale.h>
 
 
-NicklistBehavior_Config::NicklistBehavior_Config(TQWidget *parent, const char *name)
- : NicklistBehavior_ConfigUI(parent, name)
+NictdelistBehavior_Config::NictdelistBehavior_Config(TQWidget *parent, const char *name)
+ : NictdelistBehavior_ConfigUI(parent, name)
 {
   // get page widget and populate listview
   loadSettings();
@@ -34,23 +34,23 @@ NicklistBehavior_Config::NicklistBehavior_Config(TQWidget *parent, const char *n
   connect(sortOrder,TQT_SIGNAL (moved()),this,TQT_SIGNAL (modified()) );
 }
 
-NicklistBehavior_Config::~NicklistBehavior_Config()
+NictdelistBehavior_Config::~NictdelistBehavior_Config()
 {
 }
 
-void NicklistBehavior_Config::restorePageToDefaults()
+void NictdelistBehavior_Config::restorePageToDefaults()
 {
   setNickList(Preferences::defaultNicknameSortingOrder());
 }
 
-void NicklistBehavior_Config::loadSettings()
+void NictdelistBehavior_Config::loadSettings()
 {
   // get sorting order string from preferences
   setNickList(Preferences::sortOrder());
   m_oldSortingOrder=currentSortingOrder();
 }
 
-void NicklistBehavior_Config::setNickList(const TQString &sortingOrder)
+void NictdelistBehavior_Config::setNickList(const TQString &sortingOrder)
 {
   sortOrder->clear();
   // loop through the sorting order string, insert the matching descriptions in reverse order
@@ -69,7 +69,7 @@ void NicklistBehavior_Config::setNickList(const TQString &sortingOrder)
   }
 }
 
-TQString NicklistBehavior_Config::currentSortingOrder()
+TQString NictdelistBehavior_Config::currentSortingOrder()
 {
   // get the uppermost entry of the sorting list
   TQListViewItem* item=sortOrder->firstChild();
@@ -88,7 +88,7 @@ TQString NicklistBehavior_Config::currentSortingOrder()
 }
 
 // save settings permanently
-void NicklistBehavior_Config::saveSettings()
+void NictdelistBehavior_Config::saveSettings()
 {
   // get the current sorting order
   TQString newSortingOrder=currentSortingOrder();
@@ -100,7 +100,7 @@ void NicklistBehavior_Config::saveSettings()
   m_oldSortingOrder=currentSortingOrder();
 }
 
-bool NicklistBehavior_Config::hasChanged()
+bool NictdelistBehavior_Config::hasChanged()
 {
   return(m_oldSortingOrder!=currentSortingOrder());
 }
diff --git a/konversation/src/nictdelistbehavior_preferences.h b/konversation/src/nicklistbehavior_preferences.h
index f705cbf..63942ef 100644
--- a/konversation/src/nictdelistbehavior_preferences.h
+++ b/konversation/src/nicklistbehavior_preferences.h
@@ -19,14 +19,14 @@
 #include <tqobject.h>
 
 
-class NicklistBehavior_Config : public NicklistBehavior_ConfigUI, public KonviSettingsPage
+class NictdelistBehavior_Config : public NictdelistBehavior_ConfigUI, public KonviSettingsPage
 {
     Q_OBJECT
   
 
     public:
-        explicit NicklistBehavior_Config(TQWidget *parent = 0, const char *name = 0);
-        ~NicklistBehavior_Config();
+        explicit NictdelistBehavior_Config(TQWidget *parent = 0, const char *name = 0);
+        ~NictdelistBehavior_Config();
 
         virtual void saveSettings();
         virtual void loadSettings();
diff --git a/konversation/src/nictdelistbehavior_preferencesui.ui b/konversation/src/nicklistbehavior_preferencesui.ui
index 7d8335f..43e010f 100644
--- a/konversation/src/nictdelistbehavior_preferencesui.ui
+++ b/konversation/src/nicklistbehavior_preferencesui.ui
@@ -1,5 +1,5 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
-<class>NicklistBehavior_ConfigUI</class>
+<class>NictdelistBehavior_ConfigUI</class>
 <comment>This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
@@ -8,7 +8,7 @@ the Free Software Foundation; either version 2 of the License, or
 <author>Copyright (C) 2005 Peter Simonsson</author>
 <widget class="TQWidget">
     <property name="name">
-        <cstring>NicklistBehavior_ConfigUI</cstring>
+        <cstring>NictdelistBehavior_ConfigUI</cstring>
     </property>
     <property name="geometry">
         <rect>
@@ -154,7 +154,7 @@ the Free Software Foundation; either version 2 of the License, or
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>klineedit.h</includehint>
 </includehints>
 </UI>
diff --git a/konversation/src/nictdelistview.cpp b/konversation/src/nicklistview.cpp
index ba8cab9..d135d63 100644
--- a/konversation/src/nictdelistview.cpp
+++ b/konversation/src/nicklistview.cpp
@@ -17,7 +17,7 @@
 #include "images.h"
 #include "linkaddressbook/addressbook.h"
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <tqtooltip.h>
diff --git a/konversation/src/nictdelistview.h b/konversation/src/nicklistview.h
index a7a2e8f..03198db 100644
--- a/konversation/src/nictdelistview.h
+++ b/konversation/src/nicklistview.h
@@ -20,7 +20,7 @@
 #include "images.h"
 #include "common.h"
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 
 class TQPopupMenu;
diff --git a/konversation/src/nicksonline.cpp b/konversation/src/nicksonline.cpp
index 8213a60..5b00b3d 100644
--- a/konversation/src/nicksonline.cpp
+++ b/konversation/src/nicksonline.cpp
@@ -41,7 +41,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kdialog.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kiconloader.h>
 #include <kprocess.h>
 #include <kmessagebox.h>
diff --git a/konversation/src/nicksonlineitem.h b/konversation/src/nicksonlineitem.h
index 3fed49a..db498b5 100644
--- a/konversation/src/nicksonlineitem.h
+++ b/konversation/src/nicksonlineitem.h
@@ -12,7 +12,7 @@
 #ifndef NICKSONLINEITEM_H
 #define NICKSONLINEITEM_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 
 class NicksOnlineItem : public TDEListViewItem
diff --git a/konversation/src/osd_preferences.cpp b/konversation/src/osd_preferences.cpp
index 838c2b8..7bf5532 100644
--- a/konversation/src/osd_preferences.cpp
+++ b/konversation/src/osd_preferences.cpp
@@ -23,7 +23,7 @@
 #include <kcombobox.h>
 #include <kcolorbutton.h>
 #include <tqcheckbox.h>
-#include <kfontrequester.h>
+#include <tdefontrequester.h>
 
 #include <tdeconfigdialog.h>
 
diff --git a/konversation/src/osd_preferencesui.ui b/konversation/src/osd_preferencesui.ui
index 8e51e34..1601314 100644
--- a/konversation/src/osd_preferencesui.ui
+++ b/konversation/src/osd_preferencesui.ui
@@ -419,6 +419,6 @@
     <includehint>kcombobox.h</includehint>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kcolorbutton.h</includehint>
-    <includehint>kfontrequester.h</includehint>
+    <includehint>tdefontrequester.h</includehint>
 </includehints>
 </UI>
diff --git a/konversation/src/query.cpp b/konversation/src/query.cpp
index 4854fdf..b007d5d 100644
--- a/konversation/src/query.cpp
+++ b/konversation/src/query.cpp
@@ -38,7 +38,7 @@
 #include <kmessagebox.h>
 #include <kiconloader.h>
 #include <kstringhandler.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 
 Query::Query(TQWidget* parent, TQString _name) : ChatWindow(parent)
diff --git a/konversation/src/quickbuttons_preferences.cpp b/konversation/src/quickbuttons_preferences.cpp
index 674126f..885a6ac 100644
--- a/konversation/src/quickbuttons_preferences.cpp
+++ b/konversation/src/quickbuttons_preferences.cpp
@@ -22,7 +22,7 @@
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 
 QuickButtons_Config::QuickButtons_Config(TQWidget* parent, const char* name)
diff --git a/konversation/src/quickbuttons_preferencesui.ui b/konversation/src/quickbuttons_preferencesui.ui
index 1aac4ca..a17197d 100644
--- a/konversation/src/quickbuttons_preferencesui.ui
+++ b/konversation/src/quickbuttons_preferencesui.ui
@@ -215,7 +215,7 @@
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
 </includehints>
diff --git a/konversation/src/server.cpp b/konversation/src/server.cpp
index 236992c..fd372dd 100644
--- a/konversation/src/server.cpp
+++ b/konversation/src/server.cpp
@@ -55,7 +55,7 @@
 #include <kmessagebox.h>
 #include <kresolver.h>
 #include <tdesocketdevice.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstringhandler.h>
 #include <tdeversion.h>
 #include <twin.h>
@@ -829,10 +829,10 @@ void Server::resetNickSelection()
 {
     m_nickIndices.clear();
     //for equivalence testing in case the identity gets changed underneath us
-    m_referenceNicklist = getIdentity()->getNicknameList();
+    m_referenceNictdelist = getIdentity()->getNicknameList();
     //where in this identities nicklist will we have started?
-    int start = m_referenceNicklist.findIndex(getNickname());
-    int len = m_referenceNicklist.count();
+    int start = m_referenceNictdelist.findIndex(getNickname());
+    int len = m_referenceNictdelist.count();
 
     //we first use this list of indices *after* we've already tried the current nick, which we don't want
     //to retry if we wrapped, so exclude its index here
@@ -849,7 +849,7 @@ void Server::resetNickSelection()
 TQString Server::getNextNickname()
 {
      //if the identity changed underneath us (likely impossible), start over
-    if (m_referenceNicklist != getIdentity()->getNicknameList())
+    if (m_referenceNictdelist != getIdentity()->getNicknameList())
         resetNickSelection();
 
     TQString newNick = getIdentity()->getNickname(m_nickIndices.front());
diff --git a/konversation/src/server.h b/konversation/src/server.h
index 91fc786..91c1acd 100644
--- a/konversation/src/server.h
+++ b/konversation/src/server.h
@@ -617,7 +617,7 @@ void resetNickSelection();
 
         unsigned int m_completeQueryPosition;
         TQValueList<int> m_nickIndices;
-        TQStringList m_referenceNicklist;
+        TQStringList m_referenceNictdelist;
 
         // TODO roll these into a TQMap.
         TQString m_serverNickPrefixes;               // Prefixes used by the server to indicate a mode
diff --git a/konversation/src/servergroupdialog.cpp b/konversation/src/servergroupdialog.cpp
index f8278e5..a4e6786 100644
--- a/konversation/src/servergroupdialog.cpp
+++ b/konversation/src/servergroupdialog.cpp
@@ -37,7 +37,7 @@
 #include <kiconloader.h>
 #include <kmessagebox.h>
 #include <kcombobox.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kpushbutton.h>
 
 
diff --git a/konversation/src/servergroupdialogui.ui b/konversation/src/servergroupdialogui.ui
index bca7cac..882102a 100644
--- a/konversation/src/servergroupdialogui.ui
+++ b/konversation/src/servergroupdialogui.ui
@@ -308,10 +308,10 @@
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
 </includehints>
diff --git a/konversation/src/serverlistview.h b/konversation/src/serverlistview.h
index 0e4434b..3cba300 100644
--- a/konversation/src/serverlistview.h
+++ b/konversation/src/serverlistview.h
@@ -15,7 +15,7 @@
 #ifndef SERVERLISTVIEW_H
 #define SERVERLISTVIEW_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 
 class TQDragObject;
diff --git a/konversation/src/theme_preferences.cpp b/konversation/src/theme_preferences.cpp
index c01d1d0..75fd513 100644
--- a/konversation/src/theme_preferences.cpp
+++ b/konversation/src/theme_preferences.cpp
@@ -29,7 +29,7 @@
 #include <tqpainter.h>
 #include <tqtooltip.h>
 
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kurl.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
diff --git a/konversation/src/theme_preferencesui.ui b/konversation/src/theme_preferencesui.ui
index 696ab55..a6e6402 100644
--- a/konversation/src/theme_preferencesui.ui
+++ b/konversation/src/theme_preferencesui.ui
@@ -217,6 +217,6 @@
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
 </includehints>
 </UI>
diff --git a/konversation/src/topiclabel.cpp b/konversation/src/topiclabel.cpp
index 889ea3f..91f0408 100644
--- a/konversation/src/topiclabel.cpp
+++ b/konversation/src/topiclabel.cpp
@@ -28,7 +28,7 @@
 #include <kstringhandler.h>
 #include <kglobal.h>
 #include <kdebug.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <kbookmarkmanager.h>
 #include <tdeversion.h>
diff --git a/konversation/src/urlcatcher.cpp b/konversation/src/urlcatcher.cpp
index f4234bc..d06614d 100644
--- a/konversation/src/urlcatcher.cpp
+++ b/konversation/src/urlcatcher.cpp
@@ -26,16 +26,16 @@
 #include <tqlayout.h>
 
 #include <kapplication.h>
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <krun.h>
 #include <tdefiledialog.h>
 #include <kprocess.h>
 #include <tdeversion.h>
 #include <kshell.h>
-#include <klistviewsearchline.h>
+#include <tdelistviewsearchline.h>
 
 
 UrlCatcher::UrlCatcher(TQWidget* parent) : ChatWindow(parent)
diff --git a/konversation/src/valuelistviewitem.h b/konversation/src/valuelistviewitem.h
index 9aa2864..6887355 100644
--- a/konversation/src/valuelistviewitem.h
+++ b/konversation/src/valuelistviewitem.h
@@ -15,7 +15,7 @@
 #ifndef VALUELISTVIEWITEM_H
 #define VALUELISTVIEWITEM_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 
 class ValueListViewItem : public TDEListViewItem
diff --git a/konversation/src/viewcontainer.cpp b/konversation/src/viewcontainer.cpp
index 30005fd..d833a6d 100644
--- a/konversation/src/viewcontainer.cpp
+++ b/konversation/src/viewcontainer.cpp
@@ -2257,7 +2257,7 @@ void ViewContainer::openChannelSettings()
     }
 }
 
-void ViewContainer::toggleChannelNicklists()
+void ViewContainer::toggleChannelNictdelists()
 {
     TDEToggleAction* action = static_cast<TDEToggleAction*>(actionCollection()->action("hide_nicknamelist"));
 
diff --git a/konversation/src/viewcontainer.h b/konversation/src/viewcontainer.h
index 625e56c..dc4a162 100644
--- a/konversation/src/viewcontainer.h
+++ b/konversation/src/viewcontainer.h
@@ -146,7 +146,7 @@ class ViewContainer : public TQObject
         Channel* addChannel(Server* server, const TQString& name);
         void rejoinChannel();
         void openChannelSettings();
-        void toggleChannelNicklists();
+        void toggleChannelNictdelists();
 
         Query* addQuery(Server* server,const NickInfoPtr & name, bool weinitiated=true);
         void updateQueryChrome(ChatWindow* view, const TQString& name);
diff --git a/konversation/src/viewtree.h b/konversation/src/viewtree.h
index b9f115c..4aaf55b 100644
--- a/konversation/src/viewtree.h
+++ b/konversation/src/viewtree.h
@@ -12,7 +12,7 @@
 #ifndef VIEWTREE_H
 #define VIEWTREE_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 
 class ViewTreeItem;
diff --git a/konversation/src/warnings_preferences.cpp b/konversation/src/warnings_preferences.cpp
index ddb443e..8edd057 100644
--- a/konversation/src/warnings_preferences.cpp
+++ b/konversation/src/warnings_preferences.cpp
@@ -21,7 +21,7 @@
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 
 Warnings_Config::Warnings_Config( TQWidget* parent, const char* name, WFlags fl )
diff --git a/konversation/src/warnings_preferencesui.ui b/konversation/src/warnings_preferencesui.ui
index 62b7226..26cbd16 100644
--- a/konversation/src/warnings_preferencesui.ui
+++ b/konversation/src/warnings_preferencesui.ui
@@ -45,6 +45,6 @@
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/konversation/src/watchednicknames_preferencesui.ui b/konversation/src/watchednicknames_preferencesui.ui
index 16341e8..ac4e486 100644
--- a/konversation/src/watchednicknames_preferencesui.ui
+++ b/konversation/src/watchednicknames_preferencesui.ui
@@ -408,7 +408,7 @@ When the nickname watcher is turned on, you will be notified when the nicknames
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
 </includehints>