diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:21:02 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:21:02 -0600 |
commit | 033160606842587f113a62c987d5bee31a1349cc (patch) | |
tree | 6861c5dfa3804654c5389d9473231e20251dd94b /kiosktool/kioskrun.h | |
parent | 70fa683ca9a2e47fc14ad0462cb25becb890d146 (diff) | |
download | kiosktool-033160606842587f113a62c987d5bee31a1349cc.tar.gz kiosktool-033160606842587f113a62c987d5bee31a1349cc.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kiosktool/kioskrun.h')
-rw-r--r-- | kiosktool/kioskrun.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kiosktool/kioskrun.h b/kiosktool/kioskrun.h index 4b5f818..416e21b 100644 --- a/kiosktool/kioskrun.h +++ b/kiosktool/kioskrun.h @@ -32,7 +32,7 @@ class ImmutableStatus; class KConfig; -class KProcess; +class TDEProcess; class KSimpleConfig; class KioskGui; @@ -75,7 +75,7 @@ public: void forceSycocaUpdate(); // Run a program inside the runtime test environment - KProcess* run(const TQString &cmd, const TQStringList &args=TQStringList()); + TDEProcess* run(const TQString &cmd, const TQStringList &args=TQStringList()); // A DCOPRef to make dcop calls into the runtime test environment DCOPRef dcopRef(const TQCString &appId, const TQCString &objId); @@ -180,7 +180,7 @@ protected: void shutdownRuntimeEnv(); void setupConfigEnv(); void shutdownConfigEnv(); - void applyEnvironment(KProcess *p); + void applyEnvironment(TDEProcess *p); TQString saveImmutableStatus(const TQString &filename); bool restoreImmutableStatus(const TQString &filename, bool force); |