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/khtmlimage.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/khtmlimage.h')
| -rw-r--r-- | khtml/khtmlimage.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/khtml/khtmlimage.h b/khtml/khtmlimage.h index dda918177..6db0cbf5f 100644 --- a/khtml/khtmlimage.h +++ b/khtml/khtmlimage.h @@ -27,7 +27,7 @@ #include "misc/loader_client.h" class KHTMLPart; -class KInstance; +class TDEInstance; namespace khtml { @@ -48,10 +48,10 @@ public: TQObject *parent, const char *name, const char *className, const TQStringList &args ); - static KInstance *instance() { return s_instance; } + static TDEInstance *instance() { return s_instance; } private: - static KInstance *s_instance; + static TDEInstance *s_instance; }; /** |