From 8bc199f487aad2badc9a54c2105f13fff3da7295 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 31 Jan 2013 21:51:08 -0600
Subject: Rename KStartup for enhanced compatibility with KDE4

---
 tdeio/tdeio/krun.cpp     | 30 +++++++++++++++---------------
 tdeio/tdeio/krun.h       | 12 ++++++------
 tdeio/tdeioexec/main.cpp |  4 ++--
 3 files changed, 23 insertions(+), 23 deletions(-)

(limited to 'tdeio')

diff --git a/tdeio/tdeio/krun.cpp b/tdeio/tdeio/krun.cpp
index ff6f6bbb1..b243671b4 100644
--- a/tdeio/tdeio/krun.cpp
+++ b/tdeio/tdeio/krun.cpp
@@ -563,13 +563,13 @@ static pid_t runCommandInternal( TDEProcess* proc, const KService* service, cons
 #ifdef Q_WS_X11 // Startup notification doesn't work with QT/E, service isn't needed without Startup notification
   bool silent;
   TQCString wmclass;
-  KStartupInfoId id;
+  TDEStartupInfoId id;
   bool startup_notify = ( asn != "0" && KRun::checkStartupNotify( binName, service, &silent, &wmclass ));
   if( startup_notify )
   {
       id.initId( asn );
       id.setupStartupEnv();
-      KStartupInfoData data;
+      TDEStartupInfoData data;
       data.setHostname();
       data.setBin( bin );
       if( !execName.isEmpty())
@@ -584,19 +584,19 @@ static pid_t runCommandInternal( TDEProcess* proc, const KService* service, cons
       if( !wmclass.isEmpty())
           data.setWMClass( wmclass );
       if( silent )
-          data.setSilent( KStartupInfoData::Yes );
+          data.setSilent( TDEStartupInfoData::Yes );
       data.setDesktop( KWin::currentDesktop());
       if( window )
           data.setLaunchedBy( window->winId());
-      KStartupInfo::sendStartup( id, data );
+      TDEStartupInfo::sendStartup( id, data );
   }
   pid_t pid = TDEProcessRunner::run( proc, binName, id );
   if( startup_notify && pid )
   {
-      KStartupInfoData data;
+      TDEStartupInfoData data;
       data.addPid( pid );
-      KStartupInfo::sendChange( id, data );
-      KStartupInfo::resetStartupEnv();
+      TDEStartupInfo::sendChange( id, data );
+      TDEStartupInfo::resetStartupEnv();
   }
   return pid;
 #else
@@ -807,14 +807,14 @@ pid_t KRun::run( const KService& _service, const KURL::List& _urls, TQWidget* wi
   if( window != NULL )
   {
     if( myasn.isEmpty())
-        myasn = KStartupInfo::createNewStartupId();
+        myasn = TDEStartupInfo::createNewStartupId();
     if( myasn != "0" )
     {
-        KStartupInfoId id;
+        TDEStartupInfoId id;
         id.initId( myasn );
-        KStartupInfoData data;
+        TDEStartupInfoData data;
         data.setLaunchedBy( window->winId());
-        KStartupInfo::sendChange( id, data );
+        TDEStartupInfo::sendChange( id, data );
     }
   }
 
@@ -1484,7 +1484,7 @@ TDEProcessRunner::run(TDEProcess * p, const TQString & binName)
 
 #ifdef Q_WS_X11
 pid_t
-TDEProcessRunner::run(TDEProcess * p, const TQString & binName, const KStartupInfoId& id )
+TDEProcessRunner::run(TDEProcess * p, const TQString & binName, const TDEStartupInfoId& id )
 {
   return (new TDEProcessRunner(p, binName, id))->pid();
 }
@@ -1505,7 +1505,7 @@ TDEProcessRunner::TDEProcessRunner(TDEProcess * p, const TQString & _binName )
 }
 
 #ifdef Q_WS_X11
-TDEProcessRunner::TDEProcessRunner(TDEProcess * p, const TQString & _binName, const KStartupInfoId& id )
+TDEProcessRunner::TDEProcessRunner(TDEProcess * p, const TQString & _binName, const TDEStartupInfoId& id )
   : TQObject(),
     process_(p),
     binName( _binName ),
@@ -1559,10 +1559,10 @@ TDEProcessRunner::slotProcessExited(TDEProcess * p)
 #ifdef Q_WS_X11
   if( !id_.none())
   {
-      KStartupInfoData data;
+      TDEStartupInfoData data;
       data.addPid( pid()); // announce this pid for the startup notification has finished
       data.setHostname();
-      KStartupInfo::sendFinish( id_, data );
+      TDEStartupInfo::sendFinish( id_, data );
   }
 #endif
   deleteLater();
diff --git a/tdeio/tdeio/krun.h b/tdeio/tdeio/krun.h
index 03186af85..40fd36416 100644
--- a/tdeio/tdeio/krun.h
+++ b/tdeio/tdeio/krun.h
@@ -482,8 +482,8 @@ class TDEIO_EXPORT TDEProcessRunner : public TQObject
   public:
 
     static pid_t run(TDEProcess *, const TQString & binName);
-#ifdef Q_WS_X11 // We don't have KStartupInfo in Qt/Embedded
-    static pid_t run(TDEProcess *, const TQString & binName, const KStartupInfoId& id );
+#ifdef Q_WS_X11 // We don't have TDEStartupInfo in Qt/Embedded
+    static pid_t run(TDEProcess *, const TQString & binName, const TDEStartupInfoId& id );
 #endif
 
     virtual ~TDEProcessRunner();
@@ -497,15 +497,15 @@ class TDEIO_EXPORT TDEProcessRunner : public TQObject
   private:
 
     TDEProcessRunner(TDEProcess *, const TQString & binName);
-#ifdef Q_WS_X11 // We don't have KStartupInfo in Qt/Embedded
-    TDEProcessRunner(TDEProcess *, const TQString & binName, const KStartupInfoId& id );
+#ifdef Q_WS_X11 // We don't have TDEStartupInfo in Qt/Embedded
+    TDEProcessRunner(TDEProcess *, const TQString & binName, const TDEStartupInfoId& id );
 #endif
     TDEProcessRunner();
 
     TDEProcess * process_;
     TQString binName;
-#ifdef Q_WS_X11 // We don't have KStartupInfo in Qt/Embedded
-    KStartupInfoId id_;
+#ifdef Q_WS_X11 // We don't have TDEStartupInfo in Qt/Embedded
+    TDEStartupInfoId id_;
 #endif
 };
 
diff --git a/tdeio/tdeioexec/main.cpp b/tdeio/tdeioexec/main.cpp
index 9f7bd9faa..3ae7b592b 100644
--- a/tdeio/tdeioexec/main.cpp
+++ b/tdeio/tdeioexec/main.cpp
@@ -206,7 +206,7 @@ void KIOExec::slotRunApp()
 
 #ifdef Q_WS_X11
     // propagate the startup indentification to the started process
-    KStartupInfoId id;
+    TDEStartupInfoId id;
     id.initId( kapp->startupId());
     id.setupStartupEnv();
 #endif
@@ -216,7 +216,7 @@ void KIOExec::slotRunApp()
     proc.start( TDEProcess::Block );
 
 #ifdef Q_WS_X11
-    KStartupInfo::resetStartupEnv();
+    TDEStartupInfo::resetStartupEnv();
 #endif
 
     kdDebug() << "EXEC done" << endl;
-- 
cgit v1.2.3