summaryrefslogtreecommitdiffstats
path: root/libkpimidentities/identitymanager.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:37:21 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:37:21 -0600
commit86d8364ac704bdc8ad2dfcf52307d9626cfac567 (patch)
tree97d3ac2c2f60780d9a1de4f82caac7cb27534501 /libkpimidentities/identitymanager.h
parenta9bde819f2b421dcc44741156e75eca4bb5fb4f4 (diff)
downloadtdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.tar.gz
tdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'libkpimidentities/identitymanager.h')
-rw-r--r--libkpimidentities/identitymanager.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/libkpimidentities/identitymanager.h b/libkpimidentities/identitymanager.h
index 2f0d5bde9..b0aee59d4 100644
--- a/libkpimidentities/identitymanager.h
+++ b/libkpimidentities/identitymanager.h
@@ -37,8 +37,8 @@
#include <dcopobject.h>
#include <tdepimmacros.h>
-class KConfigBase;
-class KConfig;
+class TDEConfigBase;
+class TDEConfig;
class KMKernel;
class TQStringList;
class KMIdentity;
@@ -226,15 +226,15 @@ k_dcop:
private:
void writeConfig() const;
- void readConfig(KConfigBase* config);
- TQStringList groupList(KConfigBase* config) const;
+ void readConfig(TDEConfigBase* config);
+ TQStringList groupList(TDEConfigBase* config) const;
void createDefaultIdentity();
// returns a new Unique Object Identifier
int newUoid();
private:
- KConfig* mConfig;
+ TDEConfig* mConfig;
bool mReadOnly;
};