diff options
Diffstat (limited to 'kword/mailmerge')
-rw-r--r-- | kword/mailmerge/KWClassicSerialDataSource.cpp | 4 | ||||
-rw-r--r-- | kword/mailmerge/KWClassicSerialDataSource.h | 2 | ||||
-rw-r--r-- | kword/mailmerge/kabc/KWMailMergeKABC.cpp | 4 | ||||
-rw-r--r-- | kword/mailmerge/kabc/KWMailMergeKABC.h | 2 | ||||
-rw-r--r-- | kword/mailmerge/kspread/kwmailmerge_kspread.cpp | 4 | ||||
-rw-r--r-- | kword/mailmerge/kspread/kwmailmerge_kspread.h | 2 | ||||
-rw-r--r-- | kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp | 4 | ||||
-rw-r--r-- | kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h | 2 | ||||
-rw-r--r-- | kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp | 4 | ||||
-rw-r--r-- | kword/mailmerge/sql/KWQtSqlSerialDataSource.h | 2 | ||||
-rw-r--r-- | kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp | 2 | ||||
-rw-r--r-- | kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.h | 2 |
12 files changed, 17 insertions, 17 deletions
diff --git a/kword/mailmerge/KWClassicSerialDataSource.cpp b/kword/mailmerge/KWClassicSerialDataSource.cpp index f54e529c..ef76bea0 100644 --- a/kword/mailmerge/KWClassicSerialDataSource.cpp +++ b/kword/mailmerge/KWClassicSerialDataSource.cpp @@ -46,7 +46,7 @@ * ******************************************************************/ -KWClassicSerialDataSource::KWClassicSerialDataSource(KInstance *inst,TQObject *parent) +KWClassicSerialDataSource::KWClassicSerialDataSource(TDEInstance *inst,TQObject *parent) : KWMailMergeDataSource(inst,parent) // : doc( doc_ ) { @@ -561,7 +561,7 @@ void KWClassicMailMergeEditor::removeRecord() } extern "C" { - KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_classic(KInstance *inst,TQObject *parent) + KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_classic(TDEInstance *inst,TQObject *parent) { return new KWClassicSerialDataSource(inst,parent); } diff --git a/kword/mailmerge/KWClassicSerialDataSource.h b/kword/mailmerge/KWClassicSerialDataSource.h index 6f6133e2..9863ffe0 100644 --- a/kword/mailmerge/KWClassicSerialDataSource.h +++ b/kword/mailmerge/KWClassicSerialDataSource.h @@ -48,7 +48,7 @@ class KWClassicSerialDataSource: public KWMailMergeDataSource Q_OBJECT public: - KWClassicSerialDataSource(KInstance *inst,TQObject *parent); + KWClassicSerialDataSource(TDEInstance *inst,TQObject *parent); ~KWClassicSerialDataSource(); virtual void save( TQDomDocument &doc,TQDomElement&); diff --git a/kword/mailmerge/kabc/KWMailMergeKABC.cpp b/kword/mailmerge/kabc/KWMailMergeKABC.cpp index 1886207c..74fc211c 100644 --- a/kword/mailmerge/kabc/KWMailMergeKABC.cpp +++ b/kword/mailmerge/kabc/KWMailMergeKABC.cpp @@ -33,7 +33,7 @@ #include "KWMailMergeKABC.h" #include "KWMailMergeKABCConfig.h" -KWMailMergeKABC::KWMailMergeKABC( KInstance *inst, TQObject *parent ) +KWMailMergeKABC::KWMailMergeKABC( TDEInstance *inst, TQObject *parent ) : KWMailMergeDataSource( inst, parent ) { _addressBook = KABC::StdAddressBook::self(); @@ -537,7 +537,7 @@ TQStringList KWMailMergeKABC::singleRecords() const extern "C" { - KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_kabc( KInstance *inst, TQObject *parent ) + KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_kabc( TDEInstance *inst, TQObject *parent ) { return new KWMailMergeKABC( inst, parent ); } diff --git a/kword/mailmerge/kabc/KWMailMergeKABC.h b/kword/mailmerge/kabc/KWMailMergeKABC.h index 818a06e8..32a078a6 100644 --- a/kword/mailmerge/kabc/KWMailMergeKABC.h +++ b/kword/mailmerge/kabc/KWMailMergeKABC.h @@ -36,7 +36,7 @@ class KWMailMergeKABC: public KWMailMergeDataSource public: - KWMailMergeKABC( KInstance *inst, TQObject *parent ); + KWMailMergeKABC( TDEInstance *inst, TQObject *parent ); ~KWMailMergeKABC(); /** 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(); /** diff --git a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp index 466ac182..a30340ad 100644 --- a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp +++ b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp @@ -41,7 +41,7 @@ * ******************************************************************/ -KWQtSqlPowerSerialDataSource::KWQtSqlPowerSerialDataSource(KInstance *inst,TQObject *parent) +KWQtSqlPowerSerialDataSource::KWQtSqlPowerSerialDataSource(TDEInstance *inst,TQObject *parent) : KWQtSqlSerialDataSourceBase(inst,parent),myquery(0) { port=i18n("default"); @@ -249,7 +249,7 @@ KWQtSqlPowerMailMergeEditor::~KWQtSqlPowerMailMergeEditor(){;} extern "C" { - KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_qtsqldb_power(KInstance *inst,TQObject *parent) + KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_qtsqldb_power(TDEInstance *inst,TQObject *parent) { return new KWQtSqlPowerSerialDataSource(inst,parent); } diff --git a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h index 4df94a07..c9b24ac3 100644 --- a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h +++ b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h @@ -47,7 +47,7 @@ class KWQtSqlPowerSerialDataSource: public KWQtSqlSerialDataSourceBase Q_OBJECT // public: - KWQtSqlPowerSerialDataSource(KInstance *inst,TQObject *parent); + KWQtSqlPowerSerialDataSource(TDEInstance *inst,TQObject *parent); ~KWQtSqlPowerSerialDataSource(); virtual void save( TQDomDocument &doc,TQDomElement&); diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp index 14c3640e..2b3f711d 100644 --- a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp +++ b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp @@ -38,7 +38,7 @@ * ******************************************************************/ -KWQtSqlSerialDataSource::KWQtSqlSerialDataSource(KInstance *inst,TQObject *parent) +KWQtSqlSerialDataSource::KWQtSqlSerialDataSource(TDEInstance *inst,TQObject *parent) : KWQtSqlSerialDataSourceBase(inst,parent) { myquery=0; @@ -211,7 +211,7 @@ void KWQtSqlDataSourceEditor::editFilter() } extern "C" { - KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_qtsqldb(KInstance *inst,TQObject *parent) + KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_qtsqldb(TDEInstance *inst,TQObject *parent) { return new KWQtSqlSerialDataSource(inst,parent); } diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSource.h b/kword/mailmerge/sql/KWQtSqlSerialDataSource.h index 16a9051f..704ae05e 100644 --- a/kword/mailmerge/sql/KWQtSqlSerialDataSource.h +++ b/kword/mailmerge/sql/KWQtSqlSerialDataSource.h @@ -36,7 +36,7 @@ class KWQtSqlSerialDataSource: public KWQtSqlSerialDataSourceBase { public: - KWQtSqlSerialDataSource(KInstance *inst,TQObject *parent); + KWQtSqlSerialDataSource(TDEInstance *inst,TQObject *parent); ~KWQtSqlSerialDataSource(); virtual void save( TQDomDocument &doc,TQDomElement&); diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp index 9a333a8d..41e971be 100644 --- a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp +++ b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp @@ -46,7 +46,7 @@ int KWQtSqlSerialDataSourceBase::connectionId=0; -KWQtSqlSerialDataSourceBase::KWQtSqlSerialDataSourceBase(KInstance *inst,TQObject *parent) +KWQtSqlSerialDataSourceBase::KWQtSqlSerialDataSourceBase(TDEInstance *inst,TQObject *parent) : KWMailMergeDataSource(inst,parent) { DataBaseConnection=TQString("KWTQTSQLPOWER")+parent->name()+TQString("--%1").arg(connectionId++); diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.h b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.h index 388e9751..120ce209 100644 --- a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.h +++ b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.h @@ -41,7 +41,7 @@ class KWQtSqlSerialDataSourceBase: public KWMailMergeDataSource // K_DCOP public: - KWQtSqlSerialDataSourceBase(KInstance *inst,TQObject *parent); + KWQtSqlSerialDataSourceBase(TDEInstance *inst,TQObject *parent); ~KWQtSqlSerialDataSourceBase(); virtual bool showConfigDialog(TQWidget *par,int action); |