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/KWMailMergeDataSource.cpp | |
| parent | c2ba2f56121c21a762619faf195e8332ef5b224f (diff) | |
| download | koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.tar.gz koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kword/KWMailMergeDataSource.cpp')
| -rw-r--r-- | kword/KWMailMergeDataSource.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kword/KWMailMergeDataSource.cpp b/kword/KWMailMergeDataSource.cpp index d21c4bd0..924c665d 100644 --- a/kword/KWMailMergeDataSource.cpp +++ b/kword/KWMailMergeDataSource.cpp @@ -1,7 +1,7 @@ #include "KWMailMergeDataSource.h" #include "KWMailMergeDataSource.moc" -KWMailMergeDataSource::KWMailMergeDataSource(KInstance* inst,TQObject *parent): TQObject(parent), +KWMailMergeDataSource::KWMailMergeDataSource(TDEInstance* inst,TQObject *parent): TQObject(parent), DCOPObject(TQCString(parent->name())+".plugin_loading"),m_instance(inst) { } |