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 /kate | |
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
Diffstat (limited to 'kate')
-rw-r--r-- | kate/data/cpp.xml | 2 | ||||
-rw-r--r-- | kate/part/kateautoindent.cpp | 4 | ||||
-rw-r--r-- | kate/part/katebookmarks.cpp | 10 | ||||
-rw-r--r-- | kate/part/katecodefoldinghelpers.cpp | 12 | ||||
-rw-r--r-- | kate/part/kateconfig.cpp | 12 | ||||
-rw-r--r-- | kate/part/katedialogs.cpp | 6 | ||||
-rw-r--r-- | kate/part/katedocument.cpp | 40 | ||||
-rw-r--r-- | kate/part/katefactory.cpp | 2 | ||||
-rw-r--r-- | kate/part/katefiletype.cpp | 50 | ||||
-rw-r--r-- | kate/part/katehighlight.cpp | 50 | ||||
-rw-r--r-- | kate/part/katejscript.cpp | 4 | ||||
-rw-r--r-- | kate/part/kateprinter.cpp | 2 | ||||
-rw-r--r-- | kate/part/katerenderer.cpp | 4 | ||||
-rw-r--r-- | kate/part/kateschema.cpp | 10 | ||||
-rw-r--r-- | kate/part/katesearch.cpp | 6 | ||||
-rw-r--r-- | kate/part/katetemplatehandler.cpp | 10 | ||||
-rw-r--r-- | kate/part/kateundo.cpp | 8 | ||||
-rw-r--r-- | kate/plugins/autobookmarker/autobookmarker.cpp | 2 | ||||
-rw-r--r-- | kate/plugins/insertfile/insertfileplugin.cpp | 4 | ||||
-rw-r--r-- | kate/plugins/isearch/ISearchPlugin.cpp | 4 | ||||
-rw-r--r-- | kate/plugins/kdatatool/kate_kdatatool.cpp | 8 | ||||
-rw-r--r-- | kate/plugins/wordcompletion/docwordcompletion.cpp | 4 |
22 files changed, 128 insertions, 126 deletions
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; } |