diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:22:42 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:22:42 -0600 |
commit | 63bcbec9a09626ba09945de06b3eb74f50f3b228 (patch) | |
tree | 205df87b7ca9a12d3295653c8e4a0dd7283ea03a /kbabel/kbabeldict/modules/poauxiliary/pa_factory.h | |
parent | cfe9ce987a45dd734b924ee4596946227a50609e (diff) | |
download | tdesdk-63bcbec9a09626ba09945de06b3eb74f50f3b228.tar.gz tdesdk-63bcbec9a09626ba09945de06b3eb74f50f3b228.zip |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kbabel/kbabeldict/modules/poauxiliary/pa_factory.h')
-rw-r--r-- | kbabel/kbabeldict/modules/poauxiliary/pa_factory.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kbabel/kbabeldict/modules/poauxiliary/pa_factory.h b/kbabel/kbabeldict/modules/poauxiliary/pa_factory.h index 640bcf8a..a0a5a361 100644 --- a/kbabel/kbabeldict/modules/poauxiliary/pa_factory.h +++ b/kbabel/kbabeldict/modules/poauxiliary/pa_factory.h @@ -36,8 +36,8 @@ #define PA_FACTORY_H #include <klibloader.h> -class KInstance; -class KAboutData; +class TDEInstance; +class TDEAboutData; class PaFactory : public KLibFactory { @@ -51,11 +51,11 @@ public: , const char *classname=TQOBJECT_OBJECT_NAME_STRING , const TQStringList &args = TQStringList()); - static KInstance *instance(); + static TDEInstance *instance(); private: - static KInstance *s_instance; - static KAboutData *s_about; + static TDEInstance *s_instance; + static TDEAboutData *s_about; }; #endif |