summaryrefslogtreecommitdiffstats
path: root/kcontrol/konqhtml/policies.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
commitcc74f360bb40da3d79f58048f8e8611804980aa6 (patch)
treec4385d2c16b904757b1c8bb998a4aec6993373f7 /kcontrol/konqhtml/policies.h
parent79b21d47bce1ee428affc97534cd8b257232a871 (diff)
downloadtdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz
tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/konqhtml/policies.h')
-rw-r--r--kcontrol/konqhtml/policies.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/kcontrol/konqhtml/policies.h b/kcontrol/konqhtml/policies.h
index a9814396a..df2a97750 100644
--- a/kcontrol/konqhtml/policies.h
+++ b/kcontrol/konqhtml/policies.h
@@ -24,7 +24,7 @@
#include <tqstring.h>
-class KConfig;
+class TDEConfig;
// special value for inheriting a global policy
#define INHERIT_POLICY 32767
@@ -54,7 +54,7 @@ public:
* @param feature_key key of the "feature enabled" policy. The final
* key the policy is stored under will be prefix + featureKey.
*/
- Policies(KConfig* config, const TQString &group, bool global,
+ Policies(TDEConfig* config, const TQString &group, bool global,
const TQString &domain, const TQString &prefix,
const TQString &feature_key);
@@ -123,7 +123,7 @@ protected:
unsigned int feature_enabled;
bool is_global;
- KConfig *config;
+ TDEConfig *config;
TQString groupname;
TQString domain;
TQString prefix;