Rename many classes and header files to avoid conflicts with KDE4

8 files changed, 12 insertions, 12 deletions

diff --git a/kcontrol/tdeio/kcookiesmanagement.cpp b/kcontrol/tdeio/kcookiesmanagement.cpp
index 172b0f5e0..0fc8e9941 100644
--- a/kcontrol/tdeio/kcookiesmanagement.cpp
+++ b/kcontrol/tdeio/kcookiesmanagement.cpp
@@ -35,8 +35,8 @@
 #include <kdialog.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <klistview.h>
-#include <klistviewsearchline.h>
+#include <tdelistview.h>
+#include <tdelistviewsearchline.h>
 #include <kmessagebox.h>
 #include <dcopref.h>
 
diff --git a/kcontrol/tdeio/kcookiesmanagementdlg_ui.ui b/kcontrol/tdeio/kcookiesmanagementdlg_ui.ui
index 6b7bd409f..724901ccd 100644
--- a/kcontrol/tdeio/kcookiesmanagementdlg_ui.ui
+++ b/kcontrol/tdeio/kcookiesmanagementdlg_ui.ui
@@ -318,6 +318,6 @@
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
-    <includehint>klistviewsearchline.h</includehint>
+    <includehint>tdelistviewsearchline.h</includehint>
 </includehints>
 </UI>
diff --git a/kcontrol/tdeio/kcookiespolicies.cpp b/kcontrol/tdeio/kcookiespolicies.cpp
index 9241e1a04..7e9b39f65 100644
--- a/kcontrol/tdeio/kcookiespolicies.cpp
+++ b/kcontrol/tdeio/kcookiespolicies.cpp
@@ -35,8 +35,8 @@
 #include <kiconloader.h>
 #include <kidna.h>
 #include <kmessagebox.h>
-#include <klistview.h>
-#include <klistviewsearchline.h>
+#include <tdelistview.h>
+#include <tdelistviewsearchline.h>
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <dcopref.h>
diff --git a/kcontrol/tdeio/kcookiespoliciesdlg_ui.ui b/kcontrol/tdeio/kcookiespoliciesdlg_ui.ui
index fb315acf7..03703bf1a 100644
--- a/kcontrol/tdeio/kcookiespoliciesdlg_ui.ui
+++ b/kcontrol/tdeio/kcookiespoliciesdlg_ui.ui
@@ -317,7 +317,7 @@ List of sites for which you have set a specific cookie policy. Specific policies
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
-    <includehint>klistview.h</includehint>
-    <includehint>klistviewsearchline.h</includehint>
+    <includehint>tdelistview.h</includehint>
+    <includehint>tdelistviewsearchline.h</includehint>
 </includehints>
 </UI>
diff --git a/kcontrol/tdeio/kmanualproxydlg.cpp b/kcontrol/tdeio/kmanualproxydlg.cpp
index dd5dcfd16..eed6d6f7c 100644
--- a/kcontrol/tdeio/kmanualproxydlg.cpp
+++ b/kcontrol/tdeio/kmanualproxydlg.cpp
@@ -29,7 +29,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <knuminput.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klineedit.h>
 #include <kicontheme.h>
 #include <kurifilter.h>
@@ -411,7 +411,7 @@ bool KManualProxyDlg::isValidURL( const TQString& _url, KURL* result ) const
     KURL url (_url);
     
     TQStringList filters;
-    filters << "kshorturifilter" << "localdomainurifilter";
+    filters << "tdeshorturifilter" << "localdomainurifilter";
     
     // If the typed URL is malformed, and the filters cannot filter it
     // then it must be an invalid entry.
diff --git a/kcontrol/tdeio/socks.cpp b/kcontrol/tdeio/socks.cpp
index a27f0c2df..0456aabdd 100644
--- a/kcontrol/tdeio/socks.cpp
+++ b/kcontrol/tdeio/socks.cpp
@@ -26,7 +26,7 @@
 #include <tqcheckbox.h>
 
 #include <tdefiledialog.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kmessagebox.h>
 #include <ksocks.h>
 #include <kapplication.h>
diff --git a/kcontrol/tdeio/useragentdlg.cpp b/kcontrol/tdeio/useragentdlg.cpp
index 67f13bf8b..c325d2bce 100644
--- a/kcontrol/tdeio/useragentdlg.cpp
+++ b/kcontrol/tdeio/useragentdlg.cpp
@@ -34,7 +34,7 @@
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kmessagebox.h>
 #include <ksimpleconfig.h>
 #include <tdeio/http_slave_defaults.h>
diff --git a/kcontrol/tdeio/useragentdlg_ui.ui b/kcontrol/tdeio/useragentdlg_ui.ui
index db158b1d0..c3c364f84 100644
--- a/kcontrol/tdeio/useragentdlg_ui.ui
+++ b/kcontrol/tdeio/useragentdlg_ui.ui
@@ -350,6 +350,6 @@ By default, only minimal identification information is sent to remote sites. The
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>klineedit.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>