diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:18:35 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:18:35 -0600 |
commit | f71394031a5e1c3b315081a98000f242b461ca8c (patch) | |
tree | 54081035a0fdae2cadbf9d7df74a9a4e4cd46925 /kghostview/kgvfactory.h | |
parent | e5ce3b4175f2e72788b49b9ed46c722784218dad (diff) | |
download | tdegraphics-f71394031a5e1c3b315081a98000f242b461ca8c.tar.gz tdegraphics-f71394031a5e1c3b315081a98000f242b461ca8c.zip |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kghostview/kgvfactory.h')
-rw-r--r-- | kghostview/kgvfactory.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kghostview/kgvfactory.h b/kghostview/kgvfactory.h index 1c49926f..1b2e0801 100644 --- a/kghostview/kgvfactory.h +++ b/kghostview/kgvfactory.h @@ -22,16 +22,16 @@ #include <kparts/factory.h> #include <kparts/part.h> -class KInstance; -class KAboutData; +class TDEInstance; +class TDEAboutData; class KDE_EXPORT KGVFactory : public KParts::Factory { public: KGVFactory(); virtual ~KGVFactory(); - static KInstance *instance(); - static KAboutData *aboutData(); + static TDEInstance *instance(); + static TDEAboutData *aboutData(); virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, @@ -39,11 +39,11 @@ class KDE_EXPORT KGVFactory : public KParts::Factory const TQStringList &args ); protected: - virtual KInstance *createInstance(); + virtual TDEInstance *createInstance(); private: static KGVFactory*s_self; - static KInstance *s_instance; - static KAboutData *s_aboutData; + static TDEInstance *s_instance; + static TDEAboutData *s_aboutData; }; #endif |