diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-02-15 19:11:41 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-02-15 19:11:41 +0000 |
| commit | 374d939d8af431477ce2601815f0ba121b66871c (patch) | |
| tree | ad878478dcc0bedf51e3cffb2ed611ada422b290 | |
| parent | f9279733bf71e446933b46f40cbe9c9b9f57b778 (diff) | |
| download | tdelibs-374d939d8af431477ce2601815f0ba121b66871c.tar.gz tdelibs-374d939d8af431477ce2601815f0ba121b66871c.zip | |
Allow kdelibs to function correctly with TQt for Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1220926 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
230 files changed, 935 insertions, 908 deletions
diff --git a/dcop/client/dcop.cpp b/dcop/client/dcop.cpp index a76610505..c58945904 100644 --- a/dcop/client/dcop.cpp +++ b/dcop/client/dcop.cpp @@ -262,7 +262,7 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt } if ( s == static_cast<int>(partl.count())-1) { - partl.remove(partl.at(s)); + partl.remove(partl.tqat(s)); } lt = partl.join(" "); diff --git a/dcop/client/dcopfind.cpp b/dcop/client/dcopfind.cpp index 0cc48c435..9d5e6182f 100644 --- a/dcop/client/dcopfind.cpp +++ b/dcop/client/dcopfind.cpp @@ -98,7 +98,7 @@ bool findObject( const char* app, const char* obj, const char* func, QCStringLis } if (s==(int)partl.count()-1) { - partl.remove(partl.at(s)); + partl.remove(partl.tqat(s)); } lt = partl.join(" "); diff --git a/dcop/dcopclient.cpp b/dcop/dcopclient.cpp index 8f4b7ce15..892884af3 100644 --- a/dcop/dcopclient.cpp +++ b/dcop/dcopclient.cpp @@ -483,7 +483,7 @@ void DCOPProcessInternal( DCOPClientPrivate *d, int opcode, CARD32 key, const TQ int datalen = reply.size(); pMsg->key = key; pMsg->length += datalen; - IceSendData( iceConn, datalen, const_cast<char *>(reply.data())); + IceSendData( iceConn, datalen, reply.data()); return; } @@ -1617,7 +1617,8 @@ bool DCOPClient::receive(const TQCString &/*app*/, const TQCString &objId, // fall through and send to object proxies } - if (!objId.isEmpty() && objId[objId.length()-1] == '*') { +// if (!objId.isEmpty() && objId[objId.length()-1] == '*') { + if (!objId.isEmpty() && ((objId.length()>0)?(objId[objId.length()-1] == '*'):0)) { // handle a multicast to several objects. // doesn't handle proxies currently. should it? TQPtrList<DCOPObject> matchList = diff --git a/dcop/dcopserver.cpp b/dcop/dcopserver.cpp index ef37f0a32..c78664f9a 100644 --- a/dcop/dcopserver.cpp +++ b/dcop/dcopserver.cpp @@ -127,7 +127,7 @@ static TQCString readQCString(TQDataStream &ds) TQ_UINT32 len; ds >> len; TQIODevice *device = ds.tqdevice(); - int bytesLeft = device->size()-device->at(); + int bytesLeft = device->size()-device->tqat(); if ((bytesLeft < 0 ) || (len > (uint) bytesLeft)) { qWarning("Corrupt data!\n"); @@ -146,7 +146,7 @@ static TQByteArray readQByteArray(TQDataStream &ds) TQ_UINT32 len; ds >> len; TQIODevice *device = ds.tqdevice(); - int bytesLeft = device->size()-device->at(); + int bytesLeft = device->size()-device->tqat(); if ((bytesLeft < 0 ) || (len > (uint) bytesLeft)) { qWarning("Corrupt data!\n"); diff --git a/interfaces/ktexteditor/editorchooser.cpp b/interfaces/ktexteditor/editorchooser.cpp index fa4677aaf..0e52c4f00 100644 --- a/interfaces/ktexteditor/editorchooser.cpp +++ b/interfaces/ktexteditor/editorchooser.cpp @@ -95,7 +95,7 @@ void EditorChooser::writeAppSetting(const TQString& postfix){ cfg->setGroup("KTEXTEDITOR:"+postfix); cfg->writeEntry("DEVELOPER_INFO","NEVER TRY TO USE VALUES FROM THAT GROUP, THEY ARE SUBJECT TO CHANGES"); cfg->writePathEntry("editor", (d->chooser->editorCombo->currentItem()==0) ? - TQString::null : (*d->elements.at(d->chooser->editorCombo->currentItem()-1))); + TQString::null : (*d->elements.tqat(d->chooser->editorCombo->currentItem()-1))); cfg->sync(); cfg->setGroup(previousGroup); diff --git a/kab/qconfigDB.cc b/kab/qconfigDB.cc index a682a1ed1..d1a676887 100644 --- a/kab/qconfigDB.cc +++ b/kab/qconfigDB.cc @@ -1188,7 +1188,7 @@ KeyValueMap::insert(const TQCString& key, const TQStrList& values, bool force) // ----- create coded string list: for(count=0; count<values.count(); ++count) { // create strings like "abc\efgh\eijk": - temp=makeComplexString(((TQStrList)values).at(count)); + temp=makeComplexString(((TQStrList)values).tqat(count)); temp.remove(0, 1); // remove the leading "\"" temp.remove(temp.length()-1, 1); // the trailing "\"" value+=temp; @@ -1231,7 +1231,7 @@ KeyValueMap::get(const TQCString& key, TQStringList& values) const // ----- do the conversion: for(count=0; count<temp.count(); ++count) { - values.append(TQString::fromUtf8(temp.at(count))); + values.append(TQString::fromUtf8(temp.tqat(count))); } // ----- kdDebug(GUARD, KAB_KDEBUG_AREA) << "KeyValueMap::get[QStringList]: done." << endl; @@ -1252,7 +1252,7 @@ KeyValueMap::insert(const TQCString& key, const TQStringList& values, bool force // ----- create TQCString list: for(count=0; count<values.count(); ++count) { - utf8strings.append((*values.at(count)).utf8()); + utf8strings.append((*values.tqat(count)).utf8()); } kdDebug(GUARD, KAB_KDEBUG_AREA) << "KeyValueMap::insert[QStringList]: done." << endl; return insert(key, utf8strings, force); diff --git a/kabc/formats/binaryformat.cpp b/kabc/formats/binaryformat.cpp index 2e66a6be7..f9d0d705d 100644 --- a/kabc/formats/binaryformat.cpp +++ b/kabc/formats/binaryformat.cpp @@ -113,7 +113,7 @@ void BinaryFormat::saveAll( AddressBook*, Resource *resource, TQFile *file ) } // set real number of entries - stream.tqdevice()->at( 2 * sizeof( TQ_UINT32 ) ); + stream.tqdevice()->tqat( 2 * sizeof( TQ_UINT32 ) ); stream << counter; } diff --git a/kabc/kab2kabc.cpp b/kabc/kab2kabc.cpp index 8c8823f1e..26adeea56 100644 --- a/kabc/kab2kabc.cpp +++ b/kabc/kab2kabc.cpp @@ -57,12 +57,12 @@ void readKMailEntry( const TQString &kmailEntry, KABC::AddressBook *ab ) TQString name; TQString comment; - if ( entry.at( entry.length() -1 ) == ')' ) { + if ( entry.tqat( entry.length() -1 ) == ')' ) { int br = entry.tqfindRev( '(' ); if ( br >= 0 ) { comment = entry.mid( br + 1, entry.length() - br - 2 ); entry.truncate( br ); - if ( entry.at( entry.length() - 1 ).isSpace() ) { + if ( entry.tqat( entry.length() - 1 ).isSpace() ) { entry.truncate( br - 1 ); } } @@ -80,22 +80,22 @@ void readKMailEntry( const TQString &kmailEntry, KABC::AddressBook *ab ) name = entry.left( posSpace ); } - if ( email.at( 0 ) == '<' && email.at( email.length() - 1) == '>' ) { + if ( email.tqat( 0 ) == '<' && email.tqat( email.length() - 1) == '>' ) { email = email.mid( 1, email.length() - 2 ); } - if ( name.at( 0 ) == '"' && name.at( name.length() - 1) == '"' ) { + if ( name.tqat( 0 ) == '"' && name.tqat( name.length() - 1) == '"' ) { name = name.mid( 1, name.length() - 2 ); } - if ( name.at( 0 ) == '\'' && name.at( name.length() - 1) == '\'' ) { + if ( name.tqat( 0 ) == '\'' && name.tqat( name.length() - 1) == '\'' ) { name = name.mid( 1, name.length() - 2 ); } - if ( name.at( name.length() -1 ) == ')' ) { + if ( name.tqat( name.length() -1 ) == ')' ) { int br = name.tqfindRev( '(' ); if ( br >= 0 ) { comment = name.mid( br + 1, name.length() - br - 2 ) + " " + comment; name.truncate( br ); - if ( name.at( name.length() - 1 ).isSpace() ) { + if ( name.tqat( name.length() - 1 ).isSpace() ) { name.truncate( br - 1 ); } } @@ -148,16 +148,16 @@ void importKMailAddressBook( KABC::AddressBook *ab ) TQStringList::ConstIterator it; for ( it = kmailEntries.begin(); it != kmailEntries.end(); ++it ) { - if ( (*it).at( 0 ) == '#' ) continue; + if ( (*it).tqat( 0 ) == '#' ) continue; bool insideQuote = false; int end = (*it).length() - 1; for ( int i = end; i; i-- ) { - if ( (*it).at( i ) == '"' ) { + if ( (*it).tqat( i ) == '"' ) { if ( insideQuote ) insideQuote = false; else insideQuote = true; - } else if ( (*it).at( i ) == ',' && !insideQuote ) { + } else if ( (*it).tqat( i ) == ',' && !insideQuote ) { readKMailEntry( (*it).mid( i + 1, end - i ), ab ); end = i - 1; } diff --git a/kabc/resourceselectdialog.cpp b/kabc/resourceselectdialog.cpp index 256125cd2..3d01bfc8e 100644 --- a/kabc/resourceselectdialog.cpp +++ b/kabc/resourceselectdialog.cpp @@ -64,7 +64,7 @@ ResourceSelectDialog::ResourceSelectDialog( AddressBook *ab, TQWidget *parent, c uint counter = 0; TQPtrList<Resource> list = ab->resources(); for ( uint i = 0; i < list.count(); ++i ) { - Resource *resource = list.at( i ); + Resource *resource = list.tqat( i ); if ( resource && !resource->readOnly() ) { mResourceMap.insert( counter, resource ); mResourceId->insertItem( resource->resourceName() ); diff --git a/kabc/tests/testaddresseelist.cpp b/kabc/tests/testaddresseelist.cpp index e7cc123f1..7075dcdd8 100644 --- a/kabc/tests/testaddresseelist.cpp +++ b/kabc/tests/testaddresseelist.cpp @@ -64,12 +64,12 @@ int main(int /*argc*/,char /* **argv*/) list.append(f); list.sortBy(FamilyName); - if ( !( (*list.at(0)).uid()=="78ze" - && (*list.at(1)).uid()=="Rsdf" - && (*list.at(2)).uid()=="Fhwn" - && (*list.at(3)).uid()=="kk45" - && (*list.at(4)).uid()=="Asdf" - && (*list.at(5)).uid()=="Z2hk" + if ( !( (*list.tqat(0)).uid()=="78ze" + && (*list.tqat(1)).uid()=="Rsdf" + && (*list.tqat(2)).uid()=="Fhwn" + && (*list.tqat(3)).uid()=="kk45" + && (*list.tqat(4)).uid()=="Asdf" + && (*list.tqat(5)).uid()=="Z2hk" ) ) { kdError() << "SORTING BY FAMILY NAME NOT CORRECT!" << endl; kdDebug() << "list sorted by family name:" << endl; @@ -79,12 +79,12 @@ int main(int /*argc*/,char /* **argv*/) } list.setReverseSorting(true); list.sort(); - if ( !( (*list.at(5)).uid()=="78ze" - && (*list.at(4)).uid()=="Rsdf" - && (*list.at(3)).uid()=="Fhwn" - && (*list.at(2)).uid()=="kk45" - && (*list.at(1)).uid()=="Asdf" - && (*list.at(0)).uid()=="Z2hk" + if ( !( (*list.tqat(5)).uid()=="78ze" + && (*list.tqat(4)).uid()=="Rsdf" + && (*list.tqat(3)).uid()=="Fhwn" + && (*list.tqat(2)).uid()=="kk45" + && (*list.tqat(1)).uid()=="Asdf" + && (*list.tqat(0)).uid()=="Z2hk" ) ) { kdError() << "REVERSE SORTING BY FAMILY NAME NOT CORRECT!" << endl; kdDebug() << "list reverse sorted by family name:" << endl; @@ -95,12 +95,12 @@ int main(int /*argc*/,char /* **argv*/) list.setReverseSorting(false); list.sortBy(FormattedName); - if ( !( (*list.at(0)).uid()=="78ze" - && (*list.at(1)).uid()=="Rsdf" - && (*list.at(2)).uid()=="Fhwn" - && (*list.at(3)).uid()=="kk45" - && (*list.at(4)).uid()=="Z2hk" - && (*list.at(5)).uid()=="Asdf" + if ( !( (*list.tqat(0)).uid()=="78ze" + && (*list.tqat(1)).uid()=="Rsdf" + && (*list.tqat(2)).uid()=="Fhwn" + && (*list.tqat(3)).uid()=="kk45" + && (*list.tqat(4)).uid()=="Z2hk" + && (*list.tqat(5)).uid()=="Asdf" ) ) { kdError() << "SORTING BY FORMATTED NAME NOT CORRECT!" << endl; kdDebug() << "list sorted by formatted name:" << endl; @@ -110,12 +110,12 @@ int main(int /*argc*/,char /* **argv*/) } list.setReverseSorting(true); list.sort(); - if ( !( (*list.at(5)).uid()=="78ze" - && (*list.at(4)).uid()=="Rsdf" - && (*list.at(3)).uid()=="Fhwn" - && (*list.at(2)).uid()=="kk45" - && (*list.at(1)).uid()=="Z2hk" - && (*list.at(0)).uid()=="Asdf" + if ( !( (*list.tqat(5)).uid()=="78ze" + && (*list.tqat(4)).uid()=="Rsdf" + && (*list.tqat(3)).uid()=="Fhwn" + && (*list.tqat(2)).uid()=="kk45" + && (*list.tqat(1)).uid()=="Z2hk" + && (*list.tqat(0)).uid()=="Asdf" ) ) { kdError() << "REVERSE SORTING BY FORMATTED NAME NOT CORRECT!" << endl; kdDebug() << "list reverse sorted by formatted name:" << endl; @@ -127,12 +127,12 @@ int main(int /*argc*/,char /* **argv*/) list.setReverseSorting(false); list.sortBy(Uid); - if ( !( (*list.at(0)).uid()=="78ze" - && (*list.at(1)).uid()=="Asdf" - && (*list.at(2)).uid()=="Fhwn" - && (*list.at(3)).uid()=="Rsdf" - && (*list.at(4)).uid()=="Z2hk" - && (*list.at(5)).uid()=="kk45" + if ( !( (*list.tqat(0)).uid()=="78ze" + && (*list.tqat(1)).uid()=="Asdf" + && (*list.tqat(2)).uid()=="Fhwn" + && (*list.tqat(3)).uid()=="Rsdf" + && (*list.tqat(4)).uid()=="Z2hk" + && (*list.tqat(5)).uid()=="kk45" ) ) { kdError() << "SORTING BY UID NOT CORRECT!" << endl; kdDebug() << "list sorted by Uid:" << endl; @@ -142,12 +142,12 @@ int main(int /*argc*/,char /* **argv*/) } list.setReverseSorting(true); list.sortBy(Uid); - if ( !( (*list.at(5)).uid()=="78ze" - && (*list.at(4)).uid()=="Asdf" - && (*list.at(3)).uid()=="Fhwn" - && (*list.at(2)).uid()=="Rsdf" - && (*list.at(1)).uid()=="Z2hk" - && (*list.at(0)).uid()=="kk45" + if ( !( (*list.tqat(5)).uid()=="78ze" + && (*list.tqat(4)).uid()=="Asdf" + && (*list.tqat(3)).uid()=="Fhwn" + && (*list.tqat(2)).uid()=="Rsdf" + && (*list.tqat(1)).uid()=="Z2hk" + && (*list.tqat(0)).uid()=="kk45" ) ) { kdError() << "REVERSE SORTING BY UID NOT CORRECT!" << endl; kdDebug() << "list sorted by Uid:" << endl; @@ -170,8 +170,8 @@ int main(int /*argc*/,char /* **argv*/) list2.append(f); list2.setReverseSorting(false); list2.sort(); - if ( !( (*list2.at(0)).uid()=="78ze" - && (*list2.at(1)).uid()=="Asdf" + if ( !( (*list2.tqat(0)).uid()=="78ze" + && (*list2.tqat(1)).uid()=="Asdf" ) ) { kdError() << "SORTING BY FORMATTED NAME IN A TWO ENTRY LIST NOT CORRECT!" << endl; kdDebug() << "list sorted by formatted name, two entries:" << endl; @@ -181,8 +181,8 @@ int main(int /*argc*/,char /* **argv*/) } list2.setReverseSorting(true); list2.sort(); - if ( !( (*list2.at(1)).uid()=="78ze" - && (*list2.at(0)).uid()=="Asdf" + if ( !( (*list2.tqat(1)).uid()=="78ze" + && (*list2.tqat(0)).uid()=="Asdf" ) ) { kdError() << "REVERSE SORTING BY FORMATTED NAME IN A TWO ENTRY LIST NOT CORRECT!" << endl; kdDebug() << "list reverse sorted by formatted name, two entries:" << endl; diff --git a/kabc/vcard/AdrValue.cpp b/kabc/vcard/AdrValue.cpp index 535ba6980..dc6384417 100644 --- a/kabc/vcard/AdrValue.cpp +++ b/kabc/vcard/AdrValue.cpp @@ -112,13 +112,13 @@ AdrValue::_parse() switch (i) { - case 0: poBox_ = l.at(0); break; - case 1: extAddress_ = l.at(1); break; - case 2: street_ = l.at(2); break; - case 3: locality_ = l.at(3); break; - case 4: region_ = l.at(4); break; - case 5: postCode_ = l.at(5); break; - case 6: countryName_ = l.at(6); break; + case 0: poBox_ = l.tqat(0); break; + case 1: extAddress_ = l.tqat(1); break; + case 2: street_ = l.tqat(2); break; + case 3: locality_ = l.tqat(3); break; + case 4: region_ = l.tqat(4); break; + case 5: postCode_ = l.tqat(5); break; + case 6: countryName_ = l.tqat(6); break; default: break; } } diff --git a/kabc/vcard/ContentLine.cpp b/kabc/vcard/ContentLine.cpp index a301a0244..8babc9292 100644 --- a/kabc/vcard/ContentLine.cpp +++ b/kabc/vcard/ContentLine.cpp @@ -174,7 +174,7 @@ ContentLine::_parse() return; } - name_ = l.at(0); + name_ = l.tqat(0); // Now we have the name, so the rest of 'l' is the params. // Remove the name part. diff --git a/kabc/vcard/LangValue.cpp b/kabc/vcard/LangValue.cpp index f7e5a759e..d41c61d96 100644 --- a/kabc/vcard/LangValue.cpp +++ b/kabc/vcard/LangValue.cpp @@ -79,7 +79,7 @@ LangValue::_parse() if (l.count() == 0) return; - primary_ = l.at(0); + primary_ = l.tqat(0); l.remove(0u); diff --git a/kabc/vcard/NValue.cpp b/kabc/vcard/NValue.cpp index e63268134..7bcfa1397 100644 --- a/kabc/vcard/NValue.cpp +++ b/kabc/vcard/NValue.cpp @@ -106,11 +106,11 @@ NValue::_parse() for (unsigned int i = 0; i < l.count(); i++) { switch (i) { - case 0: family_ = l.at(0); break; - case 1: given_ = l.at(1); break; - case 2: middle_ = l.at(2); break; - case 3: prefix_ = l.at(3); break; - case 4: suffix_ = l.at(4); break; + case 0: family_ = l.tqat(0); break; + case 1: given_ = l.tqat(1); break; + case 2: middle_ = l.tqat(2); break; + case 3: prefix_ = l.tqat(3); break; + case 4: suffix_ = l.tqat(4); break; default: break; } } diff --git a/kabc/vcard/OrgValue.cpp b/kabc/vcard/OrgValue.cpp index 94ca18243..d3fb93ac7 100644 --- a/kabc/vcard/OrgValue.cpp +++ b/kabc/vcard/OrgValue.cpp @@ -102,6 +102,6 @@ OrgValue::numValues() OrgValue::value(unsigned int i) { parse(); - return valueList_.at(i); + return valueList_.tqat(i); } diff --git a/kabc/vcard/TextListValue.cpp b/kabc/vcard/TextListValue.cpp index 2bec2e181..ef2b5d07d 100644 --- a/kabc/vcard/TextListValue.cpp +++ b/kabc/vcard/TextListValue.cpp @@ -102,6 +102,6 @@ TextListValue::numValues() TextListValue::value(unsigned int i) { parse(); - return valueList_.at(i); + return valueList_.tqat(i); } diff --git a/kabc/vcard/VCard.cpp b/kabc/vcard/VCard.cpp index c63e978d4..25d3a7a2d 100644 --- a/kabc/vcard/VCard.cpp +++ b/kabc/vcard/VCard.cpp @@ -95,7 +95,7 @@ VCard::_parse() } // Get the first line - TQCString beginLine = TQCString(l.at(0)).stripWhiteSpace(); + TQCString beginLine = TQCString(l.tqat(0)).stripWhiteSpace(); vDebug("Begin line == \"" + beginLine + "\""); diff --git a/kabc/vcardparser/vcardparser.cpp b/kabc/vcardparser/vcardparser.cpp index 35d48f77c..b92f341a0 100644 --- a/kabc/vcardparser/vcardparser.cpp +++ b/kabc/vcardparser/vcardparser.cpp @@ -144,7 +144,7 @@ VCard::List VCardParser::parseVCards( const TQString& text ) } else if ( vCardLine.parameter( "encoding" ).lower() == "quoted-printable" ) { // join any qp-folded lines - while ( value.at( value.length() - 1 ) == '=' && it != linesEnd ) { + while ( value.tqat( value.length() - 1 ) == '=' && it != linesEnd ) { value = value.remove( value.length() - 1, 1 ) + (*it); ++it; } diff --git a/kate/data/cpp.xml b/kate/data/cpp.xml index e9f0ac85a..6007caf73 100644 --- a/kate/data/cpp.xml +++ b/kate/data/cpp.xml @@ -113,6 +113,7 @@ <item> Q_INVOKABLE </item> <item> Q_NOREPLY </item> <item> Q_OBJECT </item> + <item> TQ_OBJECT </item> <item> Q_OVERRIDE </item> <item> Q_PRIVATE_SLOT </item> <item> Q_PROPERTY </item> @@ -134,6 +135,7 @@ <item> slots </item> <item> foreach </item> <item> forever </item> + <item> tqt_dynamic_cast</item> <item> qint8 </item> <item> qint16 </item> diff --git a/kate/part/kateautoindent.cpp b/kate/part/kateautoindent.cpp index 25c84c2b4..48c6b29c6 100644 --- a/kate/part/kateautoindent.cpp +++ b/kate/part/kateautoindent.cpp @@ -223,7 +223,7 @@ void KateNormalIndent::updateConfig () for (uint i=0; i<items.count(); i++) { - TQString name = items.at(i)->name; + TQString name = items.tqat(i)->name; if (name.tqfind("Comment") != -1 && commentAttrib == 255) { commentAttrib = i; @@ -2384,7 +2384,7 @@ void KateVarIndent::slotVariableChanged( const TQString &var, const TQString &va for (uint i=0; i<items.count(); i++) { - if ( items.at(i)->name.section( ':', 1 ) == val ) + if ( items.tqat(i)->name.section( ':', 1 ) == val ) { d->coupleAttrib = i; break; diff --git a/kate/part/katebookmarks.cpp b/kate/part/katebookmarks.cpp index a6de77841..2d1be2c20 100644 --- a/kate/part/katebookmarks.cpp +++ b/kate/part/katebookmarks.cpp @@ -128,7 +128,7 @@ void KateBookmarks::clearBookmarks () TQPtrList<KTextEditor::Mark> m = m_view->getDoc()->marks(); for (uint i=0; i < m.count(); i++) - m_view->getDoc()->removeMark( m.at(i)->line, KTextEditor::MarkInterface::markType01 ); + m_view->getDoc()->removeMark( m.tqat(i)->line, KTextEditor::MarkInterface::markType01 ); // just to be sure ;) marksChanged (); @@ -255,8 +255,8 @@ void KateBookmarks::goNext() int found = -1; for (uint z=0; z < m.count(); z++) - if ( (m.at(z)->line > line) && ((found == -1) || (uint(found) > m.at(z)->line)) ) - found = m.at(z)->line; + if ( (m.tqat(z)->line > line) && ((found == -1) || (uint(found) > m.tqat(z)->line)) ) + found = m.tqat(z)->line; if (found != -1) m_view->gotoLineNumber ( found ); @@ -272,8 +272,8 @@ void KateBookmarks::goPrevious() int found = -1; for (uint z=0; z < m.count(); z++) - if ((m.at(z)->line < line) && ((found == -1) || (uint(found) < m.at(z)->line))) - found = m.at(z)->line; + if ((m.tqat(z)->line < line) && ((found == -1) || (uint(found) < m.tqat(z)->line))) + found = m.tqat(z)->line; if (found != -1) m_view->gotoLineNumber ( found ); diff --git a/kate/part/katecodefoldinghelpers.cpp b/kate/part/katecodefoldinghelpers.cpp index ab571d9d0..15ba05cb7 100644 --- a/kate/part/katecodefoldinghelpers.cpp +++ b/kate/part/katecodefoldinghelpers.cpp @@ -1259,7 +1259,7 @@ void KateCodeFoldingTree::cleanupUnneededNodes(unsigned int line) for (int i=0; i<(int)markedForDeleting.count(); i++) { - KateCodeFoldingNode *node = markedForDeleting.at(i); + KateCodeFoldingNode *node = markedForDeleting.tqat(i); if (node->deleteOpening) kdDebug(13000)<<"DELETE OPENING SET"<<endl; if (node->deleteEnding) @@ -1335,7 +1335,7 @@ void KateCodeFoldingTree::toggleRegionVisibility(unsigned int line) findAllNodesOpenedOrClosedAt(line); for (int i=0; i<(int)nodesForLine.count(); i++) { - KateCodeFoldingNode *node=nodesForLine.at(i); + KateCodeFoldingNode *node=nodesForLine.tqat(i); if ( (!node->startLineValid) || (getStartLine(node) != line) ) { nodesForLine.remove(i); @@ -1346,10 +1346,10 @@ void KateCodeFoldingTree::toggleRegionVisibility(unsigned int line) if (nodesForLine.isEmpty()) return; - nodesForLine.at(0)->visible = !nodesForLine.at(0)->visible; + nodesForLine.tqat(0)->visible = !nodesForLine.tqat(0)->visible; - if (!nodesForLine.at(0)->visible) - addHiddenLineBlock(nodesForLine.at(0),line); + if (!nodesForLine.tqat(0)->visible) + addHiddenLineBlock(nodesForLine.tqat(0),line); else { for (TQValueList<KateHiddenLineBlock>::Iterator it=hiddenLines.begin(); it!=hiddenLines.end();++it) @@ -1359,7 +1359,7 @@ void KateCodeFoldingTree::toggleRegionVisibility(unsigned int line) break; } - updateHiddenSubNodes(nodesForLine.at(0)); + updateHiddenSubNodes(nodesForLine.tqat(0)); } emit regionVisibilityChangedAt(line); diff --git a/kate/part/kateconfig.cpp b/kate/part/kateconfig.cpp index 3158f32db..5bfe55fbc 100644 --- a/kate/part/kateconfig.cpp +++ b/kate/part/kateconfig.cpp @@ -237,7 +237,7 @@ void KateDocumentConfig::updateConfig () { for (uint z=0; z < KateFactory::self()->documents()->count(); z++) { - KateFactory::self()->documents()->at(z)->updateConfig (); + KateFactory::self()->documents()->tqat(z)->updateConfig (); } } } @@ -570,8 +570,8 @@ bool KateDocumentConfig::plugin (uint index) const if (index >= m_plugins.size()) return false; - if (m_pluginsSet.at(index) || isGlobal()) - return m_plugins.at(index); + if (m_pluginsSet.tqat(index) || isGlobal()) + return m_plugins.tqat(index); return s_global->plugin (index); } @@ -734,7 +734,7 @@ void KateViewConfig::updateConfig () { for (uint z=0; z < KateFactory::self()->views()->count(); z++) { - KateFactory::self()->views()->at(z)->updateConfig (); + KateFactory::self()->views()->tqat(z)->updateConfig (); } } } @@ -1088,7 +1088,7 @@ void KateRendererConfig::updateConfig () { for (uint z=0; z < KateFactory::self()->renderers()->count(); z++) { - KateFactory::self()->renderers()->at(z)->updateConfig (); + KateFactory::self()->renderers()->tqat(z)->updateConfig (); } } } @@ -1114,7 +1114,7 @@ void KateRendererConfig::reloadSchema() { if ( isGlobal() ) for ( uint z=0; z < KateFactory::self()->renderers()->count(); z++ ) - KateFactory::self()->renderers()->at(z)->config()->reloadSchema(); + KateFactory::self()->renderers()->tqat(z)->config()->reloadSchema(); else if ( m_renderer && m_schemaSet ) setSchemaInternal( m_schema ); diff --git a/kate/part/katedialogs.cpp b/kate/part/katedialogs.cpp index c4e0e3776..80a47cbe9 100644 --- a/kate/part/katedialogs.cpp +++ b/kate/part/katedialogs.cpp @@ -819,7 +819,7 @@ void KateEditKeyConfiguration::showEvent ( TQShowEvent * ) if (!m_ready) { (new TQVBoxLayout(this))->setAutoAdd(true); - KateView* view = (KateView*)m_doc->views().at(0); + KateView* view = (KateView*)m_doc->views().tqat(0); m_ac = view->editActionCollection(); m_keyChooser = new KKeyChooser( m_ac, this, false ); connect( m_keyChooser, TQT_SIGNAL( keyChange() ), this, TQT_SLOT( slotChanged() ) ); @@ -1154,7 +1154,7 @@ void KatePartPluginConfigPage::apply () KateDocumentConfig::global()->configStart (); for (uint i=0; i < m_items.count(); i++) - KateDocumentConfig::global()->setPlugin (m_items.at(i)->pluginIndex(), m_items.at(i)->isOn()); + KateDocumentConfig::global()->setPlugin (m_items.tqat(i)->pluginIndex(), m_items.tqat(i)->isOn()); KateDocumentConfig::global()->configEnd (); } @@ -1243,7 +1243,7 @@ void KatePartPluginConfigPage::slotConfigure() for( uint i=0; i<editorPages.count(); i++ ) { - editorPages.at( i )->apply(); + editorPages.tqat( i )->apply(); } } diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp index d9cdb1974..3f26d2bb5 100644 --- a/kate/part/katedocument.cpp +++ b/kate/part/katedocument.cpp @@ -323,7 +323,7 @@ void KateDocument::enablePluginGUI (KTextEditor::Plugin *plugin) if (!KTextEditor::pluginViewInterface(plugin)) return; for (uint i=0; i< m_views.count(); i++) - enablePluginGUI (plugin, m_views.at(i)); + enablePluginGUI (plugin, m_views.tqat(i)); } void KateDocument::disablePluginGUI (KTextEditor::Plugin *plugin, KateView *view) @@ -347,7 +347,7 @@ void KateDocument::disablePluginGUI (KTextEditor::Plugin *plugin) if (!KTextEditor::pluginViewInterface(plugin)) return; for (uint i=0; i< m_views.count(); i++) - disablePluginGUI (plugin, m_views.at(i)); + disablePluginGUI (plugin, m_views.tqat(i)); } //END @@ -641,7 +641,7 @@ bool KateDocument::setText(const TQString &s) TQValueList<KTextEditor::Mark> msave; for (uint i=0; i < m.count(); i++) - msave.append (*m.at(i)); + msave.append (*m.tqat(i)); editStart (); @@ -924,7 +924,7 @@ void KateDocument::editStart (bool withUndo) for (uint z = 0; z < m_views.count(); z++) { - m_views.at(z)->editStart (); + m_views.tqat(z)->editStart (); } m_buffer->editStart (); @@ -1029,7 +1029,7 @@ void KateDocument::editEnd () // edit end for all views !!!!!!!!! for (uint z = 0; z < m_views.count(); z++) - m_views.at(z)->editEnd (m_buffer->editTagStart(), m_buffer->editTagEnd(), m_buffer->editTagFrom()); + m_views.tqat(z)->editEnd (m_buffer->editTagStart(), m_buffer->editTagEnd(), m_buffer->editTagFrom()); if (m_buffer->editChanged()) { @@ -2011,7 +2011,7 @@ void KateDocument::configDialog() for (uint i=0; i<editorPages.count(); i++) { - editorPages.at(i)->apply(); + editorPages.tqat(i)->apply(); } KateDocumentConfig::global()->configEnd (); @@ -2869,7 +2869,7 @@ void KateDocument::setModified(bool m) { void KateDocument::makeAttribs(bool needInvalidate) { for (uint z = 0; z < m_views.count(); z++) - m_views.at(z)->renderer()->updateAttributes (); + m_views.tqat(z)->renderer()->updateAttributes (); if (needInvalidate) m_buffer->tqinvalidateHighlighting(); @@ -3227,7 +3227,7 @@ void KateDocument::del( KateView *view, const KateTextCursor& c ) void KateDocument::paste ( KateView* view ) { - TQString s = TQApplication::clipboard()->text(); + TQString s = TQApplication::tqclipboard()->text(); if (s.isEmpty()) return; @@ -3981,7 +3981,7 @@ void KateDocument::transform( KateView *v, const KateTextCursor &c, if ( ( ! start && ! p ) || ( ( ln == selstart.line() || v->blockSelectionMode() ) && ! p && ! highlight()->isInWord( l->getChar( start - 1 )) ) || - ( p && ! highlight()->isInWord( s.at( p-1 ) ) ) + ( p && ! highlight()->isInWord( s.tqat( p-1 ) ) ) ) s[p] = s.tqat(p).upper(); p++; @@ -4096,7 +4096,7 @@ TQString KateDocument::getWord( const KateTextCursor& cursor ) { void KateDocument::tagLines(int start, int end) { for (uint z = 0; z < m_views.count(); z++) - m_views.at(z)->tagLines (start, end, true); + m_views.tqat(z)->tagLines (start, end, true); } void KateDocument::tagLines(KateTextCursor start, KateTextCursor end) @@ -4109,21 +4109,21 @@ void KateDocument::tagLines(KateTextCursor start, KateTextCursor end) } for (uint z = 0; z < m_views.count(); z++) - m_views.at(z)->tagLines(start, end, true); + m_views.tqat(z)->tagLines(start, end, true); } void KateDocument::tqrepaintViews(bool paintOnlyDirty) { for (uint z = 0; z < m_views.count(); z++) - m_views.at(z)->tqrepaintText(paintOnlyDirty); + m_views.tqat(z)->tqrepaintText(paintOnlyDirty); } void KateDocument::tagAll() { for (uint z = 0; z < m_views.count(); z++) { - m_views.at(z)->tagAll(); - m_views.at(z)->updateView (true); + m_views.tqat(z)->tagAll(); + m_views.tqat(z)->updateView (true); } } @@ -4287,9 +4287,9 @@ void KateDocument::setDocName (TQString name ) for (uint z=0; z < KateFactory::self()->documents()->count(); z++) { - if ( (KateFactory::self()->documents()->at(z) != this) && (KateFactory::self()->documents()->at(z)->url().filename() == url().filename()) ) - if ( KateFactory::self()->documents()->at(z)->m_docNameNumber > count ) - count = KateFactory::self()->documents()->at(z)->m_docNameNumber; + if ( (KateFactory::self()->documents()->tqat(z) != this) && (KateFactory::self()->documents()->tqat(z)->url().filename() == url().filename()) ) + if ( KateFactory::self()->documents()->tqat(z)->m_docNameNumber > count ) + count = KateFactory::self()->documents()->tqat(z)->m_docNameNumber; } m_docNameNumber = count + 1; @@ -4437,14 +4437,14 @@ void KateDocument::reloadFile() TQValueList<int> lines, cols; for ( uint i=0; i < m_views.count(); i++ ) { - lines.append( m_views.at( i )->cursorLine() ); - cols.append( m_views.at( i )->cursorColumn() ); + lines.append( m_views.tqat( i )->cursorLine() ); + cols.append( m_views.tqat( i )->cursorColumn() ); } KateDocument::openURL( url() ); for ( uint i=0; i < m_views.count(); i++ ) - m_views.at( i )->setCursorPositionInternal( lines[ i ], cols[ i ], m_config->tabWidth(), false ); + m_views.tqat( i )->setCursorPositionInternal( lines[ i ], cols[ i ], m_config->tabWidth(), false ); m_reloading = false; diff --git a/kate/part/katefactory.cpp b/kate/part/katefactory.cpp index 9bd00bfbc..a9ccc7333 100644 --- a/kate/part/katefactory.cpp +++ b/kate/part/katefactory.cpp @@ -267,7 +267,7 @@ KateIndentScript KateFactory::indentScript (const TQString &scriptname) KateIndentScript result; for(uint i=0;i<m_indentScriptManagers.count();i++) { - result=m_indentScriptManagers.at(i)->script(scriptname); + result=m_indentScriptManagers.tqat(i)->script(scriptname); if (!result.isNull()) return result; } return result; diff --git a/kate/part/katefiletype.cpp b/kate/part/katefiletype.cpp index 801791e5c..461c6c994 100644 --- a/kate/part/katefiletype.cpp +++ b/kate/part/katefiletype.cpp @@ -106,20 +106,20 @@ void KateFileTypeManager::save (TQPtrList<KateFileType> *v) TQStringList newg; for (uint z=0; z < v->count(); z++) { - config.setGroup (v->at(z)->name); + config.setGroup (v->tqat(z)->name); - config.writeEntry ("Section", v->at(z)->section); - config.writeEntry ("Wildcards", v->at(z)->wildcards, ';'); - config.writeEntry ("Mimetypes", v->at(z)->mimetypes, ';'); - config.writeEntry ("Priority", v->at(z)->priority); + config.writeEntry ("Section", v->tqat(z)->section); + config.writeEntry ("Wildcards", v->tqat(z)->wildcards, ';'); + config.writeEntry ("Mimetypes", v->tqat(z)->mimetypes, ';'); + config.writeEntry ("Priority", v->tqat(z)->priority); - TQString varLine = v->at(z)->varLine; + TQString varLine = v->tqat(z)->varLine; if (TQRegExp("kate:(.*)").search(varLine) < 0) varLine.prepend ("kate: "); config.writeEntry ("Variables", varLine); - newg << v->at(z)->name; + newg << v->tqat(z)->name; } TQStringList g (config.groupList()); @@ -187,8 +187,8 @@ int KateFileTypeManager::fileType (KateDocument *doc) for (uint z=0; z < m_types.count(); z++) { - if (m_types.at(z)->mimetypes.tqfindIndex (mt->name()) > -1) - types.append (m_types.at(z)); + if (m_types.tqat(z)->mimetypes.tqfindIndex (mt->name()) > -1) + types.append (m_types.tqat(z)); } if ( !types.isEmpty() ) @@ -218,13 +218,13 @@ int KateFileTypeManager::wildcardsFind (const TQString &fileName) for (uint z=0; z < m_types.count(); z++) { - for( TQStringList::Iterator it = m_types.at(z)->wildcards.begin(); it != m_types.at(z)->wildcards.end(); ++it ) + for( TQStringList::Iterator it = m_types.tqat(z)->wildcards.begin(); it != m_types.tqat(z)->wildcards.end(); ++it ) { // anders: we need to be sure to match the end of string, as eg a css file // would otherwise end up with the c hl TQRegExp re(*it, true, true); if ( ( re.search( fileName ) > -1 ) && ( re.matchedLength() == (int)fileName.length() ) ) - types.append (m_types.at(z)); + types.append (m_types.tqat(z)); } } @@ -251,7 +251,7 @@ int KateFileTypeManager::wildcardsFind (const TQString &fileName) const KateFileType *KateFileTypeManager::fileType (uint number) { if (number < m_types.count()) - return m_types.at(number); + return m_types.tqat(number); return 0; } @@ -373,7 +373,7 @@ void KateFileTypeConfigTab::reload() { KateFileType *type = new KateFileType (); - *type = *KateFactory::self()->fileTypeManager()->list()->at(z); + *type = *KateFactory::self()->fileTypeManager()->list()->tqat(z); m_types.append (type); } @@ -398,10 +398,10 @@ void KateFileTypeConfigTab::update () typeCombo->clear (); for( uint i = 0; i < m_types.count(); i++) { - if (m_types.at(i)->section.length() > 0) - typeCombo->insertItem(m_types.at(i)->section + TQString ("/") + m_types.at(i)->name); + if (m_types.tqat(i)->section.length() > 0) + typeCombo->insertItem(m_types.tqat(i)->section + TQString ("/") + m_types.tqat(i)->name); else - typeCombo->insertItem(m_types.at(i)->name); + typeCombo->insertItem(m_types.tqat(i)->name); } typeCombo->setCurrentItem (0); @@ -427,7 +427,7 @@ void KateFileTypeConfigTab::newType () TQString newN = i18n("New Filetype"); for( uint i = 0; i < m_types.count(); i++) { - if (m_types.at(i)->name == newN) + if (m_types.tqat(i)->name == newN) { typeCombo->setCurrentItem (i); typeChanged (i); @@ -464,7 +464,7 @@ void KateFileTypeConfigTab::typeChanged (int type) KateFileType *t = 0; if ((type > -1) && ((uint)type < m_types.count())) - t = m_types.at(type); + t = m_types.tqat(type); if (t) { @@ -536,8 +536,8 @@ void KateViewFileTypeAction::slotAboutToShow() for (int z=0; z<count; z++) { - TQString hlName = KateFactory::self()->fileTypeManager()->list()->at(z)->name; - TQString hlSection = KateFactory::self()->fileTypeManager()->list()->at(z)->section; + TQString hlName = KateFactory::self()->fileTypeManager()->list()->tqat(z)->name; + TQString hlSection = KateFactory::self()->fileTypeManager()->list()->tqat(z)->section; if ( !hlSection.isEmpty() && (names.tqcontains(hlName) < 1) ) { @@ -551,7 +551,7 @@ void KateViewFileTypeAction::slotAboutToShow() int m = subMenusName.tqfindIndex (hlSection); names << hlName; - subMenus.at(m)->insertItem ( hlName, this, TQT_SLOT(setType(int)), 0, z+1); + subMenus.tqat(m)->insertItem ( hlName, this, TQT_SLOT(setType(int)), 0, z+1); } else if (names.tqcontains(hlName) < 1) { @@ -564,8 +564,8 @@ void KateViewFileTypeAction::slotAboutToShow() for (uint i=0;i<subMenus.count();i++) { - for (uint i2=0;i2<subMenus.at(i)->count();i2++) - subMenus.at(i)->setItemChecked(subMenus.at(i)->idAt(i2),false); + for (uint i2=0;i2<subMenus.tqat(i)->count();i2++) + subMenus.tqat(i)->setItemChecked(subMenus.tqat(i)->idAt(i2),false); } popupMenu()->setItemChecked (0, false); @@ -577,8 +577,8 @@ void KateViewFileTypeAction::slotAboutToShow() if ((t = KateFactory::self()->fileTypeManager()->fileType (doc->fileType()))) { int i = subMenusName.tqfindIndex (t->section); - if (i >= 0 && subMenus.at(i)) - subMenus.at(i)->setItemChecked (doc->fileType()+1, true); + if (i >= 0 && subMenus.tqat(i)) + subMenus.tqat(i)->setItemChecked (doc->fileType()+1, true); else popupMenu()->setItemChecked (0, true); } diff --git a/kate/part/katehighlight.cpp b/kate/part/katehighlight.cpp index aa0a94d24..3799f645d 100644 --- a/kate/part/katehighlight.cpp +++ b/kate/part/katehighlight.cpp @@ -815,7 +815,7 @@ int KateHlCOct::checkHgl(const TQString& text, int offset, int len) int offset2 = offset; - while ((len > 0) && (text.at(offset2) >= '0' && text.at(offset2) <= '7')) + while ((len > 0) && (text.tqat(offset2) >= TQChar('0') && text.tqat(offset2) <= TQChar('7'))) { offset2++; len--; @@ -1038,7 +1038,7 @@ static int checkEscapedChar(const TQString& text, int offset, int& len) // replaced with something else but // for right now they work // check for hexdigits - for (i = 0; (len > 0) && (i < 2) && (text.at(offset) >= '0' && text.at(offset) <= '9' || (text[offset] & 0xdf) >= 'A' && (text[offset] & 0xdf) <= 'F'); i++) + for (i = 0; (len > 0) && (i < 2) && (static_cast<const char>(text.tqat(offset)) >= '0' && static_cast<const char>(text.tqat(offset)) <= '9' || (text[offset] & 0xdf) >= 'A' && (text[offset] & 0xdf) <= 'F'); i++) { offset++; len--; @@ -1051,7 +1051,7 @@ static int checkEscapedChar(const TQString& text, int offset, int& len) case '0': case '1': case '2': case '3' : case '4': case '5': case '6': case '7' : - for (i = 0; (len > 0) && (i < 3) && (text.at(offset) >='0'&& text.at(offset) <='7'); i++) + for (i = 0; (len > 0) && (i < 3) && (static_cast<const char>(text.tqat(offset)) >= '0' && static_cast<const char>(text.tqat(offset)) <= '7'); i++) { offset++; len--; @@ -1890,7 +1890,7 @@ void KateHighlighting::addToKateHlItemDataList() int KateHighlighting::lookupAttrName(const TQString& name, KateHlItemDataList &iDl) { for (uint i = 0; i < iDl.count(); i++) - if (iDl.at(i)->name == buildPrefix+name) + if (iDl.tqat(i)->name == buildPrefix+name) return i; kdDebug(13010)<<"Couldn't resolve itemDataName:"<<name<<endl; @@ -2885,13 +2885,13 @@ void KateHighlighting::clearAttributeArrays () for (uint z = 0; z < nAttribs; z++) { - KateHlItemData *itemData = itemDataList.at(z); - KateAttribute n = *defaultStyleList.at(itemData->defStyleNum); + KateHlItemData *itemData = itemDataList.tqat(z); + KateAttribute n = *defaultStyleList.tqat(itemData->defStyleNum); if (itemData && itemData->isSomethingSet()) n += *itemData; - array->at(z) = n; + array->tqat(z) = n; } } } @@ -2924,13 +2924,13 @@ TQMemArray<KateAttribute> *KateHighlighting::attributes (uint schema) for (uint z = 0; z < nAttribs; z++) { - KateHlItemData *itemData = itemDataList.at(z); - KateAttribute n = *defaultStyleList.at(itemData->defStyleNum); + KateHlItemData *itemData = itemDataList.tqat(z); + KateAttribute n = *defaultStyleList.tqat(itemData->defStyleNum); if (itemData && itemData->isSomethingSet()) n += *itemData; - array->at(z) = n; + array->tqat(z) = n; } m_attributeArrays.insert(schema, array); @@ -2946,7 +2946,7 @@ void KateHighlighting::getKateHlItemDataListCopy (uint schema, KateHlItemDataLis outlist.clear (); outlist.setAutoDelete (true); for (uint z=0; z < itemDataList.count(); z++) - outlist.append (new KateHlItemData (*itemDataList.at(z))); + outlist.append (new KateHlItemData (*itemDataList.tqat(z))); } //END @@ -2974,7 +2974,7 @@ KateHlManager::KateHlManager() if (insert == hlList.count()) break; - if ( TQString(hlList.at(insert)->section() + hlList.at(insert)->nameTranslated()).lower() + if ( TQString(hlList.tqat(insert)->section() + hlList.tqat(insert)->nameTranslated()).lower() > TQString(hl->section() + hl->nameTranslated()).lower() ) break; } @@ -3011,14 +3011,14 @@ KateHighlighting *KateHlManager::getHl(int n) if (n < 0 || n >= (int) hlList.count()) n = 0; - return hlList.at(n); + return hlList.tqat(n); } int KateHlManager::nameFind(const TQString &name) { int z (hlList.count() - 1); for (; z > 0; z--) - if (hlList.at(z)->name() == name) + if (hlList.tqat(z)->name() == name) return z; return z; @@ -3269,7 +3269,7 @@ void KateHlManager::getDefaults(uint schema, KateAttributeList &list) for (uint z = 0; z < defaultStyles(); z++) { - KateAttribute *i = list.at(z); + KateAttribute *i = list.tqat(z); TQStringList s = config->readListEntry(defaultStyleName(z)); if (!s.isEmpty()) { @@ -3323,7 +3323,7 @@ void KateHlManager::setDefaults(uint schema, KateAttributeList &list) for (uint z = 0; z < defaultStyles(); z++) { TQStringList settings; - KateAttribute *i = list.at(z); + KateAttribute *i = list.tqat(z); settings<<(i->itemSet(KateAttribute::TextColor)?TQString::number(i->textColor().rgb(),16):""); settings<<(i->itemSet(KateAttribute::SelectedTextColor)?TQString::number(i->selectedTextColor().rgb(),16):""); @@ -3348,22 +3348,22 @@ int KateHlManager::highlights() TQString KateHlManager::hlName(int n) { - return hlList.at(n)->name(); + return hlList.tqat(n)->name(); } TQString KateHlManager::hlNameTranslated(int n) { - return hlList.at(n)->nameTranslated(); + return hlList.tqat(n)->nameTranslated(); } TQString KateHlManager::hlSection(int n) { - return hlList.at(n)->section(); + return hlList.tqat(n)->section(); } bool KateHlManager::hlHidden(int n) { - return hlList.at(n)->hidden(); + return hlList.tqat(n)->hidden(); } TQString KateHlManager::identifierForName(const TQString& name) @@ -3433,7 +3433,7 @@ void KateViewHighlightAction::slotAboutToShow() int m = subMenusName.tqfindIndex (hlSection); names << hlName; - subMenus.at(m)->insertItem ( '&' + hlName, this, TQT_SLOT(setHl(int)), 0, z); + subMenus.tqat(m)->insertItem ( '&' + hlName, this, TQT_SLOT(setHl(int)), 0, z); } else if (names.tqcontains(hlName) < 1) { @@ -3447,16 +3447,16 @@ void KateViewHighlightAction::slotAboutToShow() for (uint i=0;i<subMenus.count();i++) { - for (uint i2=0;i2<subMenus.at(i)->count();i2++) + for (uint i2=0;i2<subMenus.tqat(i)->count();i2++) { - subMenus.at(i)->setItemChecked(subMenus.at(i)->idAt(i2),false); + subMenus.tqat(i)->setItemChecked(subMenus.tqat(i)->idAt(i2),false); } } popupMenu()->setItemChecked (0, false); int i = subMenusName.tqfindIndex (KateHlManager::self()->hlSection(doc->hlMode())); - if (i >= 0 && subMenus.at(i)) - subMenus.at(i)->setItemChecked (doc->hlMode(), true); + if (i >= 0 && subMenus.tqat(i)) + subMenus.tqat(i)->setItemChecked (doc->hlMode(), true); else popupMenu()->setItemChecked (0, true); } diff --git a/kate/part/katejscript.cpp b/kate/part/katejscript.cpp index 9959f59dd..615adab01 100644 --- a/kate/part/katejscript.cpp +++ b/kate/part/katejscript.cpp @@ -416,10 +416,10 @@ KJS::Value KJS::KateJSDocumentProtoFunc::call(KJS::ExecState *exec, KJS::Object return KJS::Null (); case KateJSDocument::IsInWord: - return KJS::Boolean( doc->highlight()->isInWord( args[0].toString(exec).qstring().at(0), args[1].toUInt32(exec) ) ); + return KJS::Boolean( doc->highlight()->isInWord( args[0].toString(exec).qstring().tqat(0), args[1].toUInt32(exec) ) ); case KateJSDocument::CanBreakAt: - return KJS::Boolean( doc->highlight()->canBreakAt( args[0].toString(exec).qstring().at(0), args[1].toUInt32(exec) ) ); + return KJS::Boolean( doc->highlight()->canBreakAt( args[0].toString(exec).qstring().tqat(0), args[1].toUInt32(exec) ) ); case KateJSDocument::CanComment: return KJS::Boolean( doc->highlight()->canComment( args[0].toUInt32(exec), args[1].toUInt32(exec) ) ); diff --git a/kate/part/kateprinter.cpp b/kate/part/kateprinter.cpp index f9dfb8abe..05f360497 100644 --- a/kate/part/kateprinter.cpp +++ b/kate/part/kateprinter.cpp @@ -505,7 +505,7 @@ bool KatePrinter::print (KateDocument *doc) // use color of dsNormal for the title string and the hline KateAttributeList _dsList; KateHlManager::self()->getDefaults ( renderer.config()->schema(), _dsList ); - paint.setPen( _dsList.at(0)->textColor() ); + paint.setPen( _dsList.tqat(0)->textColor() ); int _marg = 0; // this could be available globally!?? if ( useBox ) { diff --git a/kate/part/katerenderer.cpp b/kate/part/katerenderer.cpp index cfcec76bb..143d24f6d 100644 --- a/kate/part/katerenderer.cpp +++ b/kate/part/katerenderer.cpp @@ -69,9 +69,9 @@ void KateRenderer::updateAttributes () KateAttribute* KateRenderer::attribute(uint pos) { if (pos < m_attributes->size()) - return &m_attributes->at(pos); + return &m_attributes->tqat(pos); - return &m_attributes->at(0); + return &m_attributes->tqat(0); } void KateRenderer::setDrawCaret(bool drawCaret) diff --git a/kate/part/kateschema.cpp b/kate/part/kateschema.cpp index 307caec09..5adb89b9c 100644 --- a/kate/part/kateschema.cpp +++ b/kate/part/kateschema.cpp @@ -643,14 +643,14 @@ void KateSchemaConfigFontColorTab::schemaChanged (uint schema) p.setColor( TQColorGroup::Highlight, KateFactory::self()->schemaManager()->schema(schema)-> readColorEntry( "Color Selection", &_c ) ); - _c = l->at(0)->textColor(); // not quite as much of an assumption ;) + _c = l->tqat(0)->textColor(); // not quite as much of an assumption ;) p.setColor( TQColorGroup::Text, _c ); m_defaultStyles->viewport()->setPalette( p ); // insert the default styles backwards to get them in the right order for ( int i = KateHlManager::self()->defaultStyles() - 1; i >= 0; i-- ) { - new KateStyleListItem( m_defaultStyles, KateHlManager::self()->defaultStyleName(i, true), l->at( i ) ); + new KateStyleListItem( m_defaultStyles, KateHlManager::self()->defaultStyleName(i, true), l->tqat( i ) ); } } @@ -770,7 +770,7 @@ void KateSchemaConfigHighlightTab::schemaChanged (uint schema) p.setColor( TQColorGroup::Highlight, KateFactory::self()->schemaManager()->schema(m_schema)-> readColorEntry( "Color Selection", &_c ) ); - _c = l->at(0)->textColor(); // not quite as much of an assumption ;) + _c = l->tqat(0)->textColor(); // not quite as much of an assumption ;) p.setColor( TQColorGroup::Text, _c ); m_styles->viewport()->setPalette( p ); @@ -795,9 +795,9 @@ void KateSchemaConfigHighlightTab::schemaChanged (uint schema) parent->setOpen(true); prefixes.insert( prefix, parent ); } - new KateStyleListItem( parent, name, l->at(itemData->defStyleNum), itemData ); + new KateStyleListItem( parent, name, l->tqat(itemData->defStyleNum), itemData ); } else { - new KateStyleListItem( m_styles, itemData->name, l->at(itemData->defStyleNum), itemData ); + new KateStyleListItem( m_styles, itemData->name, l->tqat(itemData->defStyleNum), itemData ); } } } diff --git a/kate/part/katesearch.cpp b/kate/part/katesearch.cpp index cc72bd8ae..6ef973030 100644 --- a/kate/part/katesearch.cpp +++ b/kate/part/katesearch.cpp @@ -386,7 +386,7 @@ void KateSearch::replaceOne() int ncaps = m_re.numCaptures(); while ( pos >= 0 ) { TQString substitute; - TQChar argument = br.cap(1).at(0); + TQChar argument = TQString(br.cap(1)).tqat(0); if ( argument.isDigit() ) { // the second character is a digit, this is a backreference int ccap = argument.digitValue(); @@ -639,9 +639,9 @@ bool KateSearch::doSearch( const TQString& text ) { found = ( ( foundCol == 0 || - ! doc()->highlight()->isInWord( doc()->textLine( foundLine ).at( foundCol - 1 ) ) ) && + ! doc()->highlight()->isInWord( doc()->textLine( foundLine ).tqat( foundCol - 1 ) ) ) && ( foundCol + matchLen == doc()->lineLength( foundLine ) || - ! doc()->highlight()->isInWord( doc()->textLine( foundLine ).at( foundCol + matchLen ) ) ) + ! doc()->highlight()->isInWord( doc()->textLine( foundLine ).tqat( foundCol + matchLen ) ) ) ); if ( found ) { diff --git a/kate/part/katetemplatehandler.cpp b/kate/part/katetemplatehandler.cpp index 52e07a2e4..e9124e77f 100644 --- a/kate/part/katetemplatehandler.cpp +++ b/kate/part/katetemplatehandler.cpp @@ -173,7 +173,7 @@ void KateTemplateHandler::generateRangeTable( uint insertLine, uint insertCol, c { ++col; - if ( insertString.at( colInText ) == '\n' ) + if ( insertString.tqat( colInText ) == '\n' ) { col = 0; line++; @@ -216,7 +216,7 @@ void KateTemplateHandler::slotTextInserted( int line, int col ) if ( !m_currentRange ) return ; - KateTemplatePlaceHolder *ph = m_tabOrder.at( m_currentTabStop ); + KateTemplatePlaceHolder *ph = m_tabOrder.tqat( m_currentTabStop ); TQString sourceText = m_doc->text ( m_currentRange->start().line(), m_currentRange->start().col(), m_currentRange->end().line(), m_currentRange->end().col(), false ); @@ -257,7 +257,7 @@ void KateTemplateHandler::locateRange( const KateTextCursor& cursor ) for ( uint i = 0;i < m_tabOrder.count();i++ ) { - KateTemplatePlaceHolder *ph = m_tabOrder.at( i ); + KateTemplatePlaceHolder *ph = m_tabOrder.tqat( i ); for ( KateSuperRangeList::const_iterator it = ph->ranges.begin();it != ph->ranges.end();++it ) { @@ -297,9 +297,9 @@ bool KateTemplateHandler::operator() ( KKey key ) if ( m_currentTabStop < 0 ) m_currentTabStop = m_tabOrder.count() - 1; } - m_currentRange = m_tabOrder.at( m_currentTabStop ) ->ranges.at( 0 ); + m_currentRange = m_tabOrder.tqat( m_currentTabStop ) ->ranges.tqat( 0 ); - if ( m_tabOrder.at( m_currentTabStop ) ->isInitialValue ) + if ( m_tabOrder.tqat( m_currentTabStop ) ->isInitialValue ) { m_doc->activeView()->setSelection( m_currentRange->start(), m_currentRange->end() ); } diff --git a/kate/part/kateundo.cpp b/kate/part/kateundo.cpp index 379df16f0..81901d9f8 100644 --- a/kate/part/kateundo.cpp +++ b/kate/part/kateundo.cpp @@ -296,9 +296,9 @@ void KateUndoGroup::undo () if (m_doc->activeView()) { for (uint z=0; z < m_items.count(); z++) - if (m_items.at(z)->type() != KateUndoGroup::editMarkLineAutoWrapped) + if (m_items.tqat(z)->type() != KateUndoGroup::editMarkLineAutoWrapped) { - m_doc->activeView()->editSetCursor (m_items.at(z)->cursorBefore()); + m_doc->activeView()->editSetCursor (m_items.tqat(z)->cursorBefore()); break; } } @@ -319,9 +319,9 @@ void KateUndoGroup::redo () if (m_doc->activeView()) { for (uint z=0; z < m_items.count(); z++) - if (m_items.at(z)->type() != KateUndoGroup::editMarkLineAutoWrapped) + if (m_items.tqat(z)->type() != KateUndoGroup::editMarkLineAutoWrapped) { - m_doc->activeView()->editSetCursor (m_items.at(z)->cursorAfter()); + m_doc->activeView()->editSetCursor (m_items.tqat(z)->cursorAfter()); break; } } diff --git a/kate/plugins/autobookmarker/autobookmarker.cpp b/kate/plugins/autobookmarker/autobookmarker.cpp index a0e61f3d0..3f1e7fc2a 100644 --- a/kate/plugins/autobookmarker/autobookmarker.cpp +++ b/kate/plugins/autobookmarker/autobookmarker.cpp @@ -235,7 +235,7 @@ void ABGlobal::writeConfig() // fill in the current list for ( uint i = 0; i < m_ents->count(); i++ ) { - AutoBookmarkEnt *e = m_ents->at( i ); + AutoBookmarkEnt *e = m_ents->tqat( i ); config->setGroup( TQString("autobookmark%1").arg( i ) ); config->writeEntry( "pattern", e->pattern ); config->writeEntry( "filemask", e->filemask, ';' ); diff --git a/kate/plugins/insertfile/insertfileplugin.cpp b/kate/plugins/insertfile/insertfileplugin.cpp index 6a350831f..df8c31cad 100644 --- a/kate/plugins/insertfile/insertfileplugin.cpp +++ b/kate/plugins/insertfile/insertfileplugin.cpp @@ -59,9 +59,9 @@ void InsertFilePlugin::addView(KTextEditor::View *view) void InsertFilePlugin::removeView(KTextEditor::View *view) { for (uint z=0; z < m_views.count(); z++) - if (m_views.at(z)->parentClient() == view) + if (m_views.tqat(z)->parentClient() == view) { - InsertFilePluginView *nview = m_views.at(z); + InsertFilePluginView *nview = m_views.tqat(z); m_views.remove (nview); delete nview; } diff --git a/kate/plugins/isearch/ISearchPlugin.cpp b/kate/plugins/isearch/ISearchPlugin.cpp index 249abf9f2..fef94b1dd 100644 --- a/kate/plugins/isearch/ISearchPlugin.cpp +++ b/kate/plugins/isearch/ISearchPlugin.cpp @@ -485,9 +485,9 @@ void ISearchPlugin::removeView(KTextEditor::View *view) { for (uint z=0; z < m_views.count(); z++) { - if (m_views.at(z)->parentClient() == view) + if (m_views.tqat(z)->parentClient() == view) { - ISearchPluginView *nview = m_views.at(z); + ISearchPluginView *nview = m_views.tqat(z); m_views.remove (nview); delete nview; } diff --git a/kate/plugins/kdatatool/kate_kdatatool.cpp b/kate/plugins/kdatatool/kate_kdatatool.cpp index dcd19675b..6f519c24f 100644 --- a/kate/plugins/kdatatool/kate_kdatatool.cpp +++ b/kate/plugins/kdatatool/kate_kdatatool.cpp @@ -58,9 +58,9 @@ void KDataToolPlugin::removeView(KTextEditor::View *view) { for (uint z=0; z < m_views.count(); z++) { - if (m_views.at(z)->parentClient() == view) + if (m_views.tqat(z)->parentClient() == view) { - KDataToolPluginView *nview = m_views.at(z); + KDataToolPluginView *nview = m_views.tqat(z); m_views.remove (nview); delete nview; } @@ -126,7 +126,7 @@ void KDataToolPluginView::aboutToShow() // find begin of word: m_singleWord_start = 0; for(int i = col; i >= 0; i--) { - TQChar ch = tmp_line.at(i); + TQChar ch = tmp_line.tqat(i); if( ! (ch.isLetter() || ch == '-' || ch == '\'') ) { m_singleWord_start = i+1; @@ -137,7 +137,7 @@ void KDataToolPluginView::aboutToShow() // find end of word: m_singleWord_end = tmp_line.length(); for(uint i = col+1; i < tmp_line.length(); i++) { - TQChar ch = tmp_line.at(i); + TQChar ch = tmp_line.tqat(i); if( ! (ch.isLetter() || ch == '-' || ch == '\'') ) { m_singleWord_end = i; diff --git a/kate/plugins/wordcompletion/docwordcompletion.cpp b/kate/plugins/wordcompletion/docwordcompletion.cpp index 37da55224..435578d6d 100644 --- a/kate/plugins/wordcompletion/docwordcompletion.cpp +++ b/kate/plugins/wordcompletion/docwordcompletion.cpp @@ -91,9 +91,9 @@ void DocWordCompletionPlugin::addView(KTextEditor::View *view) void DocWordCompletionPlugin::removeView(KTextEditor::View *view) { for (uint z=0; z < m_views.count(); z++) - if (m_views.at(z)->parentClient() == view) + if (m_views.tqat(z)->parentClient() == view) { - DocWordCompletionPluginView *nview = m_views.at(z); + DocWordCompletionPluginView *nview = m_views.tqat(z); m_views.remove (nview); delete nview; } diff --git a/kcert/kcertpart.cc b/kcert/kcertpart.cc index adef41c28..7352c1d13 100644 --- a/kcert/kcertpart.cc +++ b/kcert/kcertpart.cc @@ -716,7 +716,7 @@ void KCertPart::slotChain(int c) { displayPKCS12Cert(_p12->getCertificate()); _p12_certState->setText(KSSLCertificate::verifyText(_p12->validate())); } else { - displayPKCS12Cert(_p12->getCertificate()->chain().getChain().at(c-1)); + displayPKCS12Cert(_p12->getCertificate()->chain().getChain().tqat(c-1)); } } diff --git a/kdecore/kapplication.cpp b/kdecore/kapplication.cpp index 3b6b78367..ddbfd4a05 100644 --- a/kdecore/kapplication.cpp +++ b/kdecore/kapplication.cpp @@ -850,7 +850,7 @@ void KApplication::init(bool GUIenabled) // kdialog itself. // * Don't warn if we run with a read-only $HOME TQCString readOnly = getenv("KDE_HOME_READONLY"); - if (readOnly.isEmpty() && (qstrcmp(name(), "kdialog") != 0)) + if (readOnly.isEmpty() && (tqstrcmp(name(), "kdialog") != 0)) { KConfigGroupSaver saver(config, "KDE Action Restrictions"); if (config->readBoolEntry("warn_unwritable_config",true)) diff --git a/kdecore/kcalendarsystem.cpp b/kdecore/kcalendarsystem.cpp index 57898da84..782b272e7 100644 --- a/kdecore/kcalendarsystem.cpp +++ b/kdecore/kcalendarsystem.cpp @@ -90,10 +90,10 @@ static int stringToInteger(const TQString & sNum, int & iLength) unsigned int iPos = 0; int result = 0; - for (; sNum.length() > iPos && sNum.at(iPos).isDigit(); iPos++) + for (; sNum.length() > iPos && sNum.tqat(iPos).isDigit(); iPos++) { result *= 10; - result += sNum.at(iPos).digitValue(); + result += sNum.tqat(iPos).digitValue(); } iLength = iPos; diff --git a/kdecore/kclipboard.cpp b/kdecore/kclipboard.cpp index 244b43541..03a4f916f 100644 --- a/kdecore/kclipboard.cpp +++ b/kdecore/kclipboard.cpp @@ -67,7 +67,7 @@ public: virtual const char *format( int i ) const { if ( i < (int) m_formats.count() ) - return m_formats.at( i ); + return m_formats.tqat( i ); else return 0L; } @@ -78,7 +78,7 @@ public: { int index = m_formats.tqfind( format ); if ( index > -1 ) - return *(m_data.at( index )); + return *(m_data.tqat( index )); return TQByteArray(); } diff --git a/kdecore/kclipboard.h b/kdecore/kclipboard.h index aecfccf52..9432d70aa 100644 --- a/kdecore/kclipboard.h +++ b/kdecore/kclipboard.h @@ -103,7 +103,7 @@ private: KClipboardSynchronizer( TQObject *parent = 0, const char *name = 0L ); void setupSignals(); - static void setClipboard( TQMimeSource* data, QClipboard::Mode mode ); + static void setClipboard( TQMimeSource* data, TQClipboard::Mode mode ); static KClipboardSynchronizer *s_self; static bool s_sync; diff --git a/kdecore/kcmdlineargs.cpp b/kdecore/kcmdlineargs.cpp index 7219163a8..93da1470b 100644 --- a/kdecore/kcmdlineargs.cpp +++ b/kdecore/kcmdlineargs.cpp @@ -1239,7 +1239,7 @@ KCmdLineArgs::arg(int n) const exit(255); } - return parsedArgList->at(n); + return parsedArgList->tqat(n); } KURL diff --git a/kdecore/kcompletion.cpp b/kdecore/kcompletion.cpp index 2876e9138..ce2f3c3b5 100644 --- a/kdecore/kcompletion.cpp +++ b/kdecore/kcompletion.cpp @@ -127,7 +127,7 @@ void KCompletion::addItem( const TQString& item, uint weight ) // nodes. for ( uint i = 0; i < len; i++ ) { - node = node->insert( item.at(i), sorted ); + node = node->insert( item.tqat(i), sorted ); if ( weighted ) node->confirm( weight -1 ); // node->insert() sets weighting to 1 } @@ -419,7 +419,7 @@ TQString KCompletion::findCompletion( const TQString& string ) // start at the tree-root and try to find the search-string for( uint i = 0; i < string.length(); i++ ) { - ch = string.at( i ); + ch = string.tqat( i ); node = node->find( ch ); if ( node ) @@ -508,7 +508,7 @@ void KCompletion::findAllCompletions(const TQString& string, // start at the tree-root and try to find the search-string for( uint i = 0; i < string.length(); i++ ) { - ch = string.at( i ); + ch = string.tqat( i ); node = node->find( ch ); if ( node ) @@ -595,7 +595,7 @@ void KCompletion::extractStringsFromNodeCI( const KCompTreeNode *node, return; } - TQChar ch1 = restString.at(0); + TQChar ch1 = restString.tqat(0); TQString newRest = restString.mid(1); KCompTreeNode *child1, *child2; @@ -725,7 +725,7 @@ void KCompTreeNode::remove( const TQString& str ) uint i = 0; for ( ; i < string.length(); i++ ) { - child = parent->find( string.at( i ) ); + child = parent->find( string.tqat( i ) ); if ( child ) deletables.insert( i + 1, child ); else @@ -736,8 +736,8 @@ void KCompTreeNode::remove( const TQString& str ) for ( ; i >= 1; i-- ) { - parent = deletables.at( i - 1 ); - child = deletables.at( i ); + parent = deletables.tqat( i - 1 ); + child = deletables.tqat( i ); if ( child->myChildren.count() == 0 ) delete parent->myChildren.remove( child ); } @@ -874,7 +874,7 @@ KCompTreeNode *KCompTreeNodeList::remove(KCompTreeNode *item) return item; } -KCompTreeNode *KCompTreeNodeList::at(uint index) const +KCompTreeNode *KCompTreeNodeList::tqat(uint index) const { KCompTreeNode *cur = first; while (index-- && cur) cur = cur->next; diff --git a/kdecore/kcompletion_private.h b/kdecore/kcompletion_private.h index f4363ae95..1ce613faa 100644 --- a/kdecore/kcompletion_private.h +++ b/kdecore/kcompletion_private.h @@ -38,7 +38,7 @@ public: KCompTreeNode *begin() const { return first; } KCompTreeNode *end() const { return last; } - KCompTreeNode *at(uint index) const; + KCompTreeNode *tqat(uint index) const; void append(KCompTreeNode *item); void prepend(KCompTreeNode *item); void insert(KCompTreeNode *after, KCompTreeNode *item); @@ -119,7 +119,7 @@ public: return &myChildren; } inline const KCompTreeNode * tqchildAt(int index) const { - return myChildren.at(index); + return myChildren.tqat(index); } inline const KCompTreeNode * firstChild() const { return myChildren.begin(); diff --git a/kdecore/kconfigbackend.cpp b/kdecore/kconfigbackend.cpp index 192ef9b20..4fc63ebe6 100644 --- a/kdecore/kconfigbackend.cpp +++ b/kdecore/kconfigbackend.cpp @@ -496,7 +496,7 @@ qWarning("SIGBUS while reading %s", rFile.name().latin1()); else #endif { - rFile.at(0); + rFile.tqat(0); data = rFile.readAll(); s = data.data(); eof = s + data.size(); diff --git a/kdecore/kconfigbase.cpp b/kdecore/kconfigbase.cpp index 8319e3aa1..0b35f91e0 100644 --- a/kdecore/kconfigbase.cpp +++ b/kdecore/kconfigbase.cpp @@ -969,7 +969,7 @@ TQColor KConfigBase::readColorEntry( const char *pKey, TQString aValue = readEntry( pKey ); if( !aValue.isEmpty() ) { - if ( aValue.at(0) == (QChar)'#' ) + if ( aValue.tqat(0) == (QChar)'#' ) { aRetColor.setNamedColor(aValue); } @@ -1040,10 +1040,10 @@ TQDateTime KConfigBase::readDateTimeEntry( const char *pKey, TQStrList list; int count = readListEntry( pKey, list, ',' ); if( count == 6 ) { - TQDate date( atoi( list.at( 0 ) ), atoi( list.at( 1 ) ), - atoi( list.at( 2 ) ) ); - TQTime time( atoi( list.at( 3 ) ), atoi( list.at( 4 ) ), - atoi( list.at( 5 ) ) ); + TQDate date( atoi( list.tqat( 0 ) ), atoi( list.tqat( 1 ) ), + atoi( list.tqat( 2 ) ) ); + TQTime time( atoi( list.tqat( 3 ) ), atoi( list.tqat( 4 ) ), + atoi( list.tqat( 5 ) ) ); return TQDateTime( date, time ); } @@ -1424,7 +1424,7 @@ void KConfigBase::writeEntry ( const char *pKey, const TQStrList &list, } str_list += sep; } - if( str_list.at(str_list.length() - 1) == (QChar)sep ) + if( str_list.tqat(str_list.length() - 1) == (QChar)sep ) str_list.truncate( str_list.length() -1 ); writeEntry( pKey, str_list, bPersistent, bGlobal, bNLS ); } @@ -1468,7 +1468,7 @@ void KConfigBase::writeEntry ( const char *pKey, const TQStringList &list, } str_list += sep; } - if( str_list.at(str_list.length() - 1) == (QChar)sep ) + if( str_list.tqat(str_list.length() - 1) == (QChar)sep ) str_list.truncate( str_list.length() -1 ); writeEntry( pKey, str_list, bPersistent, bGlobal, bNLS, bExpand ); } diff --git a/kdecore/kdebug.cpp b/kdecore/kdebug.cpp index b76444b3c..75f2864f9 100644 --- a/kdecore/kdebug.cpp +++ b/kdecore/kdebug.cpp @@ -415,7 +415,7 @@ kdbgstream& kdbgstream::operator << (const TQWidget* widget) return *this; } output += string; - if (output.at(output.length() -1 ) == (QChar)'\n') + if (output.tqat(output.length() -1 ) == (QChar)'\n') { flush(); } diff --git a/kdecore/kdebug.h b/kdecore/kdebug.h index 8e749b24d..0a7d2546f 100644 --- a/kdecore/kdebug.h +++ b/kdecore/kdebug.h @@ -216,7 +216,7 @@ class KDECORE_EXPORT kdbgstream { kdbgstream &operator<<(const TQString& string) { if (!print) return *this; output += string; - if (output.at(output.length() -1 ) == (QChar)'\n') + if (output.tqat(output.length() -1 ) == (QChar)'\n') flush(); return *this; } @@ -228,7 +228,7 @@ class KDECORE_EXPORT kdbgstream { kdbgstream &operator<<(const char *string) { if (!print) return *this; output += TQString::fromUtf8(string); - if (output.at(output.length() - 1) == (QChar)'\n') + if (output.tqat(output.length() - 1) == (QChar)'\n') flush(); return *this; } diff --git a/kdecore/kkeyserver_x11.cpp b/kdecore/kkeyserver_x11.cpp index 8263d2735..65e0e7215 100644 --- a/kdecore/kkeyserver_x11.cpp +++ b/kdecore/kkeyserver_x11.cpp @@ -671,7 +671,7 @@ bool modXToModQt( uint modX, int& modQt ) return modToModQt( modX, modQt ); } -KDECORE_EXPORT int qtButtonStateToMod( Qt::ButtonState s ) +KDECORE_EXPORT int qtButtonStateToMod( TQt::ButtonState s ) { int modQt = 0; if (s & Qt::ShiftButton) modQt |= KKey::SHIFT; diff --git a/kdecore/klibloader.cpp b/kdecore/klibloader.cpp index 80c5e6377..3af226886 100644 --- a/kdecore/klibloader.cpp +++ b/kdecore/klibloader.cpp @@ -549,17 +549,17 @@ void KLibLoader::close_pending(KLibWrapPrivate *wrap) We need to make sure to clear the clipboard before unloading a DSO because the DSO could have defined an object derived from QMimeSource and placed that on the clipboard. */ - /*kapp->clipboard()->clear();*/ + /*kapp->tqclipboard()->clear();*/ /* Well.. let's do something more subtle... convert the clipboard context to text. That should be safe as it only uses objects defined by Qt. */ - if( kapp->clipboard()->ownsSelection()) { - kapp->clipboard()->setText( - kapp->clipboard()->text( QClipboard::Selection ), QClipboard::Selection ); + if( kapp->tqclipboard()->ownsSelection()) { + kapp->tqclipboard()->setText( + kapp->tqclipboard()->text( TQClipboard::Selection ), TQClipboard::Selection ); } - if( kapp->clipboard()->ownsClipboard()) { - kapp->clipboard()->setText( - kapp->clipboard()->text( QClipboard::Clipboard ), QClipboard::Clipboard ); + if( kapp->tqclipboard()->ownsClipboard()) { + kapp->tqclipboard()->setText( + kapp->tqclipboard()->text( TQClipboard::Clipboard ), TQClipboard::Clipboard ); } } diff --git a/kdecore/klocale.cpp b/kdecore/klocale.cpp index 567c9a7f5..f9de79b52 100644 --- a/kdecore/klocale.cpp +++ b/kdecore/klocale.cpp @@ -1103,7 +1103,7 @@ KLocale::SignPosition KLocale::negativeMonetarySignPosition() const static inline void put_it_in( TQChar *buffer, uint& index, const TQString &s ) { for ( uint l = 0; l < s.length(); l++ ) - buffer[index++] = s.at( l ); + buffer[index++] = s.tqat( l ); } static inline void put_it_in( TQChar *buffer, uint& index, int number ) @@ -1352,14 +1352,14 @@ TQString KLocale::formatDate(const TQDate &pDate, bool shortFormat) const { if ( !escape ) { - if ( (TQChar(rst.at( format_index )).tqunicode()) == '%' ) + if ( (TQChar(rst.tqat( format_index )).tqunicode()) == '%' ) escape = true; else - buffer.append(rst.at(format_index)); + buffer.append(rst.tqat(format_index)); } else { - switch ( TQChar(rst.at( format_index )).tqunicode() ) + switch ( TQChar(rst.tqat( format_index )).tqunicode() ) { case '%': buffer.append('%'); @@ -1401,7 +1401,7 @@ TQString KLocale::formatDate(const TQDate &pDate, bool shortFormat) const buffer.append(calendar()->weekDayName(pDate, false)); break; default: - buffer.append(rst.at(format_index)); + buffer.append(rst.tqat(format_index)); break; } escape = false; @@ -1583,12 +1583,12 @@ double KLocale::readMoney(const TQString &_str, bool * ok) const */ static int readInt(const TQString &str, uint &pos) { - if (!str.at(pos).isDigit()) return -1; + if (!str.tqat(pos).isDigit()) return -1; int result = 0; - for (; str.length() > pos && str.at(pos).isDigit(); pos++) + for (; str.length() > pos && str.tqat(pos).isDigit(); pos++) { result *= 10; - result += str.at(pos).digitValue(); + result += str.tqat(pos).digitValue(); } return result; @@ -1625,22 +1625,22 @@ TQDate KLocale::readDate(const TQString &intstr, const TQString &fmt, bool* ok) while (fmt.length() > fmtpos && str.length() > strpos && !error) { - TQChar c = fmt.at(fmtpos++); + TQChar c = fmt.tqat(fmtpos++); if (c != (QChar)'%') { - if (c.isSpace() && str.at(strpos).isSpace()) + if (c.isSpace() && str.tqat(strpos).isSpace()) strpos++; - else if (c != str.at(strpos++)) + else if (c != str.tqat(strpos++)) error = true; } else { int j; // remove space at the beginning - if (str.length() > strpos && str.at(strpos).isSpace()) + if (str.length() > strpos && str.tqat(strpos).isSpace()) strpos++; - c = fmt.at(fmtpos++); + c = fmt.tqat(fmtpos++); switch (c) { case 'a': @@ -1765,22 +1765,22 @@ TQTime KLocale::readTime(const TQString &intstr, ReadTimeFlags flags, bool *ok) { if ( !(Format.length() > Formatpos && str.length() > strpos) ) goto error; - TQChar c = Format.at(Formatpos++); + TQChar c = Format.tqat(Formatpos++); if (c != (QChar)'%') { if (c.isSpace()) strpos++; - else if (c != str.at(strpos++)) + else if (c != str.tqat(strpos++)) goto error; continue; } // remove space at the beginning - if (str.length() > strpos && str.at(strpos).isSpace()) + if (str.length() > strpos && str.tqat(strpos).isSpace()) strpos++; - c = Format.at(Formatpos++); + c = Format.tqat(Formatpos++); switch (c) { case 'p': @@ -1876,14 +1876,14 @@ TQString KLocale::formatTime(const TQTime &pTime, bool includeSecs, bool isDurat { if ( !escape ) { - if ( (TQChar(rst.at( format_index )).tqunicode()) == '%' ) + if ( (TQChar(rst.tqat( format_index )).tqunicode()) == '%' ) escape = true; else - buffer[index++] = rst.at( format_index ); + buffer[index++] = rst.tqat( format_index ); } else { - switch ( TQChar(rst.at( format_index )).tqunicode() ) + switch ( TQChar(rst.tqat( format_index )).tqunicode() ) { case '%': buffer[index++] = (QChar)'%'; @@ -1915,7 +1915,7 @@ TQString KLocale::formatTime(const TQTime &pTime, bool includeSecs, bool isDurat number = pTime.hour(); case 'l': // to share the code - if ( (TQChar(rst.at( format_index )).tqunicode()) == 'l' ) + if ( (TQChar(rst.tqat( format_index )).tqunicode()) == 'l' ) number = isDuration ? pTime.hour() : (pTime.hour() + 11) % 12 + 1; if ( number / 10 ) buffer[index++] = number / 10 + '0'; @@ -1932,7 +1932,7 @@ TQString KLocale::formatTime(const TQTime &pTime, bool includeSecs, bool isDurat } break; default: - buffer[index++] = rst.at( format_index ); + buffer[index++] = rst.tqat( format_index ); break; } escape = false; diff --git a/kdecore/kpalette.cpp b/kdecore/kpalette.cpp index 1a828fe4d..f07ac4228 100644 --- a/kdecore/kpalette.cpp +++ b/kdecore/kpalette.cpp @@ -176,7 +176,7 @@ KPalette::color(int index) if ((index < 0) || (index >= nrColors())) return TQColor(); - kolor *node = mKolorList.at(index); + kolor *node = mKolorList.tqat(index); if (!node) return TQColor(); @@ -202,7 +202,7 @@ KPalette::colorName(int index) if ((index < 0) || (index >= nrColors())) return TQString::null; - kolor *node = mKolorList.at(index); + kolor *node = mKolorList.tqat(index); if (!node) return TQString::null; @@ -227,7 +227,7 @@ KPalette::changeColor(int index, if ((index < 0) || (index >= nrColors())) return -1; - kolor *node = mKolorList.at(index); + kolor *node = mKolorList.tqat(index); if (!node) return -1; diff --git a/kdecore/krfcdate.cpp b/kdecore/krfcdate.cpp index ebb12aa62..9d7c0b7ab 100644 --- a/kdecore/krfcdate.cpp +++ b/kdecore/krfcdate.cpp @@ -394,7 +394,7 @@ KRFCDate::parseDateISO8601( const TQString& input_ ) mday = l[2].toUInt(); // Z suffix means UTC. - if ((QChar)'Z' == timeString.at(timeString.length() - 1)) { + if ((QChar)'Z' == timeString.tqat(timeString.length() - 1)) { timeString.remove(timeString.length() - 1, 1); } diff --git a/kdecore/kstandarddirs.cpp b/kdecore/kstandarddirs.cpp index 91a178a53..46939d032 100644 --- a/kdecore/kstandarddirs.cpp +++ b/kdecore/kstandarddirs.cpp @@ -189,7 +189,7 @@ void KStandardDirs::addPrefix( const TQString& _dir, bool priority ) return; TQString dir = _dir; - if (dir.at(dir.length() - 1) != QChar('/')) + if (dir.tqat(dir.length() - 1) != QChar('/')) dir += QChar('/'); if (!prefixes.tqcontains(dir)) { @@ -209,7 +209,7 @@ void KStandardDirs::addXdgConfigPrefix( const TQString& _dir, bool priority ) return; TQString dir = _dir; - if (dir.at(dir.length() - 1) != QChar('/')) + if (dir.tqat(dir.length() - 1) != QChar('/')) dir += QChar('/'); if (!d->xdgconf_prefixes.tqcontains(dir)) { @@ -229,7 +229,7 @@ void KStandardDirs::addXdgDataPrefix( const TQString& _dir, bool priority ) return; TQString dir = _dir; - if (dir.at(dir.length() - 1) != QChar('/')) + if (dir.tqat(dir.length() - 1) != QChar('/')) dir += QChar('/'); if (!d->xdgdata_prefixes.tqcontains(dir)) { @@ -271,7 +271,7 @@ bool KStandardDirs::addResourceType( const char *type, relatives.insert(type, rels); } TQString copy = relativename; - if (copy.at(copy.length() - 1) != QChar('/')) + if (copy.tqat(copy.length() - 1) != QChar('/')) copy += QChar('/'); if (!rels->tqcontains(copy)) { if (priority) @@ -301,7 +301,7 @@ bool KStandardDirs::addResourceDir( const char *type, absolutes.insert(type, paths); } TQString copy = absdir; - if (copy.at(copy.length() - 1) != QChar('/')) + if (copy.tqat(copy.length() - 1) != QChar('/')) copy += QChar('/'); if (!paths->tqcontains(copy)) { @@ -452,7 +452,7 @@ bool KStandardDirs::exists(const TQString &fullPath) { KDE_struct_stat buff; if (access(TQFile::encodeName(fullPath), R_OK) == 0 && KDE_stat( TQFile::encodeName(fullPath), &buff ) == 0) - if (fullPath.at(fullPath.length() - 1) != QChar('/')) { + if (fullPath.tqat(fullPath.length() - 1) != QChar('/')) { if (S_ISREG( buff.st_mode )) return true; } else @@ -478,9 +478,9 @@ static void lookupDirectory(const TQString& path, const TQString &relPart, return; #ifdef Q_WS_WIN - assert(path.at(path.length() - 1) == QChar('/') || path.at(path.length() - 1) == QChar('\\')); + assert(path.tqat(path.length() - 1) == QChar('/') || path.tqat(path.length() - 1) == QChar('\\')); #else - assert(path.at(path.length() - 1) == QChar('/')); + assert(path.tqat(path.length() - 1) == QChar('/')); #endif struct dirent *ep; @@ -492,7 +492,7 @@ static void lookupDirectory(const TQString& path, const TQString &relPart, while( ( ep = readdir( dp ) ) != 0L ) { TQString fn( TQFile::decodeName(ep->d_name)); - if (fn == _dot || fn == _dotdot || TQChar(fn.at(fn.length() - 1)).latin1() == TQChar('~').latin1()) + if (fn == _dot || fn == _dotdot || TQChar(fn.tqat(fn.length() - 1)).latin1() == TQChar('~').latin1()) continue; if (!recursive && !regexp.exactMatch(fn)) @@ -569,9 +569,9 @@ static void lookupPrefix(const TQString& prefix, const TQString& relpath, if (prefix.isEmpty()) //for sanity return; #ifdef Q_WS_WIN - assert(prefix.at(prefix.length() - 1) == QChar('/') || prefix.at(prefix.length() - 1) == QChar('\\')); + assert(prefix.tqat(prefix.length() - 1) == QChar('/') || prefix.tqat(prefix.length() - 1) == QChar('\\')); #else - assert(prefix.at(prefix.length() - 1) == QChar('/')); + assert(prefix.tqat(prefix.length() - 1) == QChar('/')); #endif KDE_struct_stat buff; @@ -591,7 +591,7 @@ static void lookupPrefix(const TQString& prefix, const TQString& relpath, while( ( ep = readdir( dp ) ) != 0L ) { TQString fn( TQFile::decodeName(ep->d_name)); - if (fn == _dot || fn == _dotdot || fn.at(fn.length() - 1) == QChar('~')) + if (fn == _dot || fn == _dotdot || fn.tqat(fn.length() - 1) == QChar('~')) continue; if ( !pathExp.exactMatch(fn) ) @@ -1176,7 +1176,7 @@ bool KStandardDirs::makeDir(const TQString& dir, int mode) uint len = target.length(); // append trailing slash if missing - if (dir.at(len - 1) != QChar('/')) + if (dir.tqat(len - 1) != QChar('/')) target += QChar('/'); TQString base(""); diff --git a/kdecore/kstringhandler.cpp b/kdecore/kstringhandler.cpp index e37d1a3ce..e309ea6f0 100644 --- a/kdecore/kstringhandler.cpp +++ b/kdecore/kstringhandler.cpp @@ -62,7 +62,7 @@ TQString KStringHandler::word( const TQString &text , const char *range ) // Extract words // int wordsToExtract = cnt-pos+1; - TQStringList::Iterator it = list.at( pos); + TQStringList::Iterator it = list.tqat( pos); while ( (it != list.end()) && (wordsToExtract-- > 0)) { @@ -91,7 +91,7 @@ TQString KStringHandler::insword( const TQString &text , const TQString &word , if ( pos >= list.count() ) list.append( word ); else - list.insert( list.at(pos) , word ); + list.insert( list.tqat(pos) , word ); // Rejoin return list.join( " " ); @@ -112,7 +112,7 @@ TQString KStringHandler::setword( const TQString &text , const TQString &word , list.append( word ); else { - list.insert( list.remove( list.at(pos) ) , word ); + list.insert( list.remove( list.tqat(pos) ) , word ); } // Rejoin @@ -140,7 +140,7 @@ TQString KStringHandler::remrange( const TQString &text , const char *range ) // Remove that range of words // int wordsToDelete = cnt-pos+1; - TQStringList::Iterator it = list.at( pos); + TQStringList::Iterator it = list.tqat( pos); while ( (it != list.end()) && (wordsToDelete-- > 0)) it = list.remove( it ); @@ -159,7 +159,7 @@ TQString KStringHandler::remword( const TQString &text , uint pos ) TQStringList list = TQStringList::split( " ", text, true ); if ( pos < list.count() ) - list.remove( list.at( pos ) ); + list.remove( list.tqat( pos ) ); // Rejoin return list.join( " " ); diff --git a/kdecore/ksycoca.cpp b/kdecore/ksycoca.cpp index 255763ef0..0846c5c95 100644 --- a/kdecore/ksycoca.cpp +++ b/kdecore/ksycoca.cpp @@ -177,7 +177,8 @@ bool KSycoca::openDatabase( bool openDummyIfNotFound ) { // We open a dummy database instead. //kdDebug(7011) << "No database, opening a dummy one." << endl; - TQBuffer *buffer = new TQBuffer( TQByteArray() ); + TQBuffer *buffer = new TQBuffer(); + buffer->tqsetBufferFromCopy(TQByteArray()); buffer->open(IO_ReadWrite); m_str = new TQDataStream( buffer); (*m_str) << (TQ_INT32) KSYCOCA_VERSION; @@ -229,7 +230,7 @@ void KSycoca::closeDatabase() { QIODevice *device = 0; if (m_str) - device = m_str->device(); + device = m_str->tqdevice(); #ifdef HAVE_MMAP if (device && m_sycoca_mmap) { @@ -248,6 +249,7 @@ void KSycoca::closeDatabase() if (TQT_TQIODEVICE(d->database) != device) delete d->database; if (m_barray) delete m_barray; + m_barray = 0; device = 0; d->database = 0; // It is very important to delete all factories here @@ -286,7 +288,7 @@ TQDataStream * KSycoca::findEntry(int offset, KSycocaType &type) if ( !m_str ) openDatabase(); //kdDebug(7011) << TQString("KSycoca::_findEntry(offset=%1)").arg(offset,8,16) << endl; - m_str->tqdevice()->at(offset); + m_str->tqdevice()->tqat(offset); TQ_INT32 aType; (*m_str) >> aType; type = (KSycocaType) aType; @@ -304,7 +306,7 @@ bool KSycoca::checkVersion(bool abortOnError) // We should never get here... if a database was found then m_str shouldn't be 0L. assert(m_str); } - m_str->tqdevice()->at(0); + m_str->tqdevice()->tqat(0); TQ_INT32 aVersion; (*m_str) >> aVersion; if ( aVersion < KSYCOCA_VERSION ) @@ -359,7 +361,7 @@ TQDataStream * KSycoca::findFactory(KSycocaFactoryId id) if (aId == id) { //kdDebug(7011) << TQString("KSycoca::findFactory(%1) offset %2").arg((int)id).arg(aOffset) << endl; - m_str->tqdevice()->at(aOffset); + m_str->tqdevice()->tqat(aOffset); return m_str; } } diff --git a/kdecore/ksycocadict.cpp b/kdecore/ksycocadict.cpp index 76124e76a..11b16b08b 100644 --- a/kdecore/ksycocadict.cpp +++ b/kdecore/ksycocadict.cpp @@ -60,7 +60,7 @@ KSycocaDict::KSycocaDict(TQDataStream *str, int offset) : d(0), mStr(str), mOffset(offset) { TQ_UINT32 test1, test2; - str->tqdevice()->at(offset); + str->tqdevice()->tqat(offset); (*str) >> test1 >> test2; if ((test1 > 0x000fffff) || (test2 > 1024)) { @@ -70,10 +70,10 @@ KSycocaDict::KSycocaDict(TQDataStream *str, int offset) return; } - str->tqdevice()->at(offset); + str->tqdevice()->tqat(offset); (*str) >> mHashTableSize; (*str) >> mHashList; - mOffset = str->tqdevice()->at(); // Start of hashtable + mOffset = str->tqdevice()->tqat(); // Start of hashtable } KSycocaDict::~KSycocaDict() @@ -131,7 +131,7 @@ KSycocaDict::find_string(const TQString &key ) uint off = mOffset+sizeof(TQ_INT32)*hash; //kdDebug(7011) << TQString("off is %1").arg(off,8,16) << endl; - mStr->tqdevice()->at( off ); + mStr->tqdevice()->tqat( off ); TQ_INT32 offset; (*mStr) >> offset; @@ -146,7 +146,7 @@ KSycocaDict::find_string(const TQString &key ) // Lookup duplicate list. offset = -offset; - mStr->tqdevice()->at(offset); + mStr->tqdevice()->tqat(offset); //kdDebug(7011) << TQString("Looking up duplicate list at %1").arg(offset,8,16) << endl; while(true) @@ -286,7 +286,7 @@ KSycocaDict::save(TQDataStream &str) return; } - mOffset = str.tqdevice()->at(); + mOffset = str.tqdevice()->tqat(); //kdDebug(7011) << TQString("KSycocaDict: %1 entries.").arg(count()) << endl; @@ -402,12 +402,12 @@ KSycocaDict::save(TQDataStream &str) str << mHashTableSize; str << mHashList; - mOffset = str.tqdevice()->at(); // mOffset points to start of hashTable + mOffset = str.tqdevice()->tqat(); // mOffset points to start of hashTable //kdDebug(7011) << TQString("Start of Hash Table, offset = %1").arg(mOffset,8,16) << endl; for(int pass = 1; pass <= 2; pass++) { - str.tqdevice()->at(mOffset); + str.tqdevice()->tqat(mOffset); //kdDebug(7011) << TQString("Writing hash table (pass #%1)").arg(pass) << endl; for(uint i=0; i < mHashTableSize; i++) { @@ -421,7 +421,7 @@ KSycocaDict::save(TQDataStream &str) str << tmpid; //kdDebug(7011) << TQString("Hash table : %1").arg(tmpid,8,16) << endl; } - //kdDebug(7011) << TQString("End of Hash Table, offset = %1").arg(str.tqdevice()->at(),8,16) << endl; + //kdDebug(7011) << TQString("End of Hash Table, offset = %1").arg(str.tqdevice()->tqat(),8,16) << endl; //kdDebug(7011) << TQString("Writing duplicate lists (pass #%1)").arg(pass) << endl; for(uint i=0; i < mHashTableSize; i++) @@ -429,7 +429,7 @@ KSycocaDict::save(TQDataStream &str) if (hashTable[i].duplicates) { TQPtrList<string_entry> *dups = hashTable[i].duplicates; - hashTable[i].duplicate_offset = str.tqdevice()->at(); + hashTable[i].duplicate_offset = str.tqdevice()->tqat(); /*kdDebug(7011) << TQString("Duplicate lists: Offset = %1 list_size = %2") .arg(hashTable[i].duplicate_offset,8,16).arg(dups->count()) << endl; */ @@ -441,7 +441,7 @@ KSycocaDict::save(TQDataStream &str) str << (TQ_INT32) 0; // End of list marker (0) } } - //kdDebug(7011) << TQString("End of Dict, offset = %1").arg(str.tqdevice()->at(),8,16) << endl; + //kdDebug(7011) << TQString("End of Dict, offset = %1").arg(str.tqdevice()->tqat(),8,16) << endl; } //kdDebug(7011) << "Cleaning up hash table." << endl; diff --git a/kdecore/ksycocaentry.h b/kdecore/ksycocaentry.h index 2b4611cc2..1d5f1845a 100644 --- a/kdecore/ksycocaentry.h +++ b/kdecore/ksycocaentry.h @@ -101,7 +101,7 @@ public: // KDoc seems to barf on those typedefs and generates no docs after them */ virtual void save(TQDataStream &s) { - mOffset = s.tqdevice()->at(); // store position in member variable + mOffset = s.tqdevice()->tqat(); // store position in member variable s << (TQ_INT32) sycocaType() << mPath; } diff --git a/kdecore/ksycocafactory.cpp b/kdecore/ksycocafactory.cpp index 122dd9405..da65619e6 100644 --- a/kdecore/ksycocafactory.cpp +++ b/kdecore/ksycocafactory.cpp @@ -46,10 +46,10 @@ KSycocaFactory::KSycocaFactory(KSycocaFactoryId factory_id) (*m_str) >> i; m_endEntryOffset = i; - int saveOffset = m_str->tqdevice()->at(); + int saveOffset = m_str->tqdevice()->tqat(); // Init index tables m_sycocaDict = new KSycocaDict(m_str, m_sycocaDictOffset); - saveOffset = m_str->tqdevice()->at(saveOffset); + saveOffset = m_str->tqdevice()->tqat(saveOffset); } } else @@ -78,7 +78,7 @@ void KSycocaFactory::saveHeader(TQDataStream &str) { // Write header - str.tqdevice()->at(mOffset); + str.tqdevice()->tqat(mOffset); str << (TQ_INT32) m_sycocaDictOffset; str << (TQ_INT32) m_beginEntryOffset; str << (TQ_INT32) m_endEntryOffset; @@ -91,13 +91,13 @@ KSycocaFactory::save(TQDataStream &str) // building database if (!m_sycocaDict) return; // Error! - mOffset = str.tqdevice()->at(); // store position in member variable + mOffset = str.tqdevice()->tqat(); // store position in member variable m_sycocaDictOffset = 0; // Write header (pass #1) saveHeader(str); - m_beginEntryOffset = str.tqdevice()->at(); + m_beginEntryOffset = str.tqdevice()->tqat(); // Write all entries. int entryCount = 0; @@ -110,7 +110,7 @@ KSycocaFactory::save(TQDataStream &str) entryCount++; } - m_endEntryOffset = str.tqdevice()->at(); + m_endEntryOffset = str.tqdevice()->tqat(); // Write indices... // Linear index @@ -124,16 +124,16 @@ KSycocaFactory::save(TQDataStream &str) } // Dictionary index - m_sycocaDictOffset = str.tqdevice()->at(); + m_sycocaDictOffset = str.tqdevice()->tqat(); m_sycocaDict->save(str); - int endOfFactoryData = str.tqdevice()->at(); + int endOfFactoryData = str.tqdevice()->tqat(); // Update header (pass #2) saveHeader(str); // Seek to end. - str.tqdevice()->at(endOfFactoryData); + str.tqdevice()->tqat(endOfFactoryData); } void @@ -169,7 +169,7 @@ KSycocaEntry::List KSycocaFactory::allEntries() // Assume we're NOT building a database - m_str->tqdevice()->at(m_endEntryOffset); + m_str->tqdevice()->tqat(m_endEntryOffset); TQ_INT32 entryCount; (*m_str) >> entryCount; diff --git a/kdecore/kurl.cpp b/kdecore/kurl.cpp index 428ab2f20..cc7c3fddb 100644 --- a/kdecore/kurl.cpp +++ b/kdecore/kurl.cpp @@ -1687,14 +1687,14 @@ TQString KURL::fileName( bool _strip_trailing_slash ) const if ( _strip_trailing_slash ) { - while ( len >= 1 && path[ len - 1 ] == (QChar)'/' ) + while ( len >= 1 && path[ len - 1 ] == TQChar('/') ) len--; } - else if ( path[ len - 1 ] == (QChar)'/' ) + else if ( path[ len - 1 ] == TQChar('/') ) return fname; // Does the path only consist of '/' characters ? - if ( len == 1 && path[ 0 ] == (QChar)'/' ) + if ( len == 1 && path[ 0 ] == TQChar('/') ) return fname; // Skip last n slashes @@ -1704,13 +1704,13 @@ TQString KURL::fileName( bool _strip_trailing_slash ) const // This is hairy, we need the last unencoded slash. // Count in the encoded string how many encoded slashes follow the last // unencoded one. - int i = m_strPath_encoded.tqfindRev( (QChar)'/', len - 1 ); + int i = m_strPath_encoded.tqfindRev( TQChar('/'), len - 1 ); TQString fileName_encoded = m_strPath_encoded.mid(i+1); n += fileName_encoded.tqcontains("%2f", false); } int i = len; do { - i = path.tqfindRev( (QChar)'/', i - 1 ); + i = path.tqfindRev( TQChar('/'), i - 1 ); } while (--n && (i > 0)); diff --git a/kdecore/network/ksrvresolverworker.cpp b/kdecore/network/ksrvresolverworker.cpp index c1df59bde..e217507f3 100644 --- a/kdecore/network/ksrvresolverworker.cpp +++ b/kdecore/network/ksrvresolverworker.cpp @@ -85,7 +85,7 @@ bool KSrvResolverWorker::preprocess() return false; protoname = "_"; - protoname += names.at(0); + protoname += names.tqat(0); } else if (sockettype == SOCK_STREAM || sockettype == 0) protoname = "_tcp"; diff --git a/kdecore/svgicons/ksvgiconengine.cpp b/kdecore/svgicons/ksvgiconengine.cpp index faca9d967..2dcd1c226 100644 --- a/kdecore/svgicons/ksvgiconengine.cpp +++ b/kdecore/svgicons/ksvgiconengine.cpp @@ -202,7 +202,11 @@ public: TQWMatrix matrix = m_engine->painter()->parseTransform(transform); TQWMatrix *current = m_engine->painter()->tqworldMatrix(); +#ifdef USE_QT4 +printf("[FIXME] *current = matrix * *current locks up under Qt4; bypassing for now\n\r"); +#else // USE_QT4 *current = matrix * *current; +#endif // USE_QT4 } void parseCommonAttributes(TQDomNode &node) diff --git a/kdecore/tests/kurltest.cpp b/kdecore/tests/kurltest.cpp index e80561d2c..c8e5bcced 100644 --- a/kdecore/tests/kurltest.cpp +++ b/kdecore/tests/kurltest.cpp @@ -384,7 +384,7 @@ int main(int argc, char *argv[]) check("KURL::setFileName()", u2.url(), "file:///home/dfaure/myotherfile.txt"); // more tricky, renaming a directory (kpropsdlg.cc, line ~ 238) TQString tmpurl = "file:/home/dfaure/myolddir/"; - if ( tmpurl.at(tmpurl.length() - 1) == '/') + if ( tmpurl.tqat(tmpurl.length() - 1) == '/') // It's a directory, so strip the trailing slash first tmpurl.truncate( tmpurl.length() - 1); KURL newUrl = tmpurl; diff --git a/kded/kbuildservicefactory.cpp b/kded/kbuildservicefactory.cpp index 64298c273..dcd77c87b 100644 --- a/kded/kbuildservicefactory.cpp +++ b/kded/kbuildservicefactory.cpp @@ -113,32 +113,32 @@ KBuildServiceFactory::save(TQDataStream &str) { KSycocaFactory::save(str); - m_nameDictOffset = str.tqdevice()->at(); + m_nameDictOffset = str.tqdevice()->tqat(); m_nameDict->save(str); - m_relNameDictOffset = str.tqdevice()->at(); + m_relNameDictOffset = str.tqdevice()->tqat(); m_relNameDict->save(str); saveOfferList(str); saveInitList(str); - m_menuIdDictOffset = str.tqdevice()->at(); + m_menuIdDictOffset = str.tqdevice()->tqat(); m_menuIdDict->save(str); - int endOfFactoryData = str.tqdevice()->at(); + int endOfFactoryData = str.tqdevice()->tqat(); // Update header (pass #3) saveHeader(str); // Seek to end. - str.tqdevice()->at(endOfFactoryData); + str.tqdevice()->tqat(endOfFactoryData); } void KBuildServiceFactory::saveOfferList(TQDataStream &str) { - m_offerListOffset = str.tqdevice()->at(); + m_offerListOffset = str.tqdevice()->tqat(); bool isNumber; for(TQDictIterator<KSycocaEntry::Ptr> itserv ( *m_entryDict ); @@ -201,7 +201,7 @@ KBuildServiceFactory::saveOfferList(TQDataStream &str) void KBuildServiceFactory::saveInitList(TQDataStream &str) { - m_initListOffset = str.tqdevice()->at(); + m_initListOffset = str.tqdevice()->tqat(); KService::List initList; diff --git a/kded/kbuildservicegroupfactory.cpp b/kded/kbuildservicegroupfactory.cpp index a992b885d..164dd81e3 100644 --- a/kded/kbuildservicegroupfactory.cpp +++ b/kded/kbuildservicegroupfactory.cpp @@ -165,14 +165,14 @@ KBuildServiceGroupFactory::save(TQDataStream &str) { KSycocaFactory::save(str); - m_baseGroupDictOffset = str.tqdevice()->at(); + m_baseGroupDictOffset = str.tqdevice()->tqat(); m_baseGroupDict->save(str); - int endOfFactoryData = str.tqdevice()->at(); + int endOfFactoryData = str.tqdevice()->tqat(); // Update header (pass #3) saveHeader(str); // Seek to end. - str.tqdevice()->at(endOfFactoryData); + str.tqdevice()->tqat(endOfFactoryData); } diff --git a/kded/kbuildservicetypefactory.cpp b/kded/kbuildservicetypefactory.cpp index c6a386aca..e27a83cc4 100644 --- a/kded/kbuildservicetypefactory.cpp +++ b/kded/kbuildservicetypefactory.cpp @@ -152,13 +152,13 @@ KBuildServiceTypeFactory::save(TQDataStream &str) savePatternLists(str); - int endOfFactoryData = str.tqdevice()->at(); + int endOfFactoryData = str.tqdevice()->tqat(); // Update header (pass #3) saveHeader(str); // Seek to end. - str.tqdevice()->at(endOfFactoryData); + str.tqdevice()->tqat(endOfFactoryData); } void @@ -203,10 +203,10 @@ KBuildServiceTypeFactory::savePatternLists(TQDataStream &str) TQ_INT32 entrySize = 0; TQ_INT32 nrOfEntries = 0; - m_fastPatternOffset = str.tqdevice()->at(); + m_fastPatternOffset = str.tqdevice()->tqat(); // Write out fastPatternHeader (Pass #1) - str.tqdevice()->at(m_fastPatternOffset); + str.tqdevice()->tqat(m_fastPatternOffset); str << nrOfEntries; str << entrySize; @@ -214,27 +214,27 @@ KBuildServiceTypeFactory::savePatternLists(TQDataStream &str) TQStringList::ConstIterator it = fastPatterns.begin(); for ( ; it != fastPatterns.end() ; ++it ) { - int start = str.tqdevice()->at(); + int start = str.tqdevice()->tqat(); // Justify to 6 chars with spaces, so that the size remains constant // in the database file. TQString paddedPattern = (*it).leftJustify(6).right(4); // remove leading "*." //kdDebug(7021) << TQString("FAST : '%1' '%2'").arg(paddedPattern).arg(dict[(*it)]->name()) << endl; str << paddedPattern; str << dict[(*it)]->offset(); - entrySize = str.tqdevice()->at() - start; + entrySize = str.tqdevice()->tqat() - start; nrOfEntries++; } // store position - m_otherPatternOffset = str.tqdevice()->at(); + m_otherPatternOffset = str.tqdevice()->tqat(); // Write out fastPatternHeader (Pass #2) - str.tqdevice()->at(m_fastPatternOffset); + str.tqdevice()->tqat(m_fastPatternOffset); str << nrOfEntries; str << entrySize; // For the other patterns - str.tqdevice()->at(m_otherPatternOffset); + str.tqdevice()->tqat(m_otherPatternOffset); it = otherPatterns.begin(); for ( ; it != otherPatterns.end() ; ++it ) diff --git a/kded/kbuildsycoca.cpp b/kded/kbuildsycoca.cpp index 58585f19a..584531d8c 100644 --- a/kded/kbuildsycoca.cpp +++ b/kded/kbuildsycoca.cpp @@ -541,7 +541,7 @@ bool KBuildSycoca::recreate() void KBuildSycoca::save() { // Write header (#pass 1) - m_str->tqdevice()->at(0); + m_str->tqdevice()->tqat(0); (*m_str) << (TQ_INT32) KSycoca::version(); KSycocaFactory * servicetypeFactory = 0L; @@ -579,10 +579,10 @@ void KBuildSycoca::save() return; // error } - int endOfData = m_str->tqdevice()->at(); + int endOfData = m_str->tqdevice()->tqat(); // Write header (#pass 2) - m_str->tqdevice()->at(0); + m_str->tqdevice()->tqat(0); (*m_str) << (TQ_INT32) KSycoca::version(); for(KSycocaFactory *factory = m_lstFactories->first(); @@ -599,7 +599,7 @@ void KBuildSycoca::save() (*m_str) << (TQ_INT32) 0; // No more factories. // Jump to end of database - m_str->tqdevice()->at(endOfData); + m_str->tqdevice()->tqat(endOfData); } bool KBuildSycoca::checkDirTimestamps( const TQString& dirname, const TQDateTime& stamp, bool top ) diff --git a/kded/kctimefactory.cpp b/kded/kctimefactory.cpp index f268889c4..98471af48 100644 --- a/kded/kctimefactory.cpp +++ b/kded/kctimefactory.cpp @@ -53,7 +53,7 @@ KCTimeInfo::save(TQDataStream &str) { KSycocaFactory::save(str); - m_dictOffset = str.tqdevice()->at(); + m_dictOffset = str.tqdevice()->tqat(); TQDictIterator<TQ_UINT32> it(ctimeDict); while( it.current()) { @@ -62,10 +62,10 @@ KCTimeInfo::save(TQDataStream &str) } str << TQString::null << (TQ_UINT32) 0; - int endOfFactoryData = str.tqdevice()->at(); + int endOfFactoryData = str.tqdevice()->tqat(); saveHeader(str); - str.tqdevice()->at(endOfFactoryData); + str.tqdevice()->tqat(endOfFactoryData); } void @@ -86,7 +86,7 @@ void KCTimeInfo::fillCTimeDict(TQDict<TQ_UINT32> &dict) { assert(m_str); - m_str->tqdevice()->at(m_dictOffset); + m_str->tqdevice()->tqat(m_dictOffset); TQString path; TQ_UINT32 ctime; while(true) diff --git a/kded/vfolder_menu.cpp b/kded/vfolder_menu.cpp index c2321cf39..ce938c7cb 100644 --- a/kded/vfolder_menu.cpp +++ b/kded/vfolder_menu.cpp @@ -1000,7 +1000,7 @@ VFolderMenu::loadApplications(const TQString &dir, const TQString &prefix) while( ( ep = readdir( dp ) ) != 0L ) { TQString fn( TQFile::decodeName(ep->d_name)); - if (fn == _dot || fn == _dotdot || TQChar(fn.at(fn.length() - 1)).latin1() == '~') + if (fn == _dot || fn == _dotdot || TQChar(fn.tqat(fn.length() - 1)).latin1() == '~') continue; TQString pathfn = dir + fn; @@ -1110,7 +1110,7 @@ kdDebug(7021) << "processLegacyDir(" << dir << ", " << relDir << ", " << prefix while( ( ep = readdir( dp ) ) != 0L ) { TQString fn( TQFile::decodeName(ep->d_name)); - if (fn == _dot || fn == _dotdot || TQChar(fn.at(fn.length() - 1)).latin1() == '~') + if (fn == _dot || fn == _dotdot || TQChar(fn.tqat(fn.length() - 1)).latin1() == '~') continue; TQString pathfn = dir + fn; diff --git a/kdefx/kimageeffect.cpp b/kdefx/kimageeffect.cpp index 80b3c3e68..4864bdfa6 100644 --- a/kdefx/kimageeffect.cpp +++ b/kdefx/kimageeffect.cpp @@ -1079,6 +1079,11 @@ TQImage& KImageEffect::blend(const TQColor& clr, TQImage& dst, float opacity) if (dst.depth() != 32) dst = dst.convertDepth(32); +#ifdef USE_QT4 + if (dst.format() != QImage::Format_ARGB32) + dst = dst.convertToFormat(QImage::Format_ARGB32); // This is needed because Qt4 has multiple variants with a 32 bit depth, and the routines below expect one specific variant (ARGB) +#endif + int pixels = dst.width() * dst.height(); #ifdef USE_SSE2_INLINE_ASM @@ -1329,6 +1334,13 @@ TQImage& KImageEffect::blend(TQImage& src, TQImage& dst, float opacity) if (src.depth() != 32) src = src.convertDepth(32); if (dst.depth() != 32) dst = dst.convertDepth(32); +#ifdef USE_QT4 + if (src.format() != QImage::Format_ARGB32) + src = dst.convertToFormat(QImage::Format_ARGB32); // This is needed because Qt4 has multiple variants with a 32 bit depth, and the routines below expect one specific variant (ARGB) + if (dst.format() != QImage::Format_ARGB32) + dst = dst.convertToFormat(QImage::Format_ARGB32); // This is needed because Qt4 has multiple variants with a 32 bit depth, and the routines below expect one specific variant (ARGB) +#endif + int pixels = src.width() * src.height(); #ifdef USE_SSE2_INLINE_ASM diff --git a/kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp b/kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp index 39da4d383..5be680300 100644 --- a/kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp @@ -127,7 +127,7 @@ void CupsdSecurityPage::slotAdd() { if (KMessageBox::warningContinueCancel(this, i18n("This location is already defined. Do you want to replace the existing one?"),TQString::null,i18n("Replace")) == KMessageBox::Continue) { - index = locs_.at(); + index = locs_.tqat(); locs_.remove(); break; } @@ -149,7 +149,7 @@ void CupsdSecurityPage::slotAdd() void CupsdSecurityPage::slotEdit(int index) { - CupsLocation *loc = locs_.at(index); + CupsLocation *loc = locs_.tqat(index); LocationDialog::editLocation(loc, this, conf_); } diff --git a/kdeprint/cups/cupsdconf2/locationdialog.cpp b/kdeprint/cups/cupsdconf2/locationdialog.cpp index 155d11388..a4d550d0e 100644 --- a/kdeprint/cups/cupsdconf2/locationdialog.cpp +++ b/kdeprint/cups/cupsdconf2/locationdialog.cpp @@ -128,7 +128,7 @@ void LocationDialog::setInfos(CupsdConf *conf) void LocationDialog::fillLocation(CupsLocation *loc) { - loc->resource_ = conf_->resources_.at(resource_->currentItem()); + loc->resource_ = conf_->resources_.tqat(resource_->currentItem()); loc->resourcename_ = loc->resource_->path_; loc->authtype_ = authtype_->currentItem(); loc->authclass_ = (loc->authtype_ == AUTHTYPE_NONE ? AUTHCLASS_ANONYMOUS : authclass_->currentItem()); diff --git a/kdeprint/cups/kmcupsconfigwidget.cpp b/kdeprint/cups/kmcupsconfigwidget.cpp index cd3c3ab01..5242cd240 100644 --- a/kdeprint/cups/kmcupsconfigwidget.cpp +++ b/kdeprint/cups/kmcupsconfigwidget.cpp @@ -87,13 +87,13 @@ KMCupsConfigWidget::KMCupsConfigWidget(TQWidget *parent, const char *name) TQVBoxLayout *lay0 = new TQVBoxLayout(this, 0, 10); lay0->addWidget(m_hostbox,1); lay0->addWidget(m_loginbox,1); - TQGridLayout *lay2 = new TQGridLayout(m_hostbox->layout(), 2, 2, 10); + TQGridLayout *lay2 = new TQGridLayout(m_hostbox->tqlayout(), 2, 2, 10); lay2->setColStretch(1,1); lay2->addWidget(m_hostlabel,0,0); lay2->addWidget(m_portlabel,1,0); lay2->addWidget(m_host,0,1); lay2->addWidget(m_port,1,1); - TQGridLayout *lay3 = new TQGridLayout(m_loginbox->layout(), 4, 2, 10); + TQGridLayout *lay3 = new TQGridLayout(m_loginbox->tqlayout(), 4, 2, 10); lay3->setColStretch(1,1); lay3->addWidget(m_loginlabel,0,0); lay3->addWidget(m_passwordlabel,1,0); diff --git a/kdeprint/cups/kpimagepage.cpp b/kdeprint/cups/kpimagepage.cpp index 4280ab40e..d669bc475 100644 --- a/kdeprint/cups/kpimagepage.cpp +++ b/kdeprint/cups/kpimagepage.cpp @@ -353,7 +353,7 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name) l0->addWidget(sizebox, 1, 0); l0->addWidget(positionbox, 1, 1); l0->setColStretch(0, 1); - TQGridLayout *l1 = new TQGridLayout(colorbox->layout(), 5, 2, 10); + TQGridLayout *l1 = new TQGridLayout(colorbox->tqlayout(), 5, 2, 10); l1->addWidget(m_brightness, 0, 0); l1->addWidget(m_hue, 1, 0); l1->addWidget(m_saturation, 2, 0); @@ -361,14 +361,14 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name) l1->addWidget(m_gamma, 4, 0); l1->addMultiCellWidget(m_preview, 0, 3, 1, 1); l1->addWidget(defbtn, 4, 1); - TQVBoxLayout *l2 = new TQVBoxLayout(TQT_TQLAYOUT(sizebox->layout()), 3); + TQVBoxLayout *l2 = new TQVBoxLayout(TQT_TQLAYOUT(sizebox->tqlayout()), 3); l2->addStretch(1); l2->addWidget(lab); l2->addWidget(m_sizetype); l2->addSpacing(10); l2->addWidget(m_size); l2->addStretch(1); - TQGridLayout *l3 = new TQGridLayout(positionbox->layout(), 2, 2, 10); + TQGridLayout *l3 = new TQGridLayout(positionbox->tqlayout(), 2, 2, 10); TQHBoxLayout *l4 = new TQHBoxLayout(0, 0, 10); TQVBoxLayout *l5 = new TQVBoxLayout(0, 0, 10); l3->addLayout(l4, 0, 1); diff --git a/kdeprint/driver.cpp b/kdeprint/driver.cpp index 6cedb46b1..241dd0b10 100644 --- a/kdeprint/driver.cpp +++ b/kdeprint/driver.cpp @@ -627,7 +627,7 @@ void DrListOption::setChoice(int choicenum) { if (choicenum >= 0 && choicenum < (int)m_choices.count()) { - setValueText(m_choices.at(choicenum)->name()); + setValueText(m_choices.tqat(choicenum)->name()); } } diff --git a/kdeprint/kmjobmanager.cpp b/kdeprint/kmjobmanager.cpp index fcc7d1a00..fcde4817f 100644 --- a/kdeprint/kmjobmanager.cpp +++ b/kdeprint/kmjobmanager.cpp @@ -53,7 +53,7 @@ void KMJobManager::discardAllJobs() void KMJobManager::removeDiscardedJobs() { for (uint i=0;i<m_jobs.count();i++) - if (m_jobs.at(i)->isDiscarded()) + if (m_jobs.tqat(i)->isDiscarded()) { m_jobs.remove(i); i--; diff --git a/kdeprint/kmmanager.cpp b/kdeprint/kmmanager.cpp index 4299b3718..e63fd8e4f 100644 --- a/kdeprint/kmmanager.cpp +++ b/kdeprint/kmmanager.cpp @@ -253,7 +253,7 @@ TQPtrList<KMPrinter>* KMManager::printerList(bool reload) // remove discarded printers for (uint i=0; i<m_printers.count(); i++) { - KMPrinter *prt = m_printers.at(i); + KMPrinter *prt = m_printers.tqat(i); if (prt->isDiscarded()) { m_printers.remove(i); diff --git a/kdeprint/kpcopiespage.cpp b/kdeprint/kpcopiespage.cpp index 2079bc0f1..6d7a29c8c 100644 --- a/kdeprint/kpcopiespage.cpp +++ b/kdeprint/kpcopiespage.cpp @@ -220,7 +220,7 @@ KPCopiesPage::KPCopiesPage(KPrinter *prt, TQWidget *parent, const char *name) l1->setColStretch(1,1); l1->addWidget(m_pagebox,0,0); l1->addWidget(m_copybox,0,1); - TQVBoxLayout *l3 = new TQVBoxLayout(TQT_TQLAYOUT(m_pagebox->layout()), 5); + TQVBoxLayout *l3 = new TQVBoxLayout(TQT_TQLAYOUT(m_pagebox->tqlayout()), 5); l3->addWidget(m_all); l3->addWidget(m_current); TQHBoxLayout *l4 = new TQHBoxLayout(0, 0, 5); @@ -233,7 +233,7 @@ KPCopiesPage::KPCopiesPage(KPrinter *prt, TQWidget *parent, const char *name) l3->addLayout(l2); l2->addWidget(m_pagesetlabel,0); l2->addWidget(m_pageset,1); - TQGridLayout *l5 = new TQGridLayout(m_copybox->layout(), 4, 2, 10); + TQGridLayout *l5 = new TQGridLayout(m_copybox->tqlayout(), 4, 2, 10); l5->setRowStretch(4,1); l5->addWidget(m_copieslabel,0,0); l5->addWidget(m_copies,0,1); diff --git a/kdeprint/kpgeneralpage.cpp b/kdeprint/kpgeneralpage.cpp index 272d97119..ac7dfdae0 100644 --- a/kdeprint/kpgeneralpage.cpp +++ b/kdeprint/kpgeneralpage.cpp @@ -347,27 +347,27 @@ KPGeneralPage::KPGeneralPage(KMPrinter *pr, DrMain *dr, TQWidget *parent, const lay2->addWidget(m_nupbox, 1, 1); lay2->setColStretch(0, 1); lay2->setColStretch(1, 1); - TQGridLayout *lay3 = new TQGridLayout(m_orientbox->layout(), 4, 2, + TQGridLayout *lay3 = new TQGridLayout(m_orientbox->tqlayout(), 4, 2, KDialog::spacingHint()); lay3->addWidget(m_portrait, 0, 0); lay3->addWidget(m_landscape, 1, 0); lay3->addWidget(m_revland, 2, 0); lay3->addWidget(m_revport, 3, 0); lay3->addMultiCellWidget(m_orientpix, 0, 3, 1, 1); - TQGridLayout *lay4 = new TQGridLayout(m_duplexbox->layout(), 3, 2, + TQGridLayout *lay4 = new TQGridLayout(m_duplexbox->tqlayout(), 3, 2, KDialog::spacingHint()); lay4->addWidget(m_dupnone, 0, 0); lay4->addWidget(m_duplong, 1, 0); lay4->addWidget(m_dupshort, 2, 0); lay4->addMultiCellWidget(m_duplexpix, 0, 2, 1, 1); lay4->setRowStretch( 0, 1 ); - TQGridLayout *lay5 = new TQGridLayout(m_nupbox->layout(), 3, 2, + TQGridLayout *lay5 = new TQGridLayout(m_nupbox->tqlayout(), 3, 2, KDialog::spacingHint()); lay5->addWidget(m_nup1, 0, 0); lay5->addWidget(m_nup2, 1, 0); lay5->addWidget(m_nup4, 2, 0); lay5->addMultiCellWidget(m_nuppix, 0, 2, 1, 1); - TQGridLayout *lay6 = new TQGridLayout(m_bannerbox->layout(), 2, 2, + TQGridLayout *lay6 = new TQGridLayout(m_bannerbox->tqlayout(), 2, 2, KDialog::spacingHint()); lay6->addWidget(m_startbannerlabel, 0, 0); lay6->addWidget(m_endbannerlabel, 1, 0); @@ -622,17 +622,17 @@ void KPGeneralPage::getOptions(TQMap<TQString,TQString>& opts, bool incldef) DrListOption *opt; if ((opt=(DrListOption*)driver()->findOption("PageSize")) != NULL) { - DrBase *ch = opt->choices()->at(m_pagesize->currentItem()); + DrBase *ch = opt->choices()->tqat(m_pagesize->currentItem()); if (incldef || ch->name() != opt->get("default")) opts["PageSize"] = ch->name(); } if ((opt=(DrListOption*)driver()->findOption("MediaType")) != NULL) { - DrBase *ch = opt->choices()->at(m_papertype->currentItem()); + DrBase *ch = opt->choices()->tqat(m_papertype->currentItem()); if (incldef || ch->name() != opt->get("default")) opts["MediaType"] = ch->name(); } if ((opt=(DrListOption*)driver()->findOption("InputSlot")) != NULL) { - DrBase *ch = opt->choices()->at(m_inputslot->currentItem()); + DrBase *ch = opt->choices()->tqat(m_inputslot->currentItem()); if (incldef || ch->name() != opt->get("default")) opts["InputSlot"] = ch->name(); } diff --git a/kdeprint/kpqtpage.cpp b/kdeprint/kpqtpage.cpp index 92337f399..4c1a67f38 100644 --- a/kdeprint/kpqtpage.cpp +++ b/kdeprint/kpqtpage.cpp @@ -164,15 +164,15 @@ void KPQtPage::init() lay0->addWidget(m_orientbox,1,0); lay0->addWidget(m_colorbox,1,1); lay0->addWidget(m_nupbox,2,0); - TQGridLayout *lay1 = new TQGridLayout(m_orientbox->layout(), 2, 2, 10); + TQGridLayout *lay1 = new TQGridLayout(m_orientbox->tqlayout(), 2, 2, 10); lay1->addWidget(m_portrait,0,0); lay1->addWidget(m_landscape,1,0); lay1->addMultiCellWidget(m_orientpix,0,1,1,1); - TQGridLayout *lay2 = new TQGridLayout(m_colorbox->layout(), 2, 2, 10); + TQGridLayout *lay2 = new TQGridLayout(m_colorbox->tqlayout(), 2, 2, 10); lay2->addWidget(m_color,0,0); lay2->addWidget(m_grayscale,1,0); lay2->addMultiCellWidget(m_colorpix,0,1,1,1); - TQGridLayout *lay3 = new TQGridLayout(m_nupbox->layout(), 4, 2, 5); + TQGridLayout *lay3 = new TQGridLayout(m_nupbox->tqlayout(), 4, 2, 5); lay3->addWidget(m_nup1,0,0); lay3->addWidget(m_nup2,1,0); lay3->addWidget(m_nup4,2,0); @@ -305,7 +305,7 @@ void KPQtPage::getOptions(TQMap<TQString,TQString>& opts, bool incldef) DrListOption *opt = static_cast<DrListOption*>(driver()->findOption("PageSize")); if (opt) { - DrBase *ch = opt->choices()->at(m_pagesize->currentItem()); + DrBase *ch = opt->choices()->tqat(m_pagesize->currentItem()); if (ch && (incldef || ch->name() != opt->get("default"))) { opts["PageSize"] = ch->name(); diff --git a/kdeprint/kprintdialog.cpp b/kdeprint/kprintdialog.cpp index 2bfd8100e..a873f41c2 100644 --- a/kdeprint/kprintdialog.cpp +++ b/kdeprint/kprintdialog.cpp @@ -361,7 +361,7 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name) l2->addStretch(1); l2->addWidget(d->m_ok,0); l2->addWidget(m_cancel,0); - TQGridLayout *l3 = new TQGridLayout(m_pbox->layout(),3,3,7); + TQGridLayout *l3 = new TQGridLayout(m_pbox->tqlayout(),3,3,7); l3->setColStretch(1,1); l3->setRowStretch(0,1); TQGridLayout *l4 = new TQGridLayout(0, 5, 2, 0, 5); @@ -824,7 +824,7 @@ void KPrintDialog::reload() // remove printer dependent pages (usually from plugin) TQTabWidget *tabs = static_cast<TQTabWidget*>(TQT_TQWIDGET(d->m_dummy->child("TabWidget", "TQTabWidget"))); for (uint i=0; i<d->m_pages.count(); i++) - if (d->m_pages.at(i)->onlyRealPrinters()) + if (d->m_pages.tqat(i)->onlyRealPrinters()) { KPrintDialogPage *page = d->m_pages.take(i--); if (tabs) @@ -952,10 +952,10 @@ void KPrintDialog::enableDialogPage( int index, bool flag ) if ( d->m_pages.count() > 1 ) { TQTabWidget *tabs = static_cast<TQTabWidget*>(TQT_TQWIDGET(d->m_dummy->child("TabWidget", "TQTabWidget"))); - tabs->setTabEnabled( d->m_pages.at( index ), flag ); + tabs->setTabEnabled( d->m_pages.tqat( index ), flag ); } else - d->m_pages.at( 0 )->setEnabled( flag ); + d->m_pages.tqat( 0 )->setEnabled( flag ); } void KPrintDialog::slotOpenFileDialog() diff --git a/kdeprint/management/kmiconview.cpp b/kdeprint/management/kmiconview.cpp index a7671c789..7afaf1537 100644 --- a/kdeprint/management/kmiconview.cpp +++ b/kdeprint/management/kmiconview.cpp @@ -180,7 +180,7 @@ void KMIconView::setPrinterList(TQPtrList<KMPrinter> *list) } for (uint i=0; i<m_items.count(); i++) - if (m_items.at(i)->isDiscarded()) + if (m_items.tqat(i)->isDiscarded()) { delete m_items.take(i); i--; diff --git a/kdeprint/management/kmjobviewer.cpp b/kdeprint/management/kmjobviewer.cpp index d22bad860..ebdfacf81 100644 --- a/kdeprint/management/kmjobviewer.cpp +++ b/kdeprint/management/kmjobviewer.cpp @@ -398,7 +398,7 @@ void KMJobViewer::updateJobs() } for (uint i=0; i<m_items.count(); i++) - if (m_items.at(i)->isDiscarded()) + if (m_items.tqat(i)->isDiscarded()) { delete m_items.take(i); i--; @@ -510,7 +510,7 @@ void KMJobViewer::slotMove(int prID) { if (prID >= 0 && prID < (int)(m_printers.count())) { - KMPrinter *p = m_printers.at(prID); + KMPrinter *p = m_printers.tqat(prID); send(KMJob::Move,i18n("Move to %1").arg(p->printerName()),p->printerName()); } } @@ -540,7 +540,7 @@ void KMJobViewer::slotPrinterSelected(int prID) { if (prID >= 0 && prID < (int)(m_printers.count()+1)) { - TQString prname = (prID == 0 ? i18n("All Printers") : m_printers.at(prID-1)->printerName()); + TQString prname = (prID == 0 ? i18n("All Printers") : m_printers.tqat(prID-1)->printerName()); emit printerChanged(this, prname); } } diff --git a/kdeprint/management/kmlistview.cpp b/kdeprint/management/kmlistview.cpp index 9bcaa44d3..76ec62bb3 100644 --- a/kdeprint/management/kmlistview.cpp +++ b/kdeprint/management/kmlistview.cpp @@ -216,7 +216,7 @@ void KMListView::setPrinterList(TQPtrList<KMPrinter> *list) TQPtrList<KMListViewItem> deleteList; deleteList.setAutoDelete(true); for (uint i=0; i<m_items.count(); i++) - if (m_items.at(i)->isDiscarded()) + if (m_items.tqat(i)->isDiscarded()) { // instance items are put in front of the list // so that they are destroyed first diff --git a/kdeprint/management/kmspecialprinterdlg.cpp b/kdeprint/management/kmspecialprinterdlg.cpp index ce5741574..c444091e7 100644 --- a/kdeprint/management/kmspecialprinterdlg.cpp +++ b/kdeprint/management/kmspecialprinterdlg.cpp @@ -138,7 +138,7 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name) l0->addWidget(sep); l0->addWidget(m_gb); l0->addWidget(m_outfile_gb); - TQGridLayout *l6 = new TQGridLayout(m_outfile_gb->layout(), 3, 2, 10); + TQGridLayout *l6 = new TQGridLayout(m_outfile_gb->tqlayout(), 3, 2, 10); l6->addMultiCellWidget( m_usefile, 0, 0, 0, 1 ); l6->addWidget(m_mimetypelabel, 1, 0); l6->addWidget(m_mimetype, 1, 1); diff --git a/kdeprint/management/kmwdriverselect.cpp b/kdeprint/management/kmwdriverselect.cpp index 93e37be7d..353fc0861 100644 --- a/kdeprint/management/kmwdriverselect.cpp +++ b/kdeprint/management/kmwdriverselect.cpp @@ -93,7 +93,7 @@ void KMWDriverSelect::updatePrinter(KMPrinter *p) int index = m_list->currentItem(); if (m_entries && index >= 0 && index < (int)(m_entries->count())) { - KMDBEntry *entry = m_entries->at(index); + KMDBEntry *entry = m_entries->tqat(index); p->setDbEntry(entry); p->setDriverInfo(entry->description); } @@ -107,8 +107,8 @@ void KMWDriverSelect::updatePrinter(KMPrinter *p) void KMWDriverSelect::slotDriverComment() { int index = m_list->currentItem(); - if (m_entries && index >=0 && index < (int)(m_entries->count()) && !m_entries->at(index)->drivercomment.isEmpty()) - KMessageBox::information(this, m_entries->at(index)->drivercomment, TQString::null, TQString::null, KMessageBox::AllowLink); + if (m_entries && index >=0 && index < (int)(m_entries->count()) && !m_entries->tqat(index)->drivercomment.isEmpty()) + KMessageBox::information(this, m_entries->tqat(index)->drivercomment, TQString::null, TQString::null, KMessageBox::AllowLink); else KMessageBox::error(this, i18n("No information about the selected driver.")); } diff --git a/kdeprint/management/kmwinfobase.cpp b/kdeprint/management/kmwinfobase.cpp index 0d6d4beae..835042c59 100644 --- a/kdeprint/management/kmwinfobase.cpp +++ b/kdeprint/management/kmwinfobase.cpp @@ -56,19 +56,19 @@ void KMWInfoBase::setInfo(const TQString& s) void KMWInfoBase::setLabel(int i, const TQString& s) { if (i >= 0 && i < m_nlines) - m_labels.at(i)->setText(s); + m_labels.tqat(i)->setText(s); } void KMWInfoBase::setText(int i, const TQString& s) { if (i >= 0 && i < m_nlines) - m_edits.at(i)->setText(s); + m_edits.tqat(i)->setText(s); } TQString KMWInfoBase::text(int i) { if (i >= 0 && i < m_nlines) - return m_edits.at(i)->text(); + return m_edits.tqat(i)->text(); return TQString::null; } @@ -76,15 +76,15 @@ void KMWInfoBase::setCurrent(int i) { if (i >= 0 && i < m_nlines) { - m_edits.at(i)->selectAll(); - m_edits.at(i)->setFocus(); + m_edits.tqat(i)->selectAll(); + m_edits.tqat(i)->setFocus(); } } TQLineEdit* KMWInfoBase::lineEdit( int i ) { if ( i >= 0 && i < m_nlines ) - return m_edits.at( i ); + return m_edits.tqat( i ); else return NULL; } diff --git a/kdeprint/management/kxmlcommanddlg.cpp b/kdeprint/management/kxmlcommanddlg.cpp index 3d92ad472..c0377993a 100644 --- a/kdeprint/management/kxmlcommanddlg.cpp +++ b/kdeprint/management/kxmlcommanddlg.cpp @@ -230,9 +230,9 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam l5->addWidget(m_edit1, 0, 1); l5->addWidget(m_edit2, 1, 1); - TQGridLayout *l8 = new TQGridLayout(gb_input->layout(), 2, 2, + TQGridLayout *l8 = new TQGridLayout(gb_input->tqlayout(), 2, 2, KDialog::spacingHint()); - TQGridLayout *l9 = new TQGridLayout(gb_output->layout(), 2, 2, + TQGridLayout *l9 = new TQGridLayout(gb_output->tqlayout(), 2, 2, KDialog::spacingHint()); l8->addWidget(m_inputfilelab, 0, 0); l8->addWidget(m_inputpipelab, 1, 0); @@ -243,7 +243,7 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam l9->addWidget(m_outputfile, 0, 1); l9->addWidget(m_outputpipe, 1, 1); - TQVBoxLayout *l11 = new TQVBoxLayout(TQT_TQLAYOUT(gb->layout())); + TQVBoxLayout *l11 = new TQVBoxLayout(TQT_TQLAYOUT(gb->tqlayout())); l11->addWidget(m_stack); TQVBoxLayout *l12 = new TQVBoxLayout( 0, 0, 0 ); @@ -895,14 +895,14 @@ KXmlCommandDlg::KXmlCommandDlg(TQWidget *parent, const char *name) l6->addWidget(m_mimetypelab, 0); l6->addWidget(m_mimetype, 1); l7->addWidget(m_gb1); - TQGridLayout *l2 = new TQGridLayout(TQT_TQLAYOUT(m_gb1->layout()), 4, 3, 10); + TQGridLayout *l2 = new TQGridLayout(TQT_TQLAYOUT(m_gb1->tqlayout()), 4, 3, 10); l2->addMultiCellWidget(m_availablemime, 0, 3, 2, 2); l2->addMultiCellWidget(m_selectedmime, 0, 3, 0, 0); l2->addWidget(m_addmime, 1, 1); l2->addWidget(m_removemime, 2, 1); l2->setRowStretch(0, 1); l2->setRowStretch(3, 1); - TQHBoxLayout *l4 = new TQHBoxLayout(TQT_TQLAYOUT(m_gb2->layout()), 10); + TQHBoxLayout *l4 = new TQHBoxLayout(TQT_TQLAYOUT(m_gb2->tqlayout()), 10); l4->addWidget(m_requirements); TQVBoxLayout *l8 = new TQVBoxLayout(0, 0, 0); l4->addLayout(l8); diff --git a/kdeprint/rlpr/kmproxywidget.cpp b/kdeprint/rlpr/kmproxywidget.cpp index daf4b7665..1aeb1c03f 100644 --- a/kdeprint/rlpr/kmproxywidget.cpp +++ b/kdeprint/rlpr/kmproxywidget.cpp @@ -46,7 +46,7 @@ KMProxyWidget::KMProxyWidget(TQWidget *parent, const char *name) m_proxyhost->setEnabled(false); m_proxyport->setEnabled(false); - TQGridLayout *lay0 = new TQGridLayout(layout(), 3, 2, 10); + TQGridLayout *lay0 = new TQGridLayout(tqlayout(), 3, 2, 10); lay0->setColStretch(1,1); lay0->addMultiCellWidget(m_useproxy,0,0,0,1); lay0->addWidget(m_hostlabel,1,0); diff --git a/kdesu/process.cpp b/kdesu/process.cpp index cce910c47..00c320a12 100644 --- a/kdesu/process.cpp +++ b/kdesu/process.cpp @@ -524,7 +524,7 @@ int PtyProcess::waitForChild() fputs(output, stdout); fflush(stdout); } - lineStart = output.at( output.length() - 1 ) == '\n'; + lineStart = output.tqat( output.length() - 1 ) == '\n'; output = readAll(false); } } diff --git a/kdeui/kaction.cpp b/kdeui/kaction.cpp index 5327845ab..2c5b5caec 100644 --- a/kdeui/kaction.cpp +++ b/kdeui/kaction.cpp @@ -256,7 +256,7 @@ void KAction::initPrivate( const TQString& text, const KShortcut& cut, { d->m_cutDefault = cut; - m_parentCollection = dynamic_cast<KActionCollection *>( parent() ); + m_parentCollection = tqt_dynamic_cast<KActionCollection *>( parent() ); kdDebug(129) << "KAction::initPrivate(): this = " << this << " name = \"" << name() << "\" cut = " << cut.toStringInternal() << " m_parentCollection = " << m_parentCollection << endl; if ( m_parentCollection ) m_parentCollection->insert( this ); @@ -816,7 +816,7 @@ void KAction::plugMainWindowAccel( TQWidget *w ) while ( !tl->isDialog() && ( n = tl->tqparentWidget() ) ) // lookup parent and store tl = n; - KMainWindow * mw = dynamic_cast<KMainWindow *>(tl); // try to see if it's a kmainwindow + KMainWindow * mw = tqt_dynamic_cast<KMainWindow *>(tl); // try to see if it's a kmainwindow if (mw) plugAccel( mw->accel() ); else @@ -1051,12 +1051,12 @@ TQWidget* KAction::container( int index ) const KToolBar* KAction::toolBar( int index ) const { - return dynamic_cast<KToolBar *>( d->m_containers[ index ].m_container ); + return tqt_dynamic_cast<KToolBar *>( d->m_containers[ index ].m_container ); } TQPopupMenu* KAction::popupMenu( int index ) const { - return dynamic_cast<TQPopupMenu *>( d->m_containers[ index ].m_container ); + return tqt_dynamic_cast<TQPopupMenu *>( d->m_containers[ index ].m_container ); } TQWidget* KAction::representative( int index ) const @@ -1120,14 +1120,14 @@ void KAction::slotPopupActivated() { if( ::tqqt_cast<TQSignal *>(sender())) { - int id = dynamic_cast<const TQSignal *>(sender())->value().toInt(); + int id = tqt_dynamic_cast<const TQSignal *>(sender())->value().toInt(); int pos = findContainer(id); if(pos != -1) { - TQPopupMenu* qpm = dynamic_cast<TQPopupMenu *>( container(pos) ); + TQPopupMenu* qpm = tqt_dynamic_cast<TQPopupMenu *>( container(pos) ); if(qpm) { - KPopupMenu* kpm = dynamic_cast<KPopupMenu *>( qpm ); + KPopupMenu* kpm = tqt_dynamic_cast<KPopupMenu *>( qpm ); TQt::ButtonState state; if ( kpm ) // KPopupMenu? Nice, it stores the state. state = kpm->state(); diff --git a/kdeui/kactionclasses.cpp b/kdeui/kactionclasses.cpp index 3185db276..2d926f971 100644 --- a/kdeui/kactionclasses.cpp +++ b/kdeui/kactionclasses.cpp @@ -1949,8 +1949,8 @@ int KToolBarPopupAction::plug( TQWidget *widget, int index ) int id_ = KAction::getToolButtonID(); if ( icon().isEmpty() && !iconSet().isNull() ) { - bar->insertButton( iconSet().pixmap(), id_, TQT_SIGNAL( buttonClicked(int, Qt::ButtonState) ), this, - TQT_SLOT( slotButtonClicked(int, Qt::ButtonState) ), + bar->insertButton( iconSet().pixmap(), id_, TQT_SIGNAL( buttonClicked(int, TQt::ButtonState) ), this, + TQT_SLOT( slotButtonClicked(int, TQt::ButtonState) ), isEnabled(), plainText(), index ); } else { @@ -1960,8 +1960,8 @@ int KToolBarPopupAction::plug( TQWidget *widget, int index ) else instance = KGlobal::instance(); - bar->insertButton( icon(), id_, TQT_SIGNAL( buttonClicked(int, Qt::ButtonState) ), this, - TQT_SLOT( slotButtonClicked(int, Qt::ButtonState) ), + bar->insertButton( icon(), id_, TQT_SIGNAL( buttonClicked(int, TQt::ButtonState) ), this, + TQT_SLOT( slotButtonClicked(int, TQt::ButtonState) ), isEnabled(), plainText(), index, instance ); } @@ -2027,7 +2027,7 @@ int KToggleToolBarAction::plug( TQWidget* w, int index ) while ( !tl->isDialog() && ( n = tl->tqparentWidget() ) ) // lookup parent and store tl = n; - KMainWindow * mw = dynamic_cast<KMainWindow *>(tl); // try to see if it's a kmainwindow + KMainWindow * mw = tqt_dynamic_cast<KMainWindow *>(tl); // try to see if it's a kmainwindow if ( mw ) m_toolBar = mw->toolBar( m_toolBarName ); @@ -2326,7 +2326,7 @@ void KPasteTextAction::menuAboutToShow() if (reply.isValid()) list = reply; } - TQString clipboardText = tqApp->clipboard()->text(TQClipboard::Clipboard); + TQString clipboardText = tqApp->tqclipboard()->text(TQClipboard::Clipboard); if (list.isEmpty()) list << clipboardText; bool found = false; @@ -2354,7 +2354,7 @@ void KPasteTextAction::menuItemActivated( int id) TQString clipboardText = reply; reply = klipper.call("setClipboardContents(TQString)", clipboardText); if (reply.isValid()) - kdDebug(129) << "Clipboard: " << TQString(tqApp->clipboard()->text(TQClipboard::Clipboard)) << endl; + kdDebug(129) << "Clipboard: " << TQString(tqApp->tqclipboard()->text(TQClipboard::Clipboard)) << endl; } TQTimer::singleShot(20, this, TQT_SLOT(slotActivated())); } diff --git a/kdeui/kactioncollection.cpp b/kdeui/kactioncollection.cpp index 47f649d6b..671bc5d94 100644 --- a/kdeui/kactioncollection.cpp +++ b/kdeui/kactioncollection.cpp @@ -110,7 +110,7 @@ KActionCollection::KActionCollection( TQObject *parent, const char *name, kdWarning(129) << "KActionCollection::KActionCollection( TQObject *parent, const char *name, KInstance *instance )" << endl; //ellis kdDebug(129) << kdBacktrace() << endl; d = new KActionCollectionPrivate; - TQWidget* w = dynamic_cast<TQWidget*>( parent ); + TQWidget* w = tqt_dynamic_cast<TQWidget*>( parent ); if( w ) setWidget( w ); //d->m_bOneKAccelOnly = (d->m_kaccelList.count() > 0); @@ -250,8 +250,8 @@ void KActionCollection::removeWidget( TQWidget* w ) } delete pKAccel; - d->m_widgetList.remove( d->m_widgetList.at( i ) ); - d->m_kaccelList.remove( d->m_kaccelList.at( i ) ); + d->m_widgetList.remove( d->m_widgetList.tqat( i ) ); + d->m_kaccelList.remove( d->m_kaccelList.tqat( i ) ); if( d->m_iWidgetCurrent == (int)i ) d->m_iWidgetCurrent = -1; @@ -402,7 +402,7 @@ KAction* KActionCollection::action( int index ) const TQAsciiDictIterator<KAction> it( d->m_actionDict ); it += index; return it.current(); -// return d->m_actions.at( index ); +// return d->m_actions.tqat( index ); } bool KActionCollection::readShortcutSettings( const TQString& sConfigGroup, KConfigBase* pConfig ) diff --git a/kdeui/kcolorbutton.cpp b/kdeui/kcolorbutton.cpp index 847b6816b..c208d96f4 100644 --- a/kdeui/kcolorbutton.cpp +++ b/kdeui/kcolorbutton.cpp @@ -159,7 +159,7 @@ void KColorButton::keyPressEvent( TQKeyEvent *e ) } else if ( KStdAccel::paste().contains( key ) ) { TQColor color; - KColorDrag::decode( TQApplication::tqclipboard()->data( QClipboard::Clipboard ), color ); + KColorDrag::decode( TQApplication::tqclipboard()->data( TQClipboard::Clipboard ), color ); setColor( color ); } else diff --git a/kdeui/kcombobox.cpp b/kdeui/kcombobox.cpp index 94df22190..25a6a4a43 100644 --- a/kdeui/kcombobox.cpp +++ b/kdeui/kcombobox.cpp @@ -261,7 +261,7 @@ void KComboBox::setLineEdit( TQLineEdit *edit ) } TQComboBox::setLineEdit( edit ); - d->klineEdit = dynamic_cast<KLineEdit*>( edit ); + d->klineEdit = tqt_dynamic_cast<KLineEdit*>( edit ); setDelegate( d->klineEdit ); // Connect the returnPressed signal for both Q[K]LineEdits' diff --git a/kdeui/kcursor.cpp b/kdeui/kcursor.cpp index 0ee90bb1e..da32249a9 100644 --- a/kdeui/kcursor.cpp +++ b/kdeui/kcursor.cpp @@ -308,7 +308,7 @@ TQWidget* KCursorPrivateAutoHideEventFilter::actualWidget() const TQWidget* w = m_widget; // Is w a scrollview ? Call setCursor on the viewport in that case. - TQScrollView * sv = dynamic_cast<TQScrollView *>( w ); + TQScrollView * sv = tqt_dynamic_cast<TQScrollView *>( w ); if ( sv ) w = sv->viewport(); diff --git a/kdeui/kdockwidget.cpp b/kdeui/kdockwidget.cpp index 3c8832391..7375a25e9 100644 --- a/kdeui/kdockwidget.cpp +++ b/kdeui/kdockwidget.cpp @@ -535,7 +535,7 @@ void KDockWidget::setPixmap(const TQPixmap& pixmap) { dtg->changeTab(this,pixmap,dtg->tabLabel(this)); TQWidget *contWid=parentDockContainer(); if (contWid) { - KDockContainer *x = dynamic_cast<KDockContainer*>(contWid); + KDockContainer *x = tqt_dynamic_cast<KDockContainer*>(contWid); if (x) { x->setPixmap(this,pixmap); } @@ -556,7 +556,7 @@ KDockWidget::~KDockWidget() } if (latestKDockContainer()) { - KDockContainer *x = dynamic_cast<KDockContainer*>(latestKDockContainer()); + KDockContainer *x = tqt_dynamic_cast<KDockContainer*>(latestKDockContainer()); if (x) { x->removeWidget(this); } @@ -719,7 +719,7 @@ void KDockWidget::setLatestKDockContainer(TQWidget* container) { if (container) { - if (dynamic_cast<KDockContainer*>(container)) + if (tqt_dynamic_cast<KDockContainer*>(container)) d->container=container; else d->container=0; @@ -729,7 +729,7 @@ void KDockWidget::setLatestKDockContainer(TQWidget* container) TQWidget* KDockWidget::latestKDockContainer() { if (!(d->container)) return 0; - if (dynamic_cast<KDockContainer*>(d->container.operator->())) return d->container; + if (tqt_dynamic_cast<KDockContainer*>(d->container.operator->())) return d->container; return 0; } @@ -782,7 +782,7 @@ void KDockWidget::updateHeader() header->hide(); } else { header->setTopLevel( false ); - if (widget && dynamic_cast<KDockContainer*>(widget)) + if (widget && tqt_dynamic_cast<KDockContainer*>(widget)) header->hide(); else header->show(); @@ -999,7 +999,7 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos, * dock tab group, and our parent isn't a KDockContainer, and we have no explicit * parent dock container...we can't do much yet */ if ( parent() && !parent()->inherits("KDockSplitter") && !parentDockTabGroup() && - !(dynamic_cast<KDockContainer*>(parent())) && !parentDockContainer()){ + !(tqt_dynamic_cast<KDockContainer*>(parent())) && !parentDockContainer()){ // kdDebug(282)<<"KDockWidget::manualDock(): success = false (3)"<<endl; // kdDebug(282)<<parent()->name()<<endl; success = false; @@ -1064,11 +1064,11 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos, if (!contWid) contWid=target->widget; if (contWid) { - KDockContainer *cont=dynamic_cast<KDockContainer*>(contWid); + KDockContainer *cont=tqt_dynamic_cast<KDockContainer*>(contWid); if (cont) { if (latestKDockContainer() && (latestKDockContainer()!=contWid)) { - KDockContainer* dc = dynamic_cast<KDockContainer*>(latestKDockContainer()); + KDockContainer* dc = tqt_dynamic_cast<KDockContainer*>(latestKDockContainer()); if (dc) { dc->removeWidget(this); } @@ -1227,7 +1227,7 @@ TQWidget *KDockWidget::parentDockContainer() const { if (!parent()) return 0L; TQWidget* candidate = tqparentWidget()->tqparentWidget(); - if (candidate && dynamic_cast<KDockContainer*>(candidate)) return candidate; + if (candidate && tqt_dynamic_cast<KDockContainer*>(candidate)) return candidate; return 0L; } @@ -1382,7 +1382,7 @@ void KDockWidget::undock() { // kdDebug(282)<<"undocked from dockcontainer"<<endl; undockedFromContainer=true; - KDockContainer* dc = dynamic_cast<KDockContainer*>(d->container.operator->()); + KDockContainer* dc = tqt_dynamic_cast<KDockContainer*>(d->container.operator->()); if (dc) { dc->undockWidget(this); setFormerBrotherDockWidget(dc->parentDockWidget()); @@ -1462,7 +1462,7 @@ void KDockWidget::setWidget( TQWidget* mw ) layout = new TQVBoxLayout( this ); layout->setResizeMode( TQLayout::Minimum ); - KDockContainer* dc = dynamic_cast<KDockContainer*>(widget); + KDockContainer* dc = tqt_dynamic_cast<KDockContainer*>(widget); if (dc) { d->isContainer=true; @@ -1538,7 +1538,7 @@ void KDockWidget::makeDockVisible() } if (parentDockContainer()) { TQWidget *contWid=parentDockContainer(); - KDockContainer *x = dynamic_cast<KDockContainer*>(contWid); + KDockContainer *x = tqt_dynamic_cast<KDockContainer*>(contWid); if (x) { x->showWidget(this); } @@ -1862,7 +1862,7 @@ KDockWidget* KDockManager::findDockWidgetAt( const TQPoint& pos ) } if ( qt_tqfind_obj_child( TQT_TQOBJECT(w), "KDockSplitter", "_dock_split_" ) ) return 0L; if ( qt_tqfind_obj_child( TQT_TQOBJECT(w), "KDockTabGroup", "_dock_tab" ) ) return 0L; - if (dynamic_cast<KDockContainer*>(w)) return 0L; + if (tqt_dynamic_cast<KDockContainer*>(w)) return 0L; if (!childDockWidgetList) return 0L; if ( childDockWidgetList->tqfind(w) != -1 ) return 0L; @@ -2221,7 +2221,7 @@ void KDockManager::writeConfig(TQDomElement &base) for (TQObjectListIt it(d->containerDocks);it.current();++it) { - KDockContainer* dc = dynamic_cast<KDockContainer*>(((KDockWidget*)it.current())->widget); + KDockContainer* dc = tqt_dynamic_cast<KDockContainer*>(((KDockWidget*)it.current())->widget); if (dc) { dc->prepareSave(nList); } @@ -2241,7 +2241,7 @@ void KDockManager::writeConfig(TQDomElement &base) TQDomElement groupEl; if (obj->d->isContainer) { - KDockContainer* x = dynamic_cast<KDockContainer*>(obj->widget); + KDockContainer* x = tqt_dynamic_cast<KDockContainer*>(obj->widget); if (x) { groupEl=doc.createElement("dockContainer"); x->save(groupEl); @@ -2379,7 +2379,7 @@ void KDockManager::readConfig(TQDomElement &base) if (!(cont->d->isContainer)) { kdDebug(282)<<"restoration of dockContainer is only supported for already existing dock containers"<<endl; } else { - KDockContainer *dc=dynamic_cast<KDockContainer*>(cont->getWidget()); + KDockContainer *dc=tqt_dynamic_cast<KDockContainer*>(cont->getWidget()); if (!dc) kdDebug(282)<<"Error while trying to handle dockcontainer configuration restoration"<<endl; else { dc->load(childEl); @@ -2555,7 +2555,7 @@ void KDockManager::writeConfig( KConfig* c, TQString group ) // kdDebug(282)<<TQString("list size: %1").arg(nList.count())<<endl; for (TQObjectListIt it(d->containerDocks);it.current();++it) { - KDockContainer* dc = dynamic_cast<KDockContainer*>(((KDockWidget*)it.current())->widget); + KDockContainer* dc = tqt_dynamic_cast<KDockContainer*>(((KDockWidget*)it.current())->widget); if (dc) { dc->prepareSave(nList); } @@ -2571,7 +2571,7 @@ void KDockManager::writeConfig( KConfig* c, TQString group ) obj->header->saveConfig( c ); } if (obj->d->isContainer) { - KDockContainer* x = dynamic_cast<KDockContainer*>(obj->widget); + KDockContainer* x = tqt_dynamic_cast<KDockContainer*>(obj->widget); if (x) { x->save(c,group); } @@ -2734,7 +2734,7 @@ void KDockManager::readConfig( KConfig* c, TQString group ) } if (obj && obj->d->isContainer) { - dynamic_cast<KDockContainer*>(obj->widget)->load(c,group); + tqt_dynamic_cast<KDockContainer*>(obj->widget)->load(c,group); removeFromAutoCreateList(obj); } if ( obj && obj->header){ @@ -2774,7 +2774,7 @@ void KDockManager::readConfig( KConfig* c, TQString group ) KDockWidget* d2 = getDockWidgetFromName( list.current() ); tabDockGroup = d2->manualDock( d1, KDockWidget::DockCenter ); if ( tabDockGroup ){ - KDockTabGroup* tab = dynamic_cast<KDockTabGroup*>(tabDockGroup->widget); + KDockTabGroup* tab = tqt_dynamic_cast<KDockTabGroup*>(tabDockGroup->widget); list.next(); while ( list.current() && tabDockGroup ){ KDockWidget* tabDock = getDockWidgetFromName( list.current() ); @@ -2791,7 +2791,7 @@ void KDockManager::readConfig( KConfig* c, TQString group ) obj = tabDockGroup; } - if (obj && obj->d->isContainer) dynamic_cast<KDockContainer*>(obj->widget)->load(c,group); + if (obj && obj->d->isContainer) tqt_dynamic_cast<KDockContainer*>(obj->widget)->load(c,group); if ( obj && obj->header){ obj->header->loadConfig( c ); } @@ -2950,7 +2950,7 @@ void KDockManager::slotMenuPopup() void KDockManager::slotMenuActivated( int id ) { - MenuDockData* data = menuData->at( id ); + MenuDockData* data = menuData->tqat( id ); data->dock->changeHideShowState(); } @@ -3121,9 +3121,9 @@ void KDockArea::resizeEvent(TQResizeEvent *rsize) // for (unsigned int i=0;i<children()->count();i++) { // TQPtrList<TQObject> list(children()); -// TQObject *obj=((TQPtrList<TQObject*>)children())->at(i); +// TQObject *obj=((TQPtrList<TQObject*>)children())->tqat(i); TQObject *obj=children()->getFirst(); - if (split = dynamic_cast<KDockSplitter*>(obj)) + if (split = tqt_dynamic_cast<KDockSplitter*>(obj)) { split->setGeometry( TQRect(TQPoint(0,0), size() )); // break; @@ -3272,7 +3272,7 @@ void KDockContainer::prepareSave(TQStringList &names) names.remove(tmp->data); // for (uint i=0;i<m_children.count();i++) // { -// names.remove(m_children.at(i)); +// names.remove(m_children.tqat(i)); // } } diff --git a/kdeui/kdockwidget_private.cpp b/kdeui/kdockwidget_private.cpp index c049d6fb1..707a72f19 100644 --- a/kdeui/kdockwidget_private.cpp +++ b/kdeui/kdockwidget_private.cpp @@ -274,7 +274,7 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) // However, this works surprising well! if (m_orientation == Qt::Horizontal) { if (ev->oldSize().height() != ev->size().height()) { - if( (c1->getWidget()) && (dc=dynamic_cast<KDockContainer*>(c1->getWidget()))) { + if( (c1->getWidget()) && (dc=tqt_dynamic_cast<KDockContainer*>(c1->getWidget()))) { // dockwidget is on the bottom. move xpos so that the size from child1 stays xpos = (int)ceil(((double)factor) * checkValue(height() - child1->height() - 4) / height()); } else { @@ -286,7 +286,7 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) } } else { if (ev->oldSize().width() != width()) { - if( (c1->getWidget()) && (dc=dynamic_cast<KDockContainer*>(c1->getWidget()))) { + if( (c1->getWidget()) && (dc=tqt_dynamic_cast<KDockContainer*>(c1->getWidget()))) { xpos = (int)ceil(((double)factor) * checkValue(width() - child1->width() - 4) / width()); } else { // xpos should not change @@ -332,11 +332,11 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) kdDebug(282) << "Splitter visibility : " << divider->isVisible() << endl;; kdDebug(282) << "Splitter procentual pos: " << xpos << endl; if (c0->getWidget()) { - dc=dynamic_cast<KDockContainer*>(c0->getWidget()); + dc=tqt_dynamic_cast<KDockContainer*>(c0->getWidget()); kdDebug(282) << "Child 0 KDockContainer?: " << dc << endl; } if (c1->getWidget()) { - dc=dynamic_cast<KDockContainer*>(c1->getWidget()); + dc=tqt_dynamic_cast<KDockContainer*>(c1->getWidget()); kdDebug(282) << "Child 1 KDockContainer?: " << dc << endl; } kdDebug(282) << "Child0 : " << child0 << endl; @@ -348,7 +348,7 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) // if( ( (m_orientation==Qt::Vertical) &&((fixedWidth0==-1) && (fixedWidth1==-1)) ) || ( (m_orientation==Qt::Horizontal) &&((fixedHeight0==-1) && (fixedHeight1==-1)) ) ) { - if ((c0->getWidget()) && (dc=dynamic_cast<KDockContainer*>(c0->getWidget())) + if ((c0->getWidget()) && (dc=tqt_dynamic_cast<KDockContainer*>(c0->getWidget())) && (dc->isOverlapMode())) { // child0 ist a KDockContainer int position; @@ -367,7 +367,7 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) divider->setGeometry(position, 0, 4, height()); } } else { - if ((c1->getWidget()) && (dc=dynamic_cast<KDockContainer*>(c1->getWidget())) + if ((c1->getWidget()) && (dc=tqt_dynamic_cast<KDockContainer*>(c1->getWidget())) && (dc->isOverlapMode())) { // child1 ist a KDockContainer int position; @@ -403,7 +403,7 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) int diff = 0; if (m_orientation == Qt::Horizontal) { - if ((c1->getWidget()) && (dc=dynamic_cast<KDockContainer*>(c1->getWidget()))) { + if ((c1->getWidget()) && (dc=tqt_dynamic_cast<KDockContainer*>(c1->getWidget()))) { // bottom is dockcontainer if( divider->isVisible() ) { child0->setGeometry(0, 0, width(), position); @@ -419,7 +419,7 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) } divider->setGeometry(0, position, width(), 4); } else { - if ((c1->getWidget()) && (dc=dynamic_cast<KDockContainer*>(c1->getWidget()))) { + if ((c1->getWidget()) && (dc=tqt_dynamic_cast<KDockContainer*>(c1->getWidget()))) { // right is dockcontainer if( divider->isVisible() ) { child0->setGeometry(0, 0, position, height()); @@ -497,8 +497,8 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e) switch (e->type()) { case TQEvent::MouseMove: mev= (TQMouseEvent*)e; - child0->setUpdatesEnabled(mOpaqueResize); - child1->setUpdatesEnabled(mOpaqueResize); + child0->tqsetUpdatesEnabled(mOpaqueResize); + child1->tqsetUpdatesEnabled(mOpaqueResize); if (m_orientation == Qt::Horizontal) { if ((fixedHeight0!=-1) || (fixedHeight1!=-1)) { @@ -536,8 +536,8 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e) handled= true; break; case TQEvent::MouseButtonRelease: - child0->setUpdatesEnabled(true); - child1->setUpdatesEnabled(true); + child0->tqsetUpdatesEnabled(true); + child1->tqsetUpdatesEnabled(true); mev= (TQMouseEvent*)e; if (m_orientation == Qt::Horizontal){ if ((fixedHeight0!=-1) || (fixedHeight1!=-1)) diff --git a/kdeui/keditlistbox.cpp b/kdeui/keditlistbox.cpp index 2960252d4..f8aeb096f 100644 --- a/kdeui/keditlistbox.cpp +++ b/kdeui/keditlistbox.cpp @@ -411,7 +411,7 @@ void KEditListBox::virtual_hook( int, void* ) KEditListBox::CustomEditor::CustomEditor( KComboBox *combo ) { m_representationWidget = combo; - m_lineEdit = dynamic_cast<KLineEdit*>( combo->lineEdit() ); + m_lineEdit = tqt_dynamic_cast<KLineEdit*>( combo->lineEdit() ); assert( m_lineEdit ); } diff --git a/kdeui/kiconview.cpp b/kdeui/kiconview.cpp index 357d6b2c4..6c4c5ff4b 100644 --- a/kdeui/kiconview.cpp +++ b/kdeui/kiconview.cpp @@ -184,7 +184,7 @@ void KIconView::slotAutoSelect() bool select = !m_pCurrentItem->isSelected(); bool update = viewport()->isUpdatesEnabled(); - viewport()->setUpdatesEnabled( false ); + viewport()->tqsetUpdatesEnabled( false ); //Calculate the smallest rectangle that contains the current Item //and the one that got the autoselect event @@ -216,7 +216,7 @@ void KIconView::slotAutoSelect() } blockSignals( block ); - viewport()->setUpdatesEnabled( update ); + viewport()->tqsetUpdatesEnabled( update ); tqrepaintContents( redraw, false ); emit selectionChanged(); diff --git a/kdeui/kjanuswidget.cpp b/kdeui/kjanuswidget.cpp index cb7da4a4f..2cfbb473e 100644 --- a/kdeui/kjanuswidget.cpp +++ b/kdeui/kjanuswidget.cpp @@ -518,7 +518,7 @@ bool KJanusWidget::setSwallowedWidget( TQWidget *widget ) TQObjectList l = mSwallowPage->childrenListObject(); // silence please for( uint i=0; i < l.count(); i++ ) { - TQObject *o = l.at(i); + TQObject *o = l.tqat(i); if( o->isWidgetType() ) { ((TQWidget*)o)->hide(); diff --git a/kdeui/klanguagebutton.cpp b/kdeui/klanguagebutton.cpp index 469fef5a1..7da8b85e5 100644 --- a/kdeui/klanguagebutton.cpp +++ b/kdeui/klanguagebutton.cpp @@ -191,7 +191,7 @@ void KLanguageButton::slotActivated( int index ) setCurrentItem( index ); // Forward event from popup menu as if it was emitted from this widget: - TQString id = *m_ids->at( index ); + TQString id = *m_ids->tqat( index ); emit activated( id ); } @@ -199,7 +199,7 @@ void KLanguageButton::slotHighlighted( int index ) { //kdDebug() << "slotHighlighted" << index << endl; - TQString id = *m_ids->at( index ); + TQString id = *m_ids->tqat( index ); emit ( highlighted(id) ); } @@ -237,7 +237,7 @@ bool KLanguageButton::contains( const TQString & id ) const TQString KLanguageButton::current() const { - return *m_ids->at( currentItem() ); + return *m_ids->tqat( currentItem() ); } @@ -248,7 +248,7 @@ TQString KLanguageButton::id( int i ) const kdDebug() << "KLanguageButton::tag(), unknown tag " << i << endl; return TQString::null; } - return *m_ids->at( i ); + return *m_ids->tqat( i ); } diff --git a/kdeui/klineedit.cpp b/kdeui/klineedit.cpp index d3d50795c..48861d38c 100644 --- a/kdeui/klineedit.cpp +++ b/kdeui/klineedit.cpp @@ -420,9 +420,9 @@ bool KLineEdit::copySqueezedText(bool clipboard) const return false; TQString t = d->squeezedText; t = t.mid(start, end - start); - disconnect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this, 0); - TQApplication::clipboard()->setText( t, clipboard ? QClipboard::Clipboard : QClipboard::Selection ); - connect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this, + disconnect( TQApplication::tqclipboard(), TQT_SIGNAL(selectionChanged()), this, 0); + TQApplication::tqclipboard()->setText( t, clipboard ? TQClipboard::Clipboard : TQClipboard::Selection ); + connect( TQApplication::tqclipboard(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(clipboardChanged()) ); return true; } @@ -453,7 +453,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) } else if ( KStdAccel::pasteSelection().contains( key ) ) { - TQString text = TQApplication::clipboard()->text( QClipboard::Selection); + TQString text = TQApplication::tqclipboard()->text( TQClipboard::Selection); insert( text ); deselect(); return; @@ -840,7 +840,7 @@ void KLineEdit::mousePressEvent( TQMouseEvent* e ) void KLineEdit::mouseReleaseEvent( TQMouseEvent* e ) { TQLineEdit::mouseReleaseEvent( e ); - if (TQApplication::clipboard()->supportsSelection() ) { + if (TQApplication::tqclipboard()->supportsSelection() ) { if ( e->button() == Qt::LeftButton ) { // Fix copying of squeezed text if needed copySqueezedText( false ); diff --git a/kdeui/klistbox.cpp b/kdeui/klistbox.cpp index 13c5ab325..30d418daf 100644 --- a/kdeui/klistbox.cpp +++ b/kdeui/klistbox.cpp @@ -133,7 +133,7 @@ void KListBox::slotAutoSelect() bool select = !m_pCurrentItem->isSelected(); bool update = viewport()->isUpdatesEnabled(); - viewport()->setUpdatesEnabled( false ); + viewport()->tqsetUpdatesEnabled( false ); bool down = index( previousItem ) < index( m_pCurrentItem ); TQListBoxItem* it = down ? previousItem : m_pCurrentItem; @@ -150,7 +150,7 @@ void KListBox::slotAutoSelect() } blockSignals( block ); - viewport()->setUpdatesEnabled( update ); + viewport()->tqsetUpdatesEnabled( update ); triggerUpdate( false ); emit selectionChanged(); diff --git a/kdeui/klistview.cpp b/kdeui/klistview.cpp index 2e9253ac7..b65cab53b 100644 --- a/kdeui/klistview.cpp +++ b/kdeui/klistview.cpp @@ -621,7 +621,7 @@ void KListView::slotAutoSelect() bool select = !d->pCurrentItem->isSelected(); bool update = viewport()->isUpdatesEnabled(); - viewport()->setUpdatesEnabled( false ); + viewport()->tqsetUpdatesEnabled( false ); bool down = previousItem->itemPos() < d->pCurrentItem->itemPos(); TQListViewItemIterator lit( down ? previousItem : d->pCurrentItem ); @@ -638,7 +638,7 @@ void KListView::slotAutoSelect() } blockSignals( block ); - viewport()->setUpdatesEnabled( update ); + viewport()->tqsetUpdatesEnabled( update ); triggerUpdate(); emit selectionChanged(); @@ -661,7 +661,7 @@ void KListView::slotAutoSelect() } } else - kdDebug() << "KListView::slotAutoSelect: That´s not supposed to happen!!!!" << endl; + kdDebug() << "KListView::slotAutoSelect: That�s not supposed to happen!!!!" << endl; } void KListView::slotHeaderChanged() diff --git a/kdeui/klistviewsearchline.cpp b/kdeui/klistviewsearchline.cpp index 23fb14e18..6a73f9e38 100644 --- a/kdeui/klistviewsearchline.cpp +++ b/kdeui/klistviewsearchline.cpp @@ -302,7 +302,7 @@ void KListViewSearchLine::activateSearch() void KListViewSearchLine::itemAdded(TQListViewItem *item) const { - item->setVisible(itemMatches(item, text())); + item->tqsetVisible(itemMatches(item, text())); } void KListViewSearchLine::listViewDeleted() @@ -347,9 +347,9 @@ void KListViewSearchLine::checkItemParentsNotVisible() { TQListViewItem *item = it.current(); if(itemMatches(item, d->search)) - item->setVisible(true); + item->tqsetVisible(true); else - item->setVisible(false); + item->tqsetVisible(false); } } @@ -381,23 +381,23 @@ bool KListViewSearchLine::checkItemParentsVisible(TQListViewItem *item, TQListVi visible = true; if (highestHiddenParent) { - highestHiddenParent->setVisible(true); - // Calling setVisible on our ancestor will unhide all its descendents. Hide the ones + highestHiddenParent->tqsetVisible(true); + // Calling tqsetVisible on our ancestor will unhide all its descendents. Hide the ones // before us that should not be shown. for(TQListViewItem *hide = first; hide != item; hide = hide->nextSibling()) - hide->setVisible(false); + hide->tqsetVisible(false); highestHiddenParent = 0; - // If we matched, than none of our children matched, yet the setVisible() call on our + // If we matched, than none of our children matched, yet the tqsetVisible() call on our // ancestor unhid them, undo the damage: if(!childMatch) for(TQListViewItem *hide = item->firstChild(); hide; hide = hide->nextSibling()) - hide->setVisible(false); + hide->tqsetVisible(false); } else - item->setVisible(true); + item->tqsetVisible(true); } else - item->setVisible(false); + item->tqsetVisible(false); } return visible; } @@ -470,7 +470,7 @@ KListViewSearchLine *KListViewSearchLineWidget::searchLine() const void KListViewSearchLineWidget::positionInToolBar() { - KToolBar *toolBar = dynamic_cast<KToolBar *>(parent()); + KToolBar *toolBar = tqt_dynamic_cast<KToolBar *>(parent()); if(toolBar) { diff --git a/kdeui/kmainwindow.cpp b/kdeui/kmainwindow.cpp index 2a0bad08d..777f5e004 100644 --- a/kdeui/kmainwindow.cpp +++ b/kdeui/kmainwindow.cpp @@ -491,7 +491,7 @@ void KMainWindow::setupGUI( TQSize defaultSize, int options, const TQString & xm void KMainWindow::createGUI( const TQString &xmlfile, bool _conserveMemory ) { // disabling the updates prevents unnecessary redraws - setUpdatesEnabled( false ); + tqsetUpdatesEnabled( false ); // just in case we are rebuilding, let's remove our old client guiFactory()->removeClient( this ); @@ -564,7 +564,7 @@ void KMainWindow::createGUI( const TQString &xmlfile, bool _conserveMemory ) conserveMemory(); } - setUpdatesEnabled( true ); + tqsetUpdatesEnabled( true ); updateGeometry(); } diff --git a/kdeui/kmainwindowiface.cpp b/kdeui/kmainwindowiface.cpp index 0cee0f24b..9394d27bb 100644 --- a/kdeui/kmainwindowiface.cpp +++ b/kdeui/kmainwindowiface.cpp @@ -135,7 +135,7 @@ int KMainWindowInterface::getWinID() } void KMainWindowInterface::grabWindowToClipBoard() { - QClipboard *clipboard = TQApplication::clipboard(); + TQClipboard *clipboard = TQApplication::tqclipboard(); clipboard->setPixmap(TQPixmap::grabWidget(m_MainWindow)); } void KMainWindowInterface::hide() diff --git a/kdeui/kmenubar.cpp b/kdeui/kmenubar.cpp index ceee8e222..ed2702a9a 100644 --- a/kdeui/kmenubar.cpp +++ b/kdeui/kmenubar.cpp @@ -506,7 +506,7 @@ void KMenuBar::drawContents( TQPainter* p ) BackgroundMode bg_mode = backgroundMode(); BackgroundOrigin bg_origin = backgroundOrigin(); - setUpdatesEnabled(false); + tqsetUpdatesEnabled(false); setBackgroundMode(X11ParentRelative); setBackgroundOrigin(WindowOrigin); @@ -561,7 +561,7 @@ void KMenuBar::drawContents( TQPainter* p ) setBackgroundOrigin(bg_origin); setBackgroundMode(bg_mode); - setUpdatesEnabled(up_enabled); + tqsetUpdatesEnabled(up_enabled); } } diff --git a/kdeui/kpassdlg.cpp b/kdeui/kpassdlg.cpp index 37333ad21..5e5df81cd 100644 --- a/kdeui/kpassdlg.cpp +++ b/kdeui/kpassdlg.cpp @@ -187,9 +187,9 @@ void KPasswordEdit::erase() void KPasswordEdit::focusInEvent(TQFocusEvent *e) { const TQString txt = text(); - setUpdatesEnabled(false); + tqsetUpdatesEnabled(false); TQLineEdit::focusInEvent(e); - setUpdatesEnabled(true); + tqsetUpdatesEnabled(true); setText(txt); } diff --git a/kdeui/ksharedpixmap.cpp b/kdeui/ksharedpixmap.cpp index a062d2f8b..d0a74f223 100644 --- a/kdeui/ksharedpixmap.cpp +++ b/kdeui/ksharedpixmap.cpp @@ -206,13 +206,13 @@ bool KSharedPixmap::x11Event(XEvent *event) TQPixmap::resize( tw+origin.x(), th+origin.y() ); - XCopyArea(qt_xdisplay(), pixmap, ((KPixmap*)this)->handle(), qt_xget_temp_gc(qt_xscreen(), false), + XCopyArea(qt_xdisplay(), pixmap, (static_cast<KPixmap*>(this))->handle(), qt_xget_temp_gc(qt_xscreen(), false), xa, ya, t1w+origin.x(), t1h+origin.y(), origin.x(), origin.y() ); - XCopyArea(qt_xdisplay(), pixmap, ((KPixmap*)this)->handle(), qt_xget_temp_gc(qt_xscreen(), false), + XCopyArea(qt_xdisplay(), pixmap, (static_cast<KPixmap*>(this))->handle(), qt_xget_temp_gc(qt_xscreen(), false), 0, ya, tw-t1w, t1h, t1w, 0); - XCopyArea(qt_xdisplay(), pixmap, ((KPixmap*)this)->handle(), qt_xget_temp_gc(qt_xscreen(), false), + XCopyArea(qt_xdisplay(), pixmap, (static_cast<KPixmap*>(this))->handle(), qt_xget_temp_gc(qt_xscreen(), false), xa, 0, t1w, th-t1h, 0, t1h); - XCopyArea(qt_xdisplay(), pixmap, ((KPixmap*)this)->handle(), qt_xget_temp_gc(qt_xscreen(), false), + XCopyArea(qt_xdisplay(), pixmap, (static_cast<KPixmap*>(this))->handle(), qt_xget_temp_gc(qt_xscreen(), false), 0, 0, tw-t1w, th-t1h, t1w, t1h); XFree(pixmap_id); diff --git a/kdeui/ksharedpixmap.h b/kdeui/ksharedpixmap.h index 4474cc3f5..d1e3f9026 100644 --- a/kdeui/ksharedpixmap.h +++ b/kdeui/ksharedpixmap.h @@ -58,6 +58,7 @@ class KDEUI_EXPORT KSharedPixmap: public KPixmap { Q_OBJECT + TQ_OBJECT public: diff --git a/kdeui/kspell.cpp b/kdeui/kspell.cpp index 0df7b0842..7285e9c2a 100644 --- a/kdeui/kspell.cpp +++ b/kdeui/kspell.cpp @@ -995,7 +995,7 @@ bool KSpell::check( const TQString &_buffer, bool _usedialog ) // origbuffer since I got errors otherwise if ( !origbuffer.endsWith("\n\n" ) ) { - if (origbuffer.at(origbuffer.length()-1)!='\n') + if (origbuffer.tqat(origbuffer.length()-1)!='\n') { origbuffer+='\n'; origbuffer+='\n'; //shouldn't these be removed at some point? diff --git a/kdeui/ktabbar.cpp b/kdeui/ktabbar.cpp index f5682ae3f..18c5a03d6 100644 --- a/kdeui/ktabbar.cpp +++ b/kdeui/ktabbar.cpp @@ -48,7 +48,7 @@ KTabBar::KTabBar( TQWidget *parent, const char *name ) mActivateDragSwitchTabTimer = new TQTimer( this ); connect( mActivateDragSwitchTabTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( activateDragSwitchTab() ) ); - connect(this, TQT_SIGNAL(layoutChanged()), TQT_SLOT(onLayoutChange())); + connect(this, TQT_SIGNAL(tqlayoutChanged()), TQT_SLOT(onLayoutChange())); } KTabBar::~KTabBar() @@ -67,7 +67,7 @@ void KTabBar::setTabEnabled( int id, bool enabled ) if ( !enabled && id == currentTab() && count()>1 ) { TQPtrList<TQTab> *tablist = tabList(); if ( mTabCloseActivatePrevious ) - t = tablist->at( count()-2 ); + t = tablist->tqat( count()-2 ); else { int index = indexOf( id ); index += ( index+1 == count() ) ? -1 : 1; diff --git a/kdeui/ktabwidget.cpp b/kdeui/ktabwidget.cpp index bc28b5d4d..3825d5aa5 100644 --- a/kdeui/ktabwidget.cpp +++ b/kdeui/ktabwidget.cpp @@ -95,7 +95,7 @@ void KTabWidget::insertTab( TQWidget *child, TQTab *tab, int index ) resizeTabs( d->m_tabNames.count()-1 ); } else { - d->m_tabNames.insert( d->m_tabNames.at( index ), tab->text() ); + d->m_tabNames.insert( d->m_tabNames.tqat( index ), tab->text() ); resizeTabs( index ); } } @@ -422,7 +422,7 @@ void KTabWidget::moveTab( int from, int to ) if ( to < 0 || to >= count() ) d->m_tabNames.append( TQString::null ); else - d->m_tabNames.insert( d->m_tabNames.at( to ), TQString::null ); + d->m_tabNames.insert( d->m_tabNames.tqat( to ), TQString::null ); } w = page( to ); @@ -441,7 +441,7 @@ void KTabWidget::removePage( TQWidget * w ) { if ( d->m_automaticResizeTabs ) { int index = indexOf( w ); if ( index != -1 ) - d->m_tabNames.remove( d->m_tabNames.at( index ) ); + d->m_tabNames.remove( d->m_tabNames.tqat( index ) ); } TQTabWidget::removePage( w ); if ( d->m_automaticResizeTabs ) diff --git a/kdeui/ktextedit.cpp b/kdeui/ktextedit.cpp index fda46df76..73bbf3c5f 100644 --- a/kdeui/ktextedit.cpp +++ b/kdeui/ktextedit.cpp @@ -172,7 +172,7 @@ void KTextEdit::keyPressEvent( TQKeyEvent *e ) } else if ( KStdAccel::pasteSelection().contains( key ) ) { - TQString text = TQApplication::clipboard()->text( QClipboard::Selection); + TQString text = TQApplication::tqclipboard()->text( TQClipboard::Selection); if ( !text.isEmpty() ) insert( text ); e->accept(); diff --git a/kdeui/ktoolbar.cpp b/kdeui/ktoolbar.cpp index d6ae372d6..456acc438 100644 --- a/kdeui/ktoolbar.cpp +++ b/kdeui/ktoolbar.cpp @@ -194,7 +194,7 @@ TQSizePolicy KToolBarSeparator::sizePolicy() const KToolBar::KToolBar( TQWidget *parent, const char *name, bool honorStyle, bool readConfig ) : TQToolBar( TQString::tqfromLatin1( name ), - dynamic_cast<TQMainWindow*>(parent), + tqt_dynamic_cast<TQMainWindow*>(parent), parent, false, name ? name : "mainToolBar") { @@ -430,7 +430,7 @@ KAnimWidget *KToolBar::animatedWidget( int id ) Id2WidgetMap::Iterator it = id2widget.tqfind( id ); if ( it == id2widget.end() ) return 0; - KAnimWidget *aw = dynamic_cast<KAnimWidget *>(*it); + KAnimWidget *aw = tqt_dynamic_cast<KAnimWidget *>(*it); if ( aw ) return aw; TQObjectList *l = queryList( "KAnimWidget" ); @@ -440,7 +440,7 @@ KAnimWidget *KToolBar::animatedWidget( int id ) } for ( TQObject *o = l->first(); o; o = l->next() ) { - KAnimWidget *aw = dynamic_cast<KAnimWidget *>(o); + KAnimWidget *aw = tqt_dynamic_cast<KAnimWidget *>(o); if ( aw ) { delete l; @@ -613,7 +613,7 @@ KComboBox * KToolBar::getCombo(int id) Id2WidgetMap::Iterator it = id2widget.tqfind( id ); if ( it == id2widget.end() ) return 0; - return dynamic_cast<KComboBox *>( *it ); + return tqt_dynamic_cast<KComboBox *>( *it ); } @@ -622,7 +622,7 @@ KLineEdit * KToolBar::getLined (int id) Id2WidgetMap::Iterator it = id2widget.tqfind( id ); if ( it == id2widget.end() ) return 0; - return dynamic_cast<KLineEdit *>( *it ); + return tqt_dynamic_cast<KLineEdit *>( *it ); } @@ -631,7 +631,7 @@ KToolBarButton * KToolBar::getButton (int id) Id2WidgetMap::Iterator it = id2widget.tqfind( id ); if ( it == id2widget.end() ) return 0; - return dynamic_cast<KToolBarButton *>( *it ); + return tqt_dynamic_cast<KToolBarButton *>( *it ); } @@ -734,7 +734,7 @@ int KToolBar::itemIndex (int id) int KToolBar::idAt (int index) { - TQWidget *w = widgets.at(index); + TQWidget *w = widgets.tqat(index); return widget2id[w]; } @@ -856,10 +856,11 @@ void KToolBar::setIconText(IconText icontext, bool update) // ugly hack to force a TQMainWindow::triggerLayout( true ) TQMainWindow *mw = mainWindow(); if ( mw ) { - mw->setUpdatesEnabled( false ); - mw->setToolBarsMovable( !mw->toolBarsMovable() ); - mw->setToolBarsMovable( !mw->toolBarsMovable() ); - mw->setUpdatesEnabled( true ); + mw->tqsetUpdatesEnabled( false ); +// mw->setToolBarsMovable( !mw->toolBarsMovable() ); // Old way +// mw->setToolBarsMovable( !mw->toolBarsMovable() ); + mw->setCentralWidget(mw->centralWidget()); // This is a faster hack + mw->tqsetUpdatesEnabled( true ); } } @@ -893,14 +894,14 @@ void KToolBar::setIconSize(int size, bool update) // ugly hack to force a TQMainWindow::triggerLayout( true ) if ( mainWindow() ) { TQMainWindow *mw = mainWindow(); - mw->setUpdatesEnabled( false ); - mw->setToolBarsMovable( !mw->toolBarsMovable() ); - mw->setToolBarsMovable( !mw->toolBarsMovable() ); - mw->setUpdatesEnabled( true ); + mw->tqsetUpdatesEnabled( false ); +// mw->setToolBarsMovable( !mw->toolBarsMovable() ); // Old way +// mw->setToolBarsMovable( !mw->toolBarsMovable() ); + mw->setCentralWidget(mw->centralWidget()); // This is a faster hack + mw->tqsetUpdatesEnabled( true ); } } - int KToolBar::iconSize() const { if ( !d->m_iconSize ) // default value? @@ -946,7 +947,7 @@ void KToolBar::setFlat (bool flag) else mainWindow()->moveDockWindow( this, DockTop ); // And remember to save the new look later - KMainWindow *kmw = dynamic_cast<KMainWindow *>(mainWindow()); + KMainWindow *kmw = tqt_dynamic_cast<KMainWindow *>(mainWindow()); if ( kmw ) kmw->setSettingsDirty(); } @@ -1092,7 +1093,7 @@ void KToolBar::saveSettings(KConfig *config, const TQString &_configGroup) // reappear at the same position the next time. // The whole set of indexes has to be saved. //kdDebug(220) << name() << " writing index " << index << endl; - KMainWindow *kmw = dynamic_cast<KMainWindow *>(mainWindow()); + KMainWindow *kmw = tqt_dynamic_cast<KMainWindow *>(mainWindow()); // don't save if there's only one toolbar // Don't use kmw->toolBarIterator() because you might @@ -1203,7 +1204,7 @@ void KToolBar::mousePressEvent ( TQMouseEvent *m ) else return; // assume this was an action handled elsewhere, no need for setSettingsDirty() } - KMainWindow *kmw = dynamic_cast<KMainWindow *>(mw); + KMainWindow *kmw = tqt_dynamic_cast<KMainWindow *>(mw); if ( kmw ) kmw->setSettingsDirty(); } @@ -1237,17 +1238,17 @@ void KToolBar::rebuildLayout() for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { if ( w == rightAligned ) continue; - KToolBarSeparator *ktbs = dynamic_cast<KToolBarSeparator *>(w); + KToolBarSeparator *ktbs = tqt_dynamic_cast<KToolBarSeparator *>(w); if ( ktbs && !ktbs->showLine() ) { l->addSpacing( orientation() == Qt::Vertical ? w->tqsizeHint().height() : w->tqsizeHint().width() ); w->hide(); continue; } - if ( dynamic_cast<TQPopupMenu *>(w) ) // w is a QPopupMenu? + if ( tqt_dynamic_cast<TQPopupMenu *>(w) ) // w is a QPopupMenu? continue; l->addWidget( w ); w->show(); - if ((orientation() == Qt::Horizontal) && dynamic_cast<TQLineEdit *>(w)) // w is TQLineEdit ? + if ((orientation() == Qt::Horizontal) && tqt_dynamic_cast<TQLineEdit *>(w)) // w is TQLineEdit ? l->addSpacing(2); // A little bit extra spacing behind it. } if ( rightAligned ) { @@ -1269,14 +1270,14 @@ void KToolBar::rebuildLayout() void KToolBar::childEvent( TQChildEvent *e ) { if ( e->child()->isWidgetType() ) { - TQWidget * w = dynamic_cast<TQWidget *>(e->child()); + TQWidget * w = tqt_dynamic_cast<TQWidget *>(e->child()); if (!w || !(::qstrcmp( "qt_dockwidget_internal", w->name()))) { TQToolBar::childEvent( e ); return; } if ( e->type() == TQEvent::ChildInserted ) { - if ( !dynamic_cast<TQPopupMenu *>(w)) { // e->child() is not a QPopupMenu + if ( !tqt_dynamic_cast<TQPopupMenu *>(w)) { // e->child() is not a QPopupMenu // prevent items that have been explicitly inserted by insert*() from // being inserted again if ( !widget2id.tqcontains( w ) ) @@ -1293,8 +1294,8 @@ void KToolBar::childEvent( TQChildEvent *e ) layoutTimer->start( 50, true ); TQBoxLayout *l = boxLayout(); - // clear the old layout so that we don't get unnecassery layout - // changes till we have rebuild the thing + // clear the old layout so that we don't get unnecessary layout + // changes until we have rebuilt the thing TQLayoutIterator it = l->iterator(); while ( it.current() ) it.deleteCurrent(); @@ -1366,7 +1367,7 @@ TQSize KToolBar::tqsizeHint() const minSize = minSize.expandedTo(TQSize(0, sh.height())); minSize += TQSize(sh.width()+1, 0); - if (dynamic_cast<TQLineEdit *>(w)) // w is a TQLineEdit ? + if (tqt_dynamic_cast<TQLineEdit *>(w)) // w is a TQLineEdit ? minSize += TQSize(2, 0); // A little bit extra spacing behind it. } @@ -1428,7 +1429,7 @@ void KToolBar::show() void KToolBar::resizeEvent( TQResizeEvent *e ) { bool b = isUpdatesEnabled(); - setUpdatesEnabled( false ); + tqsetUpdatesEnabled( false ); TQToolBar::resizeEvent( e ); if (b) { @@ -1443,6 +1444,10 @@ void KToolBar::resizeEvent( TQResizeEvent *e ) slotRepaint(); } } +// else { +// printf("[WARNING] In KToolBar::resizeEvent, but this code block should not be executing. Preventing toolbar lockup. [Code 0045]\n\r"); +// tqsetUpdatesEnabled( true ); +// } } void KToolBar::slotIconChanged(int group) @@ -1473,7 +1478,7 @@ void KToolBar::slotAppearanceChanged() applyAppearanceSettings(KGlobal::config(), TQString::null, true /* lose local settings */ ); // And remember to save the new look later - KMainWindow *kmw = dynamic_cast<KMainWindow *>(mainWindow()); + KMainWindow *kmw = tqt_dynamic_cast<KMainWindow *>(mainWindow()); if ( kmw ) kmw->setSettingsDirty(); } @@ -1727,14 +1732,14 @@ bool KToolBar::event( TQEvent *e ) void KToolBar::slotRepaint() { - setUpdatesEnabled( false ); + tqsetUpdatesEnabled( false ); // Send a resizeEvent to update the "toolbar extension arrow" // (The button you get when your toolbar-items don't fit in // the available space) TQResizeEvent ev(size(), size()); resizeEvent(&ev); TQApplication::sendPostedEvents( this, TQEvent::LayoutHint ); - setUpdatesEnabled( true ); + tqsetUpdatesEnabled( true ); tqrepaint( true ); } @@ -1745,7 +1750,7 @@ void KToolBar::toolBarPosChanged( TQToolBar *tb ) if ( d->oldPos == DockMinimized ) rebuildLayout(); d->oldPos = (TQMainWindow::ToolBarDock)barPos(); - KMainWindow *kmw = dynamic_cast<KMainWindow *>(mainWindow()); + KMainWindow *kmw = tqt_dynamic_cast<KMainWindow *>(mainWindow()); if ( kmw ) kmw->setSettingsDirty(); } @@ -2133,7 +2138,7 @@ void KToolBar::slotContextAboutToShow() // and ToolBarHandler::setupActions() deletes it, so better not keep it around. // So we currently plug/unplug the last two actions of the menu. // Another way would be to keep around the actions and plug them all into a (new each time) popupmenu. - KMainWindow *kmw = dynamic_cast<KMainWindow *>(mainWindow()); + KMainWindow *kmw = tqt_dynamic_cast<KMainWindow *>(mainWindow()); if ( kmw ) { kmw->setupToolbarMenuActions(); // Only allow hiding a toolbar if the action is also plugged somewhere else (e.g. menubar) @@ -2213,7 +2218,7 @@ void KToolBar::slotContextAboutToHide() { // We have to unplug whatever slotContextAboutToShow plugged into the menu. // Unplug the toolbar menu action - KMainWindow *kmw = dynamic_cast<KMainWindow *>(mainWindow()); + KMainWindow *kmw = tqt_dynamic_cast<KMainWindow *>(mainWindow()); if ( kmw && kmw->toolBarMenuAction() ) if ( kmw->toolBarMenuAction()->containerCount() > 1 ) kmw->toolBarMenuAction()->unplug(context); diff --git a/kdeui/ktoolbarbutton.cpp b/kdeui/ktoolbarbutton.cpp index 42f0d9b90..e5dd0c736 100644 --- a/kdeui/ktoolbarbutton.cpp +++ b/kdeui/ktoolbarbutton.cpp @@ -118,7 +118,7 @@ KToolBarButton::KToolBarButton( const TQString& _icon, int _id, TQToolButton::setTextLabel(_txt); d->m_instance = _instance; - d->m_parent = dynamic_cast<KToolBar*>(_parent); + d->m_parent = tqt_dynamic_cast<KToolBar*>(_parent); if (d->m_parent) { connect(d->m_parent, TQT_SIGNAL( modechange() ), this, TQT_SLOT( modeChange() )); @@ -151,7 +151,7 @@ KToolBarButton::KToolBarButton( const TQPixmap& pixmap, int _id, d->m_id = _id; TQToolButton::setTextLabel(txt); - d->m_parent = dynamic_cast<KToolBar*>(_parent); + d->m_parent = tqt_dynamic_cast<KToolBar*>(_parent); if (d->m_parent) { connect(d->m_parent, TQT_SIGNAL( modechange() ), this, TQT_SLOT( modeChange() )); @@ -405,7 +405,7 @@ void KToolBarButton::enterEvent(TQEvent *) bool KToolBarButton::eventFilter(TQObject *o, TQEvent *ev) { - if ((KToolBarButton *)o == this) + if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this)) { // Popup the menu when the left mousebutton is pressed and the mouse diff --git a/kdeui/ktoolbarhandler.cpp b/kdeui/ktoolbarhandler.cpp index f1bce69c6..45c1962db 100644 --- a/kdeui/ktoolbarhandler.cpp +++ b/kdeui/ktoolbarhandler.cpp @@ -51,7 +51,7 @@ namespace TQPtrListIterator<TQDockWindow> dockWindowIt( dockWindows ); for ( ; dockWindowIt.current(); ++dockWindowIt ) { - KToolBar *toolBar = dynamic_cast<KToolBar *>( dockWindowIt.current() ); + KToolBar *toolBar = tqt_dynamic_cast<KToolBar *>( dockWindowIt.current() ); if ( !toolBar ) continue; @@ -232,7 +232,7 @@ void ToolBarHandler::connectToActionContainer( KAction *action ) void ToolBarHandler::connectToActionContainer( TQWidget *container ) { - TQPopupMenu *popupMenu = dynamic_cast<TQPopupMenu *>( container ); + TQPopupMenu *popupMenu = tqt_dynamic_cast<TQPopupMenu *>( container ); if ( !popupMenu ) return; diff --git a/kdeui/kwordwrap.cpp b/kdeui/kwordwrap.cpp index 0bdcf52dd..b7eeaff7c 100644 --- a/kdeui/kwordwrap.cpp +++ b/kdeui/kwordwrap.cpp @@ -201,7 +201,7 @@ void KWordWrap::drawFadeoutText(TQPainter *p, int x, int y, int maxW, int n = TQMIN( tl, 3); for (int i = 0; i < n; i++) { p->setPen( mixColors( 0.70 - i * 0.25, textColor, bgColor ) ); - TQString s( t.at( tl - n + i ) ); + TQString s( t.tqat( tl - n + i ) ); p->drawText( x, y, s ); x += fm.width( s ); } diff --git a/kdeui/kxmlguifactory.cpp b/kdeui/kxmlguifactory.cpp index 5778e74d0..169511c49 100644 --- a/kdeui/kxmlguifactory.cpp +++ b/kdeui/kxmlguifactory.cpp @@ -552,7 +552,7 @@ void KXMLGUIFactory::configureAction( KAction *action, const TQDomAttr &attribut int KXMLGUIFactory::configureShortcuts(bool bAllowLetterShortcuts , bool bSaveSettings ) { - KKeyDialog dlg( bAllowLetterShortcuts, dynamic_cast<TQWidget*>(parent()) ); + KKeyDialog dlg( bAllowLetterShortcuts, tqt_dynamic_cast<TQWidget*>(parent()) ); TQPtrListIterator<KXMLGUIClient> it( d->m_clients ); KXMLGUIClient *client; while( (client=it.current()) !=0 ) diff --git a/kdeui/kxmlguifactory_p.cpp b/kdeui/kxmlguifactory_p.cpp index f7955f471..a5ce2b4ef 100644 --- a/kdeui/kxmlguifactory_p.cpp +++ b/kdeui/kxmlguifactory_p.cpp @@ -85,7 +85,7 @@ MergingIndexList::Iterator ContainerNode::findIndex( const TQString &name ) /* * Check if the given container widget is a child of this node and return the node structure - * if fonud. + * if found. */ ContainerNode *ContainerNode::findContainerNode( TQWidget *container ) { @@ -238,7 +238,7 @@ void ContainerNode::plugActionList( BuildState &state, const MergingIndexList::I return; ContainerClient *client = findChildContainerClient( state.guiClient, - TQString::null, + TQString(), mergingIndices.end() ); client->actionLists.insert( k, state.actionList ); @@ -280,7 +280,7 @@ void ContainerNode::unplugActionList( BuildState &state, const MergingIndexList: return; ContainerClient *client = findChildContainerClient( state.guiClient, - TQString::null, + TQString(), mergingIndices.end() ); ActionListMap::Iterator lIt( client->actionLists.tqfind( k ) ); @@ -539,7 +539,7 @@ BuildHelper::BuildHelper( BuildState &state, ContainerNode *node ) } m_state.currentDefaultMergingIt = parentNode->findIndex( defaultMergingName ); - parentNode->calcMergingIndex( TQString::null, m_state.currentClientMergingIt, + parentNode->calcMergingIndex( TQString(), m_state.currentClientMergingIt, m_state, /*ignoreDefaultMergingIndex*/ false ); } @@ -727,7 +727,7 @@ void BuildHelper::processMergeElement( const TQString &tag, const TQString &name // re-calculate the running default and client merging indices. m_state.currentDefaultMergingIt = parentNode->findIndex( defaultMergingName ); - parentNode->calcMergingIndex( TQString::null, m_state.currentClientMergingIt, + parentNode->calcMergingIndex( TQString(), m_state.currentClientMergingIt, m_state, ignoreDefaultMergingIndex ); } @@ -784,7 +784,7 @@ void BuildHelper::processContainerElement( const TQDomElement &e, const TQString // and re-calculate running values, for better performance m_state.currentDefaultMergingIt = parentNode->findIndex( defaultMergingName ); - parentNode->calcMergingIndex( TQString::null, m_state.currentClientMergingIt, + parentNode->calcMergingIndex( TQString(), m_state.currentClientMergingIt, m_state, ignoreDefaultMergingIndex ); } @@ -823,8 +823,8 @@ TQWidget *BuildHelper::createContainer( TQWidget *parent, int index, void BuildState::reset() { - clientName = TQString::null; - actionListName = TQString::null; + clientName = TQString(); + actionListName = TQString(); actionList.clear(); guiClient = 0; clientBuilder = 0; diff --git a/kdeui/qxembed.cpp b/kdeui/qxembed.cpp index fa21446ed..fbf377fac 100644 --- a/kdeui/qxembed.cpp +++ b/kdeui/qxembed.cpp @@ -501,7 +501,7 @@ static int qxembed_x11_event_filter( XEvent* e) // L0683: Set focus on saved focus widget if ( focusCurrent ) { focusCurrent->setFocus(); - if( QXEmbed* emb = dynamic_cast< QXEmbed* >( focusCurrent )) + if( QXEmbed* emb = tqt_dynamic_cast< QXEmbed* >( focusCurrent )) emb->updateEmbeddedFocus( true ); } else if ( !w->tqtopLevelWidget()->tqfocusWidget() ) @@ -545,7 +545,7 @@ static int qxembed_x11_event_filter( XEvent* e) // We first record what the focus widget was // and clear the Qt focus. if ( w->tqtopLevelWidget()->tqfocusWidget() ) { - if( QXEmbed* emb = dynamic_cast< QXEmbed* >( w->tqtopLevelWidget()->tqfocusWidget())) + if( QXEmbed* emb = tqt_dynamic_cast< QXEmbed* >( w->tqtopLevelWidget()->tqfocusWidget())) emb->updateEmbeddedFocus( false ); focusMap->insert( w->tqtopLevelWidget(), new TQGuardedPtr<TQWidget>(w->tqtopLevelWidget()->tqfocusWidget() ) ); diff --git a/kdeui/tests/kdockwidgetdemo.cpp b/kdeui/tests/kdockwidgetdemo.cpp index 2f2c59d94..9b65db594 100644 --- a/kdeui/tests/kdockwidgetdemo.cpp +++ b/kdeui/tests/kdockwidgetdemo.cpp @@ -643,7 +643,7 @@ void Directory::setOpen( bool o ) return; } - listView()->setUpdatesEnabled( false ); + listView()->tqsetUpdatesEnabled( false ); const QFileInfoList * files = thisDir.entryInfoList(); if ( files ){ QFileInfoListIterator it( *files ); @@ -654,7 +654,7 @@ void Directory::setOpen( bool o ) (void)new Directory( this, f->fileName() ); } } - listView()->setUpdatesEnabled( true ); + listView()->tqsetUpdatesEnabled( true ); } TQListViewItem::setOpen( o ); } diff --git a/kdoctools/kio_help.cpp b/kdoctools/kio_help.cpp index f1f1c634b..00d968e6a 100644 --- a/kdoctools/kio_help.cpp +++ b/kdoctools/kio_help.cpp @@ -148,10 +148,10 @@ void HelpProtocol::get( const KURL& url ) doc = url.path(); if ( !mGhelp ) { - if (doc.at(0) != '/') + if (doc.tqat(0) != '/') doc = doc.prepend('/'); - if (doc.at(doc.length() - 1) == '/') + if (doc.tqat(doc.length() - 1) == '/') doc += "index.html"; } diff --git a/kdoctools/xslt.cpp b/kdoctools/xslt.cpp index 9cbf4cb4d..af3d7520b 100644 --- a/kdoctools/xslt.cpp +++ b/kdoctools/xslt.cpp @@ -133,7 +133,7 @@ xmlParserInputPtr meinExternalEntityLoader(const char *URL, const char *ID, TQString splitOut(const TQString &parsed, int index) { int start_index = index + 1; - while (parsed.at(start_index - 1) != '>') start_index++; + while (parsed.tqat(start_index - 1) != '>') start_index++; int inside = 0; @@ -170,7 +170,7 @@ TQString splitOut(const TQString &parsed, int index) if (index > 0) { int endindex = filedata.tqfindRev("</FILENAME>"); - while (filedata.at(endindex) != '>') endindex++; + while (filedata.tqat(endindex) != '>') endindex++; endindex++; filedata = filedata.left(index) + filedata.mid(endindex); } @@ -279,7 +279,7 @@ TQString lookForCache( const TQString &filename ) { kdDebug() << "lookForCache " << filename << endl; assert( filename.endsWith( ".docbook" ) ); - assert( filename.at( 0 ) == '/' ); + assert( filename.tqat( 0 ) == '/' ); TQString cache = filename.left( filename.length() - 7 ); TQString output; @@ -336,7 +336,7 @@ TQCString fromUnicode( const TQString &data ) buffer_len += test.length(); } else { TQString res; - res.sprintf( "&#%d;", TQChar(part.at( i )).tqunicode() ); + res.sprintf( "&#%d;", TQChar(part.tqat( i )).tqunicode() ); test = locale->fromUnicode( res ); if (buffer_len + test.length() + 1 > sizeof(buffer)) break; diff --git a/khtml/css/css_base.h b/khtml/css/css_base.h index 9a8774107..b38024bee 100644 --- a/khtml/css/css_base.h +++ b/khtml/css/css_base.h @@ -256,7 +256,7 @@ namespace DOM { virtual ~StyleListImpl(); unsigned long length() const { return m_lstChildren->count(); } - StyleBaseImpl *item(unsigned long num) const { return m_lstChildren->at(num); } + StyleBaseImpl *item(unsigned long num) const { return m_lstChildren->tqat(num); } void append(StyleBaseImpl *item) { m_lstChildren->append(item); } diff --git a/khtml/css/css_ruleimpl.h b/khtml/css/css_ruleimpl.h index 2753fcf83..d9928994d 100644 --- a/khtml/css/css_ruleimpl.h +++ b/khtml/css/css_ruleimpl.h @@ -137,7 +137,7 @@ public: ~CSSRuleListImpl(); unsigned long length() const { return m_lstCSSRules.count(); } - CSSRuleImpl *item ( unsigned long index ) { return m_lstCSSRules.at( index ); } + CSSRuleImpl *item ( unsigned long index ) { return m_lstCSSRules.tqat( index ); } /* not part of the DOM */ diff --git a/khtml/css/css_valueimpl.cpp b/khtml/css/css_valueimpl.cpp index 28df97b62..cb63ceb64 100644 --- a/khtml/css/css_valueimpl.cpp +++ b/khtml/css/css_valueimpl.cpp @@ -281,7 +281,7 @@ void CSSStyleDeclarationImpl::removeCSSHints() return; for (int i = (int)m_lstValues->count()-1; i >= 0; i--) { - if (!m_lstValues->at(i)->nonCSSHint) + if (!m_lstValues->tqat(i)->nonCSSHint) m_lstValues->remove(i); } } @@ -358,8 +358,8 @@ unsigned long CSSStyleDeclarationImpl::length() const DOMString CSSStyleDeclarationImpl::item( unsigned long index ) const { - if(m_lstValues && index < m_lstValues->count() && m_lstValues->at(index)) - return getPropertyName(m_lstValues->at(index)->m_id); + if(m_lstValues && index < m_lstValues->count() && m_lstValues->tqat(index)) + return getPropertyName(m_lstValues->tqat(index)->m_id); return DOMString(); } diff --git a/khtml/css/css_valueimpl.h b/khtml/css/css_valueimpl.h index 3566c00cb..668c53d93 100644 --- a/khtml/css/css_valueimpl.h +++ b/khtml/css/css_valueimpl.h @@ -136,7 +136,7 @@ public: virtual ~CSSValueListImpl(); unsigned long length() const { return m_values.count(); } - CSSValueImpl *item ( unsigned long index ) { return m_values.at(index); } + CSSValueImpl *item ( unsigned long index ) { return m_values.tqat(index); } virtual bool isValueList() const { return true; } diff --git a/khtml/css/cssstyleselector.cpp b/khtml/css/cssstyleselector.cpp index a8993bf5f..e970f5ecd 100644 --- a/khtml/css/cssstyleselector.cpp +++ b/khtml/css/cssstyleselector.cpp @@ -786,7 +786,7 @@ unsigned int CSSStyleSelector::addInlineDeclarations(DOM::ElementImpl* e, if (i == firstLen) values = addValues; - CSSProperty *prop = values->at(i >= firstLen ? i - firstLen : i); + CSSProperty *prop = values->tqat(i >= firstLen ? i - firstLen : i); Source source = Inline; if( prop->m_important ) source = InlineImportant; @@ -1782,7 +1782,7 @@ void CSSStyleSelectorList::append( CSSStyleSheetImpl *sheet, TQPtrList<CSSSelector> *s = r->selector(); for(int j = 0; j < (int)s->count(); j++) { - CSSOrderedRule *rule = new CSSOrderedRule(r, s->at(j), count()); + CSSOrderedRule *rule = new CSSOrderedRule(r, s->tqat(j), count()); TQPtrList<CSSOrderedRule>::append(rule); //kdDebug( 6080 ) << "appending StyleRule!" << endl; } @@ -1829,7 +1829,7 @@ void CSSStyleSelectorList::append( CSSStyleSheetImpl *sheet, for( int j = 0; j < ( int ) s->count(); j++ ) { CSSOrderedRule *orderedRule = new CSSOrderedRule( - styleRule, s->at( j ), count() ); + styleRule, s->tqat( j ), count() ); TQPtrList<CSSOrderedRule>::append( orderedRule ); } } @@ -1891,7 +1891,7 @@ void CSSOrderedPropertyList::append(DOM::CSSStyleDeclarationImpl *decl, uint sel int len = values->count(); for(int i = 0; i < len; i++) { - CSSProperty *prop = values->at(i); + CSSProperty *prop = values->tqat(i); Source source = regular; if( prop->m_important ) source = important; diff --git a/khtml/ecma/kjs_debugwin.cpp b/khtml/ecma/kjs_debugwin.cpp index bd290af16..8ebd20349 100644 --- a/khtml/ecma/kjs_debugwin.cpp +++ b/khtml/ecma/kjs_debugwin.cpp @@ -548,7 +548,7 @@ void KJSDebugWin::slotToggleBreakpoint(int lineno) if (m_sourceSel->currentItem() < 0) return; - SourceFile *sourceFile = m_sourceSelFiles.at(m_sourceSel->currentItem()); + SourceFile *sourceFile = m_sourceSelFiles.tqat(m_sourceSel->currentItem()); // Find the source fragment containing the selected line (if any) int sourceId = -1; @@ -592,14 +592,14 @@ void KJSDebugWin::slotSourceSelected(int sourceSelIndex) // A source file has been selected from the drop-down list - display the file if (sourceSelIndex < 0 || sourceSelIndex >= (int)m_sourceSel->count()) return; - SourceFile *sourceFile = m_sourceSelFiles.at(sourceSelIndex); + SourceFile *sourceFile = m_sourceSelFiles.tqat(sourceSelIndex); displaySourceFile(sourceFile,true); // If the currently selected context is in the current source file, then hilight // the line it's on. if (m_contextList->currentItem() >= 0) { Context ctx = m_execs[m_contextList->currentItem()]->context(); - if (m_sourceFragments[ctx.sourceId()]->sourceFile == m_sourceSelFiles.at(sourceSelIndex)) + if (m_sourceFragments[ctx.sourceId()]->sourceFile == m_sourceSelFiles.tqat(sourceSelIndex)) setSourceLine(ctx.sourceId(),ctx.curStmtFirstLine()); } } @@ -614,7 +614,7 @@ void KJSDebugWin::slotEval() if (m_execStates.isEmpty()) { if (m_sourceSel->currentItem() < 0) return; - SourceFile *sourceFile = m_sourceSelFiles.at(m_sourceSel->currentItem()); + SourceFile *sourceFile = m_sourceSelFiles.tqat(m_sourceSel->currentItem()); if (!sourceFile->interpreter) return; exec = sourceFile->interpreter->globalExec(); @@ -744,7 +744,7 @@ bool KJSDebugWin::sourceParsed(KJS::ExecState *exec, int sourceId, if (!sourceFile->interpreter) sourceFile->interpreter = exec->interpreter(); for (index = 0; index < m_sourceSel->count(); index++) { - if (m_sourceSelFiles.at(index) == sourceFile) + if (m_sourceSelFiles.tqat(index) == sourceFile) break; } assert(index < m_sourceSel->count()); @@ -782,7 +782,7 @@ bool KJSDebugWin::sourceUnused(KJS::ExecState *exec, int sourceId) SourceFile *sourceFile = fragment->sourceFile; if (sourceFile->hasOneRef()) { for (int i = 0; i < m_sourceSel->count(); i++) { - if (m_sourceSelFiles.at(i) == sourceFile) { + if (m_sourceSelFiles.tqat(i) == sourceFile) { m_sourceSel->removeItem(i); m_sourceSelFiles.remove(i); break; @@ -930,7 +930,7 @@ void KJSDebugWin::setSourceLine(int sourceId, int lineno) SourceFile *sourceFile = source->sourceFile; if (m_curSourceFile != source->sourceFile) { for (int i = 0; i < m_sourceSel->count(); i++) - if (m_sourceSelFiles.at(i) == sourceFile) + if (m_sourceSelFiles.tqat(i) == sourceFile) m_sourceSel->setCurrentItem(i); displaySourceFile(sourceFile,false); } diff --git a/khtml/ecma/kjs_navigator.cpp b/khtml/ecma/kjs_navigator.cpp index 2d61bb29b..657addcf3 100644 --- a/khtml/ecma/kjs_navigator.cpp +++ b/khtml/ecma/kjs_navigator.cpp @@ -394,7 +394,7 @@ Value Plugins::get(ExecState *exec, const Identifier &propertyName) const bool ok; unsigned int i = propertyName.toULong(&ok); if( ok && i<plugins->count() ) - return Value( new Plugin( exec, plugins->at(i) ) ); + return Value( new Plugin( exec, plugins->tqat(i) ) ); // plugin[name] Value val = pluginByName( exec, propertyName.qstring() ); @@ -439,7 +439,7 @@ Value PluginsFunc::tryCall(ExecState *exec, Object &thisObj, const List &args) bool ok; unsigned int i = args[0].toString(exec).toArrayIndex(&ok); if( ok && i<base->plugins->count() ) - return Value( new Plugin( exec, base->plugins->at(i) ) ); + return Value( new Plugin( exec, base->plugins->tqat(i) ) ); return Undefined(); } case Plugins_NamedItem: @@ -479,7 +479,7 @@ Value MimeTypes::get(ExecState *exec, const Identifier &propertyName) const bool ok; unsigned int i = propertyName.toULong(&ok); if( ok && i<mimes->count() ) - return Value( new MimeType( exec, mimes->at(i) ) ); + return Value( new MimeType( exec, mimes->tqat(i) ) ); // mimeTypes[name] Value val = mimeTypeByName( exec, propertyName.qstring() ); @@ -522,7 +522,7 @@ Value MimeTypesFunc::tryCall(ExecState *exec, Object &thisObj, const List &args) bool ok; unsigned int i = args[0].toString(exec).toArrayIndex(&ok); if( ok && i<base->mimes->count() ) - return Value( new MimeType( exec, base->mimes->at(i) ) ); + return Value( new MimeType( exec, base->mimes->tqat(i) ) ); return Undefined(); } case MimeTypes_NamedItem: @@ -562,8 +562,8 @@ Value Plugin::get(ExecState *exec, const Identifier &propertyName) const //kdDebug(6070) << "Plugin::get plugin[" << i << "]" << endl; if( ok && i<m_info->mimes.count() ) { - //kdDebug(6070) << "returning mimetype " << m_info->mimes.at(i)->type << endl; - return Value(new MimeType(exec, m_info->mimes.at(i))); + //kdDebug(6070) << "returning mimetype " << m_info->mimes.tqat(i)->type << endl; + return Value(new MimeType(exec, m_info->mimes.tqat(i))); } // plugin["name"] @@ -609,7 +609,7 @@ Value PluginFunc::tryCall(ExecState *exec, Object &thisObj, const List &args) bool ok; unsigned int i = args[0].toString(exec).toArrayIndex(&ok); if( ok && i< plugin->pluginInfo()->mimes.count() ) - return Value( new MimeType( exec, plugin->pluginInfo()->mimes.at(i) ) ); + return Value( new MimeType( exec, plugin->pluginInfo()->mimes.tqat(i) ) ); return Undefined(); } case Plugin_NamedItem: diff --git a/khtml/ecma/kjs_window.cpp b/khtml/ecma/kjs_window.cpp index b57a8faae..77a098680 100644 --- a/khtml/ecma/kjs_window.cpp +++ b/khtml/ecma/kjs_window.cpp @@ -1013,7 +1013,7 @@ Value Window::get(ExecState *exec, const Identifier &p) const TQPtrList<KParts::ReadOnlyPart> frames = part->frames(); unsigned int len = frames.count(); if (i < len) { - KParts::ReadOnlyPart* frame = frames.at(i); + KParts::ReadOnlyPart* frame = frames.tqat(i); if (frame) return Window::retrieve(frame); } @@ -2412,7 +2412,7 @@ Value FrameArray::get(ExecState *exec, const Identifier &p) const bool ok; unsigned int i = p.toArrayIndex(&ok); if (ok && i < len) - frame = frames.at(i); + frame = frames.tqat(i); } // we are potentially fetching a reference to a another Window object here. diff --git a/khtml/html/html_formimpl.cpp b/khtml/html/html_formimpl.cpp index 08afce582..0d3affbc3 100644 --- a/khtml/html/html_formimpl.cpp +++ b/khtml/html/html_formimpl.cpp @@ -2761,7 +2761,7 @@ static TQString expandLF(const TQString& s) unsigned pos2 = 0; for(unsigned pos = 0; pos < len; pos++) { - TQChar c = s.at(pos); + TQChar c = s.tqat(pos); switch(c.tqunicode()) { case '\n': diff --git a/khtml/html/html_miscimpl.cpp b/khtml/html/html_miscimpl.cpp index 1528fa942..2b0387d35 100644 --- a/khtml/html/html_miscimpl.cpp +++ b/khtml/html/html_miscimpl.cpp @@ -328,14 +328,14 @@ NodeImpl *HTMLFormCollectionImpl::item( unsigned long index ) const TQPtrList<HTMLGenericFormElementImpl>& l = static_cast<HTMLFormElementImpl*>( m_refNode )->formElements; for (unsigned i = strt; i < l.count(); i++) { - if (l.at( i )->isEnumeratable()) + if (l.tqat( i )->isEnumeratable()) { if (dist == 0) { //Found it! m_cache->position = index; m_cache->current.index = i; - return l.at( i ); + return l.tqat( i ); } else --dist; @@ -349,7 +349,7 @@ unsigned long HTMLFormCollectionImpl::calcLength(NodeImpl *start) const unsigned length = 0; TQPtrList<HTMLGenericFormElementImpl> l = static_cast<HTMLFormElementImpl*>( start )->formElements; for ( unsigned i = 0; i < l.count(); i++ ) - if ( l.at( i )->isEnumeratable() ) + if ( l.tqat( i )->isEnumeratable() ) ++length; return length; } @@ -369,7 +369,7 @@ NodeImpl *HTMLFormCollectionImpl::nextNamedItem( const DOMString &name ) const //Go through the list, trying to find the appropriate named form element. for ( ; currentNamePos < l.count(); ++currentNamePos ) { - HTMLGenericFormElementImpl* el = l.at(currentNamePos); + HTMLGenericFormElementImpl* el = l.tqat(currentNamePos); if (el->isEnumeratable() && ((el->getAttribute(ATTR_ID) == name) || (el->getAttribute(ATTR_NAME) == name))) @@ -387,7 +387,7 @@ NodeImpl *HTMLFormCollectionImpl::nextNamedItem( const DOMString &name ) const TQPtrList<HTMLImageElementImpl>& il = static_cast<HTMLFormElementImpl*>( m_refNode )->imgElements; for ( ; currentNameImgPos < il.count(); ++currentNameImgPos ) { - HTMLImageElementImpl* el = il.at(currentNameImgPos); + HTMLImageElementImpl* el = il.tqat(currentNameImgPos); if ((el->getAttribute(ATTR_ID) == name) || (el->getAttribute(ATTR_NAME) == name)) { diff --git a/khtml/java/kjavaappletviewer.cpp b/khtml/java/kjavaappletviewer.cpp index c51fd4017..b5038a576 100644 --- a/khtml/java/kjavaappletviewer.cpp +++ b/khtml/java/kjavaappletviewer.cpp @@ -234,7 +234,7 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *, if (equalPos > 0) { const TQString name = (*it).left (equalPos).upper (); TQString value = (*it).right ((*it).length () - equalPos - 1); - if (value.at(0)=='\"') + if (value.tqat(0)=='\"') value = value.right (value.length () - 1); if (value.at (value.length () - 1) == '\"') value.truncate (value.length () - 1); diff --git a/khtml/java/kjavaprocess.cpp b/khtml/java/kjavaprocess.cpp index 6de192689..c86b922dd 100644 --- a/khtml/java/kjavaprocess.cpp +++ b/khtml/java/kjavaprocess.cpp @@ -218,12 +218,12 @@ void KJavaProcess::popBuffer() // kdDebug(6100) << "Sending buffer to java, buffer = >>"; // for( unsigned int i = 0; i < buf->size(); i++ ) // { -// if( buf->at(i) == (char)0 ) +// if( buf->tqat(i) == (char)0 ) // kdDebug(6100) << "<SEP>"; -// else if( buf->at(i) > 0 && buf->at(i) < 10 ) -// kdDebug(6100) << "<CMD " << (int) buf->at(i) << ">"; +// else if( buf->tqat(i) > 0 && buf->tqat(i) < 10 ) +// kdDebug(6100) << "<CMD " << (int) buf->tqat(i) << ">"; // else -// kdDebug(6100) << buf->at(i); +// kdDebug(6100) << buf->tqat(i); // } // kdDebug(6100) << "<<" << endl; diff --git a/khtml/khtml_caret.cpp b/khtml/khtml_caret.cpp index 756b16653..0946685cb 100644 --- a/khtml/khtml_caret.cpp +++ b/khtml/khtml_caret.cpp @@ -2103,7 +2103,7 @@ static RenderTableCell *findNearestTableCellInRow(KHTMLPart *part, int x, int n = (int)row->row->size(); int i; for (i = 0; i < n; i++) { - RenderTableCell *cell = row->row->at(i); + RenderTableCell *cell = row->row->tqat(i); if (!cell || (long)cell == -1) continue; int absx, absy; @@ -2127,7 +2127,7 @@ static RenderTableCell *findNearestTableCellInRow(KHTMLPart *part, int x, int index = i - ((cnt >> 1) + 1)*(cnt & 1) + (cnt >> 1)*!(cnt & 1); if (index < 0 || index >= n) continue; - RenderTableCell *cell = row->row->at(index); + RenderTableCell *cell = row->row->tqat(index); if (!cell || (long)cell == -1) continue; #if DEBUG_CARETMODE > 1 @@ -2227,7 +2227,7 @@ static int findRowInSection(RenderTableSection *section, RenderTableCell *cell, // check for cell int m = row->row->size(); for (int j = 0; j < m; j++) { - RenderTableCell *c = row->row->at(j); + RenderTableCell *c = row->row->tqat(j); if (c == directCell) return i; }/*next j*/ diff --git a/khtml/khtml_ext.cpp b/khtml/khtml_ext.cpp index 9997a1aba..2e1ee3350 100644 --- a/khtml/khtml_ext.cpp +++ b/khtml/khtml_ext.cpp @@ -112,7 +112,7 @@ void KHTMLPartBrowserExtension::editableWidgetFocused( TQWidget *widget ) if ( !m_connectedToClipboard && m_editableFormWidget ) { - connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ), + connect( TQApplication::tqclipboard(), TQT_SIGNAL( dataChanged() ), this, TQT_SLOT( updateEditActions() ) ); if ( m_editableFormWidget->inherits( "QLineEdit" ) || m_editableFormWidget->inherits( "QTextEdit" ) ) @@ -135,7 +135,7 @@ void KHTMLPartBrowserExtension::editableWidgetBlurred( TQWidget * /*widget*/ ) if ( m_connectedToClipboard ) { - disconnect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ), + disconnect( TQApplication::tqclipboard(), TQT_SIGNAL( dataChanged() ), this, TQT_SLOT( updateEditActions() ) ); if ( oldWidget ) @@ -338,7 +338,7 @@ void KHTMLPartBrowserExtension::updateEditActions() TQMimeSource *data = TQApplication::tqclipboard()->data(); enableAction( "paste", data->provides( "text/plain" ) ); #else - TQString data=TQApplication::clipboard()->text(); + TQString data=TQApplication::tqclipboard()->text(); enableAction( "paste", data.contains("://")); #endif bool hasSelection = false; @@ -759,7 +759,7 @@ void KHTMLPopupGUIClient::slotCopyImageLocation() TQApplication::tqclipboard()->setData( new KURLDrag( lst ), TQClipboard::Clipboard ); TQApplication::tqclipboard()->setData( new KURLDrag( lst ), TQClipboard::Selection ); #else - TQApplication::clipboard()->setText( safeURL.url() ); //FIXME(E): Handle multiple entries + TQApplication::tqclipboard()->setText( safeURL.url() ); //FIXME(E): Handle multiple entries #endif } diff --git a/khtml/khtml_pagecache.cpp b/khtml/khtml_pagecache.cpp index bd8f29a30..31e764b5e 100644 --- a/khtml/khtml_pagecache.cpp +++ b/khtml/khtml_pagecache.cpp @@ -96,7 +96,7 @@ KHTMLPageCacheEntry::endData() m_complete = true; if ( m_file->status() == 0) { m_file->dataStream()->tqdevice()->flush(); - m_file->dataStream()->tqdevice()->at(0); + m_file->dataStream()->tqdevice()->tqat(0); } } diff --git a/khtml/khtml_part.cpp b/khtml/khtml_part.cpp index 98a99ffa9..3bc21ade0 100644 --- a/khtml/khtml_part.cpp +++ b/khtml/khtml_part.cpp @@ -1480,7 +1480,7 @@ void KHTMLPart::clear() d->m_startOffset = 0; d->m_endOffset = 0; #ifndef QT_NO_CLIPBOARD - connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), TQT_SLOT( slotClearSelection())); + connect( kapp->tqclipboard(), TQT_SIGNAL( selectionChanged()), TQT_SLOT( slotClearSelection())); #endif d->m_jobPercent = 0; @@ -3005,7 +3005,7 @@ void KHTMLPart::findText() // The lineedit of the dialog would make khtml lose its selection, otherwise #ifndef QT_NO_CLIPBOARD - disconnect( kapp->clipboard(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotClearSelection()) ); + disconnect( kapp->tqclipboard(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotClearSelection()) ); #endif // Now show the dialog in which the user can choose options. @@ -3036,7 +3036,7 @@ void KHTMLPart::findText( const TQString &str, long options, TQWidget *parent, K return; #ifndef QT_NO_CLIPBOARD - connect( kapp->clipboard(), TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotClearSelection()) ); + connect( kapp->tqclipboard(), TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotClearSelection()) ); #endif // Create the KFind object @@ -6610,9 +6610,9 @@ void KHTMLPart::khtmlMouseReleaseEvent( khtml::MouseReleaseEvent *event ) #ifndef QT_NO_CLIPBOARD TQString text = selectedText(); text.replace(TQChar(0xa0), ' '); - disconnect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), this, TQT_SLOT( slotClearSelection())); - kapp->clipboard()->setText(text,QClipboard::Selection); - connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), TQT_SLOT( slotClearSelection())); + disconnect( kapp->tqclipboard(), TQT_SIGNAL( selectionChanged()), this, TQT_SLOT( slotClearSelection())); + kapp->tqclipboard()->setText(text,TQClipboard::Selection); + connect( kapp->tqclipboard(), TQT_SIGNAL( selectionChanged()), TQT_SLOT( slotClearSelection())); #endif //kdDebug( 6000 ) << "selectedText = " << text << endl; emitSelectionChanged(); diff --git a/khtml/rendering/bidi.cpp b/khtml/rendering/bidi.cpp index 80aede1ef..cc60c5588 100644 --- a/khtml/rendering/bidi.cpp +++ b/khtml/rendering/bidi.cpp @@ -484,7 +484,7 @@ static void appendRunsForObject(int start, int end, RenderObject* obj, BidiState bool haveNextMidpoint = (smidpoints && sCurrMidpoint < sNumMidpoints); BidiIterator nextMidpoint; if (haveNextMidpoint) - nextMidpoint = smidpoints->at(sCurrMidpoint); + nextMidpoint = smidpoints->tqat(sCurrMidpoint); if (betweenMidpoints) { if (!(haveNextMidpoint && nextMidpoint.obj == obj)) return; diff --git a/khtml/rendering/render_form.cpp b/khtml/rendering/render_form.cpp index 272d402b4..de87072d1 100644 --- a/khtml/rendering/render_form.cpp +++ b/khtml/rendering/render_form.cpp @@ -1406,7 +1406,7 @@ void TextAreaWidget::slotReplaceNext() } if (!(m_replace->options() & KReplaceDialog::PromptOnReplace)) { - viewport()->setUpdatesEnabled(false); + viewport()->tqsetUpdatesEnabled(false); } KFind::Result res = KFind::NoMatch; @@ -1449,7 +1449,7 @@ void TextAreaWidget::slotReplaceNext() } if (!(m_replace->options() & KReplaceDialog::PromptOnReplace)) { - viewport()->setUpdatesEnabled(true); + viewport()->tqsetUpdatesEnabled(true); tqrepaintChanged(); } diff --git a/khtml/rendering/render_layer.cpp b/khtml/rendering/render_layer.cpp index fbb7a8dd6..6c04079d9 100644 --- a/khtml/rendering/render_layer.cpp +++ b/khtml/rendering/render_layer.cpp @@ -168,7 +168,7 @@ TQRegion RenderLayer::paintedRegion(RenderLayer* rootLayer) if (m_negZOrderList) { uint count = m_negZOrderList->count(); for (uint i = 0; i < count; i++) { - RenderLayer* child = m_negZOrderList->at(i); + RenderLayer* child = m_negZOrderList->tqat(i); r += child->paintedRegion(rootLayer); } } @@ -188,7 +188,7 @@ TQRegion RenderLayer::paintedRegion(RenderLayer* rootLayer) if (m_posZOrderList) { uint count = m_posZOrderList->count(); for (uint i = 0; i < count; i++) { - RenderLayer* child = m_posZOrderList->at(i); + RenderLayer* child = m_posZOrderList->tqat(i); r += child->paintedRegion(rootLayer); } } @@ -266,7 +266,7 @@ void RenderLayer::updateWidgetMasks(RenderLayer* rootLayer) m_region = TQRect(0,0,sv->contentsWidth(),sv->contentsHeight()); for (uint i = 0; i < count; i++) { - RenderLayer* child = m_posZOrderList->at(i); + RenderLayer* child = m_posZOrderList->tqat(i); if (child->zIndex() == 0 && child->renderer()->style()->position() == STATIC) continue; // we don't know the widget's exact stacking position within flow m_region -= child->paintedRegion(rootLayer); @@ -898,7 +898,7 @@ void RenderLayer::paintLayer(RenderLayer* rootLayer, TQPainter *p, if (m_negZOrderList) { uint count = m_negZOrderList->count(); for (uint i = 0; i < count; i++) { - RenderLayer* child = m_negZOrderList->at(i); + RenderLayer* child = m_negZOrderList->tqat(i); child->paintLayer(rootLayer, p, paintDirtyRect, selectionOnly); } } @@ -946,7 +946,7 @@ void RenderLayer::paintLayer(RenderLayer* rootLayer, TQPainter *p, if (m_posZOrderList) { uint count = m_posZOrderList->count(); for (uint i = 0; i < count; i++) { - RenderLayer* child = m_posZOrderList->at(i); + RenderLayer* child = m_posZOrderList->tqat(i); child->paintLayer(rootLayer, p, paintDirtyRect, selectionOnly); } } @@ -1026,7 +1026,7 @@ RenderLayer* RenderLayer::nodeAtPointForLayer(RenderLayer* rootLayer, RenderObje if (m_posZOrderList) { uint count = m_posZOrderList->count(); for (int i = count-1; i >= 0; i--) { - RenderLayer* child = m_posZOrderList->at(i); + RenderLayer* child = m_posZOrderList->tqat(i); insideLayer = child->nodeAtPointForLayer(rootLayer, info, xMousePos, yMousePos, hitTestRect); if (insideLayer) return insideLayer; @@ -1057,7 +1057,7 @@ RenderLayer* RenderLayer::nodeAtPointForLayer(RenderLayer* rootLayer, RenderObje if (m_negZOrderList) { uint count = m_negZOrderList->count(); for (int i = count-1; i >= 0; i--) { - RenderLayer* child = m_negZOrderList->at(i); + RenderLayer* child = m_negZOrderList->tqat(i); insideLayer = child->nodeAtPointForLayer(rootLayer, info, xMousePos, yMousePos, hitTestRect); if (insideLayer) return insideLayer; @@ -1261,8 +1261,8 @@ static void sortByZOrder(TQPtrVector<RenderLayer>* buffer, for (uint i = end-1; i > start; i--) { bool sorted = true; for (uint j = start; j < i; j++) { - RenderLayer* elt = buffer->at(j); - RenderLayer* elt2 = buffer->at(j+1); + RenderLayer* elt = buffer->tqat(j); + RenderLayer* elt2 = buffer->tqat(j+1); if (elt->zIndex() > elt2->zIndex()) { sorted = false; buffer->insert(j, elt2); @@ -1279,8 +1279,8 @@ static void sortByZOrder(TQPtrVector<RenderLayer>* buffer, sortByZOrder(buffer, mergeBuffer, start, mid); sortByZOrder(buffer, mergeBuffer, mid, end); - RenderLayer* elt = buffer->at(mid-1); - RenderLayer* elt2 = buffer->at(mid); + RenderLayer* elt = buffer->tqat(mid-1); + RenderLayer* elt2 = buffer->tqat(mid); // Handle the fast common case (of equal z-indices). The list may already // be completely sorted. @@ -1293,26 +1293,26 @@ static void sortByZOrder(TQPtrVector<RenderLayer>* buffer, uint i1 = start; uint i2 = mid; - elt = buffer->at(i1); - elt2 = buffer->at(i2); + elt = buffer->tqat(i1); + elt2 = buffer->tqat(i2); while (i1 < mid || i2 < end) { if (i1 < mid && (i2 == end || elt->zIndex() <= elt2->zIndex())) { mergeBuffer->insert(mergeBuffer->count(), elt); i1++; if (i1 < mid) - elt = buffer->at(i1); + elt = buffer->tqat(i1); } else { mergeBuffer->insert(mergeBuffer->count(), elt2); i2++; if (i2 < end) - elt2 = buffer->at(i2); + elt2 = buffer->tqat(i2); } } for (uint i = start; i < end; i++) - buffer->insert(i, mergeBuffer->at(i-start)); + buffer->insert(i, mergeBuffer->tqat(i-start)); mergeBuffer->clear(); } @@ -1471,7 +1471,7 @@ static void writeLayers(TQTextStream &ts, const RenderLayer* rootLayer, RenderLa if (negList) { for (unsigned i = 0; i != negList->count(); ++i) - writeLayers(ts, rootLayer, negList->at(i), paintDirtyRect, indent ); + writeLayers(ts, rootLayer, negList->tqat(i), paintDirtyRect, indent ); } if (shouldPaint) @@ -1485,7 +1485,7 @@ static void writeLayers(TQTextStream &ts, const RenderLayer* rootLayer, RenderLa TQPtrVector<RenderLayer>* posList = l->posZOrderList(); if (posList) { for (unsigned i = 0; i != posList->count(); ++i) - writeLayers(ts, rootLayer, posList->at(i), paintDirtyRect, indent); + writeLayers(ts, rootLayer, posList->tqat(i), paintDirtyRect, indent); } } diff --git a/khtml/rendering/render_table.cpp b/khtml/rendering/render_table.cpp index 8f5879f21..1910a90e4 100644 --- a/khtml/rendering/render_table.cpp +++ b/khtml/rendering/render_table.cpp @@ -482,7 +482,7 @@ void RenderTable::paint( PaintInfo& pI, int _tx, int _ty) #if 0 TQString m; for (uint i = 0; i < borderStyles.count(); i++) - m += TQString("%1 ").arg((*borderStyles.at(i)).width()); + m += TQString("%1 ").arg((*borderStyles.tqat(i)).width()); kdDebug(6040) << m << endl; #endif TQValueListIterator<CollapsedBorderValue> it = borderStyles.begin(); diff --git a/khtml/rendering/render_text.cpp b/khtml/rendering/render_text.cpp index ffae3a624..cc41a1688 100644 --- a/khtml/rendering/render_text.cpp +++ b/khtml/rendering/render_text.cpp @@ -738,7 +738,7 @@ void RenderText::deleteInlineBoxes(RenderArena* arena) if (!arena) arena = renderArena(); for(unsigned int i=0; i < len; i++) { - InlineTextBox* s = m_lines.at(i); + InlineTextBox* s = m_lines.tqat(i); if (s) s->detach(arena); m_lines.remove(i); @@ -1464,7 +1464,7 @@ static TQString quoteAndEscapeNonPrintables(const TQString &s) TQString result; result += '"'; for (uint i = 0; i != s.length(); ++i) { - TQChar c = s.at(i); + TQChar c = s.tqat(i); if (c == '\\') { result += "\\\\"; } else if (c == '"') { diff --git a/khtml/test_regression.cpp b/khtml/test_regression.cpp index 982539621..f80d82921 100644 --- a/khtml/test_regression.cpp +++ b/khtml/test_regression.cpp @@ -1051,7 +1051,7 @@ void RegressionTest::doJavascriptReport( const TQString &test ) text.replace( TQRegExp( "\nFAIL" ), "\n<span style='color: red'>FAIL</span>" ); text.replace( TQRegExp( "\nPASSED" ), "\n<span style='color: green'>PASSED</span>" ); text.replace( TQRegExp( "\nPASS" ), "\n<span style='color: green'>PASS</span>" ); - if ( text.at( 0 ) == '\n' ) + if ( text.tqat( 0 ) == '\n' ) text = text.mid( 1, text.length() ); text.replace( '\n', "<br>\n" ); cl += text; diff --git a/khtml/xml/dom_nodeimpl.cpp b/khtml/xml/dom_nodeimpl.cpp index 4da9b5c1f..8440d4395 100644 --- a/khtml/xml/dom_nodeimpl.cpp +++ b/khtml/xml/dom_nodeimpl.cpp @@ -1925,7 +1925,7 @@ NodeImpl *GenericRONamedNodeMapImpl::item ( unsigned long index ) const if (index >= m_contents->count()) return 0; - return m_contents->at(index); + return m_contents->tqat(index); } unsigned long GenericRONamedNodeMapImpl::length( ) const diff --git a/kimgio/dds.cpp b/kimgio/dds.cpp index bdf1ae750..1beb025cf 100644 --- a/kimgio/dds.cpp +++ b/kimgio/dds.cpp @@ -910,7 +910,7 @@ namespace { // Private. return false; } - int offset = s.tqdevice()->at(); + int offset = s.tqdevice()->tqat(); int size = FaceOffset( header ); for( int i = 0; i < 6; i++ ) { @@ -921,7 +921,7 @@ namespace { // Private. } // Seek device. - s.tqdevice()->at( offset ); + s.tqdevice()->tqat( offset ); offset += size; // Load face from stream. diff --git a/kimgio/eps.cpp b/kimgio/eps.cpp index e5495aaf1..e4308b0f7 100644 --- a/kimgio/eps.cpp +++ b/kimgio/eps.cpp @@ -61,7 +61,7 @@ static bool seekToCodeStart( TQIODevice * io, TQ_UINT32 & ps_offset, TQ_UINT32 & + ((unsigned char) buf[2] << 16) + ((unsigned char) buf[3] << 24); kdDebug(399) << "kimgio EPS: Offset: " << ps_offset <<" Size: " << ps_size << endl; - if ( !io->at(ps_offset) ) // Get offset of PostScript code in the MS-DOS EPS file. + if ( !io->tqat(ps_offset) ) // Get offset of PostScript code in the MS-DOS EPS file. { kdError(399) << "kimgio EPS: cannot seek in MS-DOS EPS file" << endl; return false; @@ -218,7 +218,7 @@ KDE_EXPORT void kimgio_eps_read (TQImageIO *image) io->reset(); // Go back to start of file to give all the file to GhostScript if (ps_offset>0L) // We have an offset - io->at(ps_offset); + io->tqat(ps_offset); TQByteArray buffer ( io->readAll() ); // If we have no MS-DOS EPS file or if the size seems wrong, then choose the buffer size diff --git a/kimgio/hdr.cpp b/kimgio/hdr.cpp index b96cddcb0..82a2e111d 100644 --- a/kimgio/hdr.cpp +++ b/kimgio/hdr.cpp @@ -127,7 +127,7 @@ namespace { // Private. if (val != 2) { - s.tqdevice()->at( s.tqdevice()->at() - 1 ); + s.tqdevice()->tqat( s.tqdevice()->tqat() - 1 ); Read_Old_Line(image.data(), width, s); RGBE_To_QRgbLine(image.data(), scanline, width); continue; diff --git a/kimgio/ico.cpp b/kimgio/ico.cpp index daaeb3de7..d973896c2 100644 --- a/kimgio/ico.cpp +++ b/kimgio/ico.cpp @@ -243,7 +243,7 @@ namespace extern "C" KDE_EXPORT void kimgio_ico_read( TQImageIO* io ) { - TQIODevice::Offset offset = io->ioDevice()->at(); + TQIODevice::Offset offset = io->ioDevice()->tqat(); TQDataStream stream( io->ioDevice() ); stream.setByteOrder( TQDataStream::LittleEndian ); @@ -295,7 +295,7 @@ extern "C" KDE_EXPORT void kimgio_ico_read( TQImageIO* io ) offset + selected->offset > io->ioDevice()->size() ) return; - io->ioDevice()->at( offset + selected->offset ); + io->ioDevice()->tqat( offset + selected->offset ); TQImage icon; if ( loadFromDIB( stream, *selected, icon ) ) { @@ -334,7 +334,7 @@ void kimgio_ico_write(TQImageIO *io) if (!qt_write_dib(dib, pixels)) return; - uint hdrPos = dib.device()->at(); + uint hdrPos = dib.device()->tqat(); if (!qt_write_dib(dib, mask)) return; memmove(dibData.data() + hdrPos, dibData.data() + hdrPos + BMP_WIN + 8, dibData.size() - hdrPos - BMP_WIN - 8); @@ -361,14 +361,14 @@ void kimgio_ico_write(TQImageIO *io) rec.dibSize = dibData.size(); ico << rec.width << rec.height << rec.colors << rec.hotspotX << rec.hotspotY << rec.dibSize; - rec.dibOffset = ico.device()->at() + sizeof(rec.dibOffset); + rec.dibOffset = ico.device()->tqat() + sizeof(rec.dibOffset); ico << rec.dibOffset; BMP_INFOHDR dibHeader; - dib.device()->at(0); + dib.device()->tqat(0); dib >> dibHeader; dibHeader.biHeight = io->image().height() << 1; - dib.device()->at(0); + dib.device()->tqat(0); dib << dibHeader; ico.writeRawBytes(dibData.data(), dibData.size()); diff --git a/kimgio/jp2.cpp b/kimgio/jp2.cpp index ed5ef99c3..121e83287 100644 --- a/kimgio/jp2.cpp +++ b/kimgio/jp2.cpp @@ -291,7 +291,7 @@ kimgio_jp2_write( TQImageIO* io ) TQ_LONG size; // seek to the beginning of the file. - if( !in->at( 0 ) ) { delete ktempf; return; } + if( !in->tqat( 0 ) ) { delete ktempf; return; } // 0 or -1 is EOF / error while( ( size = in->readBlock( b.data(), 4096 ) ) > 0 ) { diff --git a/kimgio/pcx.cpp b/kimgio/pcx.cpp index 37361e848..e823ebb8d 100644 --- a/kimgio/pcx.cpp +++ b/kimgio/pcx.cpp @@ -46,7 +46,7 @@ static TQDataStream &operator>>( TQDataStream &s, PCXHEADER &ph ) // Skip the rest of the header TQ_UINT8 byte; - while ( s.tqdevice()->at() < 128 ) + while ( s.tqdevice()->tqat() < 128 ) s >> byte; return s; @@ -183,7 +183,7 @@ static void readImage4( TQImage &img, TQDataStream &s, const PCXHEADER &header ) TQ_UINT32 offset = i*header.BytesPerLine; for ( unsigned int x=0; x<header.width(); ++x ) if ( buf[ offset + ( x/8 ) ] & ( 128 >> ( x%8 ) ) ) - pixbuf[ x ] = pixbuf.at(x) + ( 1 << i ); + pixbuf[ x ] = static_cast<const char>(pixbuf.tqat(x)) + ( 1 << i ); } uchar *p = img.scanLine( y ); @@ -343,7 +343,7 @@ static void writeLine( TQDataStream &s, TQByteArray &buf ) count = 1; byte = buf[ i++ ]; - while ( ( i < size ) && ( byte == buf.at(i) ) && ( count < 63 ) ) + while ( ( i < size ) && ( TQChar(byte) == buf.tqat(i) ) && ( count < 63 ) ) { ++i; ++count; @@ -412,7 +412,7 @@ static void writeImage4( TQImage &img, TQDataStream &s, PCXHEADER &header ) { for ( int i=0; i<4; ++i ) if ( *( p+x ) & ( 1 << i ) ) - buf[ i ][ x/8 ] = buf[ i ].at(x/8) | 1 << ( 7-x%8 ); + buf[ i ][ x/8 ] = buf[ i ].tqat(x/8) | 1 << ( 7-x%8 ); } for ( int i=0; i<4; ++i ) diff --git a/kimgio/psd.cpp b/kimgio/psd.cpp index d1b93b853..d400257aa 100644 --- a/kimgio/psd.cpp +++ b/kimgio/psd.cpp @@ -119,15 +119,15 @@ namespace { // Private. // Skip mode data. s >> tmp; - s.tqdevice()->at( s.tqdevice()->at() + tmp ); + s.tqdevice()->tqat( s.tqdevice()->tqat() + tmp ); // Skip image resources. s >> tmp; - s.tqdevice()->at( s.tqdevice()->at() + tmp ); + s.tqdevice()->tqat( s.tqdevice()->tqat() + tmp ); // Skip the reserved data. s >> tmp; - s.tqdevice()->at( s.tqdevice()->at() + tmp ); + s.tqdevice()->tqat( s.tqdevice()->tqat() + tmp ); // Find out if the data is compressed. // Known values: diff --git a/kimgio/tga.cpp b/kimgio/tga.cpp index 46ecb0624..0b7c3df1e 100644 --- a/kimgio/tga.cpp +++ b/kimgio/tga.cpp @@ -324,7 +324,7 @@ KDE_EXPORT void kimgio_tga_read( TQImageIO *io ) // Read image header. TgaHeader tga; s >> tga; - s.tqdevice()->at( TgaHeader::SIZE + tga.id_length ); + s.tqdevice()->tqat( TgaHeader::SIZE + tga.id_length ); // Check image file format. if( s.atEnd() ) { diff --git a/kimgio/tiffr.cpp b/kimgio/tiffr.cpp index 96b259b39..3a95f7949 100644 --- a/kimgio/tiffr.cpp +++ b/kimgio/tiffr.cpp @@ -30,14 +30,14 @@ static toff_t tiff_seek( thandle_t handle, toff_t off, int whence ) TQIODevice *dev = reinterpret_cast<TQIODevice *>( handle ); if ( whence == SEEK_CUR ) - off += dev->at(); + off += dev->tqat(); else if ( whence == SEEK_END ) off += dev->size(); - if ( !dev->at( off ) ) + if ( !dev->tqat( off ) ) return ( toff_t )-1; - return dev->at(); + return dev->tqat(); } static toff_t tiff_size( thandle_t handle ) diff --git a/kimgio/xcf.cpp b/kimgio/xcf.cpp index 64b18f060..ff74f1576 100644 --- a/kimgio/xcf.cpp +++ b/kimgio/xcf.cpp @@ -178,7 +178,7 @@ kdDebug() << tag << " " << xcf_image.width << " " << xcf_image.height << " " << while (!layer_offsets.isEmpty()) { TQ_INT32 layer_offset = layer_offsets.pop(); - xcf_io.tqdevice()->at(layer_offset); + xcf_io.tqdevice()->tqat(layer_offset); if (!loadLayer(xcf_io, xcf_image)) return; @@ -415,7 +415,7 @@ bool XCFImageFormat::loadLayer(TQDataStream& xcf_io, XCFImage& xcf_image) if( !composeTiles(xcf_image)) return false; - xcf_io.tqdevice()->at(layer.hierarchy_offset); + xcf_io.tqdevice()->tqat(layer.hierarchy_offset); // As tiles are loaded, they are copied into the layers tiles by // this routine. (loadMask(), below, uses a slightly different @@ -427,7 +427,7 @@ bool XCFImageFormat::loadLayer(TQDataStream& xcf_io, XCFImage& xcf_image) return false; if (layer.mask_offset != 0) { - xcf_io.tqdevice()->at(layer.mask_offset); + xcf_io.tqdevice()->tqat(layer.mask_offset); if (!loadMask(xcf_io, layer)) return false; @@ -758,13 +758,13 @@ bool XCFImageFormat::loadHierarchy(TQDataStream& xcf_io, Layer& layer) } } while (junk != 0); - TQIODevice::Offset saved_pos = xcf_io.tqdevice()->at(); + TQIODevice::Offset saved_pos = xcf_io.tqdevice()->tqat(); - xcf_io.tqdevice()->at(offset); + xcf_io.tqdevice()->tqat(offset); if (!loadLevel(xcf_io, layer, bpp)) return false; - xcf_io.tqdevice()->at(saved_pos); + xcf_io.tqdevice()->tqat(saved_pos); return true; } @@ -801,7 +801,7 @@ bool XCFImageFormat::loadLevel(TQDataStream& xcf_io, Layer& layer, TQ_INT32 bpp) return false; } - TQIODevice::Offset saved_pos = xcf_io.tqdevice()->at(); + TQIODevice::Offset saved_pos = xcf_io.tqdevice()->tqat(); TQ_UINT32 offset2; xcf_io >> offset2; @@ -815,7 +815,7 @@ bool XCFImageFormat::loadLevel(TQDataStream& xcf_io, Layer& layer, TQ_INT32 bpp) if (offset2 == 0) offset2 = offset + (uint)(TILE_WIDTH * TILE_HEIGHT * 4 * 1.5); - xcf_io.tqdevice()->at(offset); + xcf_io.tqdevice()->tqat(offset); int size = layer.image_tiles[j][i].width() * layer.image_tiles[j][i].height(); if (!loadTileRLE(xcf_io, layer.tile, size, offset2 - offset, bpp)) @@ -827,7 +827,7 @@ bool XCFImageFormat::loadLevel(TQDataStream& xcf_io, Layer& layer, TQ_INT32 bpp) layer.assignBytes(layer, i, j); - xcf_io.tqdevice()->at(saved_pos); + xcf_io.tqdevice()->tqat(saved_pos); xcf_io >> offset; if (xcf_io.tqdevice()->status() != IO_Ok) { @@ -873,7 +873,7 @@ bool XCFImageFormat::loadMask(TQDataStream& xcf_io, Layer& layer) return false; } - xcf_io.tqdevice()->at(hierarchy_offset); + xcf_io.tqdevice()->tqat(hierarchy_offset); layer.assignBytes = assignMaskBytes; if (!loadHierarchy(xcf_io, layer)) diff --git a/kinit/klauncher.cpp b/kinit/klauncher.cpp index c7ceb2895..0c5ceb015 100644 --- a/kinit/klauncher.cpp +++ b/kinit/klauncher.cpp @@ -164,7 +164,7 @@ IdleSlave::age(time_t now) KLauncher::KLauncher(int _kdeinitSocket, bool new_startup) // : KApplication( false, false ), // No Styles, No GUI - : KApplication( false, true ), // QClipboard tries to construct a QWidget so a GUI is technically needed, even though it is not used + : KApplication( false, true ), // TQClipboard tries to construct a QWidget so a GUI is technically needed, even though it is not used DCOPObject("klauncher"), kdeinitSocket(_kdeinitSocket), mAutoStart( new_startup ), dontBlockReading(false), newStartup( new_startup ) diff --git a/kio/bookmarks/kbookmarkbar.cc b/kio/bookmarks/kbookmarkbar.cc index 4709988a4..158caf373 100644 --- a/kio/bookmarks/kbookmarkbar.cc +++ b/kio/bookmarks/kbookmarkbar.cc @@ -200,8 +200,8 @@ void KBookmarkBar::fillBookmarkBar(KBookmarkGroup & parent) else { KAction *action = new KBookmarkAction( text, bm.icon(), 0, m_actionCollection, 0 ); - connect(action, TQT_SIGNAL( activated ( KAction::ActivationReason, Qt::ButtonState )), - this, TQT_SLOT( slotBookmarkSelected( KAction::ActivationReason, Qt::ButtonState ) )); + connect(action, TQT_SIGNAL( activated ( KAction::ActivationReason, TQt::ButtonState )), + this, TQT_SLOT( slotBookmarkSelected( KAction::ActivationReason, TQt::ButtonState ) )); action->setProperty( "url", bm.url().url() ); action->setProperty( "address", bm.address() ); @@ -231,8 +231,8 @@ void KBookmarkBar::fillBookmarkBar(KBookmarkGroup & parent) bm.address()); connect(menu, TQT_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu * ) ), this, TQT_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu * ) )); - connect(menu, TQT_SIGNAL( openBookmark( const TQString &, Qt::ButtonState) ), - this, TQT_SIGNAL( openBookmark( const TQString &, Qt::ButtonState) )); + connect(menu, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState) ), + this, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState) )); menu->fillBookmarkMenu(); action->plug(m_toolBar); m_lstSubMenus.append( menu ); diff --git a/kio/bookmarks/kbookmarkmenu.cc b/kio/bookmarks/kbookmarkmenu.cc index 916690c19..a4195409b 100644 --- a/kio/bookmarks/kbookmarkmenu.cc +++ b/kio/bookmarks/kbookmarkmenu.cc @@ -404,9 +404,9 @@ void RMB::slotRMBActionCopyLocation( int val ) if ( !bookmark.isGroup() ) { kapp->tqclipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0), - QClipboard::Selection ); + TQClipboard::Selection ); kapp->tqclipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0), - QClipboard::Clipboard ); + TQClipboard::Clipboard ); } } @@ -609,8 +609,8 @@ void KBookmarkMenu::fillBookmarkMenu() new KBookmarkMenu( m_pManager, m_pOwner, actionMenu->popupMenu(), m_actionCollection, false, m_bAddBookmark, TQString::null ); - connect( subMenu, TQT_SIGNAL( openBookmark( const TQString &, Qt::ButtonState ) ), - this, TQT_SIGNAL( openBookmark( const TQString &, Qt::ButtonState ) )); + connect( subMenu, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) ), + this, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) )); m_lstSubMenus.append(subMenu); connect(actionMenu->popupMenu(), TQT_SIGNAL(aboutToShow()), subMenu, TQT_SLOT(slotNSLoad())); @@ -639,8 +639,8 @@ void KBookmarkMenu::fillBookmarkMenu() { //kdDebug(7043) << "Creating URL bookmark menu item for " << bm.text() << endl; KAction * action = new KBookmarkAction( text, bm.icon(), 0, m_actionCollection, 0 ); - connect(action, TQT_SIGNAL( activated ( KAction::ActivationReason, Qt::ButtonState )), - this, TQT_SLOT( slotBookmarkSelected( KAction::ActivationReason, Qt::ButtonState ) )); + connect(action, TQT_SIGNAL( activated ( KAction::ActivationReason, TQt::ButtonState )), + this, TQT_SLOT( slotBookmarkSelected( KAction::ActivationReason, TQt::ButtonState ) )); action->setProperty( "url", bm.url().url() ); action->setProperty( "address", bm.address() ); @@ -668,8 +668,8 @@ void KBookmarkMenu::fillBookmarkMenu() connect(subMenu, TQT_SIGNAL( aboutToShowContextMenu( const KBookmark &, TQPopupMenu * ) ), this, TQT_SIGNAL( aboutToShowContextMenu( const KBookmark &, TQPopupMenu * ) )); - connect(subMenu, TQT_SIGNAL( openBookmark( const TQString &, Qt::ButtonState ) ), - this, TQT_SIGNAL( openBookmark( const TQString &, Qt::ButtonState ) )); + connect(subMenu, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) ), + this, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) )); m_lstSubMenus.append( subMenu ); } } @@ -1058,8 +1058,8 @@ void KBookmarkMenuNSImporter::newBookmark( const TQString & text, const TQCStrin TQString _text = KStringHandler::csqueeze(text); _text.replace( '&', "&&" ); KAction * action = new KBookmarkAction(_text, "html", 0, 0, "", m_actionCollection, 0); - connect(action, TQT_SIGNAL( activated ( KAction::ActivationReason, Qt::ButtonState )), - m_menu, TQT_SLOT( slotBookmarkSelected( KAction::ActivationReason, Qt::ButtonState ) )); + connect(action, TQT_SIGNAL( activated ( KAction::ActivationReason, TQt::ButtonState )), + m_menu, TQT_SLOT( slotBookmarkSelected( KAction::ActivationReason, TQt::ButtonState ) )); action->setProperty( "url", url ); action->setToolTip( url ); action->plug( mstack.top()->m_parentMenu ); @@ -1076,8 +1076,8 @@ void KBookmarkMenuNSImporter::newFolder( const TQString & text, bool, const TQSt KBookmarkMenu *subMenu = new KBookmarkMenu( m_pManager, m_menu->m_pOwner, actionMenu->popupMenu(), m_actionCollection, false, m_menu->m_bAddBookmark, TQString::null ); - connect( subMenu, TQT_SIGNAL( openBookmark( const TQString &, Qt::ButtonState ) ), - m_menu, TQT_SIGNAL( openBookmark( const TQString &, Qt::ButtonState ) )); + connect( subMenu, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) ), + m_menu, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) )); mstack.top()->m_lstSubMenus.append( subMenu ); mstack.push(subMenu); diff --git a/kio/kfile/kdiroperator.cpp b/kio/kfile/kdiroperator.cpp index af3e25eec..6c38e5ef7 100644 --- a/kio/kfile/kdiroperator.cpp +++ b/kio/kfile/kdiroperator.cpp @@ -1269,8 +1269,8 @@ void KDirOperator::setupActions() mkdirAction = new KAction( i18n("New Folder..."), 0, TQT_TQOBJECT(this), TQT_SLOT( mkdir() ), myActionCollection, "mkdir" ); KAction* trash = new KAction( i18n( "Move to Trash" ), "edittrash", Key_Delete, myActionCollection, "trash" ); - connect( trash, TQT_SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState ) ), - this, TQT_SLOT( trashSelected( KAction::ActivationReason, Qt::ButtonState ) ) ); + connect( trash, TQT_SIGNAL( activated( KAction::ActivationReason, TQt::ButtonState ) ), + this, TQT_SLOT( trashSelected( KAction::ActivationReason, TQt::ButtonState ) ) ); new KAction( i18n( "Delete" ), "editdelete", SHIFT+Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( deleteSelected() ), myActionCollection, "delete" ); mkdirAction->setIcon( TQString::tqfromLatin1("folder_new") ); diff --git a/kio/kfile/kencodingfiledialog.cpp b/kio/kfile/kencodingfiledialog.cpp index be5ca033b..bded7fb79 100644 --- a/kio/kfile/kencodingfiledialog.cpp +++ b/kio/kfile/kencodingfiledialog.cpp @@ -170,7 +170,7 @@ KEncodingFileDialog::Result KEncodingFileDialog::getSaveFileNameAndEncoding(cons TQWidget *parent, const TQString& caption) { - bool specialDir = dir.at(0) == ':'; + bool specialDir = dir.tqat(0) == ':'; KEncodingFileDialog dlg(specialDir?dir:TQString::null, encoding,filter,caption.isNull() ? i18n("Save As") : caption, Saving,parent, "filedialog", true); @@ -193,7 +193,7 @@ KEncodingFileDialog::Result KEncodingFileDialog::getSaveURLAndEncoding(const TQ const TQString& dir, const TQString& filter, TQWidget *parent, const TQString& caption) { - bool specialDir = dir.at(0) == ':'; + bool specialDir = dir.tqat(0) == ':'; KEncodingFileDialog dlg(specialDir?dir:TQString::null, encoding,filter,caption.isNull() ? i18n("Save As") : caption, Saving,parent, "filedialog", true); diff --git a/kio/kfile/kfiledialog.cpp b/kio/kfile/kfiledialog.cpp index 586b34d62..227bcffea 100644 --- a/kio/kfile/kfiledialog.cpp +++ b/kio/kfile/kfiledialog.cpp @@ -1595,7 +1595,7 @@ TQString KFileDialog::getSaveFileName(const TQString& dir, const TQString& filte TQWidget *parent, const TQString& caption) { - bool specialDir = dir.at(0) == ':'; + bool specialDir = dir.tqat(0) == ':'; KFileDialog dlg( specialDir ? dir : TQString::null, filter, parent, "filedialog", true); if ( !specialDir ) dlg.setSelection( dir ); // may also be a filename @@ -1616,7 +1616,7 @@ TQString KFileDialog::getSaveFileNameWId(const TQString& dir, const TQString& fi WId parent_id, const TQString& caption) { - bool specialDir = dir.at(0) == ':'; + bool specialDir = dir.tqat(0) == ':'; TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); KFileDialog dlg( specialDir ? dir : TQString::null, filter, parent, "filedialog", true); #ifdef Q_WS_X11 @@ -1644,7 +1644,7 @@ TQString KFileDialog::getSaveFileNameWId(const TQString& dir, const TQString& fi KURL KFileDialog::getSaveURL(const TQString& dir, const TQString& filter, TQWidget *parent, const TQString& caption) { - bool specialDir = dir.at(0) == ':'; + bool specialDir = dir.tqat(0) == ':'; KFileDialog dlg(specialDir ? dir : TQString::null, filter, parent, "filedialog", true); if ( !specialDir ) dlg.setSelection( dir ); // may also be a filename @@ -1950,7 +1950,7 @@ void KFileDialog::updateAutoSelectExtension (void) // first try X-KDE-NativeExtension TQString nativeExtension = mime->property ("X-KDE-NativeExtension").toString (); - if (nativeExtension.at (0) == '.') + if (nativeExtension.tqat (0) == '.') { d->extension = nativeExtension.lower (); kdDebug (kfile_area) << "\tsetMimeFilter-style: native ext=\'" @@ -2361,7 +2361,7 @@ void KFileDialog::setNonExtSelection() TQString pattern, filename = locationEdit->currentText().stripWhiteSpace(); KServiceTypeFactory::self()->findFromPattern( filename, &pattern ); - if ( !pattern.isEmpty() && pattern.at( 0 ) == '*' && pattern.tqfind( '*' , 1 ) == -1 ) + if ( !pattern.isEmpty() && pattern.tqat( 0 ) == '*' && pattern.tqfind( '*' , 1 ) == -1 ) locationEdit->lineEdit()->setSelection( 0, filename.length() - pattern.stripWhiteSpace().length()+1 ); else { diff --git a/kio/kfile/kfilefiltercombo.cpp b/kio/kfile/kfilefiltercombo.cpp index 771cc76b0..117097c98 100644 --- a/kio/kfile/kfilefiltercombo.cpp +++ b/kio/kfile/kfilefiltercombo.cpp @@ -95,7 +95,7 @@ TQString KFileFilterCombo::currentFilter() const { TQString f = currentText(); if (f == text(currentItem())) { // user didn't edit the text - f = *filters.at(currentItem()); + f = *filters.tqat(currentItem()); if ( d->isMimeFilter || (currentItem() == 0 && d->hasAllSupportedFiles) ) { return f; // we have a mimetype as filter } diff --git a/kio/kfile/kfileiconview.cpp b/kio/kfile/kfileiconview.cpp index 38bdec9b3..c5c2ac697 100644 --- a/kio/kfile/kfileiconview.cpp +++ b/kio/kfile/kfileiconview.cpp @@ -340,10 +340,10 @@ void KFileIconView::insertItem( KFileItem *i ) TQIconView* qview = static_cast<TQIconView*>( this ); // Since creating and initializing an item leads to a tqrepaint, // we disable updates on the IconView for a while. - qview->setUpdatesEnabled( false ); + qview->tqsetUpdatesEnabled( false ); KFileIconViewItem *item = new KFileIconViewItem( qview, i ); initItem( item, i, true ); - qview->setUpdatesEnabled( true ); + qview->tqsetUpdatesEnabled( true ); if ( !i->isMimeTypeKnown() ) m_resolver->m_lstPendingMimeIconItems.append( item ); @@ -632,7 +632,7 @@ bool KFileIconView::canPreview( const KFileItem *item ) const for ( ; it != d->previewMimeTypes.end(); ++it ) { TQString type = *it; // the "mimetype" can be "image/*" - if ( type.at( type.length() - 1 ) == '*' ) { + if ( type.tqat( type.length() - 1 ) == '*' ) { r.setPattern( type ); if ( r.search( item->mimetype() ) != -1 ) return true; diff --git a/kio/kfile/kicondialog.cpp b/kio/kfile/kicondialog.cpp index 2b1b68d68..fe2fff202 100644 --- a/kio/kfile/kicondialog.cpp +++ b/kio/kfile/kicondialog.cpp @@ -122,7 +122,7 @@ void KIconCanvas::slotLoadFiles() TQApplication::setOverrideCursor(tqwaitCursor); // disable updates to not trigger paint events when adding child items - setUpdatesEnabled( false ); + tqsetUpdatesEnabled( false ); #ifdef HAVE_LIBART KSVGIconEngine *svgEngine = new KSVGIconEngine(); @@ -191,7 +191,7 @@ void KIconCanvas::slotLoadFiles() #endif // enable updates since we have to draw the whole view now - setUpdatesEnabled( true ); + tqsetUpdatesEnabled( true ); TQApplication::restoreOverrideCursor(); d->m_bLoading = false; @@ -268,11 +268,11 @@ void KIconDialog::init() top->setSpacing( spacingHint() ); TQButtonGroup *bgroup = new TQButtonGroup(0, Qt::Vertical, i18n("Icon Source"), main); - bgroup->layout()->setSpacing(KDialog::spacingHint()); - bgroup->layout()->setMargin(KDialog::marginHint()); + bgroup->tqlayout()->setSpacing(KDialog::spacingHint()); + bgroup->tqlayout()->setMargin(KDialog::marginHint()); top->addWidget(bgroup); connect(bgroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotButtonClicked(int))); - TQGridLayout *grid = new TQGridLayout(bgroup->layout(), 3, 2); + TQGridLayout *grid = new TQGridLayout(bgroup->tqlayout(), 3, 2); mpRb1 = new TQRadioButton(i18n("S&ystem icons:"), bgroup); grid->addWidget(mpRb1, 1, 0); mpCombo = new TQComboBox(bgroup); diff --git a/kio/kfile/knotifydialog.cpp b/kio/kfile/knotifydialog.cpp index 47461dbce..a04f89773 100644 --- a/kio/kfile/knotifydialog.cpp +++ b/kio/kfile/knotifydialog.cpp @@ -374,7 +374,7 @@ Application * KNotifyWidget::addApplicationEvents( const TQString& path ) kdDebug() << "**** knotify: adding path: " << path << endl; TQString relativePath = path; - if ( path.at(0) == '/' && KStandardDirs::exists( path ) ) + if ( path.tqat(0) == '/' && KStandardDirs::exists( path ) ) relativePath = makeRelative( path ); if ( !relativePath.isEmpty() ) diff --git a/kio/kfile/kpropertiesdialog.cpp b/kio/kfile/kpropertiesdialog.cpp index a7be5de64..dde96f017 100644 --- a/kio/kfile/kpropertiesdialog.cpp +++ b/kio/kfile/kpropertiesdialog.cpp @@ -576,7 +576,7 @@ void KPropertiesDialog::rename( const TQString& _name ) else { TQString tmpurl = m_singleUrl.url(); - if ( tmpurl.at(tmpurl.length() - 1) == '/') + if ( tmpurl.tqat(tmpurl.length() - 1) == '/') // It's a directory, so strip the trailing slash first tmpurl.truncate( tmpurl.length() - 1); newUrl = tmpurl; @@ -908,7 +908,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) // Enhanced rename: Don't highlight the file extension. TQString pattern; KServiceTypeFactory::self()->findFromPattern( filename, &pattern ); - if (!pattern.isEmpty() && pattern.at(0)=='*' && pattern.tqfind('*',1)==-1) + if (!pattern.isEmpty() && pattern.tqat(0)=='*' && pattern.tqfind('*',1)==-1) d->m_lined->setSelection(0, filename.length()-pattern.stripWhiteSpace().length()+1); else { @@ -1654,11 +1654,11 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr /* Group: Access Permissions */ gb = new TQGroupBox ( 0, Qt::Vertical, i18n("Access Permissions"), d->m_frame ); - gb->layout()->setSpacing(KDialog::spacingHint()); - gb->layout()->setMargin(KDialog::marginHint()); + gb->tqlayout()->setSpacing(KDialog::spacingHint()); + gb->tqlayout()->setMargin(KDialog::marginHint()); box->addWidget (gb); - gl = new TQGridLayout (gb->layout(), 7, 2); + gl = new TQGridLayout (gb->tqlayout(), 7, 2); gl->setColStretch(1, 1); l = d->explanationLabel = new TQLabel( "", gb ); @@ -1723,11 +1723,11 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr /**** Group: Ownership ****/ gb = new TQGroupBox ( 0, Qt::Vertical, i18n("Ownership"), d->m_frame ); - gb->layout()->setSpacing(KDialog::spacingHint()); - gb->layout()->setMargin(KDialog::marginHint()); + gb->tqlayout()->setSpacing(KDialog::spacingHint()); + gb->tqlayout()->setMargin(KDialog::marginHint()); box->addWidget (gb); - gl = new TQGridLayout (gb->layout(), 4, 3); + gl = new TQGridLayout (gb->tqlayout(), 4, 3); gl->addRowSpacing(0, 10); /*** Set Owner ***/ @@ -1915,10 +1915,10 @@ void KFilePermissionsPropsPlugin::slotShowAdvancedPermissions() { // Group: Access Permissions gb = new TQGroupBox ( 0, Qt::Vertical, i18n("Access Permissions"), mainVBox ); - gb->layout()->setSpacing(KDialog::spacingHint()); - gb->layout()->setMargin(KDialog::marginHint()); + gb->tqlayout()->setSpacing(KDialog::spacingHint()); + gb->tqlayout()->setMargin(KDialog::marginHint()); - gl = new TQGridLayout (gb->layout(), 6, 6); + gl = new TQGridLayout (gb->tqlayout(), 6, 6); gl->addRowSpacing(0, 10); TQValueVector<TQWidget*> theNotSpecials; @@ -3635,7 +3635,7 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props ) mainlayout->addWidget(tmpQGroupBox); - TQGridLayout *grid = new TQGridLayout(tmpQGroupBox->layout(), 2, 2); + TQGridLayout *grid = new TQGridLayout(tmpQGroupBox->tqlayout(), 2, 2); grid->setSpacing( KDialog::spacingHint() ); grid->setColStretch(1, 1); @@ -3662,7 +3662,7 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props ) mainlayout->addWidget(tmpQGroupBox); - grid = new TQGridLayout(tmpQGroupBox->layout(), 3, 2); + grid = new TQGridLayout(tmpQGroupBox->tqlayout(), 3, 2); grid->setSpacing( KDialog::spacingHint() ); grid->setColStretch(1, 1); @@ -3701,7 +3701,7 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props ) mainlayout->addWidget(tmpQGroupBox); - grid = new TQGridLayout(tmpQGroupBox->layout(), 2, 2); + grid = new TQGridLayout(tmpQGroupBox->tqlayout(), 2, 2); grid->setSpacing(KDialog::spacingHint()); grid->setColStretch(1, 1); diff --git a/kio/kfile/kurlbar.cpp b/kio/kfile/kurlbar.cpp index 692fbd8de..5cb7afe58 100644 --- a/kio/kfile/kurlbar.cpp +++ b/kio/kfile/kurlbar.cpp @@ -1010,7 +1010,7 @@ KURL KURLBarItemDialog::url() const { TQString text = m_urlEdit->url(); KURL u; - if ( text.at(0) == '/' ) + if ( text.tqat(0) == '/' ) u.setPath( text ); else u = text; diff --git a/kio/kfile/kurlcombobox.cpp b/kio/kfile/kurlcombobox.cpp index f7bf58bc0..0449795f5 100644 --- a/kio/kfile/kurlcombobox.cpp +++ b/kio/kfile/kurlcombobox.cpp @@ -87,7 +87,7 @@ TQStringList KURLComboBox::urls() const for ( int i = defaultList.count(); i < count(); i++ ) { url = text( i ); if ( !url.isEmpty() ) { - //if ( url.at(0) == '/' ) + //if ( url.tqat(0) == '/' ) // list.append( url.prepend( fileProt ) ); //else list.append( url ); @@ -129,7 +129,7 @@ void KURLComboBox::setDefaults() KURLComboItem *item; for ( unsigned int id = 0; id < defaultList.count(); id++ ) { - item = defaultList.at( id ); + item = defaultList.tqat( id ); insertURLItem( item ); } } diff --git a/kio/kio/job.cpp b/kio/kio/job.cpp index 2b82d2411..510d3538c 100644 --- a/kio/kio/job.cpp +++ b/kio/kio/job.cpp @@ -4533,7 +4533,7 @@ void MultiGetJob::slotFinished() // return slave to pool // fetch new slave for first entry in m_waitQueue and call start // again. - GetRequest *entry = m_waitQueue.at(0); + GetRequest *entry = m_waitQueue.tqat(0); m_url = entry->url; slaveDone(); Scheduler::doJob(this); diff --git a/kio/kio/kar.cpp b/kio/kio/kar.cpp index 92f923343..a68df7a85 100644 --- a/kio/kio/kar.cpp +++ b/kio/kio/kar.cpp @@ -98,7 +98,7 @@ bool KAr::openArchive( int mode ) TQCString name; int date, uid, gid, mode, size; - dev->at( dev->at() + (2 - (dev->at() % 2)) % 2 ); // Ar headers are padded to byte boundary + dev->tqat( dev->tqat() + (2 - (dev->tqat() % 2)) % 2 ); // Ar headers are padded to byte boundary if ( dev->readBlock (ar_header.data(), 60) != 60 ) { // Read ar header kdWarning(7042) << "Couldn't read header" << endl; @@ -131,7 +131,7 @@ bool KAr::openArchive( int mode ) kdDebug(7042) << "Read in longnames entry" << endl; } else if (name.mid(1, 1) == " ") { // Symbol table entry kdDebug(7042) << "Skipped symbol entry" << endl; - dev->at( dev->at() + size ); + dev->tqat( dev->tqat() + size ); skip_entry = true; } else { // Longfilename kdDebug(7042) << "Longfilename #" << name.mid(1, 15).toInt() << endl; @@ -150,10 +150,10 @@ bool KAr::openArchive( int mode ) kdDebug(7042) << "Filename: " << name << " Size: " << size << endl; KArchiveEntry* entry; - entry = new KArchiveFile(this, name, mode, date, /*uid*/ 0, /*gid*/ 0, 0, dev->at(), size); + entry = new KArchiveFile(this, name, mode, date, /*uid*/ 0, /*gid*/ 0, 0, dev->tqat(), size); rootDir()->addEntry(entry); // Ar files don't support directorys, so everything in root - dev->at( dev->at() + size ); // Skip contents + dev->tqat( dev->tqat() + size ); // Skip contents } delete[] ar_longnames; diff --git a/kio/kio/karchive.cpp b/kio/kio/karchive.cpp index 9f1ec3c79..6eca7f2db 100644 --- a/kio/kio/karchive.cpp +++ b/kio/kio/karchive.cpp @@ -491,7 +491,7 @@ int KArchiveFile::size() const TQByteArray KArchiveFile::data() const { - archive()->device()->at( m_pos ); + archive()->device()->tqat( m_pos ); // Read content TQByteArray arr( m_size ); diff --git a/kio/kio/klimitediodevice.h b/kio/kio/klimitediodevice.h index f148d5215..666021fa1 100644 --- a/kio/kio/klimitediodevice.h +++ b/kio/kio/klimitediodevice.h @@ -56,7 +56,7 @@ public: else ok = m_dev->open( m ); if ( ok )*/ - m_dev->at( m_start ); // No concurrent access ! + m_dev->tqat( m_start ); // No concurrent access ! } else kdWarning(7005) << "KLimitedIODevice::open only supports IO_ReadOnly!" << endl; @@ -89,13 +89,13 @@ public: return c[0]; } virtual int ungetch( int c ) { return m_dev->ungetch(c); } // ## apply lower limit ? - virtual Offset at() const { return m_dev->at() - m_start; } + virtual Offset at() const { return m_dev->tqat() - m_start; } virtual bool at( Offset pos ) { Q_ASSERT( pos <= m_length ); pos = QMIN( pos, m_length ); // Apply upper limit - return m_dev->at( m_start + pos ); + return m_dev->tqat( m_start + pos ); } - virtual bool atEnd() const { return m_dev->atEnd() || m_dev->at() >= m_start + m_length; } + virtual bool atEnd() const { return m_dev->atEnd() || m_dev->tqat() >= m_start + m_length; } private: TQIODevice* m_dev; TQ_ULONG m_start; diff --git a/kio/kio/kservicefactory.cpp b/kio/kio/kservicefactory.cpp index d2d4a9623..47c3fc06b 100644 --- a/kio/kio/kservicefactory.cpp +++ b/kio/kio/kservicefactory.cpp @@ -52,14 +52,14 @@ KServiceFactory::KServiceFactory() (*m_str) >> i; m_menuIdDictOffset = i; - int saveOffset = m_str->tqdevice()->at(); + int saveOffset = m_str->tqdevice()->tqat(); // Init index tables m_nameDict = new KSycocaDict(m_str, m_nameDictOffset); // Init index tables m_relNameDict = new KSycocaDict(m_str, m_relNameDictOffset); // Init index tables m_menuIdDict = new KSycocaDict(m_str, m_menuIdDictOffset); - saveOffset = m_str->tqdevice()->at(saveOffset); + saveOffset = m_str->tqdevice()->tqat(saveOffset); } else { @@ -225,7 +225,7 @@ KService::List KServiceFactory::allInitServices() // Assume we're NOT building a database - m_str->tqdevice()->at(m_initListOffset); + m_str->tqdevice()->tqat(m_initListOffset); TQ_INT32 entryCount; (*m_str) >> entryCount; @@ -253,7 +253,7 @@ KService::List KServiceFactory::offers( int serviceTypeOffset ) TQDataStream *str = m_str; // Jump to the offer list - str->tqdevice()->at( m_offerListOffset ); + str->tqdevice()->tqat( m_offerListOffset ); TQ_INT32 aServiceTypeOffset; TQ_INT32 aServiceOffset; @@ -268,13 +268,13 @@ KService::List KServiceFactory::offers( int serviceTypeOffset ) if ( aServiceTypeOffset == serviceTypeOffset ) { // Save stream position ! - int savedPos = str->tqdevice()->at(); + int savedPos = str->tqdevice()->tqat(); // Create Service KService * serv = createEntry( aServiceOffset ); if (serv) list.append( KService::Ptr( serv ) ); // Restore position - str->tqdevice()->at( savedPos ); + str->tqdevice()->tqat( savedPos ); } else if ( aServiceTypeOffset > (TQ_INT32)serviceTypeOffset ) break; // too far } diff --git a/kio/kio/kservicegroupfactory.cpp b/kio/kio/kservicegroupfactory.cpp index 326c41173..b693035a6 100644 --- a/kio/kio/kservicegroupfactory.cpp +++ b/kio/kio/kservicegroupfactory.cpp @@ -40,10 +40,10 @@ KServiceGroupFactory::KServiceGroupFactory() (*m_str) >> i; m_baseGroupDictOffset = i; - int saveOffset = m_str->tqdevice()->at(); + int saveOffset = m_str->tqdevice()->tqat(); // Init index tables m_baseGroupDict = new KSycocaDict(m_str, m_baseGroupDictOffset); - m_str->tqdevice()->at(saveOffset); + m_str->tqdevice()->tqat(saveOffset); } else { diff --git a/kio/kio/kservicetypefactory.cpp b/kio/kio/kservicetypefactory.cpp index 99a0ee349..cb0f66fa1 100644 --- a/kio/kio/kservicetypefactory.cpp +++ b/kio/kio/kservicetypefactory.cpp @@ -118,14 +118,14 @@ KMimeType * KServiceTypeFactory::findFromPattern(const TQString &_filename, TQSt // Get stream to the header TQDataStream *str = m_str; - str->tqdevice()->at( m_fastPatternOffset ); + str->tqdevice()->tqat( m_fastPatternOffset ); TQ_INT32 nrOfEntries; (*str) >> nrOfEntries; TQ_INT32 entrySize; (*str) >> entrySize; - TQ_INT32 fastOffset = str->tqdevice()->at( ); + TQ_INT32 fastOffset = str->tqdevice()->tqat( ); TQ_INT32 matchingOffset = 0; @@ -145,7 +145,7 @@ KMimeType * KServiceTypeFactory::findFromPattern(const TQString &_filename, TQSt while (left <= right) { middle = (left + right) / 2; // read pattern at position "middle" - str->tqdevice()->at( middle * entrySize + fastOffset ); + str->tqdevice()->tqat( middle * entrySize + fastOffset ); KSycocaEntry::read(*str, pattern); int cmp = pattern.compare( extension ); if (cmp < 0) @@ -166,7 +166,7 @@ KMimeType * KServiceTypeFactory::findFromPattern(const TQString &_filename, TQSt // Now try the "other" Pattern table if ( m_patterns.isEmpty() ) { - str->tqdevice()->at( m_otherPatternOffset ); + str->tqdevice()->tqat( m_otherPatternOffset ); TQString pattern; TQ_INT32 mimetypeOffset; diff --git a/kio/kio/kshred.cpp b/kio/kio/kshred.cpp index f3997bf58..151cc69a6 100644 --- a/kio/kio/kshred.cpp +++ b/kio/kio/kshred.cpp @@ -95,7 +95,7 @@ KShred::fillbyte(unsigned int byte) } if (!flush()) return false; - return file->at(0); + return file->tqat(0); } @@ -114,7 +114,7 @@ KShred::fillpattern(unsigned char *data, unsigned int size) } if (!flush()) return false; - return file->at(0); + return file->tqat(0); } @@ -140,7 +140,7 @@ KShred::fillrandom() } if (!flush()) return false; - return file->at(0); + return file->tqat(0); } diff --git a/kio/kio/ktar.cpp b/kio/kio/ktar.cpp index 6c8227d3e..7d646d8f3 100644 --- a/kio/kio/ktar.cpp +++ b/kio/kio/ktar.cpp @@ -461,14 +461,14 @@ bool KTar::openArchive( int mode ) //kdDebug(7041) << "KTar::openArchive file " << nm << " size=" << size << endl; e = new KArchiveFile( this, nm, access, time, user, group, symlink, - dev->at(), size ); + dev->tqat(), size ); } // Skip contents + align bytes int rest = size % 0x200; int skip = size + (rest ? 0x200 - rest : 0); - //kdDebug(7041) << "KTar::openArchive, at()=" << dev->at() << " rest=" << rest << " skipping " << skip << endl; - if (! dev->at( dev->at() + skip ) ) + //kdDebug(7041) << "KTar::openArchive, at()=" << dev->tqat() << " rest=" << rest << " skipping " << skip << endl; + if (! dev->tqat( dev->tqat() + skip ) ) kdWarning(7041) << "KTar::openArchive skipping " << skip << " failed" << endl; } @@ -495,7 +495,7 @@ bool KTar::openArchive( int mode ) else { //qDebug("Terminating. Read %d bytes, first one is %d", n, buffer[0]); - d->tarEnd = dev->at() - n; // Remember end of archive + d->tarEnd = dev->tqat() - n; // Remember end of archive ende = true; } } while( !ende ); @@ -591,7 +591,7 @@ bool KTar::writeDir( const TQString& name, const TQString& user, const TQString& char buffer[ 0x201 ]; memset( buffer, 0, 0x200 ); - if ( mode() & IO_ReadWrite ) device()->at(d->tarEnd); // Go to end of archive as might have moved with a read + if ( mode() & IO_ReadWrite ) device()->tqat(d->tarEnd); // Go to end of archive as might have moved with a read // If more than 100 chars, we need to use the LongLink trick if ( dirName.length() > 99 ) @@ -616,7 +616,7 @@ bool KTar::writeDir( const TQString& name, const TQString& user, const TQString& // Write header device()->writeBlock( buffer, 0x200 ); - if ( mode() & IO_ReadWrite ) d->tarEnd = device()->at(); + if ( mode() & IO_ReadWrite ) d->tarEnd = device()->tqat(); d->dirList.append( dirName ); // contains trailing slash return true; // TODO if wanted, better error control @@ -636,7 +636,7 @@ bool KTar::doneWriting( uint size ) // Write tqalignment int rest = size % 0x200; if ( mode() & IO_ReadWrite ) - d->tarEnd = device()->at() + (rest ? 0x200 - rest : 0); // Record our new end of archive + d->tarEnd = device()->tqat() + (rest ? 0x200 - rest : 0); // Record our new end of archive if ( rest ) { char buffer[ 0x201 ]; @@ -799,7 +799,7 @@ bool KTar::prepareWriting_impl(const TQString &name, const TQString &user, char buffer[ 0x201 ]; memset( buffer, 0, 0x200 ); - if ( mode() & IO_ReadWrite ) device()->at(d->tarEnd); // Go to end of archive as might have moved with a read + if ( mode() & IO_ReadWrite ) device()->tqat(d->tarEnd); // Go to end of archive as might have moved with a read // provide converted stuff we need lateron TQCString encodedFilename = TQFile::encodeName(fileName); @@ -858,7 +858,7 @@ bool KTar::writeDir_impl(const TQString &name, const TQString &user, char buffer[ 0x201 ]; memset( buffer, 0, 0x200 ); - if ( mode() & IO_ReadWrite ) device()->at(d->tarEnd); // Go to end of archive as might have moved with a read + if ( mode() & IO_ReadWrite ) device()->tqat(d->tarEnd); // Go to end of archive as might have moved with a read // provide converted stuff we need lateron TQCString encodedDirname = TQFile::encodeName(dirName); @@ -882,7 +882,7 @@ bool KTar::writeDir_impl(const TQString &name, const TQString &user, // Write header device()->writeBlock( buffer, 0x200 ); - if ( mode() & IO_ReadWrite ) d->tarEnd = device()->at(); + if ( mode() & IO_ReadWrite ) d->tarEnd = device()->tqat(); d->dirList.append( dirName ); // contains trailing slash return true; // TODO if wanted, better error control @@ -916,7 +916,7 @@ bool KTar::writeSymLink_impl(const TQString &name, const TQString &target, char buffer[ 0x201 ]; memset( buffer, 0, 0x200 ); - if ( mode() & IO_ReadWrite ) device()->at(d->tarEnd); // Go to end of archive as might have moved with a read + if ( mode() & IO_ReadWrite ) device()->tqat(d->tarEnd); // Go to end of archive as might have moved with a read // provide converted stuff we need lateron TQCString encodedFilename = TQFile::encodeName(fileName); @@ -946,7 +946,7 @@ bool KTar::writeSymLink_impl(const TQString &name, const TQString &target, // Write header bool retval = device()->writeBlock( buffer, 0x200 ) == 0x200; - if ( mode() & IO_ReadWrite ) d->tarEnd = device()->at(); + if ( mode() & IO_ReadWrite ) d->tarEnd = device()->tqat(); return retval; } diff --git a/kio/kio/kurlcompletion.cpp b/kio/kio/kurlcompletion.cpp index 339f6c351..85429a6db 100644 --- a/kio/kio/kurlcompletion.cpp +++ b/kio/kio/kurlcompletion.cpp @@ -738,7 +738,7 @@ bool KURLCompletion::userCompletion(const MyURL &url, TQString *match) { if ( url.protocol() != "file" || !url.dir().isEmpty() - || url.file().at(0) != '~' ) + || url.file().tqat(0) != '~' ) return false; if ( !isListedURL( CTUser ) ) { @@ -770,7 +770,7 @@ extern char **environ; // Array of environment variables bool KURLCompletion::envCompletion(const MyURL &url, TQString *match) { - if ( url.file().at(0) != '$' ) + if ( url.file().tqat(0) != '$' ) return false; if ( !isListedURL( CTEnv ) ) { @@ -849,7 +849,7 @@ bool KURLCompletion::exeCompletion(const MyURL &url, TQString *match) } // No hidden files unless the user types "." - bool no_hidden_files = url.file().at(0) != '.'; + bool no_hidden_files = url.file().tqat(0) != '.'; // List files if needed // @@ -923,7 +923,7 @@ bool KURLCompletion::fileCompletion(const MyURL &url, TQString *match) } // No hidden files unless the user types "." - bool no_hidden_files = ( url.file().at(0) != '.' ); + bool no_hidden_files = ( url.file().tqat(0) != '.' ); // List files if needed // @@ -1293,7 +1293,7 @@ void KURLCompletion::postProcessMatch( TQString *match ) const void KURLCompletion::adjustMatch( TQString& match ) const { - if ( match.at( match.length()-1 ) != '/' ) + if ( match.tqat( match.length()-1 ) != '/' ) { TQString copy; diff --git a/kio/kio/kurlpixmapprovider.cpp b/kio/kio/kurlpixmapprovider.cpp index caeedf066..c55546c55 100644 --- a/kio/kio/kurlpixmapprovider.cpp +++ b/kio/kio/kurlpixmapprovider.cpp @@ -22,7 +22,7 @@ TQPixmap KURLPixmapProvider::pixmapFor( const TQString& url, int size ) { KURL u; - if ( url.at(0) == '/' ) + if ( url.tqat(0) == '/' ) u.setPath( url ); else u = url; diff --git a/kio/kio/kzip.cpp b/kio/kio/kzip.cpp index 88d00c4e3..01d2dc4c9 100644 --- a/kio/kio/kzip.cpp +++ b/kio/kio/kzip.cpp @@ -427,7 +427,7 @@ bool KZip::openArchive( int mode ) for (;;) // repeat until 'end of entries' signature is reached { kdDebug(7040) << "loop starts" << endl; -kdDebug(7040) << "dev->at() now : " << dev->at() << endl; +kdDebug(7040) << "dev->tqat() now : " << dev->tqat() << endl; n = dev->readBlock( buffer, 4 ); if (n < 4) @@ -449,7 +449,7 @@ kdDebug(7040) << "dev->at() now : " << dev->at() << endl; kdDebug(7040) << "PK34 found local file header" << endl; startOfFile = false; // can this fail ??? - dev->at( dev->at() + 2 ); // skip 'version needed to extract' + dev->tqat( dev->tqat() + 2 ); // skip 'version needed to extract' // read static header stuff n = dev->readBlock( buffer, 24 ); @@ -490,7 +490,7 @@ kdDebug(7040) << "dev->at() now : " << dev->at() << endl; // read and parse the beginning of the extra field, // skip rest of extra field in case it is too long - unsigned int extraFieldEnd = dev->at() + extralen; + unsigned int extraFieldEnd = dev->tqat() + extralen; pfi->extralen = extralen; int handledextralen = QMIN(extralen, (int)sizeof buffer); @@ -505,7 +505,7 @@ kdDebug(7040) << "dev->at() now : " << dev->at() << endl; } // jump to end of extra field - dev->at( extraFieldEnd ); + dev->tqat( extraFieldEnd ); // we have to take care of the 'general purpose bit flag'. // if bit 3 is set, the header doesn't contain the length of @@ -544,18 +544,18 @@ kdDebug(7040) << "dev->at() now : " << dev->at() << endl; if ( buffer[0] == 'K' && buffer[1] == 7 && buffer[2] == 8 ) { foundSignature = true; - dev->at( dev->at() + 12 ); // skip the 'data_descriptor' + dev->tqat( dev->tqat() + 12 ); // skip the 'data_descriptor' } else if ( ( buffer[0] == 'K' && buffer[1] == 1 && buffer[2] == 2 ) || ( buffer[0] == 'K' && buffer[1] == 3 && buffer[2] == 4 ) ) { foundSignature = true; - dev->at( dev->at() - 4 ); // go back 4 bytes, so that the magic bytes can be found... + dev->tqat( dev->tqat() - 4 ); // go back 4 bytes, so that the magic bytes can be found... } else if ( buffer[0] == 'P' || buffer[1] == 'P' || buffer[2] == 'P' ) { // We have another P character so we must go back a little to check if it is a magic - dev->at( dev->at() - 3 ); + dev->tqat( dev->tqat() - 3 ); } } @@ -611,14 +611,14 @@ kdDebug(7040) << "dev->at() now : " << dev->at() << endl; if ( buffer[0] == 'K' && buffer[1] == 7 && buffer[2] == 8 ) { foundSignature = true; - dev->at( dev->at() + 12 ); // skip the 'data_descriptor' + dev->tqat( dev->tqat() + 12 ); // skip the 'data_descriptor' } if ( ( buffer[0] == 'K' && buffer[1] == 1 && buffer[2] == 2 ) || ( buffer[0] == 'K' && buffer[1] == 3 && buffer[2] == 4 ) ) { foundSignature = true; - dev->at( dev->at() - 4 ); + dev->tqat( dev->tqat() - 4 ); // go back 4 bytes, so that the magic bytes can be found // in the next cycle... } @@ -626,10 +626,10 @@ kdDebug(7040) << "dev->at() now : " << dev->at() << endl; } else { -// kdDebug(7040) << "before interesting dev->at(): " << dev->at() << endl; +// kdDebug(7040) << "before interesting dev->tqat(): " << dev->tqat() << endl; bool success; - success = dev->at( dev->at() + compr_size ); // can this fail ??? -/* kdDebug(7040) << "after interesting dev->at(): " << dev->at() << endl; + success = dev->tqat( dev->tqat() + compr_size ); // can this fail ??? +/* kdDebug(7040) << "after interesting dev->tqat(): " << dev->tqat() << endl; if ( success ) kdDebug(7040) << "dev->at was successful... " << endl; else @@ -653,7 +653,7 @@ kdDebug(7040) << "dev->at() now : " << dev->at() << endl; // so we reached the central header at the end of the zip file // here we get all interesting data out of the central header // of a file - offset = dev->at() - 4; + offset = dev->tqat() - 4; //set offset for appending new files if ( d->m_offset == 0L ) d->m_offset = offset; @@ -792,7 +792,7 @@ kdDebug(7040) << "dev->at() now : " << dev->at() << endl; //calculate offset to next entry offset += 46 + commlen + extralen + namelen; - bool b = dev->at(offset); + bool b = dev->tqat(offset); Q_ASSERT( b ); if ( !b ) return false; @@ -832,12 +832,12 @@ kdDebug(7040) << "dev->at() now : " << dev->at() << endl; if ( buffer[0] == 'K' && buffer[1] == 3 && buffer[2] == 4 ) { foundSignature = true; - dev->at( dev->at() - 4 ); // go back 4 bytes, so that the magic bytes can be found... + dev->tqat( dev->tqat() - 4 ); // go back 4 bytes, so that the magic bytes can be found... } else if ( buffer[0] == 'P' || buffer[1] == 'P' || buffer[2] == 'P' ) { // We have another P character so we must go back a little to check if it is a magic - dev->at( dev->at() - 3 ); + dev->tqat( dev->tqat() - 3 ); } } } @@ -871,14 +871,14 @@ bool KZip::closeArchive() char buffer[ 22 ]; // first used for 12, then for 22 at the end uLong crc = crc32(0L, Z_NULL, 0); - TQ_LONG centraldiroffset = device()->at(); + TQ_LONG centraldiroffset = device()->tqat(); //kdDebug(7040) << "closearchive: centraldiroffset: " << centraldiroffset << endl; TQ_LONG atbackup = centraldiroffset; TQPtrListIterator<KZipFileEntry> it( d->m_fileList ); for ( ; it.current() ; ++it ) { //set crc and compressed size in each local file header - if ( !device()->at( it.current()->headerStart() + 14 ) ) + if ( !device()->tqat( it.current()->headerStart() + 14 ) ) return false; //kdDebug(7040) << "closearchive setcrcandcsize: filename: " // << it.current()->path() @@ -905,7 +905,7 @@ bool KZip::closeArchive() if ( device()->writeBlock( buffer, 12 ) != 12 ) return false; } - device()->at( atbackup ); + device()->tqat( atbackup ); for ( it.toFirst(); it.current() ; ++it ) { @@ -994,9 +994,9 @@ bool KZip::closeArchive() if ( !ok ) return false; } - TQ_LONG centraldirendoffset = device()->at(); + TQ_LONG centraldirendoffset = device()->tqat(); //kdDebug(7040) << "closearchive: centraldirendoffset: " << centraldirendoffset << endl; - //kdDebug(7040) << "closearchive: device()->at(): " << device()->at() << endl; + //kdDebug(7040) << "closearchive: device()->tqat(): " << device()->tqat() << endl; //write end of central dir record. buffer[ 0 ] = 'P'; //end of central dir signature @@ -1107,7 +1107,7 @@ bool KZip::prepareWriting_impl(const TQString &name, const TQString &user, } // set right offset in zip. - if ( !device()->at( d->m_offset ) ) { + if ( !device()->tqat( d->m_offset ) ) { kdWarning(7040) << "prepareWriting_impl: cannot seek in ZIP file. Disk full?" << endl; abort(); return false; @@ -1144,9 +1144,9 @@ bool KZip::prepareWriting_impl(const TQString &name, const TQString &user, // construct a KZipFileEntry and add it to list KZipFileEntry * e = new KZipFileEntry( this, fileName, perm, mtime, user, group, TQString::null, - name, device()->at() + 30 + name.length(), // start + name, device()->tqat() + 30 + name.length(), // start 0 /*size unknown yet*/, d->m_compression, 0 /*csize unknown yet*/ ); - e->setHeaderStart( device()->at() ); + e->setHeaderStart( device()->tqat() ); //kdDebug(7040) << "wrote file start: " << e->position() << " name: " << name << endl; parentDir->addEntry( e ); @@ -1274,13 +1274,13 @@ bool KZip::doneWriting( uint size ) Q_ASSERT( d->m_currentFile ); //kdDebug(7040) << "donewriting reached." << endl; //kdDebug(7040) << "filename: " << d->m_currentFile->path() << endl; - //kdDebug(7040) << "getpos (at): " << device()->at() << endl; + //kdDebug(7040) << "getpos (at): " << device()->tqat() << endl; d->m_currentFile->setSize(size); int extra_field_len = 0; if ( d->m_extraField == ModificationTime ) extra_field_len = 17; // value also used in doneWriting() - int csize = device()->at() - + int csize = device()->tqat() - d->m_currentFile->headerStart() - 30 - d->m_currentFile->path().length() - extra_field_len; d->m_currentFile->setCompressedSize(csize); @@ -1294,7 +1294,7 @@ bool KZip::doneWriting( uint size ) d->m_currentFile = 0L; // update saved offset for appending new files - d->m_offset = device()->at(); + d->m_offset = device()->tqat(); return true; } diff --git a/kio/kio/paste.cpp b/kio/kio/paste.cpp index 37ba406f6..5a74c3e48 100644 --- a/kio/kio/paste.cpp +++ b/kio/kio/paste.cpp @@ -132,7 +132,7 @@ static KIO::CopyJob* chooseAndPaste( const KURL& u, TQMimeSource* data, kdDebug() << " result=" << result << " chosenFormat=" << chosenFormat << endl; KURL new_url( u ); new_url.addPath( result ); - // if "data" came from QClipboard, then it was deleted already - by a nice 0-seconds timer + // if "data" came from TQClipboard, then it was deleted already - by a nice 0-seconds timer // In that case, get it again. Let's hope the user didn't copy something else meanwhile :/ if ( clipboard ) { data = TQApplication::tqclipboard()->data(); diff --git a/kio/kio/paste.h b/kio/kio/paste.h index a65e956e1..3fad2c8b6 100644 --- a/kio/kio/paste.h +++ b/kio/kio/paste.h @@ -93,7 +93,7 @@ namespace KIO { * The filename to use in that directory is prompted by this method. * @param dialogText the text to show in the dialog * @param widget parent widget to use for dialogs - * @param clipboard whether the TQMimeSource comes from QClipboard. If you + * @param clipboard whether the TQMimeSource comes from TQClipboard. If you * use pasteClipboard for that case, you never have to worry about this parameter. * * @see pasteClipboard() diff --git a/kio/kio/pastedialog.cpp b/kio/kio/pastedialog.cpp index 480eaaba8..f698d2de3 100644 --- a/kio/kio/pastedialog.cpp +++ b/kio/kio/pastedialog.cpp @@ -62,7 +62,7 @@ KIO::PasteDialog::PasteDialog( const TQString &caption, const TQString &label, m_clipboardChanged = false; if ( clipboard ) - connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ), + connect( TQApplication::tqclipboard(), TQT_SIGNAL( dataChanged() ), this, TQT_SLOT( slotClipboardDataChanged() ) ); } diff --git a/kio/kio/scheduler.cpp b/kio/kio/scheduler.cpp index 830ebe93c..52b342dee 100644 --- a/kio/kio/scheduler.cpp +++ b/kio/kio/scheduler.cpp @@ -346,7 +346,7 @@ bool Scheduler::startJobScheduled(ProtocolInfo *protInfo) // Prevent starvation. We skip the first entry in the queue at most // 2 times in a row. The protInfo->skipCount = 0; - job = protInfo->joblist.at(0); + job = protInfo->joblist.tqat(0); slave = findIdleSlave(protInfo, job, dummy ); } else @@ -356,7 +356,7 @@ bool Scheduler::startJobScheduled(ProtocolInfo *protInfo) Slave *firstSlave = 0; for(uint i = 0; (i < protInfo->joblist.count()) && (i < 10); i++) { - job = protInfo->joblist.at(i); + job = protInfo->joblist.tqat(i); slave = findIdleSlave(protInfo, job, exact); if (!firstSlave) { diff --git a/kio/kssl/ksslcertificate.cc b/kio/kssl/ksslcertificate.cc index d712c185c..7971e57ba 100644 --- a/kio/kssl/ksslcertificate.cc +++ b/kio/kssl/ksslcertificate.cc @@ -246,7 +246,7 @@ TQString KSSLCertificate::getMD5DigestFromKDEKey(const TQString &k) { int pos = k.tqfindRev('('); if (pos != -1) { unsigned int len = k.length(); - if (k.at(len-1) == ')') { + if (k.tqat(len-1) == ')') { rc = k.mid(pos+1, len-pos-2); } } diff --git a/kio/kssl/ksslinfodlg.cc b/kio/kssl/ksslinfodlg.cc index ea7dd1457..fa0655a46 100644 --- a/kio/kssl/ksslinfodlg.cc +++ b/kio/kssl/ksslinfodlg.cc @@ -348,7 +348,7 @@ void KSSLInfoDlg::slotChain(int x) { cl.setAutoDelete(true); for (int i = 0; i < x-1; i++) cl.remove((unsigned int)0); - KSSLCertificate thisCert = *(cl.at(0)); + KSSLCertificate thisCert = *(cl.tqat(0)); cl.remove((unsigned int)0); thisCert.chain().setChain(cl); displayCert(&thisCert); diff --git a/kio/kssl/ksslsettings.cc b/kio/kssl/ksslsettings.cc index 40b3493cd..c060c6c7c 100644 --- a/kio/kssl/ksslsettings.cc +++ b/kio/kssl/ksslsettings.cc @@ -182,7 +182,7 @@ TQString KSSLSettings::getCipherList() { // Also remove NULL ciphers and 168bit ciphers for (unsigned int i = 0; i < cipherList.count(); i++) { CipherNode *j = 0L; - while ((j = cipherList.at(i)) != 0L) { + while ((j = cipherList.tqat(i)) != 0L) { if (j->name.contains("ADH-") || j->name.contains("NULL-") || j->name.contains("DES-CBC3-SHA") || j->name.contains("FZA")) { cipherList.remove(j); } else { diff --git a/kio/misc/ksendbugmail/main.cpp b/kio/misc/ksendbugmail/main.cpp index b80a23d1b..d6c852f68 100644 --- a/kio/misc/ksendbugmail/main.cpp +++ b/kio/misc/ksendbugmail/main.cpp @@ -74,7 +74,7 @@ int main(int argc, char **argv) { if (recipient.isEmpty()) recipient = "submit@bugs.kde.org"; else { - if (recipient.at(0) == '\'') { + if (recipient.tqat(0) == '\'') { recipient = recipient.mid(1).left(recipient.length() - 2); } } @@ -84,7 +84,7 @@ int main(int argc, char **argv) { if (subject.isEmpty()) subject = "(no subject)"; else { - if (subject.at(0) == '\'') + if (subject.tqat(0) == '\'') subject = subject.mid(1).left(subject.length() - 2); } TQTextIStream input(stdin); diff --git a/kio/misc/kssld/kssld.cpp b/kio/misc/kssld/kssld.cpp index 1a7cc1edf..79b5998d1 100644 --- a/kio/misc/kssld/kssld.cpp +++ b/kio/misc/kssld/kssld.cpp @@ -867,7 +867,7 @@ void KSSLD::searchAddCert(KSSLCertificate *cert) { if (elem.tqfindRef(cert) == -1) { unsigned int n = 0; for(; n < elem.size(); n++) { - if (!elem.at(n)) { + if (!elem.tqat(n)) { elem.insert(n, cert); break; } @@ -912,7 +912,7 @@ TQStringList KSSLD::getKDEKeyByEmail(const TQString &email) { TQPtrVector<KSSLCertificate> &elem = *it; for (unsigned int n = 0; n < elem.size(); n++) { - KSSLCertificate *cert = elem.at(n); + KSSLCertificate *cert = elem.tqat(n); if (cert) { rc.append(cert->getKDEKey()); } diff --git a/kio/misc/uiserver.cpp b/kio/misc/uiserver.cpp index 0524d60b3..44fb8af19 100644 --- a/kio/misc/uiserver.cpp +++ b/kio/misc/uiserver.cpp @@ -418,7 +418,7 @@ void ProgressItem::slotToggleDefaultProgress() { // Called when a rename or skip dialog pops up // We want to prevent someone from killing the job in the uiserver then -void ProgressItem::setVisible( bool visible ) { +void ProgressItem::tqsetVisible( bool visible ) { if ( m_visible != visible ) { m_visible = visible; @@ -792,7 +792,7 @@ ProgressItem* UIServer::findItem( int id ) void UIServer::setItemVisible( ProgressItem * item, bool visible ) { - item->setVisible( visible ); + item->tqsetVisible( visible ); // Check if we were the last one to be visible // or the first one -> hide/show the list in that case // (Note that the user could have hidden the listview by hand yet, no time) diff --git a/kio/misc/uiserver.h b/kio/misc/uiserver.h index 85e255a43..74c1a681e 100644 --- a/kio/misc/uiserver.h +++ b/kio/misc/uiserver.h @@ -118,7 +118,7 @@ public: bool keepOpen() const; void finished(); - void setVisible( bool visible ); + void tqsetVisible( bool visible ); void setDefaultProgressVisible( bool visible ); bool isVisible() const { return m_visible; } diff --git a/kio/tests/kfiltertest.cpp b/kio/tests/kfiltertest.cpp index e070418e4..54599e838 100644 --- a/kio/tests/kfiltertest.cpp +++ b/kio/tests/kfiltertest.cpp @@ -41,8 +41,8 @@ void test_block( const TQString & fileName ) // TQCString s(array,n+1); // Terminate with 0 before printing // printf("%s", s.data()); - kdDebug() << "dev.at = " << dev->at() << endl; - //kdDebug() << "f.at = " << f.at() << endl; + kdDebug() << "dev.at = " << dev->tqat() << endl; + //kdDebug() << "f.at = " << f.tqat() << endl; } dev->close(); delete dev; diff --git a/kioslave/http/http.cc b/kioslave/http/http.cc index f6ab75195..fa8997eca 100644 --- a/kioslave/http/http.cc +++ b/kioslave/http/http.cc @@ -4711,7 +4711,7 @@ FILE* HTTPProtocol::checkCacheEntry( bool readWrite) TQCString u = m_request.url.url().latin1(); for(int i = u.length(); i--;) { - hash = (hash * 12211 + u.at(i)) % 2147483563; + hash = (hash * 12211 + static_cast<const char>(u.tqat(i))) % 2147483563; } TQString hashString; @@ -5943,7 +5943,7 @@ TQString HTTPProtocol::createDigestAuth ( bool isForProxy ) for (int i = 0; i < count; i++ ) { - KURL u ( info.digestURI.at(i) ); + KURL u ( info.digestURI.tqat(i) ); send &= (m_request.url.protocol().lower() == u.protocol().lower()); send &= (m_request.hostname.lower() == u.host().lower()); diff --git a/kioslave/http/kcookiejar/kcookiejar.cpp b/kioslave/http/kcookiejar/kcookiejar.cpp index 83c2bd0e7..ca544ac62 100644 --- a/kioslave/http/kcookiejar/kcookiejar.cpp +++ b/kioslave/http/kcookiejar/kcookiejar.cpp @@ -618,7 +618,7 @@ void KCookieJar::extractDomains(const TQString &_fqdn, return; } // Return numeric IPv4 addresses as is... - if ((_fqdn.at(0) >= '0') && (_fqdn.at(0) <= '9')) + if ((_fqdn.tqat(0) >= TQChar('0')) && (_fqdn.tqat(0) <= TQChar('9'))) { if (_fqdn.tqfind(TQRegExp(IP_ADDRESS_EXPRESSION)) > -1) { diff --git a/kioslave/iso/kiso.cpp b/kioslave/iso/kiso.cpp index f487ad2f5..a260b5244 100644 --- a/kioslave/iso/kiso.cpp +++ b/kioslave/iso/kiso.cpp @@ -192,7 +192,7 @@ static int readf(char *buf, int start, int len,void *udata) { TQIODevice* dev = ( static_cast<KIso*> (udata) )->device(); - if (dev->at(start<<11)) { + if (dev->tqat(start<<11)) { if ((dev->readBlock(buf, len<<11)) != -1) return (len); } kdDebug() << "KIso::ReadRequest failed start: " << start << " len: " << len << endl; diff --git a/kioslave/iso/kisofile.cpp b/kioslave/iso/kisofile.cpp index 9be5dfad1..5235ea4a0 100644 --- a/kioslave/iso/kisofile.cpp +++ b/kioslave/iso/kisofile.cpp @@ -42,7 +42,7 @@ TQByteArray KIsoFile::data(long long pos, int count) const { TQByteArray r; int rlen; - if ( archive()->device()->at(position()+pos) && + if ( archive()->device()->tqat(position()+pos) && r.tqresize( ((pos+count) < size()) ? count : size()-pos) ) { rlen=archive()->device()->readBlock( r.data(), r.size() ); if (rlen ==- 1) r.resize(0); diff --git a/kmdi/kmdi/dockcontainer.cpp b/kmdi/kmdi/dockcontainer.cpp index eb8518a4a..6302a8406 100644 --- a/kmdi/kmdi/dockcontainer.cpp +++ b/kmdi/kmdi/dockcontainer.cpp @@ -246,7 +246,7 @@ bool DockContainer::eventFilter( TQObject *obj, TQEvent *event ) switch ( event->type() ){ case TQEvent::MouseButtonPress: { - KDockWidget * w=m_revMap[dynamic_cast<KMultiTabBarTab*>(obj)->id()]; + KDockWidget * w=m_revMap[tqt_dynamic_cast<KMultiTabBarTab*>(obj)->id()]; if (!w) { kdDebug()<<"NoWidget"<<endl; break; @@ -307,7 +307,7 @@ void DockContainer::showWidget(KDockWidget *w) { void DockContainer::changeOverlapMode() { - const KDockButton_Private *btn=dynamic_cast<const KDockButton_Private*>(sender()); + const KDockButton_Private *btn=tqt_dynamic_cast<const KDockButton_Private*>(sender()); kdDebug(760)<<"DockContainer::changeOverlapMode: button=="<<btn<<endl; @@ -612,7 +612,7 @@ void DockContainer::toggle() { if (m_tb->isTabRaised(oldtab)) { m_tb->setTab(oldtab,false); tabClicked(oldtab); - // KMDI::MainWindow *mainFrm = dynamic_cast<KMDI::MainWindow*>(m_mainWin); + // KMDI::MainWindow *mainFrm = tqt_dynamic_cast<KMDI::MainWindow*>(m_mainWin); // if (mainFrm && mainFrm->activeWindow() ) // TODO // mainFrm->activeWindow()->setFocus(); @@ -633,7 +633,7 @@ void DockContainer::prevToolView() { if (pos==-1) return; pos--; if (pos<0) pos=tabs->count()-1; - KMultiTabBarTab *tab=tabs->at(pos); + KMultiTabBarTab *tab=tabs->tqat(pos); if (!tab) return; //can never happen here, but who knows m_tb->setTab(tab->id(),true); tabClicked(tab->id()); @@ -645,7 +645,7 @@ void DockContainer::nextToolView() { if (pos==-1) return; pos++; if (pos>=(int)tabs->count()) pos=0; - KMultiTabBarTab *tab=tabs->at(pos); + KMultiTabBarTab *tab=tabs->tqat(pos); if (!tab) return; //can never happen here, but who knows m_tb->setTab(tab->id(),true); tabClicked(tab->id()); diff --git a/kmdi/kmdi/guiclient.cpp b/kmdi/kmdi/guiclient.cpp index 6d61f16e3..935378d08 100644 --- a/kmdi/kmdi/guiclient.cpp +++ b/kmdi/kmdi/guiclient.cpp @@ -100,7 +100,7 @@ GUIClient::~GUIClient() { // actionCollection()->writeShortcutSettings( "KMDI Shortcuts", kapp->config() ); for (uint i=0;i<m_toolViewActions.count();i++) - disconnect(m_toolViewActions.at(i),0,this,0); + disconnect(m_toolViewActions.tqat(i),0,this,0); m_toolViewActions.setAutoDelete( false ); m_toolViewActions.clear(); @@ -119,7 +119,7 @@ void GUIClient::setupActions() if (m_toolViewActions.count()<3) { for (uint i=0;i<m_toolViewActions.count();i++) - addList.append(m_toolViewActions.at(i)); + addList.append(m_toolViewActions.tqat(i)); } else addList.append(m_toolMenu); @@ -146,7 +146,7 @@ void GUIClient::addToolView(KMDI::ToolViewAccessor* mtva) cfg->setGroup( _grp ); KAction *a=new ToggleToolViewAction(i18n("Show %1").arg(mtva->wrappedWidget()->caption()), - /*TQString::null*/sc,dynamic_cast<KDockWidget*>(mtva->wrapperWidget()), + /*TQString::null*/sc,tqt_dynamic_cast<KDockWidget*>(mtva->wrapperWidget()), m_mdiMainFrm,actionCollection(), aname.latin1() ); ((ToggleToolViewAction*)a)->setCheckedState(TQString(i18n("Hide %1").arg(mtva->wrappedWidget()->caption()))); diff --git a/kmdi/kmdi/mainwindow.cpp b/kmdi/kmdi/mainwindow.cpp index 26044879e..ac45fc3a5 100644 --- a/kmdi/kmdi/mainwindow.cpp +++ b/kmdi/kmdi/mainwindow.cpp @@ -327,7 +327,7 @@ void MainWindow::setToolViewStyle(int flag) bool toolviewExists = false; TQMap<TQWidget*,KMDI::ToolViewAccessor*>::Iterator it; for (it = m_toolViews->begin(); it != m_toolViews->end(); ++it) { - KDockWidget *dockWidget = dynamic_cast<KDockWidget*>(it.data()->wrapperWidget()); + KDockWidget *dockWidget = tqt_dynamic_cast<KDockWidget*>(it.data()->wrapperWidget()); if (dockWidget) { if (flag == KMDI::IconOnly) { @@ -373,7 +373,7 @@ void MainWindow::dockToolViewsIntoContainers(TQPtrList<KDockWidget>& widgetsToRe void MainWindow::findToolViewsDockedToMain(TQPtrList<KDockWidget>* list,KDockWidget::DockPosition dprtmw) { KDockWidget *mainDock=getMainDockWidget(); if (mainDock->parentDockTabGroup()) { - mainDock=dynamic_cast<KDockWidget*>(mainDock->parentDockTabGroup()->parent()); + mainDock=tqt_dynamic_cast<KDockWidget*>(mainDock->parentDockTabGroup()->parent()); // FIXME: will likely crash below due to unchecked cast } @@ -384,7 +384,7 @@ void MainWindow::findToolViewsDockedToMain(TQPtrList<KDockWidget>* list,KDockWid } if (widget) { - KDockTabGroup *tg=dynamic_cast<KDockTabGroup*>(widget-> + KDockTabGroup *tg=tqt_dynamic_cast<KDockTabGroup*>(widget-> getWidget()); if (tg) { kdDebug(760)<<"KDockTabGroup found"<<endl; diff --git a/kmdi/kmdi/toolviewaccessor.cpp b/kmdi/kmdi/toolviewaccessor.cpp index 2ff4f972a..0a35ba25f 100644 --- a/kmdi/kmdi/toolviewaccessor.cpp +++ b/kmdi/kmdi/toolviewaccessor.cpp @@ -37,7 +37,7 @@ ToolViewAccessor::ToolViewAccessor( KMDI::MainWindow *parent, TQWidget *widgetTo mdiMainFrm=parent; d=new KMDIPrivate::ToolViewAccessorPrivate(); if (widgetToWrap->inherits("KDockWidget")) { - d->widgetContainer=dynamic_cast<KDockWidget*>(widgetToWrap); + d->widgetContainer=tqt_dynamic_cast<KDockWidget*>(widgetToWrap); d->widget=d->widgetContainer->getWidget(); } else { d->widget=widgetToWrap; diff --git a/kmdi/kmdidockcontainer.cpp b/kmdi/kmdidockcontainer.cpp index 8198541fe..9720c5214 100644 --- a/kmdi/kmdidockcontainer.cpp +++ b/kmdi/kmdidockcontainer.cpp @@ -252,7 +252,7 @@ bool KMdiDockContainer::eventFilter( TQObject *obj, TQEvent *event ) { case TQEvent::MouseButtonPress: { - KMultiTabBarTab* kmtbTab = dynamic_cast<KMultiTabBarTab*>( obj ); + KMultiTabBarTab* kmtbTab = tqt_dynamic_cast<KMultiTabBarTab*>( obj ); if ( !kmtbTab ) { kdDebug(760) << k_funcinfo << "Got a mouse button press but we have no tab" << endl; @@ -332,7 +332,7 @@ void KMdiDockContainer::showWidget( KDockWidget *w ) void KMdiDockContainer::changeOverlapMode() { - const KDockButton_Private * btn = dynamic_cast<const KDockButton_Private*>( sender() ); + const KDockButton_Private * btn = tqt_dynamic_cast<const KDockButton_Private*>( sender() ); if ( !btn ) return ; @@ -794,7 +794,7 @@ void KMdiDockContainer::toggle() kdDebug( 760 ) << k_funcinfo << "lowering tab" << endl; m_tb->setTab( oldtab, false ); tabClicked( oldtab ); - KMdiMainFrm *mainFrm = dynamic_cast<KMdiMainFrm*>( m_mainWin ); + KMdiMainFrm *mainFrm = tqt_dynamic_cast<KMdiMainFrm*>( m_mainWin ); if ( mainFrm && mainFrm->activeWindow() ) mainFrm->activeWindow()->setFocus(); } @@ -826,7 +826,7 @@ void KMdiDockContainer::prevToolView() if ( pos < 0 ) pos = tabs->count() - 1; - KMultiTabBarTab *tab = tabs->at( pos ); + KMultiTabBarTab *tab = tabs->tqat( pos ); if ( !tab ) return ; //can never happen here, but who knows @@ -847,7 +847,7 @@ void KMdiDockContainer::nextToolView() if ( pos >= ( int ) tabs->count() ) pos = 0; - KMultiTabBarTab *tab = tabs->at( pos ); + KMultiTabBarTab *tab = tabs->tqat( pos ); if ( !tab ) return ; //can never happen here, but who knows diff --git a/kmdi/kmdiguiclient.cpp b/kmdi/kmdiguiclient.cpp index cebeafc4f..a34df98f6 100644 --- a/kmdi/kmdiguiclient.cpp +++ b/kmdi/kmdiguiclient.cpp @@ -174,7 +174,7 @@ KMDIGUIClient::~KMDIGUIClient() // actionCollection()->writeShortcutSettings( "KMDI Shortcuts", kapp->config() ); for ( uint i = 0;i < m_toolViewActions.count();i++ ) - disconnect( m_toolViewActions.at( i ), 0, this, 0 ); + disconnect( m_toolViewActions.tqat( i ), 0, this, 0 ); m_toolViewActions.setAutoDelete( false ); m_toolViewActions.clear(); @@ -230,7 +230,7 @@ void KMDIGUIClient::setupActions() TQPtrList<KAction> addList; if ( m_toolViewActions.count() < 3 ) for ( uint i = 0;i < m_toolViewActions.count();i++ ) - addList.append( m_toolViewActions.at( i ) ); + addList.append( m_toolViewActions.tqat( i ) ); else addList.append( m_toolMenu ); if ( m_mdiMode == KMdi::IDEAlMode ) @@ -258,7 +258,7 @@ void KMDIGUIClient::addToolView( KMdiToolViewAccessor* mtva ) sc = KShortcut( cfg->readEntry( aname, "" ) ); cfg->setGroup( _grp ); KAction *a = new ToggleToolViewAction( i18n( "Show %1" ).arg( mtva->wrappedWidget() ->caption() ), - /*TQString::null*/sc, dynamic_cast<KDockWidget*>( mtva->wrapperWidget() ), + /*TQString::null*/sc, tqt_dynamic_cast<KDockWidget*>( mtva->wrapperWidget() ), m_mdiMainFrm, actionCollection(), aname.latin1() ); #if KDE_IS_VERSION(3,2,90) diff --git a/kmdi/kmdimainfrm.cpp b/kmdi/kmdimainfrm.cpp index fe6c374f1..487f9c2b2 100644 --- a/kmdi/kmdimainfrm.cpp +++ b/kmdi/kmdimainfrm.cpp @@ -1777,7 +1777,7 @@ void KMdiMainFrm::setToolviewStyle( int flag ) TQMap<TQWidget*, KMdiToolViewAccessor*>::Iterator it; for ( it = m_pToolViews->begin(); it != m_pToolViews->end(); ++it ) { - KDockWidget *dockWidget = dynamic_cast<KDockWidget*>( it.data()->wrapperWidget() ); + KDockWidget *dockWidget = tqt_dynamic_cast<KDockWidget*>( it.data()->wrapperWidget() ); if ( dockWidget ) { switch ( flag ) @@ -1886,7 +1886,7 @@ void KMdiMainFrm::findToolViewsDockedToMain( TQPtrList<KDockWidget>* list, KDock KDockWidget* mainDock = getMainDockWidget(); if ( mainDock->parentDockTabGroup() ) { - mainDock = dynamic_cast<KDockWidget*>( mainDock->parentDockTabGroup()->parent() ); + mainDock = tqt_dynamic_cast<KDockWidget*>( mainDock->parentDockTabGroup()->parent() ); // FIXME: will likely crash below due to unchecked cast } @@ -1903,7 +1903,7 @@ void KMdiMainFrm::findToolViewsDockedToMain( TQPtrList<KDockWidget>* list, KDock if ( widget ) { - KDockTabGroup* tg = dynamic_cast<KDockTabGroup*>( widget->getWidget() ); + KDockTabGroup* tg = tqt_dynamic_cast<KDockTabGroup*>( widget->getWidget() ); if ( tg ) { kdDebug(760) << k_funcinfo << "KDockTabGroup found" << endl; @@ -2118,7 +2118,7 @@ void KMdiMainFrm::finishIDEAlMode( bool full ) TQStringList KMdiMainFrm::prepareIdealToTabs( KDockWidget* container ) { - KDockContainer * pDW = dynamic_cast<KDockContainer*>( container->getWidget() ); + KDockContainer * pDW = tqt_dynamic_cast<KDockContainer*>( container->getWidget() ); TQStringList widgetNames = ( ( KMdiDockContainer* ) pDW ) ->containedWidgets(); for ( TQStringList::iterator it = widgetNames.begin();it != widgetNames.end();++it ) { @@ -2733,7 +2733,7 @@ void KMdiMainFrm::windowMenuItemActivated( int id ) if ( id < 100 ) return ; id -= 100; - KMdiChildView *pView = m_pDocumentViews->at( id ); + KMdiChildView *pView = m_pDocumentViews->tqat( id ); if ( !pView ) return ; if ( pView->isMinimized() ) @@ -2759,7 +2759,7 @@ void KMdiMainFrm::dockMenuItemActivated( int id ) if ( id < 100 ) return ; id -= 100; - KMdiChildView *pView = m_pDocumentViews->at( id ); + KMdiChildView *pView = m_pDocumentViews->tqat( id ); if ( !pView ) return ; if ( pView->isMinimized() ) diff --git a/kmdi/kmditoolviewaccessor.cpp b/kmdi/kmditoolviewaccessor.cpp index 954ca3e4a..f12caba05 100644 --- a/kmdi/kmditoolviewaccessor.cpp +++ b/kmdi/kmditoolviewaccessor.cpp @@ -36,7 +36,7 @@ KMdiToolViewAccessor::KMdiToolViewAccessor( KMdiMainFrm *parent, TQWidget *widge d = new KMdiToolViewAccessorPrivate(); if ( widgetToWrap->inherits( "KDockWidget" ) ) { - d->widgetContainer = dynamic_cast<KDockWidget*>( widgetToWrap ); + d->widgetContainer = tqt_dynamic_cast<KDockWidget*>( widgetToWrap ); d->widget = d->widgetContainer->getWidget(); } else diff --git a/knewstuff/downloaddialog.cpp b/knewstuff/downloaddialog.cpp index 521d13f24..40605f40d 100644 --- a/knewstuff/downloaddialog.cpp +++ b/knewstuff/downloaddialog.cpp @@ -182,9 +182,9 @@ void DownloadDialog::clear() kdDebug() << "clear listviews in " << v << endl; if(v) { - (*(v->at(0)))->clear(); - (*(v->at(1)))->clear(); - (*(v->at(2)))->clear(); + (*(v->tqat(0)))->clear(); + (*(v->tqat(1)))->clear(); + (*(v->tqat(2)))->clear(); //delete (*it); } @@ -570,7 +570,7 @@ void DownloadDialog::install(Entry *e) if(currentEntryItem() == m_entryitem) { TQPushButton *in; - in = *(m_buttons[d->m_page]->at(0)); + in = *(m_buttons[d->m_page]->tqat(0)); if(in) in->setEnabled(false); } @@ -625,8 +625,8 @@ void DownloadDialog::slotTab() else { TQPushButton *de, *in; - in = *(m_buttons[d->m_page]->at(0)); - de = *(m_buttons[d->m_page]->at(1)); + in = *(m_buttons[d->m_page]->tqat(0)); + de = *(m_buttons[d->m_page]->tqat(1)); if(in) in->setEnabled(false); if(de) de->setEnabled(false); @@ -705,8 +705,8 @@ void DownloadDialog::slotSelected() else enabled = true; TQPushButton *de, *in; - in = *(m_buttons[d->m_page]->at(0)); - de = *(m_buttons[d->m_page]->at(1)); + in = *(m_buttons[d->m_page]->tqat(0)); + de = *(m_buttons[d->m_page]->tqat(1)); if(in) in->setEnabled(enabled); if(de) de->setEnabled(true); } @@ -747,9 +747,9 @@ void DownloadDialog::slotPage(TQWidget *w) d->m_page = w; - lv_r = *(m_map[w]->at(0)); - lv_d = *(m_map[w]->at(1)); - lv_l = *(m_map[w]->at(2)); + lv_r = *(m_map[w]->tqat(0)); + lv_d = *(m_map[w]->tqat(1)); + lv_l = *(m_map[w]->tqat(2)); p = m_providers[w]; m_rt = m_rts[w]; diff --git a/kparts/browserextension.cpp b/kparts/browserextension.cpp index 81aa4fb52..f014255b4 100644 --- a/kparts/browserextension.cpp +++ b/kparts/browserextension.cpp @@ -452,7 +452,7 @@ void BrowserExtension::slotCompleted() void BrowserExtension::pasteRequest() { TQCString plain( "plain" ); - TQString url = TQApplication::tqclipboard()->tqtext(plain, TQClipboard::Selection).stripWhiteSpace(); + TQString url = TQApplication::tqclipboard()->text(plain, TQClipboard::Selection).stripWhiteSpace(); // Remove linefeeds and any whitespace surrounding it. url.remove(TQRegExp("[\\ ]*\\n+[\\ ]*")); diff --git a/kparts/componentfactory.h b/kparts/componentfactory.h index 80661b191..64feac1c8 100644 --- a/kparts/componentfactory.h +++ b/kparts/componentfactory.h @@ -66,7 +66,7 @@ namespace KParts T::tqstaticMetaObject()->className(), args ); - T *result = dynamic_cast<T *>( static_cast<TQT_BASE_OBJECT_NAME*>(object) ); + T *result = tqt_dynamic_cast<T *>( object ); if ( !result ) delete object; return result; @@ -104,7 +104,7 @@ namespace KParts T::tqstaticMetaObject()->className(), args ); - T *result = dynamic_cast<T *>( object ); + T *result = tqt_dynamic_cast<T *>( object ); if ( !result ) delete object; return result; @@ -178,7 +178,7 @@ namespace KParts *error = ErrNoFactory; return 0; } - KParts::Factory *partFactory = dynamic_cast<KParts::Factory *>( factory ); + KParts::Factory *partFactory = tqt_dynamic_cast<KParts::Factory *>( factory ); if ( !partFactory ) { library->unload(); diff --git a/kparts/dockmainwindow.cpp b/kparts/dockmainwindow.cpp index 9f7703ab6..461bc0ec3 100644 --- a/kparts/dockmainwindow.cpp +++ b/kparts/dockmainwindow.cpp @@ -76,7 +76,7 @@ void DockMainWindow::createGUI( Part * part ) KXMLGUIFactory *factory = guiFactory(); - setUpdatesEnabled( false ); + tqsetUpdatesEnabled( false ); TQPtrList<Plugin> plugins; @@ -117,7 +117,7 @@ void DockMainWindow::createGUI( Part * part ) } - setUpdatesEnabled( true ); + tqsetUpdatesEnabled( true ); d->m_activePart = part; } diff --git a/kparts/factory.cpp b/kparts/factory.cpp index fc33feccf..092d550d1 100644 --- a/kparts/factory.cpp +++ b/kparts/factory.cpp @@ -63,7 +63,7 @@ const KInstance *Factory::partInstanceFromLibrary( const TQCString &libraryName KLibFactory *factory = library->factory(); if ( !factory ) return 0; - KParts::Factory *pfactory = dynamic_cast<KParts::Factory *>( factory ); + KParts::Factory *pfactory = tqt_dynamic_cast<KParts::Factory *>( factory ); if ( !pfactory ) return 0; return pfactory->partInstance(); diff --git a/kparts/genericfactory.h b/kparts/genericfactory.h index 99ce7c3be..241943fcb 100644 --- a/kparts/genericfactory.h +++ b/kparts/genericfactory.h @@ -111,7 +111,7 @@ namespace KParts if ( part && !qstrcmp( className, "KParts::ReadOnlyPart" ) ) { - KParts::ReadWritePart *rwp = dynamic_cast<KParts::ReadWritePart *>( part ); + KParts::ReadWritePart *rwp = tqt_dynamic_cast<KParts::ReadWritePart *>( part ); if ( rwp ) rwp->setReadWrite( false ); } @@ -137,11 +137,11 @@ namespace KParts args ); // (this cast is guaranteed to work...) - KParts::Part *part = dynamic_cast<KParts::Part *>( object ); + KParts::Part *part = tqt_dynamic_cast<KParts::Part *>( object ); if ( part && !qstrcmp( className, "KParts::ReadOnlyPart" ) ) { - KParts::ReadWritePart *rwp = dynamic_cast<KParts::ReadWritePart *>( part ); + KParts::ReadWritePart *rwp = tqt_dynamic_cast<KParts::ReadWritePart *>( part ); if ( rwp ) rwp->setReadWrite( false ); } diff --git a/kparts/mainwindow.cpp b/kparts/mainwindow.cpp index c0c4cd086..facc5a0ec 100644 --- a/kparts/mainwindow.cpp +++ b/kparts/mainwindow.cpp @@ -93,7 +93,7 @@ void MainWindow::createGUI( Part * part ) assert( factory ); - setUpdatesEnabled( false ); + tqsetUpdatesEnabled( false ); TQPtrList<Plugin> plugins; @@ -137,7 +137,7 @@ void MainWindow::createGUI( Part * part ) applyMainWindowSettings( KGlobal::config(), autoSaveGroup() ); } - setUpdatesEnabled( true ); + tqsetUpdatesEnabled( true ); d->m_activePart = part; } diff --git a/kparts/partmanager.h b/kparts/partmanager.h index 83bd975b2..ca1ccfea0 100644 --- a/kparts/partmanager.h +++ b/kparts/partmanager.h @@ -131,7 +131,7 @@ public: /** * Specifies which mouse buttons the partmanager should react upon. * By default it reacts on all mouse buttons (LMB/MMB/RMB). - * @param buttonMask a combination of Qt::ButtonState values e.g. Qt::LeftButton | Qt::MidButton + * @param buttonMask a combination of TQt::ButtonState values e.g. Qt::LeftButton | Qt::MidButton */ void setActivationButtonMask( short int buttonMask ); /** diff --git a/kparts/statusbarextension.cpp b/kparts/statusbarextension.cpp index c3277752d..f7da19fec 100644 --- a/kparts/statusbarextension.cpp +++ b/kparts/statusbarextension.cpp @@ -135,7 +135,7 @@ KStatusBar * StatusBarExtension::statusBar() const { if ( !m_statusBar ) { TQWidget* w = static_cast<KParts::ReadOnlyPart*>(parent())->widget(); - KMainWindow* mw = dynamic_cast<KMainWindow *>( w->tqtopLevelWidget() ); + KMainWindow* mw = tqt_dynamic_cast<KMainWindow *>( w->tqtopLevelWidget() ); if ( mw ) m_statusBar = mw->statusBar(); } diff --git a/krandr/randr.cpp b/krandr/randr.cpp index e891c8a2d..5987d8808 100644 --- a/krandr/randr.cpp +++ b/krandr/randr.cpp @@ -627,7 +627,7 @@ const TQString& RandRDisplay::version() const void RandRDisplay::setCurrentScreen(int index) { m_currentScreenIndex = index; - m_currentScreen = m_screens.at(m_currentScreenIndex); + m_currentScreen = m_screens.tqat(m_currentScreenIndex); Q_ASSERT(m_currentScreen); } @@ -655,7 +655,7 @@ int RandRDisplay::numScreens() const RandRScreen* RandRDisplay::screen(int index) { - return m_screens.at(index); + return m_screens.tqat(index); } RandRScreen* RandRDisplay::currentScreen() diff --git a/kresources/configpage.cpp b/kresources/configpage.cpp index 46f7bfa79..c6c9fcf5b 100644 --- a/kresources/configpage.cpp +++ b/kresources/configpage.cpp @@ -106,9 +106,9 @@ ConfigPage::ConfigPage( TQWidget *parent, const char *name ) TQGroupBox *groupBox = new TQGroupBox( i18n( "Resources" ), this ); groupBox->setColumnLayout(0, Qt::Vertical ); - groupBox->layout()->setSpacing( 6 ); - groupBox->layout()->setMargin( 11 ); - TQGridLayout *groupBoxLayout = new TQGridLayout( groupBox->layout(), 2, 2 ); + groupBox->tqlayout()->setSpacing( 6 ); + groupBox->tqlayout()->setMargin( 11 ); + TQGridLayout *groupBoxLayout = new TQGridLayout( groupBox->tqlayout(), 2, 2 ); mFamilyCombo = new KComboBox( false, groupBox ); groupBoxLayout->addMultiCellWidget( mFamilyCombo, 0, 0, 0, 1 ); @@ -130,7 +130,7 @@ ConfigPage::ConfigPage( TQWidget *parent, const char *name ) mEditButton->setEnabled( false ); mStandardButton = buttonBox->addButton( i18n( "&Use as Standard" ), TQT_TQOBJECT(this), TQT_SLOT(slotStandard()) ); mStandardButton->setEnabled( false ); - buttonBox->layout(); + buttonBox->tqlayout(); groupBoxLayout->addWidget( buttonBox, 1, 1 ); diff --git a/kresources/selectdialog.cpp b/kresources/selectdialog.cpp index 3eb8ad332..5ae9bdcea 100644 --- a/kresources/selectdialog.cpp +++ b/kresources/selectdialog.cpp @@ -66,7 +66,7 @@ SelectDialog::SelectDialog( TQPtrList<Resource> list, TQWidget *parent, // setup listbox uint counter = 0; for ( uint i = 0; i < list.count(); ++i ) { - Resource *resource = list.at( i ); + Resource *resource = list.tqat( i ); if ( resource && !resource->readOnly() ) { mResourceMap.insert( counter, resource ); mResourceId->insertItem( resource->resourceName() ); diff --git a/kstyles/kthemestyle/kthemebase.cpp b/kstyles/kthemestyle/kthemebase.cpp index db258a450..6edb234e7 100644 --- a/kstyles/kthemestyle/kthemebase.cpp +++ b/kstyles/kthemestyle/kthemebase.cpp @@ -70,7 +70,7 @@ static TQColor readColorEntry( TQSettings* s, const char *pKey, TQString aValue = s->readEntry( pKey ); if ( !aValue.isEmpty() ) { - if ( aValue.at( 0 ) == '#' ) + if ( aValue.tqat( 0 ) == '#' ) { aRetColor.setNamedColor( aValue ); } diff --git a/kutils/kfinddialog.cpp b/kutils/kfinddialog.cpp index d27a50ff8..4bf564b2e 100644 --- a/kutils/kfinddialog.cpp +++ b/kutils/kfinddialog.cpp @@ -117,9 +117,9 @@ void KFindDialog::init(bool forReplace, const TQStringList &findStrings, bool ha topLayout->setMargin( 0 ); m_findGrp = new TQGroupBox(0, Qt::Vertical, i18n("Find"), page); - m_findGrp->layout()->setSpacing( KDialog::spacingHint() ); - // m_findGrp->layout()->setMargin( KDialog::marginHint() ); - m_findLayout = new TQGridLayout(m_findGrp->layout()); + m_findGrp->tqlayout()->setSpacing( KDialog::spacingHint() ); + // m_findGrp->tqlayout()->setMargin( KDialog::marginHint() ); + m_findLayout = new TQGridLayout(m_findGrp->tqlayout()); m_findLayout->setSpacing( KDialog::spacingHint() ); // m_findLayout->setMargin( KDialog::marginHint() ); @@ -138,9 +138,9 @@ void KFindDialog::init(bool forReplace, const TQStringList &findStrings, bool ha topLayout->addWidget(m_findGrp); m_replaceGrp = new TQGroupBox(0, Qt::Vertical, i18n("Replace With"), page); - m_replaceGrp->layout()->setSpacing( KDialog::spacingHint() ); - // m_replaceGrp->layout()->setMargin( KDialog::marginHint() ); - m_replaceLayout = new TQGridLayout(m_replaceGrp->layout()); + m_replaceGrp->tqlayout()->setSpacing( KDialog::spacingHint() ); + // m_replaceGrp->tqlayout()->setMargin( KDialog::marginHint() ); + m_replaceLayout = new TQGridLayout(m_replaceGrp->tqlayout()); m_replaceLayout->setSpacing( KDialog::spacingHint() ); // m_replaceLayout->setMargin( KDialog::marginHint() ); @@ -159,9 +159,9 @@ void KFindDialog::init(bool forReplace, const TQStringList &findStrings, bool ha topLayout->addWidget(m_replaceGrp); m_optionGrp = new TQGroupBox(0, Qt::Vertical, i18n("Options"), page); - m_optionGrp->layout()->setSpacing(KDialog::spacingHint()); - // m_optionGrp->layout()->setMargin(KDialog::marginHint()); - optionsLayout = new TQGridLayout(m_optionGrp->layout()); + m_optionGrp->tqlayout()->setSpacing(KDialog::spacingHint()); + // m_optionGrp->tqlayout()->setMargin(KDialog::marginHint()); + optionsLayout = new TQGridLayout(m_optionGrp->tqlayout()); optionsLayout->setSpacing( KDialog::spacingHint() ); // optionsLayout->setMargin( KDialog::marginHint() ); @@ -429,7 +429,7 @@ void KFindDialog::showPatterns() if ( d->m_regexpDialog ) { - KRegExpEditorInterface *iface = dynamic_cast<KRegExpEditorInterface *>( d->m_regexpDialog ); + KRegExpEditorInterface *iface = tqt_dynamic_cast<KRegExpEditorInterface *>( d->m_regexpDialog ); assert( iface ); iface->setRegExp( pattern() ); diff --git a/kutils/kmultitabbar.cpp b/kutils/kmultitabbar.cpp index 53f73e942..2052991b3 100644 --- a/kutils/kmultitabbar.cpp +++ b/kutils/kmultitabbar.cpp @@ -82,7 +82,7 @@ void KMultiTabBarInternal::setStyle(enum KMultiTabBar::KMultiTabBarStyle style) { m_style=style; for (uint i=0;i<m_tabs.count();i++) - m_tabs.at(i)->setStyle(m_style); + m_tabs.tqat(i)->setStyle(m_style); if ( (m_style==KMultiTabBar::KDEV3) || (m_style==KMultiTabBar::KDEV3ICON ) ) { @@ -106,7 +106,7 @@ void KMultiTabBarInternal::setStyle(enum KMultiTabBar::KMultiTabBarStyle style) } addChild(box); for (uint i=0;i<m_tabs.count();i++) - mainLayout->add(m_tabs.at(i)); + mainLayout->add(m_tabs.tqat(i)); mainLayout->setAutoAdd(true); } @@ -175,7 +175,7 @@ void KMultiTabBarInternal::mousePressEvent(TQMouseEvent *ev) uint ulen=0;\ diff=0; \ for (uint i2=i;i2<tabCount;i2++) {\ - uint l1=m_tabs.at(i2)->neededSize();\ + uint l1=m_tabs.tqat(i2)->neededSize();\ if ((ulen+l1)>space){\ if (ulen==0) diff=0;\ else diff=((float)(space-ulen))/(i2-i);\ @@ -208,7 +208,7 @@ void KMultiTabBarInternal::resizeEvent(TQResizeEvent *ev) { const uint tabCount=m_tabs.count(); for (uint i=0;i<tabCount;i++) { cnt++; - tmp+=m_tabs.at(i)->neededSize(); + tmp+=m_tabs.tqat(i)->neededSize(); if (tmp>space) { if (cnt>1)i--; else if (i==(tabCount-1)) break; @@ -232,7 +232,7 @@ void KMultiTabBarInternal::resizeEvent(TQResizeEvent *ev) { //kdDebug()<<"m_lines recalculated="<<m_lines<<endl; for (uint i=0;i<tabCount;i++) { - KMultiTabBarTab *tab=m_tabs.at(i); + KMultiTabBarTab *tab=m_tabs.tqat(i); cnt++; tmp+=tab->neededSize()+diff; if (tmp>space) { @@ -258,7 +258,7 @@ void KMultiTabBarInternal::resizeEvent(TQResizeEvent *ev) { //kdDebug()<<"starting new line:"<<lines<<endl; } else { - //kdDebug()<<"Placing line on line:"<<lines<<" pos: (x/y)=("<<tmp-m_tabs.at(i)->neededSize()<<"/"<<lines*24<<")"<<endl; + //kdDebug()<<"Placing line on line:"<<lines<<" pos: (x/y)=("<<tmp-m_tabs.tqat(i)->neededSize()<<"/"<<lines*24<<")"<<endl; //kdDebug()<<"diff="<<diff<<endl; tab->removeEventFilter(this); tab->move(NEARBYINT(tmp-tab->neededSize()),lines*24); @@ -279,7 +279,7 @@ void KMultiTabBarInternal::resizeEvent(TQResizeEvent *ev) { tmp=-diff; for (uint i=0;i<tabCount;i++) { - KMultiTabBarTab *tab=m_tabs.at(i); + KMultiTabBarTab *tab=m_tabs.tqat(i); cnt++; tmp+=tab->neededSize()+diff; if (tmp>space) { @@ -311,7 +311,7 @@ void KMultiTabBarInternal::resizeEvent(TQResizeEvent *ev) { } else { int size=0; /*move the calculation into another function and call it only on add tab and tab click events*/ for (int i=0;i<(int)m_tabs.count();i++) - size+=(m_barMode==KMultiTabBar::Vertical?m_tabs.at(i)->height():m_tabs.at(i)->width()); + size+=(m_barMode==KMultiTabBar::Vertical?m_tabs.tqat(i)->height():m_tabs.tqat(i)->width()); if ((m_position==KMultiTabBar::Bottom) || (m_position==KMultiTabBar::Top)) box->setGeometry(0,0,size,height()); else box->setGeometry(0,0,width(),size); @@ -351,7 +351,7 @@ int KMultiTabBarInternal::appendTab(const TQPixmap &pic ,int id,const TQString& if (m_expandedTabSize<tab->neededSize()) { m_expandedTabSize=tab->neededSize(); for (uint i=0;i<m_tabs.count();i++) - m_tabs.at(i)->setSize(m_expandedTabSize); + m_tabs.tqat(i)->setSize(m_expandedTabSize); } else tab->setSize(m_expandedTabSize); } else tab->updateState(); @@ -364,7 +364,7 @@ void KMultiTabBarInternal::removeTab(int id) { for (uint pos=0;pos<m_tabs.count();pos++) { - if (m_tabs.at(pos)->id()==id) + if (m_tabs.tqat(pos)->id()==id) { m_tabs.remove(pos); resizeEvent(0); @@ -377,7 +377,7 @@ void KMultiTabBarInternal::setPosition(enum KMultiTabBar::KMultiTabBarPosition p { m_position=pos; for (uint i=0;i<m_tabs.count();i++) - m_tabs.at(i)->setTabsPosition(m_position); + m_tabs.tqat(i)->setTabsPosition(m_position); viewport()->tqrepaint(); } @@ -445,13 +445,13 @@ void KMultiTabBarButton::setStyle(KMultiTabBar::KMultiTabBarStyle style) void KMultiTabBarButton::hideEvent( TQHideEvent* he) { TQPushButton::hideEvent(he); - KMultiTabBar *tb=dynamic_cast<KMultiTabBar*>(tqparentWidget()); + KMultiTabBar *tb=tqt_dynamic_cast<KMultiTabBar*>(tqparentWidget()); if (tb) tb->updateSeparator(); } void KMultiTabBarButton::showEvent( TQShowEvent* he) { TQPushButton::showEvent(he); - KMultiTabBar *tb=dynamic_cast<KMultiTabBar*>(tqparentWidget()); + KMultiTabBar *tb=tqt_dynamic_cast<KMultiTabBar*>(tqparentWidget()); if (tb) tb->updateSeparator(); } @@ -923,7 +923,7 @@ void KMultiTabBar::removeButton(int id) { for (uint pos=0;pos<m_buttons.count();pos++) { - if (m_buttons.at(pos)->id()==id) + if (m_buttons.tqat(pos)->id()==id) { m_buttons.take(pos)->deleteLater(); break; @@ -978,7 +978,7 @@ void KMultiTabBar::setPosition(KMultiTabBarPosition pos) m_position=pos; m_internal->setPosition(pos); for (uint i=0;i<m_buttons.count();i++) - m_buttons.at(i)->setPosition(pos); + m_buttons.tqat(i)->setPosition(pos); } KMultiTabBar::KMultiTabBarPosition KMultiTabBar::position() const @@ -988,7 +988,7 @@ KMultiTabBar::KMultiTabBarPosition KMultiTabBar::position() const void KMultiTabBar::fontChange(const TQFont& /* oldFont */) { for (uint i=0;i<tabs()->count();i++) - tabs()->at(i)->resize(); + tabs()->tqat(i)->resize(); tqrepaint(); } diff --git a/kwallet/backend/kwalletbackend.cc b/kwallet/backend/kwalletbackend.cc index 72b74d062..571032e8f 100644 --- a/kwallet/backend/kwalletbackend.cc +++ b/kwallet/backend/kwalletbackend.cc @@ -422,7 +422,7 @@ int Backend::open(const TQByteArray& password) { // compare hashes int sz = encrypted.size(); for (int i = 0; i < 20; i++) { - if (testhash[i] != encrypted.at(sz - 20 + i)) { + if (testhash[i] != static_cast<const char>(encrypted.tqat(sz - 20 + i))) { encrypted.fill(0); sha.reset(); return -8; // hash error. diff --git a/kwallet/backend/kwalletbackend.h b/kwallet/backend/kwalletbackend.h index a2f654ec6..6592c23bd 100644 --- a/kwallet/backend/kwalletbackend.h +++ b/kwallet/backend/kwalletbackend.h @@ -143,7 +143,7 @@ class MD5Digest : public TQByteArray { char x, y; for (; i < 16; ++i) { x = at(i); - y = r.at(i); + y = const_cast<MD5Digest&>(r).tqat(i); if (x != y) { break; } diff --git a/win/qeventloopex.cpp b/win/qeventloopex.cpp index da5eba60c..b4b32e838 100644 --- a/win/qeventloopex.cpp +++ b/win/qeventloopex.cpp @@ -204,7 +204,7 @@ void QEventLoopEx::registerSocketNotifier( TQSocketNotifier *notifier ) while ( p && p->fd > sockfd ) p = list->next(); if ( p ) - list->insert( list->at(), sn ); + list->insert( list->tqat(), sn ); else list->append( sn ); } |