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

---
 lanbrowsing/kcmlisa/kcmlisa.cpp |  6 +++---
 lanbrowsing/kcmlisa/kcmlisa.h   |  4 ++--
 lanbrowsing/kio_lan/kio_lan.cpp | 12 ++++++------
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'lanbrowsing')

diff --git a/lanbrowsing/kcmlisa/kcmlisa.cpp b/lanbrowsing/kcmlisa/kcmlisa.cpp
index d977c597..c5892395 100644
--- a/lanbrowsing/kcmlisa/kcmlisa.cpp
+++ b/lanbrowsing/kcmlisa/kcmlisa.cpp
@@ -289,8 +289,8 @@ void LisaSettings::save()
          confStream<<"PingNames = "<<writeStuff.latin1()<<"\n";
          tmp.close();
          TQString suCommand=TQString("cp '%1' '%2'; chmod 644 '%3'; rm -f '%4'").arg(m_tmpFilename).arg(m_configFilename).arg(m_configFilename).arg(m_tmpFilename);
-         KProcess *proc = new KProcess();
-         connect(proc, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(saveDone(KProcess *)));
+         TDEProcess *proc = new TDEProcess();
+         connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(saveDone(TDEProcess *)));
          *proc<<"tdesu"<<"-c"<<suCommand;
          TDEApplication::setOverrideCursor(TQt::waitCursor);
          setEnabled(false);
@@ -373,7 +373,7 @@ void LisaSettings::autoSetup()
    return;
 }
 
-void LisaSettings::saveDone(KProcess *proc)
+void LisaSettings::saveDone(TDEProcess *proc)
 {
    unlink(TQFile::encodeName(m_tmpFilename));
    TDEApplication::restoreOverrideCursor();
diff --git a/lanbrowsing/kcmlisa/kcmlisa.h b/lanbrowsing/kcmlisa/kcmlisa.h
index 5ee12b1c..51815906 100644
--- a/lanbrowsing/kcmlisa/kcmlisa.h
+++ b/lanbrowsing/kcmlisa/kcmlisa.h
@@ -28,7 +28,7 @@ class TQPushButton;
 class TQCheckBox;
 class TQSpinBox;
 class TQPushButton;
-class KProcess;
+class TDEProcess;
 class KDialogBase;
 class KRestrictedLine;
 class KEditListBox;
@@ -48,7 +48,7 @@ class LisaSettings:public KCModule
    protected slots:
       void slotChanged();
       void autoSetup();
-      void saveDone(KProcess *);  // called after the tdesud returns (on save)
+      void saveDone(TDEProcess *);  // called after the tdesud returns (on save)
       void suggestSettings();
    protected:
       KConfig m_config;
diff --git a/lanbrowsing/kio_lan/kio_lan.cpp b/lanbrowsing/kio_lan/kio_lan.cpp
index 442957ad..7e296694 100644
--- a/lanbrowsing/kio_lan/kio_lan.cpp
+++ b/lanbrowsing/kio_lan/kio_lan.cpp
@@ -76,9 +76,9 @@ int kdemain( int argc, char **argv )
   int isLanIoslave=(strcmp("lan",argv[1])==0);
 
   // Trigger creation to make sure we pick up KIOSK settings correctly.
-  (void)KGlobal::dirs();
-  (void)KGlobal::locale();
-  (void)KGlobal::config();
+  (void)TDEGlobal::dirs();
+  (void)TDEGlobal::locale();
+  (void)TDEGlobal::config();
 
   kdDebug(7101) << "LAN: kdemain: starting" << endl;
 
@@ -94,7 +94,7 @@ LANProtocol::LANProtocol(int isLanIoslave, const TQCString &pool, const TQCStrin
 ,m_maxAge(15*60)
 ,m_isLanIoslave(isLanIoslave?true:false)
 {
-   KConfig *config=KGlobal::config();
+   KConfig *config=TDEGlobal::config();
 
    m_protocolInfo[KIOLAN_FTP].enabled=config->readNumEntry("Support_FTP",PORTSETTINGS_CHECK);
    m_protocolInfo[KIOLAN_HTTP].enabled=config->readNumEntry("Support_HTTP",PORTSETTINGS_CHECK);
@@ -292,10 +292,10 @@ int LANProtocol::rlanReadDataFromServer()
    if (result!=0)
    {
       ::close(sockFD);
-      KProcess proc;
+      TDEProcess proc;
       proc<<"reslisa";
 
-      bool ok=proc.start(KProcess::DontCare);
+      bool ok=proc.start(TDEProcess::DontCare);
       if (!ok)
       {
          error( ERR_CANNOT_LAUNCH_PROCESS, "reslisa" );
-- 
cgit v1.2.1