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/plugins/calculator | |
| parent | c2ba2f56121c21a762619faf195e8332ef5b224f (diff) | |
| download | koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.tar.gz koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kspread/plugins/calculator')
| -rw-r--r-- | kspread/plugins/calculator/main.cpp | 6 | ||||
| -rw-r--r-- | kspread/plugins/calculator/main.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/kspread/plugins/calculator/main.cpp b/kspread/plugins/calculator/main.cpp index 2f1a0b89..48afebd7 100644 --- a/kspread/plugins/calculator/main.cpp +++ b/kspread/plugins/calculator/main.cpp @@ -41,12 +41,12 @@ using namespace KSpread; K_EXPORT_COMPONENT_FACTORY( libkspreadcalc, CalcFactory ) -KInstance* CalcFactory::s_global = 0; +TDEInstance* CalcFactory::s_global = 0; CalcFactory::CalcFactory( TQObject* parent, const char* name ) : KLibFactory( parent, name ) { - s_global = new KInstance( "kspreadcalc" ); + s_global = new TDEInstance( "kspreadcalc" ); } CalcFactory::~CalcFactory() @@ -66,7 +66,7 @@ TQObject* CalcFactory::createObject( TQObject* parent, const char* name, const c return obj; } -KInstance* CalcFactory::global() +TDEInstance* CalcFactory::global() { return s_global; } diff --git a/kspread/plugins/calculator/main.h b/kspread/plugins/calculator/main.h index 968057a7..f44a1a01 100644 --- a/kspread/plugins/calculator/main.h +++ b/kspread/plugins/calculator/main.h @@ -30,7 +30,7 @@ #include <koffice_export.h> class TQtCalculator; -class KInstance; +class TDEInstance; namespace KSpread { @@ -48,10 +48,10 @@ 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; }; class KSPREAD_EXPORT Calculator : public KParts::Plugin |