summaryrefslogtreecommitdiffstats
path: root/kate
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:48:49 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:48:49 -0600
commit13281e2856a2ef43bbab78c5528470309c23aa77 (patch)
tree936bcf8145dc235004c73e9fb3d6b3dca9aa370b /kate
parente81c741bb2cf337a43524e75f22f7728ce17a343 (diff)
downloadtdelibs-13281e2856a2ef43bbab78c5528470309c23aa77.tar.gz
tdelibs-13281e2856a2ef43bbab78c5528470309c23aa77.zip
Rename a number of old tq methods that are no longer tq specific
Diffstat (limited to 'kate')
-rw-r--r--kate/part/kateautoindent.cpp24
-rw-r--r--kate/part/katebookmarks.cpp10
-rw-r--r--kate/part/katebuffer.cpp32
-rw-r--r--kate/part/katebuffer.h4
-rw-r--r--kate/part/katecmds.cpp10
-rw-r--r--kate/part/katecmds.h2
-rw-r--r--kate/part/katecodecompletion.cpp4
-rw-r--r--kate/part/katecodefoldinghelpers.cpp12
-rw-r--r--kate/part/kateconfig.cpp16
-rw-r--r--kate/part/katedialogs.cpp12
-rw-r--r--kate/part/katedocument.cpp58
-rw-r--r--kate/part/katefactory.cpp2
-rw-r--r--kate/part/katefiletype.cpp52
-rw-r--r--kate/part/katehighlight.cpp60
-rw-r--r--kate/part/katejscript.cpp10
-rw-r--r--kate/part/kateprinter.cpp6
-rw-r--r--kate/part/katerenderer.cpp24
-rw-r--r--kate/part/kateschema.cpp28
-rw-r--r--kate/part/katesearch.cpp8
-rw-r--r--kate/part/katetemplatehandler.cpp10
-rw-r--r--kate/part/katetextline.cpp44
-rw-r--r--kate/part/katetextline.h6
-rw-r--r--kate/part/kateundo.cpp8
-rw-r--r--kate/part/kateview.cpp18
-rw-r--r--kate/part/kateviewhelpers.cpp2
-rw-r--r--kate/part/kateviewinternal.cpp28
-rw-r--r--kate/part/kateviewinternal.h2
-rw-r--r--kate/part/test_regression.cpp12
-rw-r--r--kate/plugins/autobookmarker/autobookmarker.cpp4
-rw-r--r--kate/plugins/insertfile/insertfileplugin.cpp6
-rw-r--r--kate/plugins/isearch/ISearchPlugin.cpp4
-rw-r--r--kate/plugins/kdatatool/kate_kdatatool.cpp8
-rw-r--r--kate/plugins/wordcompletion/docwordcompletion.cpp6
33 files changed, 266 insertions, 266 deletions
diff --git a/kate/part/kateautoindent.cpp b/kate/part/kateautoindent.cpp
index 0aabde874..ed9a6169b 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.tqat(i)->name;
+ TQString name = items.at(i)->name;
if (name.find("Comment") != -1 && commentAttrib == 255)
{
commentAttrib = i;
@@ -748,7 +748,7 @@ void KateCSmartIndent::processChar(TQChar c)
if (c == 'n')
{
- if (firstChar != '#' || textLine->string(curCol-5, 5) != TQString::tqfromLatin1("regio"))
+ if (firstChar != '#' || textLine->string(curCol-5, 5) != TQString::fromLatin1("regio"))
return;
}
@@ -1411,7 +1411,7 @@ void KateXmlIndent::getLineInfo (uint line, uint &prevIndent, int &numTags,
uint pos, len = text.length();
bool seenOpen = false;
for(pos = 0; pos < len; ++pos) {
- int ch = text.tqat(pos).tqunicode();
+ int ch = text.at(pos).unicode();
switch(ch) {
case '<':
seenOpen = true;
@@ -1467,11 +1467,11 @@ void KateXmlIndent::getLineInfo (uint line, uint &prevIndent, int &numTags,
if(unclosedTag) {
// find the start of the next attribute, so we can align with it
do {
- lastCh = text.tqat(++attrCol).tqunicode();
+ lastCh = text.at(++attrCol).unicode();
}while(lastCh && lastCh != ' ' && lastCh != '\t');
while(lastCh == ' ' || lastCh == '\t') {
- lastCh = text.tqat(++attrCol).tqunicode();
+ lastCh = text.at(++attrCol).unicode();
}
attrCol = prevLine->cursorX(attrCol, tabWidth);
@@ -1917,8 +1917,8 @@ TQString KateCSAndSIndent::calcIndent (const KateDocCursor &begin)
// if the line starts with # (but isn't a c# region thingy), no indentation at all.
if( currLineFirst >= 0 && currLine->getChar(currLineFirst) == '#' )
{
- if( !currLine->stringAtPos( currLineFirst+1, TQString::tqfromLatin1("region") ) &&
- !currLine->stringAtPos( currLineFirst+1, TQString::tqfromLatin1("endregion") ) )
+ if( !currLine->stringAtPos( currLineFirst+1, TQString::fromLatin1("region") ) &&
+ !currLine->stringAtPos( currLineFirst+1, TQString::fromLatin1("endregion") ) )
return TQString::null;
}
@@ -1974,10 +1974,10 @@ TQString KateCSAndSIndent::calcIndent (const KateDocCursor &begin)
{
#define ARRLEN( array ) ( sizeof(array)/sizeof(array[0]) )
for( uint n = 0; n < ARRLEN(scopeKeywords); ++n )
- if( textLine->stringAtPos(pos, TQString::tqfromLatin1(scopeKeywords[n]) ) )
+ if( textLine->stringAtPos(pos, TQString::fromLatin1(scopeKeywords[n]) ) )
return calcIndentAfterKeyword( begin, cur, pos, false );
for( uint n = 0; n < ARRLEN(blockScopeKeywords); ++n )
- if( textLine->stringAtPos(pos, TQString::tqfromLatin1(blockScopeKeywords[n]) ) )
+ if( textLine->stringAtPos(pos, TQString::fromLatin1(blockScopeKeywords[n]) ) )
return calcIndentAfterKeyword( begin, cur, pos, true );
#undef ARRLEN
}
@@ -2070,7 +2070,7 @@ TQString KateCSAndSIndent::calcIndentInBrace(const KateDocCursor &indentCursor,
// beginning 'namespace'. that's 99% of usage, I'd guess.
{
if( braceFirst >= 0 && braceLine->attribute(braceFirst) == keywordAttrib &&
- braceLine->stringAtPos( braceFirst, TQString::tqfromLatin1( "namespace" ) ) )
+ braceLine->stringAtPos( braceFirst, TQString::fromLatin1( "namespace" ) ) )
return continuationIndent(indentCursor) + whitespaceToOpenBrace;
if( braceCursor.line() > 0 )
@@ -2078,7 +2078,7 @@ TQString KateCSAndSIndent::calcIndentInBrace(const KateDocCursor &indentCursor,
KateTextLine::Ptr prevLine = doc->plainKateTextLine(braceCursor.line() - 1);
int firstPrev = prevLine->firstChar();
if( firstPrev >= 0 && prevLine->attribute(firstPrev) == keywordAttrib &&
- prevLine->stringAtPos( firstPrev, TQString::tqfromLatin1( "namespace" ) ) )
+ prevLine->stringAtPos( firstPrev, TQString::fromLatin1( "namespace" ) ) )
return continuationIndent(indentCursor) + whitespaceToOpenBrace;
}
}
@@ -2384,7 +2384,7 @@ void KateVarIndent::slotVariableChanged( const TQString &var, const TQString &va
for (uint i=0; i<items.count(); i++)
{
- if ( items.tqat(i)->name.section( ':', 1 ) == val )
+ if ( items.at(i)->name.section( ':', 1 ) == val )
{
d->coupleAttrib = i;
break;
diff --git a/kate/part/katebookmarks.cpp b/kate/part/katebookmarks.cpp
index 6498d9936..ac1ee73d9 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.tqat(i)->line, KTextEditor::MarkInterface::markType01 );
+ m_view->getDoc()->removeMark( m.at(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.tqat(z)->line > line) && ((found == -1) || (uint(found) > m.tqat(z)->line)) )
- found = m.tqat(z)->line;
+ if ( (m.at(z)->line > line) && ((found == -1) || (uint(found) > m.at(z)->line)) )
+ found = m.at(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.tqat(z)->line < line) && ((found == -1) || (uint(found) < m.tqat(z)->line)))
- found = m.tqat(z)->line;
+ if ((m.at(z)->line < line) && ((found == -1) || (uint(found) < m.at(z)->line)))
+ found = m.at(z)->line;
if (found != -1)
m_view->gotoLineNumber ( found );
diff --git a/kate/part/katebuffer.cpp b/kate/part/katebuffer.cpp
index 05af27ff8..2ffc8f50e 100644
--- a/kate/part/katebuffer.cpp
+++ b/kate/part/katebuffer.cpp
@@ -36,9 +36,9 @@
#include <tqpopupmenu.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqtimer.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
#include <tqcstring.h>
#include <tqdatetime.h>
@@ -172,10 +172,10 @@ class KateFileLoader
// should spaces be ignored at end of line?
inline bool removeTrailingSpaces () const { return m_removeTrailingSpaces; }
- // internal tqunicode data array
- inline const TQChar *tqunicode () const { return m_text.tqunicode(); }
+ // internal unicode data array
+ inline const TQChar *unicode () const { return m_text.unicode(); }
- // read a line, return length + offset in tqunicode data
+ // read a line, return length + offset in unicode data
void readLine (uint &offset, uint &length)
{
length = 0;
@@ -543,7 +543,7 @@ bool KateBuffer::canEncode ()
kdDebug(13020) << "ENC NAME: " << codec->name() << endl;
- // hardcode some tqunicode encodings which can encode all chars
+ // hardcode some unicode encodings which can encode all chars
if ((TQString(codec->name()) == "UTF-8") || (TQString(codec->name()) == "ISO-10646-UCS-2"))
return true;
@@ -860,12 +860,12 @@ void KateBuffer::setHighlight(uint hlMode)
// aha, hl will change
if (h != m_highlight)
{
- bool tqinvalidate = !h->noHighlighting();
+ bool invalidate = !h->noHighlighting();
if (m_highlight)
{
m_highlight->release();
- tqinvalidate = true;
+ invalidate = true;
}
h->use();
@@ -880,7 +880,7 @@ void KateBuffer::setHighlight(uint hlMode)
m_highlight = h;
- if (tqinvalidate)
+ if (invalidate)
invalidateHighlighting();
// inform the document that the hl was really changed
@@ -949,7 +949,7 @@ void KateBuffer::addIndentBasedFoldingInformation(TQMemArray<uint> &foldingList,
}
}
-bool KateBuffer::doHighlight (KateBufBlock *buf, uint startLine, uint endLine, bool tqinvalidate)
+bool KateBuffer::doHighlight (KateBufBlock *buf, uint startLine, uint endLine, bool invalidate)
{
// no hl around, no stuff to do
if (!m_highlight)
@@ -971,7 +971,7 @@ bool KateBuffer::doHighlight (KateBufBlock *buf, uint startLine, uint endLine, b
//kdDebug (13020) << "HL UNTIL LINE: " << m_lineHighlighted << " MAX: " << m_lineHighlightedMax << endl;
//kdDebug (13020) << "HL DYN COUNT: " << KateHlManager::self()->countDynamicCtxs() << " MAX: " << m_maxDynamicContexts << endl;
- // see if there are too many dynamic contexts; if yes, tqinvalidate HL of all documents
+ // see if there are too many dynamic contexts; if yes, invalidate HL of all documents
if (KateHlManager::self()->countDynamicCtxs() >= m_maxDynamicContexts)
{
{
@@ -1240,7 +1240,7 @@ bool KateBuffer::doHighlight (KateBufBlock *buf, uint startLine, uint endLine, b
buf->markDirty ();
// tag the changed lines !
- if (tqinvalidate)
+ if (invalidate)
emit tagLines (startLine, current_line + buf->startLine());
// emit that we have changed the folding
@@ -1353,14 +1353,14 @@ void KateBufBlock::fillBlock (KateFileLoader *stream)
{
uint offset = 0, length = 0;
stream->readLine(offset, length);
- const TQChar *tqunicodeData = stream->tqunicode () + offset;
+ const TQChar *unicodeData = stream->unicode () + offset;
// strip spaces at end of line
if ( stream->removeTrailingSpaces() )
{
while (length > 0)
{
- if (tqunicodeData[length-1].isSpace())
+ if (unicodeData[length-1].isSpace())
--length;
else
break;
@@ -1391,13 +1391,13 @@ void KateBufBlock::fillBlock (KateFileLoader *stream)
memcpy(buf+pos, (char *) &length, sizeof(uint));
pos += sizeof(uint);
- memcpy(buf+pos, (char *) tqunicodeData, sizeof(TQChar)*length);
+ memcpy(buf+pos, (char *) unicodeData, sizeof(TQChar)*length);
pos += sizeof(TQChar)*length;
}
else
{
KateTextLine::Ptr textLine = new KateTextLine ();
- textLine->insertText (0, length, tqunicodeData);
+ textLine->insertText (0, length, unicodeData);
m_stringList.push_back (textLine);
}
diff --git a/kate/part/katebuffer.h b/kate/part/katebuffer.h
index 450f260ab..04ee264e8 100644
--- a/kate/part/katebuffer.h
+++ b/kate/part/katebuffer.h
@@ -116,7 +116,7 @@ class KateBufBlock
void removeLine(uint i);
/**
- * mark this block as dirty, will tqinvalidate the swap data
+ * mark this block as dirty, will invalidate the swap data
* insert/removeLine will mark the block dirty itself
*/
void markDirty ();
@@ -611,7 +611,7 @@ class KateBuffer : public TQObject
* @returns true when the highlighting in the next block needs to be updated,
* false otherwise.
*/
- bool doHighlight (KateBufBlock *buf, uint from, uint to, bool tqinvalidate);
+ bool doHighlight (KateBufBlock *buf, uint from, uint to, bool invalidate);
signals:
/**
diff --git a/kate/part/katecmds.cpp b/kate/part/katecmds.cpp
index d4879cfda..c5feb5071 100644
--- a/kate/part/katecmds.cpp
+++ b/kate/part/katecmds.cpp
@@ -408,7 +408,7 @@ int KateCommands::SedReplace::sedMagic( KateDocument *doc, int &line,
TQString rep=repOld;
// now set the backreferences in the replacement
- TQStringList backrefs=matcher.tqcapturedTexts();
+ TQStringList backrefs=matcher.capturedTexts();
int refnum=1;
TQStringList::Iterator i = backrefs.begin();
@@ -578,7 +578,7 @@ bool KateCommands::Character::exec (Kate::View *view, const TQString &_cmd, TQSt
view->insertText(TQString(buf));
}
else
- { // do the tqunicode thing
+ { // do the unicode thing
TQChar c(number);
view->insertText(TQString(&c, 1));
}
@@ -593,10 +593,10 @@ bool KateCommands::Date::exec (Kate::View *view, const TQString &cmd, TQString &
if (cmd.left(4) != "date")
return false;
- if (TQDateTime::tqcurrentDateTime().toString(cmd.mid(5, cmd.length()-5)).length() > 0)
- view->insertText(TQDateTime::tqcurrentDateTime().toString(cmd.mid(5, cmd.length()-5)));
+ if (TQDateTime::currentDateTime().toString(cmd.mid(5, cmd.length()-5)).length() > 0)
+ view->insertText(TQDateTime::currentDateTime().toString(cmd.mid(5, cmd.length()-5)));
else
- view->insertText(TQDateTime::tqcurrentDateTime().toString("yyyy-MM-dd hh:mm:ss"));
+ view->insertText(TQDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss"));
return true;
}
diff --git a/kate/part/katecmds.h b/kate/part/katecmds.h
index e55e2ac8b..55c8d807b 100644
--- a/kate/part/katecmds.h
+++ b/kate/part/katecmds.h
@@ -119,7 +119,7 @@ class SedReplace : public Kate::Command
};
/**
- * insert a tqunicode or ascii character
+ * insert a unicode or ascii character
* base 9+1: 1234
* hex: 0x1234 or x1234
* octal: 01231
diff --git a/kate/part/katecodecompletion.cpp b/kate/part/katecodecompletion.cpp
index 1bff647f6..99fb1925a 100644
--- a/kate/part/katecodecompletion.cpp
+++ b/kate/part/katecodecompletion.cpp
@@ -42,7 +42,7 @@
#include <tqapplication.h>
#include <tqsizegrip.h>
#include <tqfontmetrics.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqregexp.h>
/**
@@ -384,7 +384,7 @@ void KateCodeCompletion::showComment()
m_completionListBox->ensureCurrentVisible();
finalPoint.setY(
- m_completionListBox->viewport()->mapToGlobal(m_completionListBox->tqitemRect(
+ m_completionListBox->viewport()->mapToGlobal(m_completionListBox->itemRect(
m_completionListBox->item(m_completionListBox->currentItem())).topLeft()).y());
m_commentLabel->move(finalPoint);
diff --git a/kate/part/katecodefoldinghelpers.cpp b/kate/part/katecodefoldinghelpers.cpp
index 15ba05cb7..ab571d9d0 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.tqat(i);
+ KateCodeFoldingNode *node = markedForDeleting.at(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.tqat(i);
+ KateCodeFoldingNode *node=nodesForLine.at(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.tqat(0)->visible = !nodesForLine.tqat(0)->visible;
+ nodesForLine.at(0)->visible = !nodesForLine.at(0)->visible;
- if (!nodesForLine.tqat(0)->visible)
- addHiddenLineBlock(nodesForLine.tqat(0),line);
+ if (!nodesForLine.at(0)->visible)
+ addHiddenLineBlock(nodesForLine.at(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.tqat(0));
+ updateHiddenSubNodes(nodesForLine.at(0));
}
emit regionVisibilityChangedAt(line);
diff --git a/kate/part/kateconfig.cpp b/kate/part/kateconfig.cpp
index 5bfe55fbc..7929f781d 100644
--- a/kate/part/kateconfig.cpp
+++ b/kate/part/kateconfig.cpp
@@ -38,7 +38,7 @@
#include <kstaticdeleter.h>
#include <tqpopupmenu.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
#include <kdebug.h>
@@ -237,7 +237,7 @@ void KateDocumentConfig::updateConfig ()
{
for (uint z=0; z < KateFactory::self()->documents()->count(); z++)
{
- KateFactory::self()->documents()->tqat(z)->updateConfig ();
+ KateFactory::self()->documents()->at(z)->updateConfig ();
}
}
}
@@ -422,7 +422,7 @@ TQTextCodec *KateDocumentConfig::codec ()
if (m_encodingSet || isGlobal())
{
if (m_encoding.isEmpty() && isGlobal())
- return KGlobal::charsets()->codecForName (TQString::tqfromLatin1(KGlobal::locale()->encoding()));
+ return KGlobal::charsets()->codecForName (TQString::fromLatin1(KGlobal::locale()->encoding()));
else if (m_encoding.isEmpty())
return s_global->codec ();
else
@@ -570,8 +570,8 @@ bool KateDocumentConfig::plugin (uint index) const
if (index >= m_plugins.size())
return false;
- if (m_pluginsSet.tqat(index) || isGlobal())
- return m_plugins.tqat(index);
+ if (m_pluginsSet.at(index) || isGlobal())
+ return m_plugins.at(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()->tqat(z)->updateConfig ();
+ KateFactory::self()->views()->at(z)->updateConfig ();
}
}
}
@@ -1088,7 +1088,7 @@ void KateRendererConfig::updateConfig ()
{
for (uint z=0; z < KateFactory::self()->renderers()->count(); z++)
{
- KateFactory::self()->renderers()->tqat(z)->updateConfig ();
+ KateFactory::self()->renderers()->at(z)->updateConfig ();
}
}
}
@@ -1114,7 +1114,7 @@ void KateRendererConfig::reloadSchema()
{
if ( isGlobal() )
for ( uint z=0; z < KateFactory::self()->renderers()->count(); z++ )
- KateFactory::self()->renderers()->tqat(z)->config()->reloadSchema();
+ KateFactory::self()->renderers()->at(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 f9c5dadb1..d341603dd 100644
--- a/kate/part/katedialogs.cpp
+++ b/kate/part/katedialogs.cpp
@@ -86,7 +86,7 @@
#include <tqheader.h>
#include <tqhgroupbox.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlineedit.h>
#include <tqlistbox.h>
#include <tqlistview.h>
@@ -101,7 +101,7 @@
#include <tqspinbox.h>
#include <tqstringlist.h>
#include <tqtabwidget.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
#include <tqtoolbutton.h>
#include <tqvbox.h>
#include <tqvgroupbox.h>
@@ -712,7 +712,7 @@ KateViewDefaultsConfig::KateViewDefaultsConfig(TQWidget *parent)
"you to set a maximum width of the screen, as a percentage, after which "
"dynamically wrapped lines will no longer be vertically aligned. For "
"example, at 50%, lines whose indentation levels are deeper than 50% of "
- "the width of the screen will not have vertical tqalignment applied to "
+ "the width of the screen will not have vertical alignment applied to "
"subsequent wrapped lines.</p>"));
TQWhatsThis::add(m_line,i18n(
"If this option is checked, every new view will display line numbers "
@@ -819,7 +819,7 @@ void KateEditKeyConfiguration::showEvent ( TQShowEvent * )
if (!m_ready)
{
(new TQVBoxLayout(this))->setAutoAdd(true);
- KateView* view = (KateView*)m_doc->views().tqat(0);
+ KateView* view = (KateView*)m_doc->views().at(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.tqat(i)->pluginIndex(), m_items.tqat(i)->isOn());
+ KateDocumentConfig::global()->setPlugin (m_items.at(i)->pluginIndex(), m_items.at(i)->isOn());
KateDocumentConfig::global()->configEnd ();
}
@@ -1243,7 +1243,7 @@ void KatePartPluginConfigPage::slotConfigure()
for( uint i=0; i<editorPages.count(); i++ )
{
- editorPages.tqat( i )->apply();
+ editorPages.at( i )->apply();
}
}
diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp
index 938758852..81d05b21a 100644
--- a/kate/part/katedocument.cpp
+++ b/kate/part/katedocument.cpp
@@ -72,9 +72,9 @@
#include <tqtimer.h>
#include <tqfile.h>
-#include <tqclipboard.h>
-#include <tqtextstream.h>
-#include <tqtextcodec.h>
+#include <clipboard.h>
+#include <textstream.h>
+#include <textcodec.h>
#include <tqmap.h>
//END includes
@@ -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.tqat(i));
+ enablePluginGUI (plugin, m_views.at(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.tqat(i));
+ disablePluginGUI (plugin, m_views.at(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.tqat(i));
+ msave.append (*m.at(i));
editStart ();
@@ -924,7 +924,7 @@ void KateDocument::editStart (bool withUndo)
for (uint z = 0; z < m_views.count(); z++)
{
- m_views.tqat(z)->editStart ();
+ m_views.at(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.tqat(z)->editEnd (m_buffer->editTagStart(), m_buffer->editTagEnd(), m_buffer->editTagFrom());
+ m_views.at(z)->editEnd (m_buffer->editTagStart(), m_buffer->editTagEnd(), m_buffer->editTagFrom());
if (m_buffer->editChanged())
{
@@ -1187,7 +1187,7 @@ bool KateDocument::editInsertText ( uint line, uint col, const TQString &str )
editAddUndo (KateUndoGroup::editInsertText, line, col, s.length(), s);
- l->insertText (col, s.length(), s.tqunicode());
+ l->insertText (col, s.length(), s.unicode());
// removeTrailingSpace(line); // ### nessecary?
m_buffer->changeLine(line);
@@ -1410,7 +1410,7 @@ bool KateDocument::editInsertLine ( uint line, const TQString &s )
removeTrailingSpace( line ); // old line
KateTextLine::Ptr tl = new KateTextLine();
- tl->insertText (0, s.length(), s.tqunicode(), 0);
+ tl->insertText (0, s.length(), s.unicode(), 0);
m_buffer->insertLine(line, tl);
m_buffer->changeLine(line);
@@ -2011,7 +2011,7 @@ void KateDocument::configDialog()
for (uint i=0; i<editorPages.count(); i++)
{
- editorPages.tqat(i)->apply();
+ editorPages.at(i)->apply();
}
KateDocumentConfig::global()->configEnd ();
@@ -2316,7 +2316,7 @@ bool KateDocument::openURL( const KURL &url )
w = m_views.first();
if (w)
- m_job->setWindow (w->tqtopLevelWidget());
+ m_job->setWindow (w->topLevelWidget());
emit started( m_job );
@@ -2589,7 +2589,7 @@ bool KateDocument::saveFile()
//
if (!m_buffer->canEncode ()
&& (KMessageBox::warningContinueCancel(0,
- i18n("The selected encoding cannot encode every tqunicode character in this document. Do you really want to save it? There could be some data lost."),i18n("Possible Data Loss"),i18n("Save Nevertheless")) != KMessageBox::Continue))
+ i18n("The selected encoding cannot encode every unicode character in this document. Do you really want to save it? There could be some data lost."),i18n("Possible Data Loss"),i18n("Save Nevertheless")) != KMessageBox::Continue))
{
return false;
}
@@ -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.tqat(z)->renderer()->updateAttributes ();
+ m_views.at(z)->renderer()->updateAttributes ();
if (needInvalidate)
m_buffer->invalidateHighlighting();
@@ -3195,7 +3195,7 @@ void KateDocument::backspace( KateView *view, const KateTextCursor& c )
if (!textLine)
return;
- if (config()->wordWrap() && textLine->endingWith(TQString::tqfromLatin1(" ")))
+ if (config()->wordWrap() && textLine->endingWith(TQString::fromLatin1(" ")))
{
// gg: in hard wordwrap mode, backspace must also eat the trailing space
removeText (line-1, textLine->length()-1, line, 0);
@@ -3227,7 +3227,7 @@ void KateDocument::del( KateView *view, const KateTextCursor& c )
void KateDocument::paste ( KateView* view )
{
- TQString s = TQApplication::tqclipboard()->text();
+ TQString s = TQApplication::clipboard()->text();
if (s.isEmpty())
return;
@@ -3981,9 +3981,9 @@ 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.tqat( p-1 ) ) )
+ ( p && ! highlight()->isInWord( s.at( p-1 ) ) )
)
- s[p] = s.tqat(p).upper();
+ s[p] = s.at(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.tqat(z)->tagLines (start, end, true);
+ m_views.at(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.tqat(z)->tagLines(start, end, true);
+ m_views.at(z)->tagLines(start, end, true);
}
void KateDocument::repaintViews(bool paintOnlyDirty)
{
for (uint z = 0; z < m_views.count(); z++)
- m_views.tqat(z)->repaintText(paintOnlyDirty);
+ m_views.at(z)->repaintText(paintOnlyDirty);
}
void KateDocument::tagAll()
{
for (uint z = 0; z < m_views.count(); z++)
{
- m_views.tqat(z)->tagAll();
- m_views.tqat(z)->updateView (true);
+ m_views.at(z)->tagAll();
+ m_views.at(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()->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;
+ 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;
}
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.tqat( i )->cursorLine() );
- cols.append( m_views.tqat( i )->cursorColumn() );
+ lines.append( m_views.at( i )->cursorLine() );
+ cols.append( m_views.at( i )->cursorColumn() );
}
KateDocument::openURL( url() );
for ( uint i=0; i < m_views.count(); i++ )
- m_views.tqat( i )->setCursorPositionInternal( lines[ i ], cols[ i ], m_config->tabWidth(), false );
+ m_views.at( 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 c42f698a3..64bde8718 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.tqat(i)->script(scriptname);
+ result=m_indentScriptManagers.at(i)->script(scriptname);
if (!result.isNull()) return result;
}
return result;
diff --git a/kate/part/katefiletype.cpp b/kate/part/katefiletype.cpp
index c29b8641e..c18961ac4 100644
--- a/kate/part/katefiletype.cpp
+++ b/kate/part/katefiletype.cpp
@@ -43,7 +43,7 @@
#include <tqheader.h>
#include <tqhgroupbox.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlineedit.h>
#include <tqpushbutton.h>
#include <tqtoolbutton.h>
@@ -106,20 +106,20 @@ void KateFileTypeManager::save (TQPtrList<KateFileType> *v)
TQStringList newg;
for (uint z=0; z < v->count(); z++)
{
- config.setGroup (v->tqat(z)->name);
+ config.setGroup (v->at(z)->name);
- 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);
+ 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);
- TQString varLine = v->tqat(z)->varLine;
+ TQString varLine = v->at(z)->varLine;
if (TQRegExp("kate:(.*)").search(varLine) < 0)
varLine.prepend ("kate: ");
config.writeEntry ("Variables", varLine);
- newg << v->tqat(z)->name;
+ newg << v->at(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.tqat(z)->mimetypes.findIndex (mt->name()) > -1)
- types.append (m_types.tqat(z));
+ if (m_types.at(z)->mimetypes.findIndex (mt->name()) > -1)
+ types.append (m_types.at(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.tqat(z)->wildcards.begin(); it != m_types.tqat(z)->wildcards.end(); ++it )
+ for( TQStringList::Iterator it = m_types.at(z)->wildcards.begin(); it != m_types.at(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.tqat(z));
+ types.append (m_types.at(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.tqat(number);
+ return m_types.at(number);
return 0;
}
@@ -373,7 +373,7 @@ void KateFileTypeConfigTab::reload()
{
KateFileType *type = new KateFileType ();
- *type = *KateFactory::self()->fileTypeManager()->list()->tqat(z);
+ *type = *KateFactory::self()->fileTypeManager()->list()->at(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.tqat(i)->section.length() > 0)
- typeCombo->insertItem(m_types.tqat(i)->section + TQString ("/") + m_types.tqat(i)->name);
+ if (m_types.at(i)->section.length() > 0)
+ typeCombo->insertItem(m_types.at(i)->section + TQString ("/") + m_types.at(i)->name);
else
- typeCombo->insertItem(m_types.tqat(i)->name);
+ typeCombo->insertItem(m_types.at(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.tqat(i)->name == newN)
+ if (m_types.at(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.tqat(type);
+ t = m_types.at(type);
if (t)
{
@@ -536,8 +536,8 @@ void KateViewFileTypeAction::slotAboutToShow()
for (int z=0; z<count; z++)
{
- TQString hlName = KateFactory::self()->fileTypeManager()->list()->tqat(z)->name;
- TQString hlSection = KateFactory::self()->fileTypeManager()->list()->tqat(z)->section;
+ TQString hlName = KateFactory::self()->fileTypeManager()->list()->at(z)->name;
+ TQString hlSection = KateFactory::self()->fileTypeManager()->list()->at(z)->section;
if ( !hlSection.isEmpty() && (names.contains(hlName) < 1) )
{
@@ -551,7 +551,7 @@ void KateViewFileTypeAction::slotAboutToShow()
int m = subMenusName.findIndex (hlSection);
names << hlName;
- subMenus.tqat(m)->insertItem ( hlName, this, TQT_SLOT(setType(int)), 0, z+1);
+ subMenus.at(m)->insertItem ( hlName, this, TQT_SLOT(setType(int)), 0, z+1);
}
else if (names.contains(hlName) < 1)
{
@@ -564,8 +564,8 @@ void KateViewFileTypeAction::slotAboutToShow()
for (uint i=0;i<subMenus.count();i++)
{
- for (uint i2=0;i2<subMenus.tqat(i)->count();i2++)
- subMenus.tqat(i)->setItemChecked(subMenus.tqat(i)->idAt(i2),false);
+ for (uint i2=0;i2<subMenus.at(i)->count();i2++)
+ subMenus.at(i)->setItemChecked(subMenus.at(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.findIndex (t->section);
- if (i >= 0 && subMenus.tqat(i))
- subMenus.tqat(i)->setItemChecked (doc->fileType()+1, true);
+ if (i >= 0 && subMenus.at(i))
+ subMenus.at(i)->setItemChecked (doc->fileType()+1, true);
else
popupMenu()->setItemChecked (0, true);
}
diff --git a/kate/part/katehighlight.cpp b/kate/part/katehighlight.cpp
index 7f5bcc882..31b33677c 100644
--- a/kate/part/katehighlight.cpp
+++ b/kate/part/katehighlight.cpp
@@ -47,7 +47,7 @@
#include <kapplication.h>
#include <tqstringlist.h>
-#include <tqtextstream.h>
+#include <textstream.h>
//END
//BEGIN defines
@@ -65,10 +65,10 @@ static const int KATE_DYNAMIC_CONTEXTS_RESET_DELAY = 30 * 1000;
inline bool kateInsideString (const TQString &str, TQChar ch)
{
- const TQChar *tqunicode = str.tqunicode();
+ const TQChar *unicode = str.unicode();
const uint len = str.length();
for (uint i=0; i < len; i++)
- if (tqunicode[i] == ch)
+ if (unicode[i] == ch)
return true;
return false;
@@ -661,7 +661,7 @@ int KateHlKeyword::checkHgl(const TQString& text, int offset, int len)
if (wordLen < minLen) return 0;
- if ( dict[wordLen] && dict[wordLen]->find(TQConstString(text.tqunicode() + offset, wordLen).string()) )
+ if ( dict[wordLen] && dict[wordLen]->find(TQConstString(text.unicode() + offset, wordLen).string()) )
return offset2;
return 0;
@@ -815,7 +815,7 @@ int KateHlCOct::checkHgl(const TQString& text, int offset, int len)
int offset2 = offset;
- while ((len > 0) && (text.tqat(offset2) >= TQChar('0') && text.tqat(offset2) <= TQChar('7')))
+ while ((len > 0) && (text.at(offset2) >= TQChar('0') && text.at(offset2) <= TQChar('7')))
{
offset2++;
len--;
@@ -958,7 +958,7 @@ int KateHlRegExpr::checkHgl(const TQString& text, int offset, int /*len*/)
TQStringList *KateHlRegExpr::capturedTexts()
{
- return new TQStringList(Expr->tqcapturedTexts());
+ return new TQStringList(Expr->capturedTexts());
}
KateHlItem *KateHlRegExpr::clone(const TQStringList *args)
@@ -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) && (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++)
+ for (i = 0; (len > 0) && (i < 2) && (static_cast<const char>(text.at(offset)) >= '0' && static_cast<const char>(text.at(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) && (static_cast<const char>(text.tqat(offset)) >= '0' && static_cast<const char>(text.tqat(offset)) <= '7'); i++)
+ for (i = 0; (len > 0) && (i < 3) && (static_cast<const char>(text.at(offset)) >= '0' && static_cast<const char>(text.at(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.tqat(i)->name == buildPrefix+name)
+ if (iDl.at(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.tqat(z);
- KateAttribute n = *defaultStyleList.tqat(itemData->defStyleNum);
+ KateHlItemData *itemData = itemDataList.at(z);
+ KateAttribute n = *defaultStyleList.at(itemData->defStyleNum);
if (itemData && itemData->isSomethingSet())
n += *itemData;
- array->tqat(z) = n;
+ array->at(z) = n;
}
}
}
@@ -2924,13 +2924,13 @@ TQMemArray<KateAttribute> *KateHighlighting::attributes (uint schema)
for (uint z = 0; z < nAttribs; z++)
{
- KateHlItemData *itemData = itemDataList.tqat(z);
- KateAttribute n = *defaultStyleList.tqat(itemData->defStyleNum);
+ KateHlItemData *itemData = itemDataList.at(z);
+ KateAttribute n = *defaultStyleList.at(itemData->defStyleNum);
if (itemData && itemData->isSomethingSet())
n += *itemData;
- array->tqat(z) = n;
+ array->at(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.tqat(z)));
+ outlist.append (new KateHlItemData (*itemDataList.at(z)));
}
//END
@@ -2974,7 +2974,7 @@ KateHlManager::KateHlManager()
if (insert == hlList.count())
break;
- if ( TQString(hlList.tqat(insert)->section() + hlList.tqat(insert)->nameTranslated()).lower()
+ if ( TQString(hlList.at(insert)->section() + hlList.at(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.tqat(n);
+ return hlList.at(n);
}
int KateHlManager::nameFind(const TQString &name)
{
int z (hlList.count() - 1);
for (; z > 0; z--)
- if (hlList.tqat(z)->name() == name)
+ if (hlList.at(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.tqat(z);
+ KateAttribute *i = list.at(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.tqat(z);
+ KateAttribute *i = list.at(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.tqat(n)->name();
+ return hlList.at(n)->name();
}
TQString KateHlManager::hlNameTranslated(int n)
{
- return hlList.tqat(n)->nameTranslated();
+ return hlList.at(n)->nameTranslated();
}
TQString KateHlManager::hlSection(int n)
{
- return hlList.tqat(n)->section();
+ return hlList.at(n)->section();
}
bool KateHlManager::hlHidden(int n)
{
- return hlList.tqat(n)->hidden();
+ return hlList.at(n)->hidden();
}
TQString KateHlManager::identifierForName(const TQString& name)
@@ -3433,7 +3433,7 @@ void KateViewHighlightAction::slotAboutToShow()
int m = subMenusName.findIndex (hlSection);
names << hlName;
- subMenus.tqat(m)->insertItem ( '&' + hlName, this, TQT_SLOT(setHl(int)), 0, z);
+ subMenus.at(m)->insertItem ( '&' + hlName, this, TQT_SLOT(setHl(int)), 0, z);
}
else if (names.contains(hlName) < 1)
{
@@ -3447,16 +3447,16 @@ void KateViewHighlightAction::slotAboutToShow()
for (uint i=0;i<subMenus.count();i++)
{
- for (uint i2=0;i2<subMenus.tqat(i)->count();i2++)
+ for (uint i2=0;i2<subMenus.at(i)->count();i2++)
{
- subMenus.tqat(i)->setItemChecked(subMenus.tqat(i)->idAt(i2),false);
+ subMenus.at(i)->setItemChecked(subMenus.at(i)->idAt(i2),false);
}
}
popupMenu()->setItemChecked (0, false);
int i = subMenusName.findIndex (KateHlManager::self()->hlSection(doc->hlMode()));
- if (i >= 0 && subMenus.tqat(i))
- subMenus.tqat(i)->setItemChecked (doc->hlMode(), true);
+ if (i >= 0 && subMenus.at(i))
+ subMenus.at(i)->setItemChecked (doc->hlMode(), true);
else
popupMenu()->setItemChecked (0, true);
}
diff --git a/kate/part/katejscript.cpp b/kate/part/katejscript.cpp
index 615adab01..dda470037 100644
--- a/kate/part/katejscript.cpp
+++ b/kate/part/katejscript.cpp
@@ -47,7 +47,7 @@
#include <tqfileinfo.h>
#include <tqpopupmenu.h>
#include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
namespace KJS {
@@ -62,7 +62,7 @@ UString::UString(const TQString &d)
{
unsigned int len = d.length();
UChar *dat = new UChar[len];
- memcpy(dat, d.tqunicode(), len * sizeof(UChar));
+ memcpy(dat, d.unicode(), len * sizeof(UChar));
rep = UString::Rep::create(dat, len);
}
@@ -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().tqat(0), args[1].toUInt32(exec) ) );
+ return KJS::Boolean( doc->highlight()->isInWord( args[0].toString(exec).qstring().at(0), args[1].toUInt32(exec) ) );
case KateJSDocument::CanBreakAt:
- return KJS::Boolean( doc->highlight()->canBreakAt( args[0].toString(exec).qstring().tqat(0), args[1].toUInt32(exec) ) );
+ return KJS::Boolean( doc->highlight()->canBreakAt( args[0].toString(exec).qstring().at(0), args[1].toUInt32(exec) ) );
case KateJSDocument::CanComment:
return KJS::Boolean( doc->highlight()->canComment( args[0].toUInt32(exec), args[1].toUInt32(exec) ) );
@@ -1135,7 +1135,7 @@ void KateIndentJScriptManager::parseScriptHeader(const TQString &filePath,
if (currentState==NOTHING)
{
if (keyValue.exactMatch(line)) {
- TQStringList sl=keyValue.tqcapturedTexts();
+ TQStringList sl=keyValue.capturedTexts();
kdDebug(13050)<<"key:"<<sl[1]<<endl<<"value:"<<sl[2]<<endl;
kdDebug(13050)<<"key-length:"<<sl[1].length()<<endl<<"value-length:"<<sl[2].length()<<endl;
TQString key=sl[1];
diff --git a/kate/part/kateprinter.cpp b/kate/part/kateprinter.cpp
index 925c99e1a..b6847dcc5 100644
--- a/kate/part/kateprinter.cpp
+++ b/kate/part/kateprinter.cpp
@@ -48,7 +48,7 @@
#include <tqgroupbox.h>
#include <tqhbox.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlineedit.h>
#include <tqspinbox.h>
#include <tqstringlist.h>
@@ -184,7 +184,7 @@ bool KatePrinter::print (KateDocument *doc)
// This retrieves all tags, ued or not, but
// none of theese operations should be expensive,
// and searcing each tag in the format strings is avoided.
- TQDateTime dt = TQDateTime::tqcurrentDateTime();
+ TQDateTime dt = TQDateTime::currentDateTime();
TQMap<TQString,TQString> tags;
KUser u (KUser::UseRealUserID);
@@ -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.tqat(0)->textColor() );
+ paint.setPen( _dsList.at(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 143d24f6d..48b73d7e5 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->tqat(pos);
+ return &m_attributes->at(pos);
- return &m_attributes->tqat(0);
+ return &m_attributes->at(0);
}
void KateRenderer::setDrawCaret(bool drawCaret)
@@ -537,13 +537,13 @@ void KateRenderer::paintTextLine(TQPainter& paint, const KateLineRange* range, i
if (isIMSel && !isTab)
{
// input method selection
- fillColor = m_view->tqcolorGroup().color(TQColorGroup::Foreground);
+ fillColor = m_view->colorGroup().color(TQColorGroup::Foreground);
}
else if (isIMEdit && !isTab)
{
// XIM support
// input method edit area
- const TQColorGroup& cg = m_view->tqcolorGroup();
+ const TQColorGroup& cg = m_view->colorGroup();
int h1, s1, v1, h2, s2, v2;
TQColor(cg.color( TQColorGroup::Base )).hsv( &h1, &s1, &v1 );
TQColor(cg.color( TQColorGroup::Background )).hsv( &h2, &s2, &v2 );
@@ -576,7 +576,7 @@ void KateRenderer::paintTextLine(TQPainter& paint, const KateLineRange* range, i
if (isIMSel && paintBackground && !isTab)
{
paint.save();
- paint.setPen( m_view->tqcolorGroup().color( TQColorGroup::BrightText ) );
+ paint.setPen( m_view->colorGroup().color( TQColorGroup::BrightText ) );
}
// Draw indentation markers.
@@ -745,7 +745,7 @@ uint KateRenderer::textWidth(const KateTextLine::Ptr &textLine, int cursorCol)
KateFontStruct *fs = config()->fontStruct();
- const TQChar *tqunicode = textLine->text();
+ const TQChar *unicode = textLine->text();
const TQString &textString = textLine->string();
int x = 0;
@@ -763,7 +763,7 @@ uint KateRenderer::textWidth(const KateTextLine::Ptr &textLine, int cursorCol)
x += width;
- if (z < len && tqunicode[z] == TQChar('\t'))
+ if (z < len && unicode[z] == TQChar('\t'))
x -= x % width;
}
@@ -787,7 +787,7 @@ uint KateRenderer::textWidth(const KateTextLine::Ptr &textLine, uint startcol, u
*needWrap = false;
const uint len = textLine->length();
- const TQChar *tqunicode = textLine->text();
+ const TQChar *unicode = textLine->text();
const TQString &textString = textLine->string();
uint z = startcol;
@@ -800,10 +800,10 @@ uint KateRenderer::textWidth(const KateTextLine::Ptr &textLine, uint startcol, u
// How should tabs be treated when they word-wrap on a print-out?
// if startcol != 0, this messes up (then again, word wrapping messes up anyway)
- if (tqunicode[z] == TQChar('\t'))
+ if (unicode[z] == TQChar('\t'))
x -= x % width;
- if (tqunicode[z].isSpace())
+ if (unicode[z].isSpace())
{
lastWhiteSpace = z+1;
lastWhiteSpaceX = x;
@@ -887,7 +887,7 @@ uint KateRenderer::textWidth( KateTextCursor &cursor, int xPos, uint startCol)
if (!textLine) return 0;
const uint len = textLine->length();
- const TQChar *tqunicode = textLine->text();
+ const TQChar *unicode = textLine->text();
const TQString &textString = textLine->string();
x = oldX = 0;
@@ -906,7 +906,7 @@ uint KateRenderer::textWidth( KateTextCursor &cursor, int xPos, uint startCol)
x += width;
- if (z < len && tqunicode[z] == TQChar('\t'))
+ if (z < len && unicode[z] == TQChar('\t'))
x -= x % width;
z++;
diff --git a/kate/part/kateschema.cpp b/kate/part/kateschema.cpp
index 704e2776c..f4f0c5526 100644
--- a/kate/part/kateschema.cpp
+++ b/kate/part/kateschema.cpp
@@ -49,8 +49,8 @@
#include <tqgrid.h>
#include <tqgroupbox.h>
#include <tqlabel.h>
-#include <tqtextcodec.h>
-#include <tqlayout.h>
+#include <textcodec.h>
+#include <layout.h>
#include <tqlineedit.h>
#include <tqheader.h>
#include <tqlistbox.h>
@@ -643,14 +643,14 @@ void KateSchemaConfigFontColorTab::schemaChanged (uint schema)
p.setColor( TQColorGroup::Highlight,
KateFactory::self()->schemaManager()->schema(schema)->
readColorEntry( "Color Selection", &_c ) );
- _c = l->tqat(0)->textColor(); // not quite as much of an assumption ;)
+ _c = l->at(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->tqat( i ) );
+ new KateStyleListItem( m_defaultStyles, KateHlManager::self()->defaultStyleName(i, true), l->at( 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->tqat(0)->textColor(); // not quite as much of an assumption ;)
+ _c = l->at(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->tqat(itemData->defStyleNum), itemData );
+ new KateStyleListItem( parent, name, l->at(itemData->defStyleNum), itemData );
} else {
- new KateStyleListItem( m_styles, itemData->name, l->tqat(itemData->defStyleNum), itemData );
+ new KateStyleListItem( m_styles, itemData->name, l->at(itemData->defStyleNum), itemData );
}
}
}
@@ -1088,9 +1088,9 @@ void KateStyleListView::showPopupMenu( KateStyleListItem *i, const TQPoint &glob
TQPixmap scl(16,16);
scl.fill( i->style()->selectedTextColor() );
TQPixmap bgcl(16,16);
- bgcl.fill( i->style()->itemSet(KateAttribute::BGColor) ? i->style()->bgColor() : viewport()->tqcolorGroup().base() );
+ bgcl.fill( i->style()->itemSet(KateAttribute::BGColor) ? i->style()->bgColor() : viewport()->colorGroup().base() );
TQPixmap sbgcl(16,16);
- sbgcl.fill( i->style()->itemSet(KateAttribute::SelectedBGColor) ? i->style()->selectedBGColor() : viewport()->tqcolorGroup().base() );
+ sbgcl.fill( i->style()->itemSet(KateAttribute::SelectedBGColor) ? i->style()->selectedBGColor() : viewport()->colorGroup().base() );
if ( showtitle )
m.insertTitle( i->contextName(), KateStyleListItem::ContextName );
@@ -1156,7 +1156,7 @@ void KateStyleListView::slotMousePressed(int btn, TQListViewItem* i, const TQPoi
if ( dynamic_cast<KateStyleListItem*>(i) ) {
if ( btn == Qt::LeftButton && c > 0 ) {
// map pos to item/column and call KateStyleListItem::activate(col, pos)
- ((KateStyleListItem*)i)->activate( c, viewport()->mapFromGlobal( pos ) - TQPoint( 0, tqitemRect(i).top() ) );
+ ((KateStyleListItem*)i)->activate( c, viewport()->mapFromGlobal( pos ) - TQPoint( 0, itemRect(i).top() ) );
}
}
}
@@ -1357,7 +1357,7 @@ void KateStyleListItem::toggleDefStyle()
delete is;
is = new KateAttribute( *ds );
updateStyle();
- tqrepaint();
+ repaint();
}
}
@@ -1441,7 +1441,7 @@ void KateStyleListItem::setColor( int column )
break;
}
- tqrepaint();
+ repaint();
}
void KateStyleListItem::unsetColor( int c )
@@ -1465,7 +1465,7 @@ void KateStyleListItem::paintCell( TQPainter *p, const TQColorGroup& /*cg*/, int
Q_ASSERT( lv ); //###
// use a private color group and set the text/highlighted text colors
- TQColorGroup mcg = lv->viewport()->tqcolorGroup();
+ TQColorGroup mcg = lv->viewport()->colorGroup();
if ( col ) // col 0 is drawn by the superclass method
p->fillRect( 0, 0, width, height(), TQBrush( mcg.base() ) );
@@ -1602,7 +1602,7 @@ void KateStyleListCaption::paintCell( TQPainter *p, const TQColorGroup& /*cg*/,
Q_ASSERT( lv ); //###
// use the same colorgroup as the other items in the viewport
- TQColorGroup mcg = lv->viewport()->tqcolorGroup();
+ TQColorGroup mcg = lv->viewport()->colorGroup();
TQListViewItem::paintCell( p, mcg, col, width, align );
}
diff --git a/kate/part/katesearch.cpp b/kate/part/katesearch.cpp
index 5b3629347..57b8b1e9e 100644
--- a/kate/part/katesearch.cpp
+++ b/kate/part/katesearch.cpp
@@ -40,7 +40,7 @@
#include <kreplacedialog.h>
#include <kpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
//BEGIN KateSearch
@@ -386,7 +386,7 @@ void KateSearch::replaceOne()
int ncaps = m_re.numCaptures();
while ( pos >= 0 ) {
TQString substitute;
- TQChar argument = TQString(br.cap(1)).tqat(0);
+ TQChar argument = TQString(br.cap(1)).at(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 ).tqat( foundCol - 1 ) ) ) &&
+ ! doc()->highlight()->isInWord( doc()->textLine( foundLine ).at( foundCol - 1 ) ) ) &&
( foundCol + matchLen == doc()->lineLength( foundLine ) ||
- ! doc()->highlight()->isInWord( doc()->textLine( foundLine ).tqat( foundCol + matchLen ) ) )
+ ! doc()->highlight()->isInWord( doc()->textLine( foundLine ).at( foundCol + matchLen ) ) )
);
if ( found )
{
diff --git a/kate/part/katetemplatehandler.cpp b/kate/part/katetemplatehandler.cpp
index e9124e77f..52e07a2e4 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.tqat( colInText ) == '\n' )
+ if ( insertString.at( colInText ) == '\n' )
{
col = 0;
line++;
@@ -216,7 +216,7 @@ void KateTemplateHandler::slotTextInserted( int line, int col )
if ( !m_currentRange ) return ;
- KateTemplatePlaceHolder *ph = m_tabOrder.tqat( m_currentTabStop );
+ KateTemplatePlaceHolder *ph = m_tabOrder.at( 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.tqat( i );
+ KateTemplatePlaceHolder *ph = m_tabOrder.at( 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.tqat( m_currentTabStop ) ->ranges.tqat( 0 );
+ m_currentRange = m_tabOrder.at( m_currentTabStop ) ->ranges.at( 0 );
- if ( m_tabOrder.tqat( m_currentTabStop ) ->isInitialValue )
+ if ( m_tabOrder.at( m_currentTabStop ) ->isInitialValue )
{
m_doc->activeView()->setSelection( m_currentRange->start(), m_currentRange->end() );
}
diff --git a/kate/part/katetextline.cpp b/kate/part/katetextline.cpp
index dbb827003..6c701e1ed 100644
--- a/kate/part/katetextline.cpp
+++ b/kate/part/katetextline.cpp
@@ -110,11 +110,11 @@ void KateTextLine::truncate(uint newLen)
int KateTextLine::nextNonSpaceChar(uint pos) const
{
const uint len = m_text.length();
- const TQChar *tqunicode = m_text.tqunicode();
+ const TQChar *unicode = m_text.unicode();
for(uint i = pos; i < len; i++)
{
- if(!tqunicode[i].isSpace())
+ if(!unicode[i].isSpace())
return i;
}
@@ -128,11 +128,11 @@ int KateTextLine::previousNonSpaceChar(uint pos) const
if (pos >= (uint)len)
pos = len - 1;
- const TQChar *tqunicode = m_text.tqunicode();
+ const TQChar *unicode = m_text.unicode();
for(int i = pos; i >= 0; i--)
{
- if(!tqunicode[i].isSpace())
+ if(!unicode[i].isSpace())
return i;
}
@@ -152,20 +152,20 @@ int KateTextLine::lastChar() const
const TQChar *KateTextLine::firstNonSpace() const
{
int first = firstChar();
- return (first > -1) ? ((TQChar*)m_text.tqunicode())+first : m_text.tqunicode();
+ return (first > -1) ? ((TQChar*)m_text.unicode())+first : m_text.unicode();
}
uint KateTextLine::indentDepth (uint tabwidth) const
{
uint d = 0;
const uint len = m_text.length();
- const TQChar *tqunicode = m_text.tqunicode();
+ const TQChar *unicode = m_text.unicode();
for(uint i = 0; i < len; i++)
{
- if(tqunicode[i].isSpace())
+ if(unicode[i].isSpace())
{
- if (tqunicode[i] == TQChar('\t'))
+ if (unicode[i] == TQChar('\t'))
d += tabwidth - (d % tabwidth);
else
d++;
@@ -189,11 +189,11 @@ bool KateTextLine::stringAtPos(uint pos, const TQString& match) const
// overflow again which (pos+matchlen > len) does not catch; see bugs #129263 and #129580
Q_ASSERT(pos < len);
- const TQChar *tqunicode = m_text.tqunicode();
- const TQChar *matchUnicode = match.tqunicode();
+ const TQChar *unicode = m_text.unicode();
+ const TQChar *matchUnicode = match.unicode();
for (uint i=0; i < matchlen; i++)
- if (tqunicode[i+pos] != matchUnicode[i])
+ if (unicode[i+pos] != matchUnicode[i])
return false;
return true;
@@ -206,11 +206,11 @@ bool KateTextLine::startingWith(const TQString& match) const
if (matchlen > m_text.length())
return false;
- const TQChar *tqunicode = m_text.tqunicode();
- const TQChar *matchUnicode = match.tqunicode();
+ const TQChar *unicode = m_text.unicode();
+ const TQChar *matchUnicode = match.unicode();
for (uint i=0; i < matchlen; i++)
- if (tqunicode[i] != matchUnicode[i])
+ if (unicode[i] != matchUnicode[i])
return false;
return true;
@@ -223,12 +223,12 @@ bool KateTextLine::endingWith(const TQString& match) const
if (matchlen > m_text.length())
return false;
- const TQChar *tqunicode = m_text.tqunicode();
- const TQChar *matchUnicode = match.tqunicode();
+ const TQChar *unicode = m_text.unicode();
+ const TQChar *matchUnicode = match.unicode();
uint start = m_text.length() - matchlen;
for (uint i=0; i < matchlen; i++)
- if (tqunicode[start+i] != matchUnicode[i])
+ if (unicode[start+i] != matchUnicode[i])
return false;
return true;
@@ -239,11 +239,11 @@ int KateTextLine::cursorX(uint pos, uint tabChars) const
uint x = 0;
const uint n = kMin (pos, (uint)m_text.length());
- const TQChar *tqunicode = m_text.tqunicode();
+ const TQChar *unicode = m_text.unicode();
for ( uint z = 0; z < n; z++)
{
- if (tqunicode[z] == TQChar('\t'))
+ if (unicode[z] == TQChar('\t'))
x += tabChars - (x % tabChars);
else
x++;
@@ -257,11 +257,11 @@ uint KateTextLine::lengthWithTabs (uint tabChars) const
{
uint x = 0;
const uint len = m_text.length();
- const TQChar *tqunicode = m_text.tqunicode();
+ const TQChar *unicode = m_text.unicode();
for ( uint z = 0; z < len; z++)
{
- if (tqunicode[z] == TQChar('\t'))
+ if (unicode[z] == TQChar('\t'))
x += tabChars - (x % tabChars);
else
x++;
@@ -346,7 +346,7 @@ char *KateTextLine::dump (char *buf, bool withHighlighting) const
memcpy(buf, &l, sizeof(uint));
buf += sizeof(uint);
- memcpy(buf, (char *) m_text.tqunicode(), sizeof(TQChar)*l);
+ memcpy(buf, (char *) m_text.unicode(), sizeof(TQChar)*l);
buf += sizeof(TQChar) * l;
if (!withHighlighting)
diff --git a/kate/part/katetextline.h b/kate/part/katetextline.h
index 84df82908..3922d04d0 100644
--- a/kate/part/katetextline.h
+++ b/kate/part/katetextline.h
@@ -145,10 +145,10 @@ class KateTextLine : public KShared
inline TQChar getChar (uint pos) const { return m_text[pos]; }
/**
- * Gets the text as a tqunicode representation
+ * Gets the text as a unicode representation
* @return text of this line as TQChar array
*/
- inline const TQChar *text() const { return m_text.tqunicode(); }
+ inline const TQChar *text() const { return m_text.unicode(); }
/**
* Highlighting array
@@ -419,7 +419,7 @@ class KateTextLine : public KShared
*/
private:
/**
- * text of line as tqunicode
+ * text of line as unicode
*/
TQString m_text;
diff --git a/kate/part/kateundo.cpp b/kate/part/kateundo.cpp
index 81901d9f8..379df16f0 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.tqat(z)->type() != KateUndoGroup::editMarkLineAutoWrapped)
+ if (m_items.at(z)->type() != KateUndoGroup::editMarkLineAutoWrapped)
{
- m_doc->activeView()->editSetCursor (m_items.tqat(z)->cursorBefore());
+ m_doc->activeView()->editSetCursor (m_items.at(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.tqat(z)->type() != KateUndoGroup::editMarkLineAutoWrapped)
+ if (m_items.at(z)->type() != KateUndoGroup::editMarkLineAutoWrapped)
{
- m_doc->activeView()->editSetCursor (m_items.tqat(z)->cursorAfter());
+ m_doc->activeView()->editSetCursor (m_items.at(z)->cursorAfter());
break;
}
}
diff --git a/kate/part/kateview.cpp b/kate/part/kateview.cpp
index a0310ecb5..8acad1f26 100644
--- a/kate/part/kateview.cpp
+++ b/kate/part/kateview.cpp
@@ -76,9 +76,9 @@
#include <tqstyle.h>
#include <tqevent.h>
#include <tqpopupmenu.h>
-#include <tqlayout.h>
-#include <tqclipboard.h>
-#include <tqstylesheet.h>
+#include <layout.h>
+#include <clipboard.h>
+#include <stylesheet.h>
//END includes
KateView::KateView( KateDocument *doc, TQWidget *parent, const char * name )
@@ -793,7 +793,7 @@ void KateView::contextMenuEvent( TQContextMenuEvent *ev )
if ( !m_doc || !m_doc->browserExtension() )
return;
emit m_doc->browserExtension()->popupMenu( /*this, */ev->globalPos(), m_doc->url(),
- TQString::tqfromLatin1( "text/plain" ) );
+ TQString::fromLatin1( "text/plain" ) );
ev->accept();
}
@@ -1233,11 +1233,11 @@ void KateView::updateRendererConfig()
// update the text area
m_viewInternal->updateView (true);
- m_viewInternal->tqrepaint ();
+ m_viewInternal->repaint ();
// update the left border right, for example linenumbers
m_viewInternal->leftBorder->updateFont();
- m_viewInternal->leftBorder->tqrepaint ();
+ m_viewInternal->leftBorder->repaint ();
// @@ showIndentLines is not cached anymore.
// m_renderer->setShowIndentLines (m_renderer->config()->showIndentationLines());
@@ -1596,7 +1596,7 @@ void KateView::paste()
{
m_doc->paste( this );
emit selectionChanged();
- m_viewInternal->tqrepaint();
+ m_viewInternal->repaint();
}
void KateView::cut()
@@ -1613,7 +1613,7 @@ void KateView::copy() const
if (!hasSelection())
return;
- TQApplication::tqclipboard()->setText(selection ());
+ TQApplication::clipboard()->setText(selection ());
}
void KateView::copyHTML()
@@ -1629,7 +1629,7 @@ void KateView::copyHTML()
drag->addDragObject( htmltextdrag);
drag->addDragObject( new TQTextDrag( selection()));
- TQApplication::tqclipboard()->setData(drag);
+ TQApplication::clipboard()->setData(drag);
}
TQString KateView::selectionAsHtml()
diff --git a/kate/part/kateviewhelpers.cpp b/kate/part/kateviewhelpers.cpp
index 2b717d5cd..d4b47ccc9 100644
--- a/kate/part/kateviewhelpers.cpp
+++ b/kate/part/kateviewhelpers.cpp
@@ -47,7 +47,7 @@
#include <tqtimer.h>
#include <tqwhatsthis.h>
#include <tqregexp.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
#include <math.h>
diff --git a/kate/part/kateviewinternal.cpp b/kate/part/kateviewinternal.cpp
index 831866ef0..33e0826f8 100644
--- a/kate/part/kateviewinternal.cpp
+++ b/kate/part/kateviewinternal.cpp
@@ -46,8 +46,8 @@
#include <tqpopupmenu.h>
#include <tqdropsite.h>
#include <tqpainter.h>
-#include <tqlayout.h>
-#include <tqclipboard.h>
+#include <layout.h>
+#include <clipboard.h>
#include <tqpixmap.h>
#include <tqvbox.h>
@@ -89,7 +89,7 @@ KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc)
// cursor
cursor.setMoveOnInsert (true);
- // tqinvalidate selStartCached, or keyb selection is screwed initially
+ // invalidate selStartCached, or keyb selection is screwed initially
selStartCached.setLine( -1 );
//
// scrollbar for lines
@@ -2649,9 +2649,9 @@ void KateViewInternal::keyReleaseEvent( TQKeyEvent* e )
if (m_selChangedByUser)
{
- TQApplication::tqclipboard()->setSelectionMode( true );
+ TQApplication::clipboard()->setSelectionMode( true );
m_view->copy();
- TQApplication::tqclipboard()->setSelectionMode( false );
+ TQApplication::clipboard()->setSelectionMode( false );
m_selChangedByUser = false;
}
@@ -2711,9 +2711,9 @@ void KateViewInternal::mousePressEvent( TQMouseEvent* e )
m_view->selectLine( cursor );
}
- TQApplication::tqclipboard()->setSelectionMode( true );
+ TQApplication::clipboard()->setSelectionMode( true );
m_view->copy();
- TQApplication::tqclipboard()->setSelectionMode( false );
+ TQApplication::clipboard()->setSelectionMode( false );
// Keep the line at the select anchor selected during further
// mouse selection
@@ -2759,7 +2759,7 @@ void KateViewInternal::mousePressEvent( TQMouseEvent* e )
}
else
{
- selStartCached.setLine( -1 ); // tqinvalidate
+ selStartCached.setLine( -1 ); // invalidate
}
if( !( e->state() & TQt::ShiftButton ) && isTargetSelected( e->pos() ) )
@@ -2889,9 +2889,9 @@ void KateViewInternal::mouseDoubleClickEvent(TQMouseEvent *e)
// Move cursor to end (or beginning) of selected word
if (m_view->hasSelection())
{
- TQApplication::tqclipboard()->setSelectionMode( true );
+ TQApplication::clipboard()->setSelectionMode( true );
m_view->copy();
- TQApplication::tqclipboard()->setSelectionMode( false );
+ TQApplication::clipboard()->setSelectionMode( false );
// Shift+DC before the "cached" word should move the cursor to the
// beginning of the selection, not the end
@@ -2933,9 +2933,9 @@ void KateViewInternal::mouseReleaseEvent( TQMouseEvent* e )
if (m_selChangedByUser)
{
- TQApplication::tqclipboard()->setSelectionMode( true );
+ TQApplication::clipboard()->setSelectionMode( true );
m_view->copy();
- TQApplication::tqclipboard()->setSelectionMode( false );
+ TQApplication::clipboard()->setSelectionMode( false );
// Set cursor to edge of selection... which edge depends on what
// "direction" the selection was made in
if ( m_view->selectStart < selectAnchor )
@@ -2961,9 +2961,9 @@ void KateViewInternal::mouseReleaseEvent( TQMouseEvent* e )
if( m_doc->isReadWrite() )
{
- TQApplication::tqclipboard()->setSelectionMode( true );
+ TQApplication::clipboard()->setSelectionMode( true );
m_view->paste ();
- TQApplication::tqclipboard()->setSelectionMode( false );
+ TQApplication::clipboard()->setSelectionMode( false );
}
e->accept ();
diff --git a/kate/part/kateviewinternal.h b/kate/part/kateviewinternal.h
index 0d706ffc3..4dbc08bf8 100644
--- a/kate/part/kateviewinternal.h
+++ b/kate/part/kateviewinternal.h
@@ -222,7 +222,7 @@ class KateViewInternal : public TQWidget
int scrollX;
int scrollY;
- TQt::tqCursorShape m_mouseCursor;
+ TQt::CursorShape m_mouseCursor;
KateSuperCursor cursor;
KateTextCursor displayCursor;
diff --git a/kate/part/test_regression.cpp b/kate/part/test_regression.cpp
index 6d440922e..073886898 100644
--- a/kate/part/test_regression.cpp
+++ b/kate/part/test_regression.cpp
@@ -56,7 +56,7 @@
#include <tqscrollview.h>
#include <tqstring.h>
#include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqvaluelist.h>
#include <tqwidget.h>
#include <tqfileinfo.h>
@@ -871,8 +871,8 @@ static TQString makeRelativePath(const TQString &base, const TQString &path)
pos++;
int newpos = absBase.find('/', pos);
if (newpos == -1) newpos = absBase.length();
- TQConstString cmpPathComp(absPath.tqunicode() + pos, newpos - pos);
- TQConstString cmpBaseComp(absBase.tqunicode() + pos, newpos - pos);
+ TQConstString cmpPathComp(absPath.unicode() + pos, newpos - pos);
+ TQConstString cmpBaseComp(absBase.unicode() + pos, newpos - pos);
// kdDebug() << "cmpPathComp: \"" << cmpPathComp.string() << "\"" << endl;
// kdDebug() << "cmpBaseComp: \"" << cmpBaseComp.string() << "\"" << endl;
// kdDebug() << "pos: " << pos << " newpos: " << newpos << endl;
@@ -886,8 +886,8 @@ static TQString makeRelativePath(const TQString &base, const TQString &path)
TQString rel;
{
- TQConstString relBase(absBase.tqunicode() + basepos, absBase.length() - basepos);
- TQConstString relPath(absPath.tqunicode() + pathpos, absPath.length() - pathpos);
+ TQConstString relBase(absBase.unicode() + basepos, absBase.length() - basepos);
+ TQConstString relPath(absPath.unicode() + pathpos, absPath.length() - pathpos);
// generate as many .. as there are path elements in relBase
if (relBase.string().length() > 0) {
for (int i = relBase.string().contains('/'); i > 0; --i)
@@ -935,7 +935,7 @@ void RegressionTest::doFailureReport( const TQString& test, int failures )
if ( failures & ResultFailure ) {
domDiff += "<pre>";
- FILE *pipe = popen( TQString::tqfromLatin1( "diff -u baseline/%1-result %3/%2-result" )
+ FILE *pipe = popen( TQString::fromLatin1( "diff -u baseline/%1-result %3/%2-result" )
.arg ( test, test, relOutputDir ).latin1(), "r" );
TQTextIStream *is = new TQTextIStream( pipe );
for ( int line = 0; line < 100 && !is->eof(); ++line ) {
diff --git a/kate/plugins/autobookmarker/autobookmarker.cpp b/kate/plugins/autobookmarker/autobookmarker.cpp
index 3f1e7fc2a..002d7f778 100644
--- a/kate/plugins/autobookmarker/autobookmarker.cpp
+++ b/kate/plugins/autobookmarker/autobookmarker.cpp
@@ -44,7 +44,7 @@
#include <tqcheckbox.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlineedit.h>
#include <tqlistview.h>
#include <tqpopupmenu.h>
@@ -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->tqat( i );
+ AutoBookmarkEnt *e = m_ents->at( 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 df8c31cad..2dd2eb5c2 100644
--- a/kate/plugins/insertfile/insertfileplugin.cpp
+++ b/kate/plugins/insertfile/insertfileplugin.cpp
@@ -35,7 +35,7 @@
#include <kurl.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
K_EXPORT_COMPONENT_FACTORY( ktexteditor_insertfile, KGenericFactory<InsertFilePlugin>( "ktexteditor_insertfile" ) )
@@ -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.tqat(z)->parentClient() == view)
+ if (m_views.at(z)->parentClient() == view)
{
- InsertFilePluginView *nview = m_views.tqat(z);
+ InsertFilePluginView *nview = m_views.at(z);
m_views.remove (nview);
delete nview;
}
diff --git a/kate/plugins/isearch/ISearchPlugin.cpp b/kate/plugins/isearch/ISearchPlugin.cpp
index fef94b1dd..249abf9f2 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.tqat(z)->parentClient() == view)
+ if (m_views.at(z)->parentClient() == view)
{
- ISearchPluginView *nview = m_views.tqat(z);
+ ISearchPluginView *nview = m_views.at(z);
m_views.remove (nview);
delete nview;
}
diff --git a/kate/plugins/kdatatool/kate_kdatatool.cpp b/kate/plugins/kdatatool/kate_kdatatool.cpp
index 3678c26f4..e78bb4228 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.tqat(z)->parentClient() == view)
+ if (m_views.at(z)->parentClient() == view)
{
- KDataToolPluginView *nview = m_views.tqat(z);
+ KDataToolPluginView *nview = m_views.at(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.tqat(i);
+ TQChar ch = tmp_line.at(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.tqat(i);
+ TQChar ch = tmp_line.at(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 435578d6d..81af51f08 100644
--- a/kate/plugins/wordcompletion/docwordcompletion.cpp
+++ b/kate/plugins/wordcompletion/docwordcompletion.cpp
@@ -48,7 +48,7 @@
#include <tqdict.h>
#include <tqspinbox.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqhbox.h>
#include <tqwhatsthis.h>
#include <tqcheckbox.h>
@@ -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.tqat(z)->parentClient() == view)
+ if (m_views.at(z)->parentClient() == view)
{
- DocWordCompletionPluginView *nview = m_views.tqat(z);
+ DocWordCompletionPluginView *nview = m_views.at(z);
m_views.remove (nview);
delete nview;
}