summaryrefslogtreecommitdiffstats
path: root/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 19:55:40 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 19:55:40 -0600
commit73ff676f11662d6178c8854a7832ebffe2ae409d (patch)
tree9e89ea7d87940087d2d3c5db9b378ef989dd1346 /kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.h
parentc2ba2f56121c21a762619faf195e8332ef5b224f (diff)
downloadkoffice-73ff676f11662d6178c8854a7832ebffe2ae409d.tar.gz
koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.h')
-rw-r--r--kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.h b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.h
index 388e9751b..120ce2098 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);