From 0e88a100de93641e5aeacd8c65e8076c948a5c20 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:59:01 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 filesharing/advanced/kcm_sambaconf/dictmanager.cpp            | 2 +-
 filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp         | 4 ++--
 filesharing/advanced/kcm_sambaconf/joindomaindlg.ui           | 4 ++--
 filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp           | 6 +++---
 filesharing/advanced/kcm_sambaconf/linuxpermissionchecker.cpp | 4 ++--
 filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp         | 2 +-
 filesharing/advanced/kcm_sambaconf/qmultichecklistitem.cpp    | 2 +-
 filesharing/advanced/kcm_sambaconf/sambafile.cpp              | 6 +++---
 filesharing/advanced/kcm_sambaconf/share.ui                   | 2 +-
 filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp           | 4 ++--
 filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp    | 4 ++--
 filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp          | 2 +-
 filesharing/advanced/kcm_sambaconf/usertabimpl.cpp            | 2 +-
 filesharing/advanced/nfs/nfsdialog.cpp                        | 4 ++--
 filesharing/advanced/nfs/nfsfile.cpp                          | 6 +++---
 filesharing/advanced/nfs/nfshostdlg.cpp                       | 4 ++--
 filesharing/advanced/propsdlgplugin/propertiespage.cpp        | 6 +++---
 filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp   | 4 ++--
 18 files changed, 34 insertions(+), 34 deletions(-)

(limited to 'filesharing/advanced')

diff --git a/filesharing/advanced/kcm_sambaconf/dictmanager.cpp b/filesharing/advanced/kcm_sambaconf/dictmanager.cpp
index 04eb0be7..099e29ea 100644
--- a/filesharing/advanced/kcm_sambaconf/dictmanager.cpp
+++ b/filesharing/advanced/kcm_sambaconf/dictmanager.cpp
@@ -35,7 +35,7 @@
 #include <tqstringlist.h>
 
 #include <kurlrequester.h> 
-#include <klocale.h>
+#include <tdelocale.h>
  
 #include "sambashare.h"
 #include "dictmanager.h" 
diff --git a/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp b/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp
index 9c9e8de7..2b629f42 100644
--- a/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp
+++ b/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp
@@ -39,10 +39,10 @@
 #include <tdepopupmenu.h>
 #include <tdeaction.h>
 #include <krestrictedline.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledetailview.h>
 #include <kdirlister.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurlrequester.h>
 
 #include "hiddenfileview.h"
diff --git a/filesharing/advanced/kcm_sambaconf/joindomaindlg.ui b/filesharing/advanced/kcm_sambaconf/joindomaindlg.ui
index 51a0ff36..110187f4 100644
--- a/filesharing/advanced/kcm_sambaconf/joindomaindlg.ui
+++ b/filesharing/advanced/kcm_sambaconf/joindomaindlg.ui
@@ -224,8 +224,8 @@
 </tabstops>
 <includes>
     <include location="global" impldecl="in declaration">kpassdlg.h</include>
-    <include location="global" impldecl="in implementation">kmessagebox.h</include>
-    <include location="global" impldecl="in implementation">klocale.h</include>
+    <include location="global" impldecl="in implementation">tdemessagebox.h</include>
+    <include location="global" impldecl="in implementation">tdelocale.h</include>
     <include location="local" impldecl="in implementation">joindomaindlg.ui.h</include>
 </includes>
 <Q_SLOTS>
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>
diff --git a/filesharing/advanced/kcm_sambaconf/linuxpermissionchecker.cpp b/filesharing/advanced/kcm_sambaconf/linuxpermissionchecker.cpp
index 83ea5180..081def45 100644
--- a/filesharing/advanced/kcm_sambaconf/linuxpermissionchecker.cpp
+++ b/filesharing/advanced/kcm_sambaconf/linuxpermissionchecker.cpp
@@ -26,8 +26,8 @@
 #include <tqregexp.h> 
 #include <tqstringlist.h> 
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "passwd.h"
diff --git a/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp b/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp
index fa601072..55baa274 100644
--- a/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp
+++ b/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp
@@ -50,7 +50,7 @@
 #include <tdeprint/kmprinter.h>
 #include <kcombobox.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <assert.h>
 
diff --git a/filesharing/advanced/kcm_sambaconf/qmultichecklistitem.cpp b/filesharing/advanced/kcm_sambaconf/qmultichecklistitem.cpp
index 187289b6..e11a1857 100644
--- a/filesharing/advanced/kcm_sambaconf/qmultichecklistitem.cpp
+++ b/filesharing/advanced/kcm_sambaconf/qmultichecklistitem.cpp
@@ -32,7 +32,7 @@
 #include <tqheader.h>
 
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "qmultichecklistitem.moc"
 #include "qmultichecklistitem.h"
diff --git a/filesharing/advanced/kcm_sambaconf/sambafile.cpp b/filesharing/advanced/kcm_sambaconf/sambafile.cpp
index 2cb66bec..7929b96d 100644
--- a/filesharing/advanced/kcm_sambaconf/sambafile.cpp
+++ b/filesharing/advanced/kcm_sambaconf/sambafile.cpp
@@ -26,9 +26,9 @@
 #include <tqfileinfo.h>
 #include <tdeio/job.h>
 #include <kprocess.h>
