summaryrefslogtreecommitdiffstats
path: root/kate
diff options
context:
space:
mode:
Diffstat (limited to 'kate')
-rw-r--r--kate/part/kateautoindent.cpp14
-rw-r--r--kate/part/katecmds.cpp8
-rw-r--r--kate/part/katecodecompletion.cpp2
-rw-r--r--kate/part/kateconfig.cpp2
-rw-r--r--kate/part/katedocument.cpp4
-rw-r--r--kate/part/katehighlight.cpp2
-rw-r--r--kate/part/katejscript.cpp2
-rw-r--r--kate/part/kateprinter.cpp2
-rw-r--r--kate/part/katerenderer.cpp6
-rw-r--r--kate/part/kateschema.cpp10
-rw-r--r--kate/part/kateview.cpp2
-rw-r--r--kate/part/kateviewinternal.h2
-rw-r--r--kate/part/test_regression.cpp2
13 files changed, 29 insertions, 29 deletions
diff --git a/kate/part/kateautoindent.cpp b/kate/part/kateautoindent.cpp
index 0aabde874..4d36f5918 100644
--- a/kate/part/kateautoindent.cpp
+++ b/kate/part/kateautoindent.cpp
@@ -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;
}
@@ -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;
}
}
diff --git a/kate/part/katecmds.cpp b/kate/part/katecmds.cpp
index d4879cfda..b519994f7 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();
@@ -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/katecodecompletion.cpp b/kate/part/katecodecompletion.cpp
index 1bff647f6..892a1d429 100644
--- a/kate/part/katecodecompletion.cpp
+++ b/kate/part/katecodecompletion.cpp
@@ -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/kateconfig.cpp b/kate/part/kateconfig.cpp
index 5bfe55fbc..9921fe605 100644
--- a/kate/part/kateconfig.cpp
+++ b/kate/part/kateconfig.cpp
@@ -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
diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp
index 938758852..b2ec1b411 100644
--- a/kate/part/katedocument.cpp
+++ b/kate/part/katedocument.cpp
@@ -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 );
@@ -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);
diff --git a/kate/part/katehighlight.cpp b/kate/part/katehighlight.cpp
index 7f5bcc882..1b7a4d7c3 100644
--- a/kate/part/katehighlight.cpp
+++ b/kate/part/katehighlight.cpp
@@ -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)
diff --git a/kate/part/katejscript.cpp b/kate/part/katejscript.cpp
index 615adab01..8a7731f76 100644
--- a/kate/part/katejscript.cpp
+++ b/kate/part/katejscript.cpp
@@ -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..d1c44fdca 100644
--- a/kate/part/kateprinter.cpp
+++ b/kate/part/kateprinter.cpp
@@ -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);
diff --git a/kate/part/katerenderer.cpp b/kate/part/katerenderer.cpp
index 143d24f6d..cbed7de67 100644
--- a/kate/part/katerenderer.cpp
+++ b/kate/part/katerenderer.cpp
@@ -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.
diff --git a/kate/part/kateschema.cpp b/kate/part/kateschema.cpp
index 704e2776c..1a83df6d2 100644
--- a/kate/part/kateschema.cpp
+++ b/kate/part/kateschema.cpp
@@ -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() ) );
}
}
}
@@ -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/kateview.cpp b/kate/part/kateview.cpp
index a0310ecb5..232c51b6e 100644
--- a/kate/part/kateview.cpp
+++ b/kate/part/kateview.cpp
@@ -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();
}
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..258c5a913 100644
--- a/kate/part/test_regression.cpp
+++ b/kate/part/test_regression.cpp
@@ -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 ) {