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 /filters | |
| parent | c2ba2f56121c21a762619faf195e8332ef5b224f (diff) | |
| download | koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.tar.gz koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'filters')
| -rw-r--r-- | filters/karbon/xfig/xfigimport_factory.cc | 6 | ||||
| -rw-r--r-- | filters/karbon/xfig/xfigimport_factory.h | 6 | ||||
| -rw-r--r-- | filters/kspread/kexi/kspread_kexiimport.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/filters/karbon/xfig/xfigimport_factory.cc b/filters/karbon/xfig/xfigimport_factory.cc index d734b176..1e231199 100644 --- a/filters/karbon/xfig/xfigimport_factory.cc +++ b/filters/karbon/xfig/xfigimport_factory.cc @@ -30,14 +30,14 @@ DESCRIPTION K_EXPORT_COMPONENT_FACTORY( libxfigimport, XFIGImportFactory ) -KInstance *XFIGImportFactory::s_global = 0; +TDEInstance *XFIGImportFactory::s_global = 0; XFIGImportFactory::XFIGImportFactory( TQObject *parent, const char *name) : KLibFactory(parent, name) { - s_global = new KInstance("xfigimport"); + s_global = new TDEInstance("xfigimport"); } XFIGImportFactory::~XFIGImportFactory() @@ -61,7 +61,7 @@ TQObject *XFIGImportFactory::createObject( return f; } -KInstance *XFIGImportFactory::global() +TDEInstance *XFIGImportFactory::global() { return s_global; } diff --git a/filters/karbon/xfig/xfigimport_factory.h b/filters/karbon/xfig/xfigimport_factory.h index b8d4d666..9760a92f 100644 --- a/filters/karbon/xfig/xfigimport_factory.h +++ b/filters/karbon/xfig/xfigimport_factory.h @@ -26,7 +26,7 @@ DESCRIPTION #include <klibloader.h> -class KInstance; +class TDEInstance; class XFIGImportFactory : public KLibFactory @@ -39,9 +39,9 @@ public: virtual TQObject* createObject(TQObject* parent = 0, const char* name = 0, const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList()); - static KInstance* global(); + static TDEInstance* global(); private: - static KInstance* s_global; + static TDEInstance* s_global; }; #endif diff --git a/filters/kspread/kexi/kspread_kexiimport.h b/filters/kspread/kexi/kspread_kexiimport.h index 04b260a0..8ce88641 100644 --- a/filters/kspread/kexi/kspread_kexiimport.h +++ b/filters/kspread/kexi/kspread_kexiimport.h @@ -31,7 +31,7 @@ #include <KoFilter.h> -class KAboutData; +class TDEAboutData; namespace KexiDB { |