From b10a61b1fd2fe561ba61a384d4a344bae2a4aa29 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 01:04:58 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp      | 2 +-
 filesharing/advanced/kcm_sambaconf/hiddenfileview.h        | 2 +-
 filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp        | 2 +-
 filesharing/advanced/kcm_sambaconf/kcmsambaconf.desktop    | 2 +-
 filesharing/advanced/kcm_sambaconf/sambafile.cpp           | 2 +-
 filesharing/advanced/kcm_sambaconf/sambafile.h             | 2 +-
 filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp        | 2 +-
 filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'filesharing/advanced/kcm_sambaconf')

diff --git a/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp b/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp
index 2006e1a0..ba0f760c 100644
--- a/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp
+++ b/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp
@@ -40,7 +40,7 @@
 #include <kaction.h>
 #include <krestrictedline.h>
 #include <klocale.h>
-#include <kfiledetailview.h>
+#include <tdefiledetailview.h>
 #include <kdirlister.h>
 #include <kmessagebox.h>
 #include <kurlrequester.h>
diff --git a/filesharing/advanced/kcm_sambaconf/hiddenfileview.h b/filesharing/advanced/kcm_sambaconf/hiddenfileview.h
index ed65f016..3d3d0aa8 100644
--- a/filesharing/advanced/kcm_sambaconf/hiddenfileview.h
+++ b/filesharing/advanced/kcm_sambaconf/hiddenfileview.h
@@ -29,7 +29,7 @@
 #ifndef _HIDDENFILEVIEW_H_
 #define _HIDDENFILEVIEW_H_
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <klistview.h>
 
 #include "qmultichecklistitem.h"
diff --git a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
index 7940952f..622e1f08 100644
--- a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
+++ b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
@@ -1434,7 +1434,7 @@ extern "C"
 {
   KDE_EXPORT TDECModule *create_KcmSambaConf(TQWidget *parent, const char *name)
   {
-    TDEGlobal::locale()->insertCatalogue("kfileshare");
+    TDEGlobal::locale()->insertCatalogue("tdefileshare");
     return new KcmSambaConf(parent, name);
   }
 }
diff --git a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.desktop b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.desktop
index 722679ac..8c4404ec 100644
--- a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.desktop
+++ b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell kcmsambaconf
+Exec=tdecmshell kcmsambaconf
 Icon=samba
 Type=Application
 
diff --git a/filesharing/advanced/kcm_sambaconf/sambafile.cpp b/filesharing/advanced/kcm_sambaconf/sambafile.cpp
index 6252209e..2cb66bec 100644
--- a/filesharing/advanced/kcm_sambaconf/sambafile.cpp
+++ b/filesharing/advanced/kcm_sambaconf/sambafile.cpp
@@ -24,7 +24,7 @@
 #include <ksimpleconfig.h>
 #include <kdebug.h>
 #include <tqfileinfo.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kprocess.h>
 #include <kmessagebox.h>
 #include <klocale.h>
diff --git a/filesharing/advanced/kcm_sambaconf/sambafile.h b/filesharing/advanced/kcm_sambaconf/sambafile.h
index df890129..34a82f7d 100644
--- a/filesharing/advanced/kcm_sambaconf/sambafile.h
+++ b/filesharing/advanced/kcm_sambaconf/sambafile.h
@@ -24,7 +24,7 @@
 #include <tqdict.h>
 #include <tqstring.h>
 #include <tqobject.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include "sambashare.h"
 
diff --git a/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp b/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp
index 2604a34d..099bc0bf 100644
--- a/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp
+++ b/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp
@@ -58,7 +58,7 @@
 #include <kcombobox.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kfiledetailview.h>
+#include <tdefiledetailview.h>
 #include <kdirlister.h>
 #include <kmessagebox.h>
 #include <kpopupmenu.h>
diff --git a/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp b/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp
index 02203bbd..ddfb7219 100644
--- a/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp
+++ b/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp
@@ -32,7 +32,7 @@
 #include <tqlabel.h>
  
 #include <kapplication.h> 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
  
-- 
cgit v1.2.1