diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:55:40 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:55:40 -0600 |
| commit | 73ff676f11662d6178c8854a7832ebffe2ae409d (patch) | |
| tree | 9e89ea7d87940087d2d3c5db9b378ef989dd1346 /kspread/kspread_factory.h | |
| parent | c2ba2f56121c21a762619faf195e8332ef5b224f (diff) | |
| download | koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.tar.gz koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kspread/kspread_factory.h')
| -rw-r--r-- | kspread/kspread_factory.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kspread/kspread_factory.h b/kspread/kspread_factory.h index e1897856..a2f467e0 100644 --- a/kspread/kspread_factory.h +++ b/kspread/kspread_factory.h @@ -22,7 +22,7 @@ #include <KoFactory.h> -class KAboutData; +class TDEAboutData; class DCOPObject; namespace KSpread @@ -38,17 +38,17 @@ public: virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() ); - static KInstance* global(); + static TDEInstance* global(); - // _Creates_ a KAboutData but doesn't keep ownership - static KAboutData* aboutData(); + // _Creates_ a TDEAboutData but doesn't keep ownership + static TDEAboutData* aboutData(); static DCOPObject* dcopObject(); private: - static KInstance* s_global; + static TDEInstance* s_global; static DCOPObject* s_dcopObject; - static KAboutData* s_aboutData; + static TDEAboutData* s_aboutData; }; } // namespace KSpread |