summaryrefslogtreecommitdiffstats
path: root/kmail/kmail_part.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 /kmail/kmail_part.h
parent12c8a23fe75817cb4bfcd604c1863266dd75e840 (diff)
downloadtdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.tar.gz
tdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kmail/kmail_part.h')
-rw-r--r--kmail/kmail_part.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/kmail/kmail_part.h b/kmail/kmail_part.h
index 8501519f..dd5d261a 100644
--- a/kmail/kmail_part.h
+++ b/kmail/kmail_part.h
@@ -37,8 +37,8 @@
#include <tqwidget.h>
#include <tdepimmacros.h>
-class KInstance;
-class KAboutData;
+class TDEInstance;
+class TDEAboutData;
class KMailStatusBarExtension;
class KMKernel;
class KMMainWidget;
@@ -60,7 +60,7 @@ class KDE_EXPORT KMailPart: public KParts::ReadOnlyPart, virtual public KMailPar
TQWidget* parentWidget() const;
- static KAboutData *createAboutData();
+ static TDEAboutData *createAboutData();
public slots:
virtual void save() { /*TODO*/ }