diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-25 05:28:35 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-25 05:28:35 +0000 |
| commit | f008adb5a77e094eaf6abf3fc0f36958e66896a5 (patch) | |
| tree | 8e9244c4d4957c36be81e15b566b4aa5ea26c982 /kword/KWMailMergeDataSource.cpp | |
| parent | 1210f27b660efb7b37ff43ec68763e85a403471f (diff) | |
| download | koffice-f008adb5a77e094eaf6abf3fc0f36958e66896a5.tar.gz koffice-f008adb5a77e094eaf6abf3fc0f36958e66896a5.zip | |
TQt4 port koffice
This should enable compilation under both Qt3 and Qt4; fixes for any missed components will be forthcoming
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1238284 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kword/KWMailMergeDataSource.cpp')
| -rw-r--r-- | kword/KWMailMergeDataSource.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kword/KWMailMergeDataSource.cpp b/kword/KWMailMergeDataSource.cpp index abb17501..e95085e7 100644 --- a/kword/KWMailMergeDataSource.cpp +++ b/kword/KWMailMergeDataSource.cpp @@ -1,8 +1,8 @@ #include "KWMailMergeDataSource.h" #include "KWMailMergeDataSource.moc" -KWMailMergeDataSource::KWMailMergeDataSource(KInstance* inst,QObject *parent): QObject(parent), -DCOPObject(QCString(parent->name())+".plugin_loading"),m_instance(inst) +KWMailMergeDataSource::KWMailMergeDataSource(KInstance* inst,TQObject *tqparent): TQObject(tqparent), +DCOPObject(TQCString(tqparent->name())+".plugin_loading"),m_instance(inst) { } -const QMap< QString, QString > &KWMailMergeDataSource::getRecordEntries() const {return sampleRecord;} +const TQMap< TQString, TQString > &KWMailMergeDataSource::getRecordEntries() const {return sampleRecord;} |