From c48e769eb275917717e2b55eb869f7e559293ac8 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 24 Jan 2013 13:48:31 -0600
Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

---
 filesharing/advanced/propsdlgplugin/propertiespage.cpp      | 10 +++++-----
 filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'filesharing/advanced/propsdlgplugin')

diff --git a/filesharing/advanced/propsdlgplugin/propertiespage.cpp b/filesharing/advanced/propsdlgplugin/propertiespage.cpp
index 6042b9e7..91ce79d3 100644
--- a/filesharing/advanced/propsdlgplugin/propertiespage.cpp
+++ b/filesharing/advanced/propsdlgplugin/propertiespage.cpp
@@ -211,20 +211,20 @@ bool PropertiesPage::save(NFSFile* nfsFile, SambaFile* sambaFile, bool nfs, bool
      if (nfsNeedsKDEsu) {
          nfsFile->saveTo(nfsTempFile.name());
          command += TQString("cp %1 %2;exportfs -ra;")
-        .arg(KProcess::quote( nfsTempFile.name() ))
-        .arg(KProcess::quote( nfsFileName ));
+        .arg(TDEProcess::quote( nfsTempFile.name() ))
+        .arg(TDEProcess::quote( nfsFileName ));
      }         
      
      if (sambaNeedsKDEsu) {
          sambaFile->saveTo(sambaTempFile.name());
          command += TQString("cp %1 %2;")
-        .arg(KProcess::quote( sambaTempFile.name() ))
-        .arg(KProcess::quote( sambaFileName ));
+        .arg(TDEProcess::quote( sambaTempFile.name() ))
+        .arg(TDEProcess::quote( sambaFileName ));
      }       
          
      proc<<"tdesu" << "-d" << "-c"<<command;
 
-     if (!proc.start(KProcess::Block, true)) {
+     if (!proc.start(TDEProcess::Block, true)) {
        kdDebug(FILESHARE_DEBUG) << "PropertiesPage::save: tdesu command failed" << endl;
        return false;
      }      
diff --git a/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp b/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp
index 2af403f5..59155329 100644
--- a/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp
+++ b/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp
@@ -49,7 +49,7 @@ PropsDlgSharePlugin::PropsDlgSharePlugin( KPropertiesDialog *dlg,
                     const char *, const TQStringList & )
   : KPropsDlgPlugin(dlg), d(0)
 {
-  KGlobal::locale()->insertCatalogue("kfileshare");                            
+  TDEGlobal::locale()->insertCatalogue("kfileshare");                            
                             
   if (KFileShare::shareMode() == KFileShare::Simple) {     
       kdDebug(5009) << "PropsDlgSharePlugin: Sharing mode is simple. Aborting." << endl;
@@ -100,9 +100,9 @@ PropsDlgSharePlugin::PropsDlgSharePlugin( KPropertiesDialog *dlg,
 
 void PropsDlgSharePlugin::slotConfigureFileSharing()
 {
-    KProcess proc;
+    TDEProcess proc;
     proc << KStandardDirs::findExe("tdesu") << locate("exe", "kcmshell") << "fileshare";
-    proc.start( KProcess::DontCare );
+    proc.start( TDEProcess::DontCare );
 }
 
 
-- 
cgit v1.2.1