diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:12:30 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:12:30 -0600 |
commit | 11191ef0b9908604d1d7aaca382b011ef22c454c (patch) | |
tree | d38f0ccd8bfcc9756f5cfc42fb2ad1dad351e6aa /kword/mailmerge/sql | |
parent | c9cb4f487428aad5d8cda5e3a4b9ad87390d7e54 (diff) | |
download | koffice-11191ef0b9908604d1d7aaca382b011ef22c454c.tar.gz koffice-11191ef0b9908604d1d7aaca382b011ef22c454c.zip |
Rename old tq methods that no longer need a unique name
Diffstat (limited to 'kword/mailmerge/sql')
-rw-r--r-- | kword/mailmerge/sql/KWQtSqlEasyFilter.cpp | 2 | ||||
-rw-r--r-- | kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp | 40 | ||||
-rw-r--r-- | kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp | 22 | ||||
-rw-r--r-- | kword/mailmerge/sql/kwqtsqlpower.ui | 8 | ||||
-rw-r--r-- | kword/mailmerge/sql/qtsqlopenwidget.ui | 2 |
5 files changed, 37 insertions, 37 deletions
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> |