From da47dd9fc60e6e0eecf609fb934eb0e2bd3ef3fb Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 23:21:47 -0600
Subject: Rename many classes and header files to avoid conflicts with KDE4

---
 filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp | 4 ++--
 filesharing/advanced/kcm_sambaconf/hiddenfileview.h   | 2 +-
 filesharing/advanced/kcm_sambaconf/kcminterface.ui    | 8 ++++----
 filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp   | 2 +-
 filesharing/advanced/kcm_sambaconf/share.ui           | 2 +-
 filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp   | 4 ++--
 filesharing/advanced/kcm_sambaconf/usertabimpl.cpp    | 2 +-
 filesharing/advanced/nfs/nfsdialog.cpp                | 4 ++--
 filesharing/simple/controlcenter.ui                   | 2 +-
 filesharing/simple/fileshare.cpp                      | 2 +-
 filesharing/simple/groupconfigdlg.cpp                 | 2 +-
 11 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'filesharing')

diff --git a/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp b/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp
index 0eb74f54..c66f9c9b 100644
--- a/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp
+++ b/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp
@@ -36,8 +36,8 @@
 #include <tqcursor.h>
 
 
-#include <kpopupmenu.h>
-#include <kaction.h>
+#include <tdepopupmenu.h>
+#include <tdeaction.h>
 #include <krestrictedline.h>
 #include <klocale.h>
 #include <tdefiledetailview.h>
diff --git a/filesharing/advanced/kcm_sambaconf/hiddenfileview.h b/filesharing/advanced/kcm_sambaconf/hiddenfileview.h
index f7e09e19..662889dd 100644
--- a/filesharing/advanced/kcm_sambaconf/hiddenfileview.h
+++ b/filesharing/advanced/kcm_sambaconf/hiddenfileview.h
@@ -30,7 +30,7 @@
 #define _HIDDENFILEVIEW_H_
 
 #include <tdefileitem.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include "qmultichecklistitem.h"
 
diff --git a/filesharing/advanced/kcm_sambaconf/kcminterface.ui b/filesharing/advanced/kcm_sambaconf/kcminterface.ui
index 045c552e..1bc3e393 100644
--- a/filesharing/advanced/kcm_sambaconf/kcminterface.ui
+++ b/filesharing/advanced/kcm_sambaconf/kcminterface.ui
@@ -8417,10 +8417,10 @@ This is only available if the SSL libraries have been compiled on your system an
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>kurllabel.h</includehint>
-    <includehint>klistview.h</includehint>
-    <includehint>klistview.h</includehint>
-    <includehint>klistview.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
index f22fbfba..879983d9 100644
--- a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
+++ b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
@@ -55,7 +55,7 @@
 #include <krestrictedline.h>
 #include <kmessagebox.h>
 #include <kjanuswidget.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <ksimpleconfig.h>
 
 #include "sambashare.h"
diff --git a/filesharing/advanced/kcm_sambaconf/share.ui b/filesharing/advanced/kcm_sambaconf/share.ui
index 91673c1a..c89bbe20 100644
--- a/filesharing/advanced/kcm_sambaconf/share.ui
+++ b/filesharing/advanced/kcm_sambaconf/share.ui
@@ -3282,7 +3282,7 @@ Only change something if you know what you are doing.</string>
     <includehint>kpushbutton.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>krestrictedline.h</includehint>
     <includehint>krestrictedline.h</includehint>
     <includehint>krestrictedline.h</includehint>
diff --git a/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp b/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp
index 099bc0bf..b8fa97b4 100644
--- a/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp
+++ b/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp
@@ -61,8 +61,8 @@
 #include <tdefiledetailview.h>
 #include <kdirlister.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
-#include <kaction.h>
+#include <tdepopupmenu.h>
+#include <tdeaction.h>
 #include <krestrictedline.h>
 #include <kjanuswidget.h>
 
diff --git a/filesharing/advanced/kcm_sambaconf/usertabimpl.cpp b/filesharing/advanced/kcm_sambaconf/usertabimpl.cpp
index c07da925..9d0eb7ce 100644
--- a/filesharing/advanced/kcm_sambaconf/usertabimpl.cpp
+++ b/filesharing/advanced/kcm_sambaconf/usertabimpl.cpp
@@ -37,7 +37,7 @@
 #include <tqpushbutton.h>
 #include <tqlineedit.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
diff --git a/filesharing/advanced/nfs/nfsdialog.cpp b/filesharing/advanced/nfs/nfsdialog.cpp
index c580c1c3..245402f0 100644
--- a/filesharing/advanced/nfs/nfsdialog.cpp
+++ b/filesharing/advanced/nfs/nfsdialog.cpp
@@ -29,8 +29,8 @@
 #include <kmessagebox.h>
 #include <tdefiledialog.h>
 #include <klocale.h>
-#include <klistview.h>
-#include <kaccel.h>
+#include <tdelistview.h>
+#include <tdeaccel.h>
 
 #include "nfsdialog.h"
 #include "nfsentry.h"
diff --git a/filesharing/simple/controlcenter.ui b/filesharing/simple/controlcenter.ui
index 9aab272f..750c3f6e 100644
--- a/filesharing/simple/controlcenter.ui
+++ b/filesharing/simple/controlcenter.ui
@@ -480,7 +480,7 @@
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>krichtextlabel.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
 </includehints>
 </UI>
diff --git a/filesharing/simple/fileshare.cpp b/filesharing/simple/fileshare.cpp
index 9a0cf6a9..e1d466da 100644
--- a/filesharing/simple/fileshare.cpp
+++ b/filesharing/simple/fileshare.cpp
@@ -31,7 +31,7 @@
 #include <kdialog.h>
 #include <kdialogbase.h>
 #include <kgenericfactory.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kiconloader.h>
 #include <knfsshare.h>
 #include <ksambashare.h>
diff --git a/filesharing/simple/groupconfigdlg.cpp b/filesharing/simple/groupconfigdlg.cpp
index 86173f2b..f771fa6c 100644
--- a/filesharing/simple/groupconfigdlg.cpp
+++ b/filesharing/simple/groupconfigdlg.cpp
@@ -31,7 +31,7 @@
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <kinputdialog.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kprocess.h>
 #include <kpushbutton.h>
 #include <kcombobox.h>
-- 
cgit v1.2.1