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/simple/CMakeLists.txt    | 2 +-
 filesharing/simple/fileshare.cpp     | 4 ++--
 filesharing/simple/fileshare.desktop | 2 +-
 filesharing/simple/fileshare.h       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'filesharing/simple')

diff --git a/filesharing/simple/CMakeLists.txt b/filesharing/simple/CMakeLists.txt
index 093a80c8..dd06eeb2 100644
--- a/filesharing/simple/CMakeLists.txt
+++ b/filesharing/simple/CMakeLists.txt
@@ -36,6 +36,6 @@ tde_add_kpart( kcm_fileshare AUTOMOC
     krichtextlabel.cpp
   LINK
     propsdlgplugin_common-static filesharenfs-static filesharesamba-static
-    kio-shared
+    tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/filesharing/simple/fileshare.cpp b/filesharing/simple/fileshare.cpp
index dc0c4cbe..6f39975a 100644
--- a/filesharing/simple/fileshare.cpp
+++ b/filesharing/simple/fileshare.cpp
@@ -35,7 +35,7 @@
 #include <kiconloader.h>
 #include <knfsshare.h>
 #include <ksambashare.h>
-#include <kfileshare.h>
+#include <tdefileshare.h>
 #include <kstandarddirs.h>
 #include <ksimpleconfig.h>
 #include <kmessagebox.h>
@@ -63,7 +63,7 @@ K_EXPORT_COMPONENT_FACTORY (kcm_fileshare, ShareFactory("kcmfileshare") )
 KFileShareConfig::KFileShareConfig(TQWidget *parent, const char *name, const TQStringList &):
     TDECModule(ShareFactory::instance(), parent, name)
 {
-  TDEGlobal::locale()->insertCatalogue("kfileshare");                            
+  TDEGlobal::locale()->insertCatalogue("tdefileshare");                            
 
   TQBoxLayout* layout = new TQVBoxLayout(this,0,
 				       KDialog::spacingHint());
diff --git a/filesharing/simple/fileshare.desktop b/filesharing/simple/fileshare.desktop
index 2fa28fd9..cf78fc4f 100644
--- a/filesharing/simple/fileshare.desktop
+++ b/filesharing/simple/fileshare.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell fileshare
+Exec=tdecmshell fileshare
 Icon=share
 Type=Application
 
diff --git a/filesharing/simple/fileshare.h b/filesharing/simple/fileshare.h
index 283d5125..1877362c 100644
--- a/filesharing/simple/fileshare.h
+++ b/filesharing/simple/fileshare.h
@@ -19,7 +19,7 @@
 #ifndef __fileshare_h__
 #define __fileshare_h__
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 #include "tdecmodule.h"
 class TQRadioButton;
-- 
cgit v1.2.1