From 73ff676f11662d6178c8854a7832ebffe2ae409d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 19:55:40 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp') diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp index 14c3640e9..2b3f711d9 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); } -- cgit v1.2.3