Rename many classes and header files to avoid conflicts with KDE4

6 files changed, 13 insertions, 13 deletions

diff --git a/knetwortdeconf/knetwortdeconf/Makefile.am b/knetwortdeconf/knetwortdeconf/Makefile.am
index 3fc914f..6df330e 100644
--- a/knetwortdeconf/knetwortdeconf/Makefile.am
+++ b/knetwortdeconf/knetwortdeconf/Makefile.am
@@ -17,7 +17,7 @@ kcm_knetwortdeconfmodule_la_LDFLAGS = $(all_libraries) -module -avoid-version -n
 
 ## INCLUDES were found outside tdevelop specific part
 
-kcm_knetwortdeconfmodule_la_SOURCES = kselectdistrodlg.ui kknownhostinfo.cpp \
+kcm_knetwortdeconfmodule_la_SOURCES = tdeselectdistrodlg.ui kknownhostinfo.cpp \
 		kinterfaceupdowndlg.ui kaddknownhostdlg.ui kdetectdistrodlg.ui knetwortdeconfmodule.cpp \
 		kroutinginfo.cpp kreloadnetworkdlg.ui kaddressvalidator.cpp kdnsinfo.cpp \
 		knetworkinfo.cpp kadddevicedlg.ui kadddnsserverdlg.ui knetwortdeconfigparser.cpp \
@@ -26,7 +26,7 @@ kcm_knetwortdeconfmodule_la_SOURCES = kselectdistrodlg.ui kknownhostinfo.cpp \
 	kprofileslistviewtooltip.cpp
 
 
-EXTRA_DIST = main.cpp knetwortdeconf.cpp knetwortdeconf.h knetwortdeconf.desktop cr16-app-knetwortdeconf.png cr22-app-knetwortdeconf.png cr32-app-knetwortdeconf.png knetwortdeconfdlg.ui knetworkinterface.cpp knetworkinterface.h knetwortdeconfigparser.cpp knetwortdeconfigparser.h kadddnsserverdlg.ui kadddevicedlg.ui knetworkinfo.cpp knetworkinfo.h kdnsinfo.cpp kdnsinfo.h kaddressvalidator.cpp kaddressvalidator.h kreloadnetworkdlg.ui network_card.png kroutinginfo.cpp kroutinginfo.h knetwortdeconfmodule.cpp knetwortdeconfmodule.h kdetectdistrodlg.ui kaddknownhostdlg.ui kinterfaceupdowndlg.ui kadddnsserverdlg.ui.h kadddevicedlg.ui.h kaddknownhostdlg.ui.h kknownhostinfo.cpp kknownhostinfo.h kselectdistrodlg.ui kcm_knetwortdeconfmodule version.h
+EXTRA_DIST = main.cpp knetwortdeconf.cpp knetwortdeconf.h knetwortdeconf.desktop cr16-app-knetwortdeconf.png cr22-app-knetwortdeconf.png cr32-app-knetwortdeconf.png knetwortdeconfdlg.ui knetworkinterface.cpp knetworkinterface.h knetwortdeconfigparser.cpp knetwortdeconfigparser.h kadddnsserverdlg.ui kadddevicedlg.ui knetworkinfo.cpp knetworkinfo.h kdnsinfo.cpp kdnsinfo.h kaddressvalidator.cpp kaddressvalidator.h kreloadnetworkdlg.ui network_card.png kroutinginfo.cpp kroutinginfo.h knetwortdeconfmodule.cpp knetwortdeconfmodule.h kdetectdistrodlg.ui kaddknownhostdlg.ui kinterfaceupdowndlg.ui kadddnsserverdlg.ui.h kadddevicedlg.ui.h kaddknownhostdlg.ui.h kknownhostinfo.cpp kknownhostinfo.h tdeselectdistrodlg.ui kcm_knetwortdeconfmodule version.h
 
 xdg_apps_DATA = kcm_knetwortdeconfmodule.desktop 
 
diff --git a/knetwortdeconf/knetwortdeconf/kaddknownhostdlg.ui b/knetwortdeconf/knetwortdeconf/kaddknownhostdlg.ui
index ef47e58..c14f352 100644
--- a/knetwortdeconf/knetwortdeconf/kaddknownhostdlg.ui
+++ b/knetwortdeconf/knetwortdeconf/kaddknownhostdlg.ui
@@ -295,7 +295,7 @@
     <includehint>klineedit.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>
     <includehint>kpushbutton.h</includehint>
diff --git a/knetwortdeconf/knetwortdeconf/knetwortdeconf.h b/knetwortdeconf/knetwortdeconf/knetwortdeconf.h
index 5948678..9ce0c29 100644
--- a/knetwortdeconf/knetwortdeconf/knetwortdeconf.h
+++ b/knetwortdeconf/knetwortdeconf/knetwortdeconf.h
@@ -42,11 +42,11 @@
 #include <tqlayout.h>
 #include <kdialog.h>
 #include <kinputdialog.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kpushbutton.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klineedit.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kcombobox.h>
 #include <kmessagebox.h>
 #include <kaboutapplication.h>
diff --git a/knetwortdeconf/knetwortdeconf/knetwortdeconfdlg.ui b/knetwortdeconf/knetwortdeconf/knetwortdeconfdlg.ui
index fd6abad..a608eb0 100644
--- a/knetwortdeconf/knetwortdeconf/knetwortdeconfdlg.ui
+++ b/knetwortdeconf/knetwortdeconf/knetwortdeconfdlg.ui
@@ -1075,25 +1075,25 @@
 </Q_SLOTS>
 <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>
     <includehint>klineedit.h</includehint>
     <includehint>kcombobox.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/knetwortdeconf/knetwortdeconf/knetwortdeconfigparser.h b/knetwortdeconf/knetwortdeconf/knetwortdeconfigparser.h
index 8161da5..a50a741 100644
--- a/knetwortdeconf/knetwortdeconf/knetwortdeconfigparser.h
+++ b/knetwortdeconf/knetwortdeconf/knetwortdeconfigparser.h
@@ -42,7 +42,7 @@
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
@@ -51,7 +51,7 @@
 #include "kdetectdistrodlg.h"
 #include "kreloadnetworkdlg.h"
 #include "kinterfaceupdowndlg.h"
-#include "kselectdistrodlg.h"
+#include "tdeselectdistrodlg.h"
 
 /**
   *@author Juan Luis Baptiste
diff --git a/knetwortdeconf/knetwortdeconf/tdeselectdistrodlg.ui b/knetwortdeconf/knetwortdeconf/tdeselectdistrodlg.ui
index 5baaebb..ab822a2 100644
--- a/knetwortdeconf/knetwortdeconf/tdeselectdistrodlg.ui
+++ b/knetwortdeconf/knetwortdeconf/tdeselectdistrodlg.ui
@@ -135,7 +135,7 @@
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kdialog.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
 </includehints>