summaryrefslogtreecommitdiffstats
path: root/kword/mailmerge
diff options
context:
space:
mode:
Diffstat (limited to 'kword/mailmerge')
-rw-r--r--kword/mailmerge/KWClassicSerialDataSource.cpp46
-rw-r--r--kword/mailmerge/kabc/KWMailMergeKABC.cpp18
-rw-r--r--kword/mailmerge/kabc/addresspicker.ui4
-rw-r--r--kword/mailmerge/kspread/kwmailmerge_kspread.cpp6
-rw-r--r--kword/mailmerge/sql/KWQtSqlEasyFilter.cpp2
-rw-r--r--kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp40
-rw-r--r--kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp22
-rw-r--r--kword/mailmerge/sql/kwqtsqlpower.ui8
-rw-r--r--kword/mailmerge/sql/qtsqlopenwidget.ui2
9 files changed, 74 insertions, 74 deletions
diff --git a/kword/mailmerge/KWClassicSerialDataSource.cpp b/kword/mailmerge/KWClassicSerialDataSource.cpp
index 1e6c20fe..1af6b0ad 100644
--- a/kword/mailmerge/KWClassicSerialDataSource.cpp
+++ b/kword/mailmerge/KWClassicSerialDataSource.cpp
@@ -115,25 +115,25 @@ void KWClassicSerialDataSource::removeRecord( int i )
void KWClassicSerialDataSource::save( TQDomDocument &doc, TQDomElement &parent)
{
- TQDomElement def=doc.createElement(TQString::tqfromLatin1("DEFINITION"));
+ TQDomElement def=doc.createElement(TQString::fromLatin1("DEFINITION"));
parent.appendChild(def);
for (DbRecord::Iterator it=sampleRecord.begin();it!=sampleRecord.end();++it)
{
- TQDomElement defEnt=doc.createElement(TQString::tqfromLatin1("FIELD"));
- defEnt.setAttribute(TQString::tqfromLatin1("name"),it.key());
+ TQDomElement defEnt=doc.createElement(TQString::fromLatin1("FIELD"));
+ defEnt.setAttribute(TQString::fromLatin1("name"),it.key());
def.appendChild(defEnt);
}
- TQDomElement cont=doc.createElement(TQString::tqfromLatin1("CONTENT"));
+ TQDomElement cont=doc.createElement(TQString::fromLatin1("CONTENT"));
parent.appendChild(cont);
for (Db::Iterator dbI=db.begin();dbI!=db.end();++dbI)
{
- TQDomElement rec=doc.createElement(TQString::tqfromLatin1("RECORD"));
+ TQDomElement rec=doc.createElement(TQString::fromLatin1("RECORD"));
cont.appendChild(rec);
for (DbRecord::Iterator it=sampleRecord.begin();it!=sampleRecord.end();++it)
{
- TQDomElement recEnt=doc.createElement(TQString::tqfromLatin1("ITEM"));
- recEnt.setAttribute(TQString::tqfromLatin1("name"),it.key());
- recEnt.setAttribute(TQString::tqfromLatin1("data"),(*dbI)[it.key()]);
+ TQDomElement recEnt=doc.createElement(TQString::fromLatin1("ITEM"));
+ recEnt.setAttribute(TQString::fromLatin1("name"),it.key());
+ recEnt.setAttribute(TQString::fromLatin1("data"),(*dbI)[it.key()]);
rec.appendChild(recEnt);
}
}
@@ -148,7 +148,7 @@ void KWClassicSerialDataSource::load( TQDomElement& parentElem )
TQDomElement def=defNd.toElement();
for (TQDomElement defEnt=def.firstChild().toElement();!defEnt.isNull();defEnt=defEnt.nextSibling().toElement())
{
- sampleRecord[defEnt.attribute(TQString::tqfromLatin1("name"))]=i18n( "No Value" );
+ sampleRecord[defEnt.attribute(TQString::fromLatin1("name"))]=i18n( "No Value" );
}
TQDomNode contNd=parentElem.namedItem("CONTENT");
if (contNd.isNull()) return;
@@ -157,8 +157,8 @@ void KWClassicSerialDataSource::load( TQDomElement& parentElem )
appendRecord();
for (TQDomElement recEnt=rec.firstChild().toElement();!recEnt.isNull();recEnt=recEnt.nextSibling().toElement())
{
- setValue(recEnt.attribute(TQString::tqfromLatin1("name")),
- recEnt.attribute(TQString::tqfromLatin1("data")),db.count()-1);
+ setValue(recEnt.attribute(TQString::fromLatin1("name")),
+ recEnt.attribute(TQString::fromLatin1("data")),db.count()-1);
}
}
}
@@ -219,9 +219,9 @@ TQString KWClassicMailMergeEditorListItem::text( int i ) const
void KWClassicMailMergeEditorListItem::setup()
{
setHeight( TQMAX( listView()->fontMetrics().height(),
- editWidget->tqsizeHint().height() ) );
- if ( listView()->columnWidth( 1 ) < editWidget->tqsizeHint().width() )
- listView()->setColumnWidth( 1, editWidget->tqsizeHint().width() );
+ editWidget->sizeHint().height() ) );
+ if ( listView()->columnWidth( 1 ) < editWidget->sizeHint().width() )
+ listView()->setColumnWidth( 1, editWidget->sizeHint().width() );
}
void KWClassicMailMergeEditorListItem::update()
@@ -342,27 +342,27 @@ KWClassicMailMergeEditor::KWClassicMailMergeEditor( TQWidget *parent, KWClassicS
first = new TQToolButton( toolbar );
first->setIconSet( SmallIconSet( "start" ) );
- first->setFixedSize( first->tqsizeHint() );
+ first->setFixedSize( first->sizeHint() );
connect(first, TQT_SIGNAL(clicked()), this, TQT_SLOT(firstRecord()));
back_ = new TQToolButton( toolbar );
back_->setIconSet( SmallIconSet( "back" ) );
- back_->setFixedSize( back_->tqsizeHint() );
+ back_->setFixedSize( back_->sizeHint() );
connect(back_, TQT_SIGNAL(clicked()), this, TQT_SLOT(prevRecord()));
records = new TQSpinBox( 1, db->getNumRecords(), 1, toolbar );
- records->setMaximumHeight( records->tqsizeHint().height() );
+ records->setMaximumHeight( records->sizeHint().height() );
connect( records, TQT_SIGNAL( valueChanged( int ) ),
this, TQT_SLOT( changeRecord( int ) ) );
forward = new TQToolButton( toolbar );
forward->setIconSet( SmallIconSet( "forward" ) );
- forward->setFixedSize( forward->tqsizeHint() );
+ forward->setFixedSize( forward->sizeHint() );
connect(forward, TQT_SIGNAL(clicked()), this, TQT_SLOT(nextRecord()));
finish = new TQToolButton( toolbar );
finish->setIconSet( SmallIconSet( "finish" ) );
- finish->setFixedSize( finish->tqsizeHint() );
+ finish->setFixedSize( finish->sizeHint() );
connect(finish, TQT_SIGNAL(clicked()), this, TQT_SLOT(lastRecord()));
TQWidget *sep = new TQWidget( toolbar );
@@ -370,28 +370,28 @@ KWClassicMailMergeEditor::KWClassicMailMergeEditor( TQWidget *parent, KWClassicS
newRecord = new TQToolButton( toolbar );
newRecord->setIconSet( SmallIconSet( "sl_addrecord" ) );
- newRecord->setFixedSize( newRecord->tqsizeHint() );
+ newRecord->setFixedSize( newRecord->sizeHint() );
connect( newRecord, TQT_SIGNAL( clicked() ),
this, TQT_SLOT( addRecord() ) );
TQToolTip::add( newRecord, i18n( "Add record" ) );
newEntry = new TQToolButton( toolbar );
newEntry->setIconSet( SmallIconSet( "sl_addentry" ) );
- newEntry->setFixedSize( newEntry->tqsizeHint() );
+ newEntry->setFixedSize( newEntry->sizeHint() );
connect( newEntry, TQT_SIGNAL( clicked() ),
this, TQT_SLOT( addEntry() ) );
TQToolTip::add( newEntry, i18n( "Add entry" ) );
deleteRecord = new TQToolButton( toolbar );
deleteRecord->setIconSet( SmallIconSet( "sl_delrecord" ) );
- deleteRecord->setFixedSize( deleteRecord->tqsizeHint() );
+ deleteRecord->setFixedSize( deleteRecord->sizeHint() );
connect( deleteRecord, TQT_SIGNAL( clicked() ),
this, TQT_SLOT( removeRecord() ) );
TQToolTip::add( deleteRecord, i18n( "Remove record" ) );
deleteEntry = new TQToolButton( toolbar );
deleteEntry->setIconSet( SmallIconSet( "sl_delentry" ) );
- deleteEntry->setFixedSize( deleteEntry->tqsizeHint() );
+ deleteEntry->setFixedSize( deleteEntry->sizeHint() );
connect( deleteEntry, TQT_SIGNAL( clicked() ),
this, TQT_SLOT( removeEntry() ) );
TQToolTip::add( deleteEntry, i18n( "Remove entry" ) );
diff --git a/kword/mailmerge/kabc/KWMailMergeKABC.cpp b/kword/mailmerge/kabc/KWMailMergeKABC.cpp
index 411ee5e5..7b8feb70 100644
--- a/kword/mailmerge/kabc/KWMailMergeKABC.cpp
+++ b/kword/mailmerge/kabc/KWMailMergeKABC.cpp
@@ -409,7 +409,7 @@ void KWMailMergeKABC::load( TQDomElement& parentElem )
for( TQDomElement recEnt=rec.firstChild().toElement(); !recEnt.isNull();
recEnt=recEnt.nextSibling().toElement() )
{
- addEntry( recEnt.attribute( TQString::tqfromLatin1("uid") ) );
+ addEntry( recEnt.attribute( TQString::fromLatin1("uid") ) );
}
}
else if( rec.nodeName() == "LIST" )
@@ -417,7 +417,7 @@ void KWMailMergeKABC::load( TQDomElement& parentElem )
for( TQDomElement recEnt=rec.firstChild().toElement(); !recEnt.isNull();
recEnt=recEnt.nextSibling().toElement() )
{
- addList( recEnt.attribute( TQString::tqfromLatin1("listid") ) );
+ addList( recEnt.attribute( TQString::fromLatin1("listid") ) );
}
}
else
@@ -482,26 +482,26 @@ void KWMailMergeKABC::refresh( bool )
void KWMailMergeKABC::save( TQDomDocument& doc, TQDomElement& parent)
{
- TQDomElement cont=doc.createElement(TQString::tqfromLatin1("CONTENT"));
+ TQDomElement cont=doc.createElement(TQString::fromLatin1("CONTENT"));
parent.appendChild(cont);
TQValueList<TQString>::ConstIterator it = _individualUIDs.begin();
for( ; it != _individualUIDs.end(); ++it )
{
- TQDomElement rec=doc.createElement(TQString::tqfromLatin1("RECORD"));
+ TQDomElement rec=doc.createElement(TQString::fromLatin1("RECORD"));
cont.appendChild(rec);
- TQDomElement recEnt=doc.createElement(TQString::tqfromLatin1("ITEM"));
- recEnt.setAttribute(TQString::tqfromLatin1("uid"),*it);
+ TQDomElement recEnt=doc.createElement(TQString::fromLatin1("ITEM"));
+ recEnt.setAttribute(TQString::fromLatin1("uid"),*it);
rec.appendChild(recEnt);
}
it = _lists.begin();
for( ; !(it == _lists.end()); ++it )
{
- TQDomElement rec=doc.createElement(TQString::tqfromLatin1("LIST"));
+ TQDomElement rec=doc.createElement(TQString::fromLatin1("LIST"));
cont.appendChild(rec);
- TQDomElement recEnt=doc.createElement(TQString::tqfromLatin1("ITEM"));
- recEnt.setAttribute(TQString::tqfromLatin1("listid"),*it);
+ TQDomElement recEnt=doc.createElement(TQString::fromLatin1("ITEM"));
+ recEnt.setAttribute(TQString::fromLatin1("listid"),*it);
rec.appendChild(recEnt);
}
}
diff --git a/kword/mailmerge/kabc/addresspicker.ui b/kword/mailmerge/kabc/addresspicker.ui
index c7276c9b..e9d389ad 100644
--- a/kword/mailmerge/kabc/addresspicker.ui
+++ b/kword/mailmerge/kabc/addresspicker.ui
@@ -37,7 +37,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -76,7 +76,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread.cpp b/kword/mailmerge/kspread/kwmailmerge_kspread.cpp
index 6801a64a..1a477737 100644
--- a/kword/mailmerge/kspread/kwmailmerge_kspread.cpp
+++ b/kword/mailmerge/kspread/kwmailmerge_kspread.cpp
@@ -66,15 +66,15 @@ void KWMailMergeKSpread::load( TQDomElement& parentElem )
if ( element.isNull() )
return;
- _url = element.attribute( TQString::tqfromLatin1( "URL" ) );
- _spreadSheetNumber = element.attribute( TQString::tqfromLatin1( "SpreadSheetNumber" ) ).toInt();
+ _url = element.attribute( TQString::fromLatin1( "URL" ) );
+ _spreadSheetNumber = element.attribute( TQString::fromLatin1( "SpreadSheetNumber" ) ).toInt();
initDocument();
}
void KWMailMergeKSpread::save( TQDomDocument& doc, TQDomElement& parent )
{
- TQDomElement content = doc.createElement( TQString::tqfromLatin1( "CONTENT" ) );
+ TQDomElement content = doc.createElement( TQString::fromLatin1( "CONTENT" ) );
parent.appendChild( content );
content.setAttribute( "URL", _url.url() );
diff --git a/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp b/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp
index 3db1d9d6..c45d7527 100644
--- a/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp
+++ b/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp
@@ -33,7 +33,7 @@ KWQtSqlEasyFilter::KWQtSqlEasyFilter( TQWidget *parent)
int h=m_table->rowHeight(0);
for (int i=0;i<6;i++) h+=m_table->rowHeight(i);
- h+=m_table->horizontalHeader()->tqsizeHint().height();
+ h+=m_table->horizontalHeader()->sizeHint().height();
m_table->setMinimumHeight(h);
int w=0;
diff --git a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp
index 544f7990..d5e9b4ac 100644
--- a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp
+++ b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp
@@ -85,27 +85,27 @@ TQString KWQtSqlPowerSerialDataSource::getValue( const TQString &name, int recor
void KWQtSqlPowerSerialDataSource::save( TQDomDocument &doc, TQDomElement &parent)
{
- TQDomElement def=doc.createElement(TQString::tqfromLatin1("DEFINITION"));
+ TQDomElement def=doc.createElement(TQString::fromLatin1("DEFINITION"));
parent.appendChild(def);
{
- TQDomElement defEnt=doc.createElement(TQString::tqfromLatin1("DATABASE"));
- defEnt.setAttribute(TQString::tqfromLatin1("hostname"),hostname);
- defEnt.setAttribute(TQString::tqfromLatin1("port"),port);
- defEnt.setAttribute(TQString::tqfromLatin1("driver"),driver);
- defEnt.setAttribute(TQString::tqfromLatin1("databasename"),databasename);
- defEnt.setAttribute(TQString::tqfromLatin1("username"),username);
+ TQDomElement defEnt=doc.createElement(TQString::fromLatin1("DATABASE"));
+ defEnt.setAttribute(TQString::fromLatin1("hostname"),hostname);
+ defEnt.setAttribute(TQString::fromLatin1("port"),port);
+ defEnt.setAttribute(TQString::fromLatin1("driver"),driver);
+ defEnt.setAttribute(TQString::fromLatin1("databasename"),databasename);
+ defEnt.setAttribute(TQString::fromLatin1("username"),username);
def.appendChild(defEnt);
- defEnt=doc.createElement(TQString::tqfromLatin1("QUERY"));
- defEnt.setAttribute(TQString::tqfromLatin1("value"),query);
+ defEnt=doc.createElement(TQString::fromLatin1("QUERY"));
+ defEnt.setAttribute(TQString::fromLatin1("value"),query);
def.appendChild(defEnt);
- TQDomElement sampleEnt=doc.createElement(TQString::tqfromLatin1("SAMPLERECORD"));
+ TQDomElement sampleEnt=doc.createElement(TQString::fromLatin1("SAMPLERECORD"));
parent.appendChild(sampleEnt);
for (DbRecord::Iterator it=sampleRecord.begin();it!=sampleRecord.end();++it)
{
- TQDomElement fieldEnt=doc.createElement(TQString::tqfromLatin1("FIELD"));
- fieldEnt.setAttribute(TQString::tqfromLatin1("name"),it.key());
+ TQDomElement fieldEnt=doc.createElement(TQString::fromLatin1("FIELD"));
+ fieldEnt.setAttribute(TQString::fromLatin1("name"),it.key());
sampleEnt.appendChild(fieldEnt);
}
}
@@ -122,19 +122,19 @@ void KWQtSqlPowerSerialDataSource::load( TQDomElement& parentElem )
if (!dbNd.isNull())
{
TQDomElement dbEnt=dbNd.toElement();
- if (dbEnt.tagName()==TQString::tqfromLatin1("DATABASE"))
+ if (dbEnt.tagName()==TQString::fromLatin1("DATABASE"))
{
- hostname=dbEnt.attribute(TQString::tqfromLatin1("hostname"));
- port=dbEnt.attribute(TQString::tqfromLatin1("port"));
- driver=dbEnt.attribute(TQString::tqfromLatin1("driver"));
- databasename=dbEnt.attribute(TQString::tqfromLatin1("databasename"));
- username=dbEnt.attribute(TQString::tqfromLatin1("username"));
+ hostname=dbEnt.attribute(TQString::fromLatin1("hostname"));
+ port=dbEnt.attribute(TQString::fromLatin1("port"));
+ driver=dbEnt.attribute(TQString::fromLatin1("driver"));
+ databasename=dbEnt.attribute(TQString::fromLatin1("databasename"));
+ username=dbEnt.attribute(TQString::fromLatin1("username"));
}
}
TQDomNode queryNd=def.namedItem("QUERY");
if (!queryNd.isNull())
{
- query=queryNd.toElement().attribute(TQString::tqfromLatin1("value"));
+ query=queryNd.toElement().attribute(TQString::fromLatin1("value"));
}
}
@@ -144,7 +144,7 @@ void KWQtSqlPowerSerialDataSource::load( TQDomElement& parentElem )
TQDomElement def1=defNd.toElement();
for (TQDomElement defEnt=defNd.firstChild().toElement();!defEnt.isNull();defEnt=defEnt.nextSibling().toElement())
{
- addSampleRecordEntry(defEnt.attribute(TQString::tqfromLatin1("name")));
+ addSampleRecordEntry(defEnt.attribute(TQString::fromLatin1("name")));
}
}
}
diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp
index ec31df35..2181c172 100644
--- a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp
+++ b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp
@@ -66,25 +66,25 @@ TQString KWQtSqlSerialDataSource::getValue( const TQString &name, int record ) c
void KWQtSqlSerialDataSource::save( TQDomDocument & /*doc*/, TQDomElement & /*parent*/)
{
/*
- TQDomElement def=doc.createElement(TQString::tqfromLatin1("DEFINITION"));
+ TQDomElement def=doc.createElement(TQString::fromLatin1("DEFINITION"));
parent.appendChild(def);
for (DbRecord::Iterator it=sampleRecord.begin();it!=sampleRecord.end();++it)
{
- TQDomElement defEnt=doc.createElement(TQString::tqfromLatin1("FIELD"));
- defEnt.setAttribute(TQString::tqfromLatin1("name"),it.key());
+ TQDomElement defEnt=doc.createElement(TQString::fromLatin1("FIELD"));
+ defEnt.setAttribute(TQString::fromLatin1("name"),it.key());
def.appendChild(defEnt);
}
- TQDomElement cont=doc.createElement(TQString::tqfromLatin1("CONTENT"));
+ TQDomElement cont=doc.createElement(TQString::fromLatin1("CONTENT"));
parent.appendChild(cont);
for (Db::Iterator dbI=db.begin();dbI!=db.end();++dbI)
{
- TQDomElement rec=doc.createElement(TQString::tqfromLatin1("RECORD"));
+ TQDomElement rec=doc.createElement(TQString::fromLatin1("RECORD"));
cont.appendChild(rec);
for (DbRecord::Iterator it=sampleRecord.begin();it!=sampleRecord.end();++it)
{
- TQDomElement recEnt=doc.createElement(TQString::tqfromLatin1("ITEM"));
- recEnt.setAttribute(TQString::tqfromLatin1("name"),it.key());
- recEnt.setAttribute(TQString::tqfromLatin1("data"),(*dbI)[it.key()]);
+ TQDomElement recEnt=doc.createElement(TQString::fromLatin1("ITEM"));
+ recEnt.setAttribute(TQString::fromLatin1("name"),it.key());
+ recEnt.setAttribute(TQString::fromLatin1("data"),(*dbI)[it.key()]);
rec.appendChild(recEnt);
}
}
@@ -101,7 +101,7 @@ void KWQtSqlSerialDataSource::load( TQDomElement& /*parentElem*/ )
TQDomElement def=defNd.toElement();
for (TQDomElement defEnt=def.firstChild().toElement();!defEnt.isNull();defEnt=defEnt.nextSibling().toElement())
{
- sampleRecord[defEnt.attribute(TQString::tqfromLatin1("name"))]=defEnt.attribute(TQString::tqfromLatin1("name"));//i18n( "No Value" );
+ sampleRecord[defEnt.attribute(TQString::fromLatin1("name"))]=defEnt.attribute(TQString::fromLatin1("name"));//i18n( "No Value" );
}
TQDomNode contNd=parentElem.namedItem("CONTENT");
if (contNd.isNull()) return;
@@ -110,8 +110,8 @@ void KWQtSqlSerialDataSource::load( TQDomElement& /*parentElem*/ )
appendRecord();
for (TQDomElement recEnt=rec.firstChild().toElement();!recEnt.isNull();recEnt=recEnt.nextSibling().toElement())
{
- setValue(recEnt.attribute(TQString::tqfromLatin1("name")),
- recEnt.attribute(TQString::tqfromLatin1("data")),db.count()-1);
+ setValue(recEnt.attribute(TQString::fromLatin1("name")),
+ recEnt.attribute(TQString::fromLatin1("data")),db.count()-1);
}
}
*/
diff --git a/kword/mailmerge/sql/kwqtsqlpower.ui b/kword/mailmerge/sql/kwqtsqlpower.ui
index a68b62db..afff8c7f 100644
--- a/kword/mailmerge/sql/kwqtsqlpower.ui
+++ b/kword/mailmerge/sql/kwqtsqlpower.ui
@@ -54,7 +54,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>120</height>
@@ -73,7 +73,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>120</height>
@@ -168,7 +168,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>300</width>
<height>0</height>
@@ -196,7 +196,7 @@
<property name="name">
<cstring>Line2</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
diff --git a/kword/mailmerge/sql/qtsqlopenwidget.ui b/kword/mailmerge/sql/qtsqlopenwidget.ui
index fc32bded..c0d2423a 100644
--- a/kword/mailmerge/sql/qtsqlopenwidget.ui
+++ b/kword/mailmerge/sql/qtsqlopenwidget.ui
@@ -283,7 +283,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>