Rename many classes and header files to avoid conflicts with KDE4

14 files changed, 21 insertions, 21 deletions

diff --git a/knode/articlewidget.cpp b/knode/articlewidget.cpp
index 6e7c4f613..dfe1a7cc5 100644
--- a/knode/articlewidget.cpp
+++ b/knode/articlewidget.cpp
@@ -27,7 +27,7 @@
 #include <tqtextcodec.h>
 #include <tqtimer.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kaddrbook.h>
 #include <kapplication.h>
 #include <kbookmarkmanager.h>
diff --git a/knode/headerview.cpp b/knode/headerview.cpp
index 6bfea7042..1952f8136 100644
--- a/knode/headerview.cpp
+++ b/knode/headerview.cpp
@@ -20,7 +20,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <tdeversion.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include "knglobals.h"
 #include "knconfigmanager.h"
diff --git a/knode/headerview.h b/knode/headerview.h
index 4a297c817..1b74d3639 100644
--- a/knode/headerview.h
+++ b/knode/headerview.h
@@ -17,7 +17,7 @@
 
 #include <tqtooltip.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kfoldertree.h>
 #include <kmime_util.h>
 
diff --git a/knode/knarticlewindow.cpp b/knode/knarticlewindow.cpp
index 22e37171d..90cf0e7de 100644
--- a/knode/knarticlewindow.cpp
+++ b/knode/knarticlewindow.cpp
@@ -17,8 +17,8 @@
 
 #include <kstdaction.h>
 #include <tdeconfig.h>
-#include <kaccel.h>
-#include <kaction.h>
+#include <tdeaccel.h>
+#include <tdeaction.h>
 
 #include "knarticle.h"
 #include "articlewidget.h"
diff --git a/knode/knarticlewindow.h b/knode/knarticlewindow.h
index 5feafa033..b8171da57 100644
--- a/knode/knarticlewindow.h
+++ b/knode/knarticlewindow.h
@@ -15,7 +15,7 @@
 #ifndef KNARTICLEWINDOW_H
 #define KNARTICLEWINDOW_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 class KNArticle;
 class KNArticleCollection;
diff --git a/knode/kncollectionview.cpp b/knode/kncollectionview.cpp
index 2f45a30ad..a8e9088ce 100644
--- a/knode/kncollectionview.cpp
+++ b/knode/kncollectionview.cpp
@@ -15,9 +15,9 @@
 #include <tqheader.h>
 
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include "knglobals.h"
 #include "knconfig.h"
diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp
index 555d224aa..d6617fd9c 100644
--- a/knode/kncomposer.cpp
+++ b/knode/kncomposer.cpp
@@ -22,15 +22,15 @@
 using KPIM::AddressesDialog;
 #include "recentaddresses.h"
 using TDERecentAddress::RecentAddresses;
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <kcharsets.h>
 #include <kmessagebox.h>
 #include <kabc/addresseedialog.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kkeydialog.h>
 #include <kedittoolbar.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tdefiledialog.h>
 #include <kdebug.h>
 #include <klineedit.h>
diff --git a/knode/kncomposer.h b/knode/kncomposer.h
index 2f136f11c..d12a05139 100644
--- a/knode/kncomposer.h
+++ b/knode/kncomposer.h
@@ -15,9 +15,9 @@
 #ifndef KNCOMPOSER_H
 #define KNCOMPOSER_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kdialogbase.h>
 #include <keditcl.h>
 #include <tqlineedit.h>
diff --git a/knode/knconfigwidgets.cpp b/knode/knconfigwidgets.cpp
index 48447cbc1..c8f849eaf 100644
--- a/knode/knconfigwidgets.cpp
+++ b/knode/knconfigwidgets.cpp
@@ -22,7 +22,7 @@
 #include <knumvalidator.h>
 #include <kmessagebox.h>
 #include <kcolordialog.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include <tdefiledialog.h>
 #include <kuserprofile.h>
 #include <kopenwith.h>
diff --git a/knode/knfiltermanager.cpp b/knode/knfiltermanager.cpp
index b7401f1ac..9efc23dce 100644
--- a/knode/knfiltermanager.cpp
+++ b/knode/knfiltermanager.cpp
@@ -16,7 +16,7 @@
 
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <ksimpleconfig.h>
 
diff --git a/knode/knfiltermanager.h b/knode/knfiltermanager.h
index 3172ce788..fec9a9f72 100644
--- a/knode/knfiltermanager.h
+++ b/knode/knfiltermanager.h
@@ -18,7 +18,7 @@
 #include <tqglobal.h>
 #include <tqvaluelist.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 
 namespace KNConfig {
 class FilterListWidget;
diff --git a/knode/knhdrviewitem.h b/knode/knhdrviewitem.h
index 5b69e947e..a39140ac4 100644
--- a/knode/knhdrviewitem.h
+++ b/knode/knhdrviewitem.h
@@ -17,7 +17,7 @@
 #ifndef KNHDRVIEWITEM_H
 #define KNHDRVIEWITEM_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include "headerview.h"
 
 class KNArticle;
diff --git a/knode/knmainwidget.cpp b/knode/knmainwidget.cpp
index d4ae80256..ec2176347 100644
--- a/knode/knmainwidget.cpp
+++ b/knode/knmainwidget.cpp
@@ -15,10 +15,10 @@
 
 #include <tqhbox.h>
 #include <tqlayout.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 
 #include <kinputdialog.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <kxmlguiclient.h>
 #include <tdeconfig.h>
 #include <kmessagebox.h>
@@ -64,7 +64,7 @@ using TDERecentAddress::RecentAddresses;
 #include "knmemorymanager.h"
 #include <kcmdlineargs.h>
 
-#include <klistviewsearchline.h>
+#include <tdelistviewsearchline.h>
 
 using namespace KNode;
 
diff --git a/knode/knode.h b/knode/knode.h
index 5d89532b7..f4bbf19fa 100644
--- a/knode/knode.h
+++ b/knode/knode.h
@@ -21,7 +21,7 @@
 #include <config.h>
 #endif
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kdialogbase.h>
 #include "resource.h"