From 374d939d8af431477ce2601815f0ba121b66871c Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 15 Feb 2011 19:11:41 +0000 Subject: 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 --- khtml/css/css_base.h | 2 +- khtml/css/css_ruleimpl.h | 2 +- khtml/css/css_valueimpl.cpp | 6 +++--- khtml/css/css_valueimpl.h | 2 +- khtml/css/cssstyleselector.cpp | 8 ++++---- khtml/ecma/kjs_debugwin.cpp | 14 +++++++------- khtml/ecma/kjs_navigator.cpp | 14 +++++++------- khtml/ecma/kjs_window.cpp | 4 ++-- khtml/html/html_formimpl.cpp | 2 +- khtml/html/html_miscimpl.cpp | 10 +++++----- khtml/java/kjavaappletviewer.cpp | 2 +- khtml/java/kjavaprocess.cpp | 8 ++++---- khtml/khtml_caret.cpp | 6 +++--- khtml/khtml_ext.cpp | 8 ++++---- khtml/khtml_pagecache.cpp | 2 +- khtml/khtml_part.cpp | 12 ++++++------ khtml/rendering/bidi.cpp | 2 +- khtml/rendering/render_form.cpp | 4 ++-- khtml/rendering/render_layer.cpp | 36 ++++++++++++++++++------------------ khtml/rendering/render_table.cpp | 2 +- khtml/rendering/render_text.cpp | 4 ++-- khtml/test_regression.cpp | 2 +- khtml/xml/dom_nodeimpl.cpp | 2 +- 23 files changed, 77 insertions(+), 77 deletions(-) (limited to 'khtml') 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 *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::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::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 && icount() ) - 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 && iplugins->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 && icount() ) - 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 && imimes->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 && imimes.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 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& l = static_cast( 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 l = static_cast( 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& il = static_cast( 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) << ""; -// else if( buf->at(i) > 0 && buf->at(i) < 10 ) -// kdDebug(6100) << "at(i) << ">"; +// else if( buf->tqat(i) > 0 && buf->tqat(i) < 10 ) +// kdDebug(6100) << "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* 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* 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* 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* 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 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" ), "\nFAIL" ); text.replace( TQRegExp( "\nPASSED" ), "\nPASSED" ); text.replace( TQRegExp( "\nPASS" ), "\nPASS" ); - if ( text.at( 0 ) == '\n' ) + if ( text.tqat( 0 ) == '\n' ) text = text.mid( 1, text.length() ); text.replace( '\n', "
\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 -- cgit v1.2.1