summaryrefslogtreecommitdiffstats
path: root/knode/knglobals.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:22:15 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:22:15 -0600
commit5fc6f26e12b596addd235f87320c31761bd5a84d (patch)
tree0a1ff964c23fce07fc088017df4ad537d57e62e5 /knode/knglobals.h
parent12c8a23fe75817cb4bfcd604c1863266dd75e840 (diff)
downloadtdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.tar.gz
tdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'knode/knglobals.h')
-rw-r--r--knode/knglobals.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/knode/knglobals.h b/knode/knglobals.h
index 9db4f22ef..568a9ef86 100644
--- a/knode/knglobals.h
+++ b/knode/knglobals.h
@@ -22,7 +22,7 @@
#include <tdepimmacros.h>
-class KInstance;
+class TDEInstance;
class KNConfigManager;
class KNNetAccess;
class KNProgress;
@@ -63,7 +63,7 @@ class KDE_EXPORT KNGlobals {
KNArticleFactory *artFactory;
Kpgp::Module *pgp;
KConfig *config();
- KInstance *instance;
+ TDEInstance *instance;
KNConfigManager *configManager();
KNNetAccess *netAccess();