summaryrefslogtreecommitdiffstats
path: root/filesharing/advanced/kcm_sambaconf
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:21:47 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:21:47 -0600
commitda47dd9fc60e6e0eecf609fb934eb0e2bd3ef3fb (patch)
treeb42ba87fcdfa425a31e243a62d71e1de248b6ee8 /filesharing/advanced/kcm_sambaconf
parent4ed8d784e29102ed1659f4ccf71fcc6fb0dad5c8 (diff)
downloadtdenetwork-da47dd9fc60e6e0eecf609fb934eb0e2bd3ef3fb.tar.gz
tdenetwork-da47dd9fc60e6e0eecf609fb934eb0e2bd3ef3fb.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'filesharing/advanced/kcm_sambaconf')
-rw-r--r--filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp4
-rw-r--r--filesharing/advanced/kcm_sambaconf/hiddenfileview.h2
-rw-r--r--filesharing/advanced/kcm_sambaconf/kcminterface.ui8
-rw-r--r--filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp2
-rw-r--r--filesharing/advanced/kcm_sambaconf/share.ui2
-rw-r--r--filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp4
-rw-r--r--filesharing/advanced/kcm_sambaconf/usertabimpl.cpp2
7 files changed, 12 insertions, 12 deletions
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>