summaryrefslogtreecommitdiffstats
path: root/libkpgp/kpgp.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 /libkpgp/kpgp.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 'libkpgp/kpgp.h')
-rw-r--r--libkpgp/kpgp.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/libkpgp/kpgp.h b/libkpgp/kpgp.h
index 967254b6..6628f41e 100644
--- a/libkpgp/kpgp.h
+++ b/libkpgp/kpgp.h
@@ -43,7 +43,7 @@ class TQCursor;
class TQCheckBox;
class TQGridLayout;
-class KConfig;
+class TDEConfig;
namespace Kpgp {
@@ -304,7 +304,7 @@ public:
static Kpgp::Module *getKpgp();
/** get the kpgp config object */
- static KConfig *getConfig();
+ static TDEConfig *getConfig();
/** Parses the given message and splits it into OpenPGP blocks and
Non-OpenPGP blocks.
@@ -416,7 +416,7 @@ private:
void assignPGPBase(void);
static Kpgp::Module *kpgpObject;
- KConfig *config;
+ TDEConfig *config;
struct AddressData {
KeyIDList keyIds;