summaryrefslogtreecommitdiffstats
path: root/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:59:01 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:59:01 -0600
commit0e88a100de93641e5aeacd8c65e8076c948a5c20 (patch)
tree54cce3e6ae07c4fc8921244b1397c75cc21a2997 /filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
parent5497356b6c12e5854b297bfa0d9c2a9f20cb4ca0 (diff)
downloadtdenetwork-0e88a100de93641e5aeacd8c65e8076c948a5c20.tar.gz
tdenetwork-0e88a100de93641e5aeacd8c65e8076c948a5c20.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp')
-rw-r--r--filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
index 879983d9..6af9fb71 100644
--- a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
+++ b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
@@ -44,8 +44,8 @@
#include <tqvbox.h>
#include <tqlabel.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <klineedit.h>
#include <kurlrequester.h>
#include <kcombobox.h>
@@ -53,7 +53,7 @@
#include <kiconloader.h>
#include <knuminput.h>
#include <krestrictedline.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kjanuswidget.h>
#include <tdelistview.h>
#include <ksimpleconfig.h>