summaryrefslogtreecommitdiffstats
path: root/kiosktool/kioskrun.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:08:06 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:08:06 -0600
commit3b6aefe251409d6fba19aab4085e18d90b77550f (patch)
tree2b299dc627f49dabf27ce74851c7e81367eab5e6 /kiosktool/kioskrun.h
parent033160606842587f113a62c987d5bee31a1349cc (diff)
downloadkiosktool-3b6aefe251409d6fba19aab4085e18d90b77550f.tar.gz
kiosktool-3b6aefe251409d6fba19aab4085e18d90b77550f.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kiosktool/kioskrun.h')
-rw-r--r--kiosktool/kioskrun.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/kiosktool/kioskrun.h b/kiosktool/kioskrun.h
index 416e21b..54a25a2 100644
--- a/kiosktool/kioskrun.h
+++ b/kiosktool/kioskrun.h
@@ -31,7 +31,7 @@
#include <kprogress.h>
class ImmutableStatus;
-class KConfig;
+class TDEConfig;
class TDEProcess;
class KSimpleConfig;
@@ -84,7 +84,7 @@ public:
DCOPClient *dcopClient() { return m_dcopClient; }
// Open config file in the install directory
- KConfig *configFile(const TQString &filename);
+ TDEConfig *configFile(const TQString &filename);
// Make config files temporary mutable.
void makeMutable(bool bMutable);
@@ -199,7 +199,7 @@ private:
DCOPClient *m_dcopClient;
TDEInstance *m_instance;
TDEInstance *m_saveInstance;
- TQDict<KConfig> m_saveConfigCache;
+ TQDict<TDEConfig> m_saveConfigCache;
TQDict<ImmutableStatus> m_immutableStatusCache;
bool m_noRestrictions;
bool m_forceSycocaUpdate;