summaryrefslogtreecommitdiffstats
path: root/kaddressbook/kabcore.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 /kaddressbook/kabcore.h
parent12c8a23fe75817cb4bfcd604c1863266dd75e840 (diff)
downloadtdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.tar.gz
tdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kaddressbook/kabcore.h')
-rw-r--r--kaddressbook/kabcore.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index bba0ec9c..d3ce562b 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -46,7 +46,7 @@ class CategoryEditDialog;
class CategorySelectDialog;
}
-class KAboutData;
+class TDEAboutData;
class KAction;
class KActionCollection;
class KConfig;
@@ -138,7 +138,7 @@ class KDE_EXPORT KABCore : public KAB::Core
*/
TQWidget *widget() const;
- static KAboutData *createAboutData();
+ static TDEAboutData *createAboutData();
void setStatusBar( KStatusBar *statusBar );