diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:20:05 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:20:05 -0600 |
commit | b19ddece21e102b8e4b292037ca7578f60b128fe (patch) | |
tree | 6572ca25aba80849cdfa7578bbbc9121d23afbc3 /khtml/khtml_factory.h | |
parent | e729c6d549f12e27b358a1dad04ff254c033ac71 (diff) | |
download | tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.tar.gz tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.zip |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'khtml/khtml_factory.h')
-rw-r--r-- | khtml/khtml_factory.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/khtml/khtml_factory.h b/khtml/khtml_factory.h index e9d5c62a8..4d0154128 100644 --- a/khtml/khtml_factory.h +++ b/khtml/khtml_factory.h @@ -25,8 +25,8 @@ #include <tqptrlist.h> #include <kurl.h> -class KInstance; -class KAboutData; +class TDEInstance; +class TDEAboutData; class HistoryProvider; class KHTMLSettings; class KHTMLPart; @@ -52,7 +52,7 @@ public: static TQPtrList<KHTMLPart> *partList() { return s_parts; } - static KInstance *instance(); + static TDEInstance *instance(); static KHTMLSettings *defaultHTMLSettings(); @@ -67,8 +67,8 @@ protected: private: static unsigned long s_refcnt; static KHTMLFactory *s_self; - static KInstance *s_instance; - static KAboutData *s_about; + static TDEInstance *s_instance; + static TDEAboutData *s_about; static KHTMLSettings *s_settings; static TQPtrList<KHTMLPart> *s_parts; }; |