summaryrefslogtreecommitdiffstats
path: root/korganizer/koglobals.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 /korganizer/koglobals.h
parent12c8a23fe75817cb4bfcd604c1863266dd75e840 (diff)
downloadtdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.tar.gz
tdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'korganizer/koglobals.h')
-rw-r--r--korganizer/koglobals.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/korganizer/koglobals.h b/korganizer/koglobals.h
index f32488628..4c1c5474b 100644
--- a/korganizer/koglobals.h
+++ b/korganizer/koglobals.h
@@ -33,7 +33,7 @@ class KCalendarSystem;
class AlarmClient;
class KConfig;
-class KInstance;
+class TDEInstance;
class KHolidays;
class KDE_EXPORT KOGlobals
@@ -110,7 +110,7 @@ class KDE_EXPORT KOGlobals
private:
static KOGlobals *mSelf;
- KInstance *mOwnInstance;
+ TDEInstance *mOwnInstance;
AlarmClient *mAlarmClient;