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 /kword/mailmerge/kspread | |
| parent | c2ba2f56121c21a762619faf195e8332ef5b224f (diff) | |
| download | koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.tar.gz koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kword/mailmerge/kspread')
| -rw-r--r-- | kword/mailmerge/kspread/kwmailmerge_kspread.cpp | 4 | ||||
| -rw-r--r-- | kword/mailmerge/kspread/kwmailmerge_kspread.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread.cpp b/kword/mailmerge/kspread/kwmailmerge_kspread.cpp index 025e9a4e..63a02876 100644 --- a/kword/mailmerge/kspread/kwmailmerge_kspread.cpp +++ b/kword/mailmerge/kspread/kwmailmerge_kspread.cpp @@ -29,7 +29,7 @@ using namespace KSpread; -KWMailMergeKSpread::KWMailMergeKSpread( KInstance *instance, TQObject *parent ) +KWMailMergeKSpread::KWMailMergeKSpread( TDEInstance *instance, TQObject *parent ) : KWMailMergeDataSource( instance, parent ), _spreadSheetNumber( 1 ) { } @@ -202,7 +202,7 @@ TQString KWMailMergeKSpread::cellText( const Cell *cell ) const extern "C" { - KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_kspread( KInstance *instance, TQObject *parent ) + KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_kspread( TDEInstance *instance, TQObject *parent ) { return new KWMailMergeKSpread( instance, parent ); } diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread.h b/kword/mailmerge/kspread/kwmailmerge_kspread.h index c093cb71..8f2a4f97 100644 --- a/kword/mailmerge/kspread/kwmailmerge_kspread.h +++ b/kword/mailmerge/kspread/kwmailmerge_kspread.h @@ -35,7 +35,7 @@ class KWMailMergeKSpread: public KWMailMergeDataSource public: - KWMailMergeKSpread( KInstance *inst, TQObject *parent ); + KWMailMergeKSpread( TDEInstance *inst, TQObject *parent ); ~KWMailMergeKSpread(); /** |