diff options
| author | Timothy Pearson <[email protected]> | 2013-02-01 10:42:26 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-01 10:42:26 -0600 |
| commit | 786304c6211f35ddc4cdd54b7aa7985fef4a2e70 (patch) | |
| tree | c881806a53e2864b7e183f4930f0b20abf657c38 /kword/KWMailMergeDataBase.h | |
| parent | 0dda6e85e171acf1a73dc8d3d1f67b4fcc9b1ae7 (diff) | |
| download | koffice-786304c6211f35ddc4cdd54b7aa7985fef4a2e70.tar.gz koffice-786304c6211f35ddc4cdd54b7aa7985fef4a2e70.zip | |
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'kword/KWMailMergeDataBase.h')
| -rw-r--r-- | kword/KWMailMergeDataBase.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kword/KWMailMergeDataBase.h b/kword/KWMailMergeDataBase.h index ef14ead8..e603da16 100644 --- a/kword/KWMailMergeDataBase.h +++ b/kword/KWMailMergeDataBase.h @@ -100,7 +100,7 @@ class KWMailMergeChoosePluginDialog : public KDialogBase public: - KWMailMergeChoosePluginDialog( KTrader::OfferList ); + KWMailMergeChoosePluginDialog( TDETrader::OfferList ); ~KWMailMergeChoosePluginDialog(); int currentPlugin() const; @@ -111,7 +111,7 @@ class KWMailMergeChoosePluginDialog : public KDialogBase private: class TQComboBox *chooser; class TQLabel *descriptionLabel; - KTrader::OfferList pluginOffers; + TDETrader::OfferList pluginOffers; }; class KWMailMergeConfigDialog : public KDialogBase |