summaryrefslogtreecommitdiffstats
path: root/kmail/kmkernel.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/kmkernel.h
parent12c8a23fe75817cb4bfcd604c1863266dd75e840 (diff)
downloadtdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.tar.gz
tdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kmail/kmkernel.h')
-rw-r--r--kmail/kmkernel.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h
index c334291e9..0b9aa51eb 100644
--- a/kmail/kmkernel.h
+++ b/kmail/kmkernel.h
@@ -59,7 +59,7 @@ namespace KPIM {
class KMKernel;
class KProcess;
class KProgressDialog;
-class KInstance;
+class TDEInstance;
class TQTimer;
class KProgress;
class KPassivePopup;
@@ -291,8 +291,8 @@ public:
*/
KMFolder* findFolderById( const TQString& idString );
- KInstance *xmlGuiInstance() { return mXmlGuiInstance; }
- void setXmlGuiInstance( KInstance *instance ) { mXmlGuiInstance = instance; }
+ TDEInstance *xmlGuiInstance() { return mXmlGuiInstance; }
+ void setXmlGuiInstance( TDEInstance *instance ) { mXmlGuiInstance = instance; }
KMFolder *inboxFolder() { return the_inboxFolder; }
KMFolder *outboxFolder() { return the_outboxFolder; }
@@ -489,7 +489,7 @@ private:
static KMKernel *mySelf;
KSharedConfig::Ptr mConfig;
TQTextCodec *netCodec;
- KInstance* mXmlGuiInstance;
+ TDEInstance* mXmlGuiInstance;
ConfigureDialog *mConfigureDialog;
TQTimer *mBackgroundTasksTimer;