-#include <kmessagebox.h>
-#include <klocale.h>
-#include <ktempfile.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
+#include <tdetempfile.h>
 #include <ksambashare.h>
 
 #include <pwd.h>
diff --git a/filesharing/advanced/kcm_sambaconf/share.ui b/filesharing/advanced/kcm_sambaconf/share.ui
index c89bbe20..a150c097 100644
--- a/filesharing/advanced/kcm_sambaconf/share.ui
+++ b/filesharing/advanced/kcm_sambaconf/share.ui
@@ -3251,7 +3251,7 @@ Only change something if you know what you are doing.</string>
 <includes>
     <include location="local" impldecl="in implementation">kiconloader.h</include>
     <include location="global" impldecl="in implementation">tqptrlist.h</include>
-    <include location="global" impldecl="in implementation">kmessagebox.h</include>
+    <include location="global" impldecl="in implementation">tdemessagebox.h</include>
     <include location="global" impldecl="in implementation">kprocess.h</include>
     <include location="local" impldecl="in implementation">share.ui.h</include>
 </includes>
diff --git a/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp b/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp
index b8fa97b4..56536018 100644
--- a/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp
+++ b/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp
@@ -57,10 +57,10 @@
 #include <kdebug.h>
 #include <kcombobox.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledetailview.h>
 #include <kdirlister.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <tdeaction.h>
 #include <krestrictedline.h>
diff --git a/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp b/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp
index a2a5c03e..5856528b 100644
--- a/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp
+++ b/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp
@@ -33,8 +33,8 @@
  
 #include <tdeapplication.h> 
 #include <tdefiledialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
  
 
 #include "smbconfconfigwidget.h"
diff --git a/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp b/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp
index 50bf2713..cc6e6a18 100644
--- a/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp
+++ b/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp
@@ -34,7 +34,7 @@
 #include <kurl.h>
 #include <kdebug.h>
 #include <kpassdlg.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 
 #include "sambafile.h"
diff --git a/filesharing/advanced/kcm_sambaconf/usertabimpl.cpp b/filesharing/advanced/kcm_sambaconf/usertabimpl.cpp
index 9d0eb7ce..1be8f95b 100644
--- a/filesharing/advanced/kcm_sambaconf/usertabimpl.cpp
+++ b/filesharing/advanced/kcm_sambaconf/usertabimpl.cpp
@@ -38,7 +38,7 @@
 #include <tqlineedit.h>
 
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
diff --git a/filesharing/advanced/nfs/nfsdialog.cpp b/filesharing/advanced/nfs/nfsdialog.cpp
index 245402f0..ed009db1 100644
--- a/filesharing/advanced/nfs/nfsdialog.cpp
+++ b/filesharing/advanced/nfs/nfsdialog.cpp
@@ -26,9 +26,9 @@
 #include <tqlayout.h>
 
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <tdeaccel.h>
 
diff --git a/filesharing/advanced/nfs/nfsfile.cpp b/filesharing/advanced/nfs/nfsfile.cpp
index 58c62ca8..3397ee9b 100644
--- a/filesharing/advanced/nfs/nfsfile.cpp
+++ b/filesharing/advanced/nfs/nfsfile.cpp
@@ -27,10 +27,10 @@
 #include <tqstringlist.h>
 
 #include <kdebug.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <knfsshare.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kprocio.h>
 
 #include "nfsfile.h"
diff --git a/filesharing/advanced/nfs/nfshostdlg.cpp b/filesharing/advanced/nfs/nfshostdlg.cpp
index e45f1f87..4b62845e 100644
--- a/filesharing/advanced/nfs/nfshostdlg.cpp
+++ b/filesharing/advanced/nfs/nfshostdlg.cpp
@@ -21,9 +21,9 @@
 #include <tqwhatsthis.h>
 #include <tqgroupbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <assert.h>
 
diff --git a/filesharing/advanced/propsdlgplugin/propertiespage.cpp b/filesharing/advanced/propsdlgplugin/propertiespage.cpp
index 0bf740ef..a61a8dd6 100644
--- a/filesharing/advanced/propsdlgplugin/propertiespage.cpp
+++ b/filesharing/advanced/propsdlgplugin/propertiespage.cpp
@@ -28,15 +28,15 @@
 #include <tdefileshare.h>
 #include <knfsshare.h>
 #include <ksambashare.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kdebug.h>
 #include <tdefile.h>
 #include <kurlrequester.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <klineedit.h>
 #include <kprocio.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 // NFS related
 #include "../nfs/nfsfile.h"
diff --git a/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp b/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp
index 41c3bd71..2b05706c 100644
--- a/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp
+++ b/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp
@@ -25,11 +25,11 @@
 #include <kdebug.h>
 #include <kpushbutton.h>
 #include <tdefileshare.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
 #include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "propertiespage.h"
 #include "propsdlgshareplugin.h"
-- 
cgit v1.2.1