diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:23:50 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:23:50 -0600 |
commit | 3a044decb0a5d7be822c888b2d5374573d7df96e (patch) | |
tree | ddf4681e0233c25203fc927596aa7b3bdb5f2efa /parts/documentation/protocols/chm/kchmpart.h | |
parent | 5c0390ebaa2be82d8684af5a6bc2b16740f4cc1b (diff) | |
download | tdevelop-3a044decb0a5d7be822c888b2d5374573d7df96e.tar.gz tdevelop-3a044decb0a5d7be822c888b2d5374573d7df96e.zip |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'parts/documentation/protocols/chm/kchmpart.h')
-rw-r--r-- | parts/documentation/protocols/chm/kchmpart.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/parts/documentation/protocols/chm/kchmpart.h b/parts/documentation/protocols/chm/kchmpart.h index 5c4369c3..3ed054fe 100644 --- a/parts/documentation/protocols/chm/kchmpart.h +++ b/parts/documentation/protocols/chm/kchmpart.h @@ -27,8 +27,8 @@ #include <tqcstring.h> -class KInstance; -class KAboutData; +class TDEInstance; +class TDEAboutData; class KChmPartFactory: public KParts::Factory { @@ -43,11 +43,11 @@ class KChmPartFactory: public KParts::Factory TQObject *parent, const char *name, const char *classname, const TQStringList &args ); - static KInstance *instance(); + static TDEInstance *instance(); private: - static KInstance *s_instance; - static KAboutData *s_about; + static TDEInstance *s_instance; + static TDEAboutData *s_about; }; @@ -69,7 +69,7 @@ class KChmPart : public KDevHTMLPart */ protected: //virtual bool openFile(); - KInstance *m_instance; + TDEInstance *m_instance; KParts::BrowserExtension *m_extension; KIO::TransferJob *m_job; TQCString m_htmlData; |