From f78838f2f736acc2b235d8b680f3379a07a6d372 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Mon, 19 Dec 2011 11:59:34 -0600
Subject: Remove additional unneeded tq method conversions

---
 cervisia/annotatectl.cpp         |  2 +-
 cervisia/cervisia.1.in           |  8 +++---
 cervisia/cervisia.pod            |  6 ++---
 cervisia/cervisiapart.cpp        |  4 +--
 cervisia/diffdlg.cpp             | 24 ++++++++---------
 cervisia/diffview.cpp            |  2 +-
 cervisia/logdlg.cpp              |  2 +-
 cervisia/logplainview.cpp        |  6 ++---
 cervisia/logtree.cpp             |  2 +-
 cervisia/misc.cpp                |  2 +-
 cervisia/protocolview.cpp        |  6 ++---
 cervisia/qttableview.cpp         | 56 ++++++++++++++++++++--------------------
 cervisia/qttableview.h           | 14 +++++-----
 cervisia/resolvedlg.cpp          | 20 +++++++-------
 cervisia/settingsdlg.cpp         |  2 +-
 cervisia/updateview_items.cpp    |  4 +--
 cervisia/updateview_items.h      |  2 +-
 cervisia/updateview_visitors.cpp |  2 +-
 18 files changed, 82 insertions(+), 82 deletions(-)

(limited to 'cervisia')

diff --git a/cervisia/annotatectl.cpp b/cervisia/annotatectl.cpp
index 09d0cef0..1f220342 100644
--- a/cervisia/annotatectl.cpp
+++ b/cervisia/annotatectl.cpp
@@ -79,7 +79,7 @@ void AnnotateController::showDialog(const TQString& fileName, const TQString& re
     // hide progress dialog
     delete d->progress; d->progress = 0;
 
-    d->dialog->setCaption(i18n("CVS Annotate: %1").tqarg(fileName));
+    d->dialog->setCaption(i18n("CVS Annotate: %1").arg(fileName));
     d->dialog->show();
 }
 
diff --git a/cervisia/cervisia.1.in b/cervisia/cervisia.1.in
index 3a0c720a..b60c2f3c 100644
--- a/cervisia/cervisia.1.in
+++ b/cervisia/cervisia.1.in
@@ -144,7 +144,7 @@ Cervisia \- Graphical CVS frontend
          [\ \fB\-\-nocrashhandler\fR\ ]
          [\ \fB\-\-waitforwm\fR\ ]
          [\ \fB\-\-style\fR\ \fIstyle\fR\ ]
-         [\ \fB\-\-tqgeometry\fR\ \fItqgeometry\fR\ ]
+         [\ \fB\-\-geometry\fR\ \fIgeometry\fR\ ]
          [\ \fB\-\-resolve\fR\ \fIfilename\fR\ ]
          [\ \fB\-\-log\fR\ \fIfilename\fR\ ]
          [\ \fB\-\-annotate\fR\ \fIfilename\fR\ ]
@@ -193,9 +193,9 @@ Waits for a \s-1WM_NET\s0 compatible windowmanager
 .IP "\fB\-\-style\fR \fIstyle\fR" 4
 .IX Item "--style style"
 Sets the application \s-1GUI\s0 style
-.IP "\fB\-\-tqgeometry\fR \fItqgeometry\fR" 4
-.IX Item "--tqgeometry tqgeometry"
-Sets the tqgeometry of the main window
+.IP "\fB\-\-geometry\fR \fIgeometry\fR" 4
+.IX Item "--geometry geometry"
+Sets the geometry of the main window
 .SH "FILES"
 .IX Header "FILES"
 \&\fI_KDECONFDIR_/cervisiarc\fR \- global configuration file
diff --git a/cervisia/cervisia.pod b/cervisia/cervisia.pod
index 75ea6b27..940ba8e0 100644
--- a/cervisia/cervisia.pod
+++ b/cervisia/cervisia.pod
@@ -14,7 +14,7 @@ B<cervisia>
          S<[ B<--nocrashhandler> ]>
          S<[ B<--waitforwm> ]>
          S<[ B<--style> I<style> ]>
-         S<[ B<--tqgeometry> I<tqgeometry> ]>
+         S<[ B<--geometry> I<geometry> ]>
          S<[ B<--resolve> I<filename> ]>
          S<[ B<--log> I<filename> ]>
          S<[ B<--annotate> I<filename> ]>
@@ -80,9 +80,9 @@ Waits for a WM_NET compatible windowmanager
 
 Sets the application GUI style
 
-=item B<--tqgeometry> I<tqgeometry>
+=item B<--geometry> I<geometry>
 
-Sets the tqgeometry of the main window
+Sets the geometry of the main window
 
 =head1 FILES
 
diff --git a/cervisia/cervisiapart.cpp b/cervisia/cervisiapart.cpp
index 1af4f881..35024df0 100644
--- a/cervisia/cervisiapart.cpp
+++ b/cervisia/cervisiapart.cpp
@@ -726,7 +726,7 @@ void CervisiaPart::aboutCervisia()
                           "GNU General Public License for more details.\n"
                           "See the ChangeLog file for a list of contributors."));
     TQMessageBox::about(0, i18n("About Cervisia"),
-                       aboutstr.tqarg(CERVISIA_VERSION).tqarg(TDE_VERSION_STRING));
+                       aboutstr.arg(CERVISIA_VERSION).arg(TDE_VERSION_STRING));
 }
 
 
@@ -1694,7 +1694,7 @@ void CervisiaPart::slotJobFinished()
     {
         KNotifyClient::event(widget()->parentWidget()->winId(), "cvs_commit_done",
                              i18n("A CVS commit to repository %1 is done")
-                             .tqarg(repository));
+                             .arg(repository));
         m_jobType = Unknown;
     }
 }
diff --git a/cervisia/diffdlg.cpp b/cervisia/diffdlg.cpp
index ef6c725c..1bbcd711 100644
--- a/cervisia/diffdlg.cpp
+++ b/cervisia/diffdlg.cpp
@@ -91,7 +91,7 @@ DiffDialog::DiffDialog(KConfig& cfg, TQWidget *parent, const char *name, bool mo
 
     nofnlabel = new TQLabel(mainWidget);
     // avoids auto resize when the text is changed
-    nofnlabel->setMinimumWidth(fontMetrics().width(i18n("%1 differences").tqarg(10000)));
+    nofnlabel->setMinimumWidth(fontMetrics().width(i18n("%1 differences").arg(10000)));
 
     backbutton = new TQPushButton(TQString::fromLatin1("&<<"), mainWidget);
     connect( backbutton, TQT_SIGNAL(clicked()), TQT_SLOT(backClicked()) );
@@ -189,18 +189,18 @@ static TQString regionAsString(int linenoA, int linecountA, int linenoB, int lin
     int lineendB = linenoB+linecountB-1;
     TQString res;
     if (linecountB == 0)
-        res = TQString("%1,%2d%3").tqarg(linenoA).tqarg(lineendA).tqarg(linenoB-1);
+        res = TQString("%1,%2d%3").arg(linenoA).arg(lineendA).arg(linenoB-1);
     else if (linecountA == 0)
-        res = TQString("%1a%2,%3").tqarg(linenoA-1).tqarg(linenoB).tqarg(lineendB);
+        res = TQString("%1a%2,%3").arg(linenoA-1).arg(linenoB).arg(lineendB);
     else if (linenoA == lineendA)
         if (linenoB == lineendB)
-            res = TQString("%1c%2").tqarg(linenoA).tqarg(linenoB);
+            res = TQString("%1c%2").arg(linenoA).arg(linenoB);
         else
-            res = TQString("%1c%2,%3").tqarg(linenoA).tqarg(linenoB).tqarg(lineendB);
+            res = TQString("%1c%2,%3").arg(linenoA).arg(linenoB).arg(lineendB);
     else if (linenoB == lineendB)
-        res = TQString("%1,%2c%3").tqarg(linenoA).tqarg(lineendA).tqarg(linenoB);
+        res = TQString("%1,%2c%3").arg(linenoA).arg(lineendA).arg(linenoB);
     else
-        res = TQString("%1,%2c%3,%4").tqarg(linenoA).tqarg(lineendA).tqarg(linenoB).tqarg(lineendB);
+        res = TQString("%1,%2c%3,%4").arg(linenoA).arg(lineendA).arg(linenoB).arg(lineendB);
 
     return res;
 
@@ -222,7 +222,7 @@ bool DiffDialog::parseCvsDiff(CvsService_stub* service, const TQString& fileName
     TQStringList linesA, linesB;
     int linenoA, linenoB;
 
-    setCaption(i18n("CVS Diff: %1").tqarg(fileName));
+    setCaption(i18n("CVS Diff: %1").arg(fileName));
     revlabel1->setText( revA.isEmpty()?
                         i18n("Repository:")
                         : i18n("Revision ")+revA+":" );
@@ -408,9 +408,9 @@ void DiffDialog::updateNofN()
 {
     TQString str;
     if (markeditem >= 0)
-	str = i18n("%1 of %2").tqarg(markeditem+1).tqarg(items.count());
+	str = i18n("%1 of %2").arg(markeditem+1).arg(items.count());
     else
-	str = i18n("%1 differences").tqarg(items.count());
+	str = i18n("%1 differences").arg(items.count());
     nofnlabel->setText(str);
 
     itemscombo->setCurrentItem(markeditem==-2? 0 : markeditem+1);
@@ -443,8 +443,8 @@ void DiffDialog::updateHighlight(int newitem)
 	    diff1->setCenterLine(item->linenoA);
 	    diff2->setCenterLine(item->linenoB);
 	}
-    diff1->tqrepaint();
-    diff2->tqrepaint();
+    diff1->repaint();
+    diff2->repaint();
     updateNofN();
 }
 
diff --git a/cervisia/diffview.cpp b/cervisia/diffview.cpp
index 70e0ed2b..eacd7847 100644
--- a/cervisia/diffview.cpp
+++ b/cervisia/diffview.cpp
@@ -426,7 +426,7 @@ bool DiffZoomWidget::eventFilter(TQObject *o, TQEvent *e)
     if (e->type() == TQEvent::Show
         || e->type() == TQEvent::Hide
         || e->type() == TQEvent::Resize)
-        tqrepaint();
+        repaint();
 
     return TQFrame::eventFilter(o, e);
 }
diff --git a/cervisia/logdlg.cpp b/cervisia/logdlg.cpp
index 84954778..24d244a6 100644
--- a/cervisia/logdlg.cpp
+++ b/cervisia/logdlg.cpp
@@ -233,7 +233,7 @@ bool LogDialog::parseCvsLog(CvsService_stub* service, const TQString& fileName)
     cvsService = service;
     filename = fileName;
 
-    setCaption(i18n("CVS Log: %1").tqarg(filename));
+    setCaption(i18n("CVS Log: %1").arg(filename));
 
     DCOPRef job = cvsService->log(filename);
     if( !cvsService->ok() )
diff --git a/cervisia/logplainview.cpp b/cervisia/logplainview.cpp
index 44754cd4..413180af 100644
--- a/cervisia/logplainview.cpp
+++ b/cervisia/logplainview.cpp
@@ -53,7 +53,7 @@ void LogPlainView::addRevision(const LogInfo& logInfo)
     // assemble revision information lines
     TQString logEntry;
 
-    logEntry += "<b>" + i18n("revision %1").tqarg(TQStyleSheet::escape(logInfo.m_revision)) +
+    logEntry += "<b>" + i18n("revision %1").arg(TQStyleSheet::escape(logInfo.m_revision)) +
                 "</b>";
     logEntry += " &nbsp;[<a href=\"revA#" + TQStyleSheet::escape(logInfo.m_revision) + "\">" +
                 i18n("Select for revision A") +
@@ -62,8 +62,8 @@ void LogPlainView::addRevision(const LogInfo& logInfo)
                 i18n("Select for revision B") +
                 "</a>]<br>";
     logEntry += "<i>" +
-                i18n("date: %1; author: %2").tqarg(TQStyleSheet::escape(logInfo.dateTimeToString()))
-                                            .tqarg(TQStyleSheet::escape(logInfo.m_author)) +
+                i18n("date: %1; author: %2").arg(TQStyleSheet::escape(logInfo.dateTimeToString()))
+                                            .arg(TQStyleSheet::escape(logInfo.m_author)) +
                 "</i>";
 
     append(logEntry);
diff --git a/cervisia/logtree.cpp b/cervisia/logtree.cpp
index e48c3870..95bf9035 100644
--- a/cervisia/logtree.cpp
+++ b/cervisia/logtree.cpp
@@ -243,7 +243,7 @@ void LogTreeView::setSelectedPair(TQString selectionA, TQString selectionB)
         if (oldstate != newstate)
         {
             it.current()->selected = newstate;
-            tqrepaint(false);
+            repaint(false);
         }
     }
 }
diff --git a/cervisia/misc.cpp b/cervisia/misc.cpp
index 99ae25ec..fa3936ff 100644
--- a/cervisia/misc.cpp
+++ b/cervisia/misc.cpp
@@ -215,7 +215,7 @@ bool Cervisia::CheckOverwrite(const TQString& fileName, TQWidget* parent)
     if( fi.exists() )
     {
         result = (KMessageBox::warningContinueCancel(parent,
-                  i18n("A file named \"%1\" already exists. Are you sure you want to overwrite it?").tqarg(fileName),
+                  i18n("A file named \"%1\" already exists. Are you sure you want to overwrite it?").arg(fileName),
                   i18n("Overwrite File?"),
                   KGuiItem(i18n("&Overwrite"), "filesave", i18n("Overwrite the file"))) == KMessageBox::Continue);
     }
diff --git a/cervisia/protocolview.cpp b/cervisia/protocolview.cpp
index eb248cc1..004226a8 100644
--- a/cervisia/protocolview.cpp
+++ b/cervisia/protocolview.cpp
@@ -124,7 +124,7 @@ void ProtocolView::slotJobExited(bool normalExit, int exitStatus)
     if( normalExit )
     {
         if( exitStatus )
-            msg = i18n("[Exited with status %1]\n").tqarg(exitStatus);
+            msg = i18n("[Exited with status %1]\n").arg(exitStatus);
         else
             msg = i18n("[Finished]\n");
     }
@@ -180,8 +180,8 @@ void ProtocolView::appendLine(const TQString &line)
         color = remoteChangeColor;
 
     append(color.isValid()
-           ? TQString("<font color=\"%1\"><b>%2</b></font>").tqarg(color.name())
-                                                           .tqarg(escapedLine)
+           ? TQString("<font color=\"%1\"><b>%2</b></font>").arg(color.name())
+                                                           .arg(escapedLine)
            : escapedLine);
 }
 
diff --git a/cervisia/qttableview.cpp b/cervisia/qttableview.cpp
index 02de078e..43b597a0 100644
--- a/cervisia/qttableview.cpp
+++ b/cervisia/qttableview.cpp
@@ -87,7 +87,7 @@ void TQCornerSquare::paintEvent( TQPaintEvent * )
   used by functions such as setXOffset() or maxYOffset().
 
   \i The \e widget coordinates. (0,0) is the top-left corner of the widget,
-  \e including the frame.  They are used by functions such as tqrepaint().
+  \e including the frame.  They are used by functions such as repaint().
 
   \i The \e view coordinates.  (0,0) is the top-left corner of the view, \e
   excluding the frame.  This is the least-used coordinate system; it is used by
@@ -134,7 +134,7 @@ void TQCornerSquare::paintEvent( TQPaintEvent * )
   The \link setCellHeight() cell height\endlink and \link setCellWidth()
   cell width\endlink are set to 0.
 
-  Frame line tqshapes (TQFrame::HLink and TQFrame::VLine) are disallowed;
+  Frame line shapes (TQFrame::HLink and TQFrame::VLine) are disallowed;
   see TQFrame::setFrameStyle().
 
   Note that the \a f argument is \e not \link setTableFlags() table
@@ -206,7 +206,7 @@ void QtTableView::show()
 
 
 /*!
-  \overload void QtTableView::tqrepaint( bool erase )
+  \overload void QtTableView::repaint( bool erase )
   Repaints the entire view.
 */
 
@@ -220,16 +220,16 @@ void QtTableView::show()
   If \a w is negative, it is replaced with <code>width() - x</code>.
   If \a h is negative, it is replaced with <code>height() - y</code>.
 
-  Doing a tqrepaint() usually is faster than doing an update(), but
+  Doing a repaint() usually is faster than doing an update(), but
   calling update() many times in a row will generate a single paint
   event.
 
   At present, QtTableView is the only widget that reimplements \link
-  TQWidget::tqrepaint() tqrepaint()\endlink.	 It does this because by
+  TQWidget::repaint() repaint()\endlink.	 It does this because by
   clearing and then repainting one cell at at time, it can make the
   screen flicker less than it would otherwise.  */
 
-void QtTableView::tqrepaint( int x, int y, int w, int h, bool erase )
+void QtTableView::repaint( int x, int y, int w, int h, bool erase )
 {
     if ( !isVisible() || testWState(WState_BlockUpdates) )
 	return;
@@ -248,7 +248,7 @@ void QtTableView::tqrepaint( int x, int y, int w, int h, bool erase )
 }
 
 /*!
-  \overload void QtTableView::tqrepaint( const TQRect &r, bool erase )
+  \overload void QtTableView::repaint( const TQRect &r, bool erase )
   Replaints rectangle \a r. If \a erase is TRUE draws the background
   using the palette's background.
 */
@@ -287,7 +287,7 @@ void QtTableView::setNumRows( int rows )
 	nRows = rows;
 	if ( autoUpdate() && isVisible() &&
 	     ( oldLastVisible != lastRowVisible() || oldTopCell != topCell() ) )
-		tqrepaint( oldTopCell != topCell() );
+		repaint( oldTopCell != topCell() );
     } else {
 	// Be more careful - if destructing, bad things might happen.
 	nRows = rows;
@@ -327,7 +327,7 @@ void QtTableView::setNumCols( int cols )
     if ( autoUpdate() && isVisible() ) {
 	int maxCol = lastColVisible();
 	if ( maxCol >= oldCols || maxCol >= nCols )
-	    tqrepaint();
+	    repaint();
     }
     updateScrollBars( horRange );
     updateFrameSize();
@@ -590,7 +590,7 @@ void QtTableView::setCellWidth( int cellWidth )
 
     updateScrollBars( horSteps | horRange );
     if ( autoUpdate() && isVisible() )
-	tqrepaint();
+	repaint();
 
 }
 
@@ -642,7 +642,7 @@ void QtTableView::setCellHeight( int cellHeight )
 #endif
     cellH = (short)cellHeight;
     if ( autoUpdate() && isVisible() )
-	tqrepaint();
+	repaint();
     updateScrollBars( verSteps | verRange );
 }
 
@@ -816,7 +816,7 @@ void QtTableView::setTableFlags( uint f )
 	     (f & Tbl_snapToVGrid) != 0 && yCellDelta != 0 ) {
 	    snapToGrid( (f & Tbl_snapToHGrid) != 0,	// do snapping
 			(f & Tbl_snapToVGrid) != 0 );
-	    repaintMask |= Tbl_snapToGrid;	// tqrepaint table
+	    repaintMask |= Tbl_snapToGrid;	// repaint table
 	}
     }
 
@@ -824,7 +824,7 @@ void QtTableView::setTableFlags( uint f )
 	setAutoUpdate( TRUE );
 	updateScrollBars();
 	if ( isVisible() && (f & repaintMask) )
-	    tqrepaint();
+	    repaint();
     }
 
 }
@@ -880,7 +880,7 @@ void QtTableView::clearTableFlags( uint f )
 	    (f & Tbl_smoothVScrolling) != 0 && yCellDelta != 0 ) {
 	    snapToGrid( (f & Tbl_smoothHScrolling) != 0,      // do snapping
 			(f & Tbl_smoothVScrolling) != 0 );
-	    repaintMask |= Tbl_smoothScrolling;		     // tqrepaint table
+	    repaintMask |= Tbl_smoothScrolling;		     // repaint table
 	}
     }
     if ( f & Tbl_snapToHGrid ) {
@@ -893,7 +893,7 @@ void QtTableView::clearTableFlags( uint f )
 	setAutoUpdate( TRUE );
 	updateScrollBars();	     // returns immediately if nothing to do
 	if ( isVisible() && (f & repaintMask) )
-	    tqrepaint();
+	    repaint();
     }
 
 }
@@ -915,20 +915,20 @@ void QtTableView::clearTableFlags( uint f )
   automatically whenever it has changed in some way (for example, when a
   \link setTableFlags() flag\endlink is changed).
 
-  If \a enable is FALSE, the view does NOT tqrepaint itself or update
+  If \a enable is FALSE, the view does NOT repaint itself or update
   its internal state variables when it is changed.  This can be
   useful to avoid flicker during large changes and is singularly
   useless otherwise. Disable auto-update, do the changes, re-enable
-  auto-update and call tqrepaint().
+  auto-update and call repaint().
 
   \warning Do not leave the view in this state for a long time
   (i.e., between events). If, for example, the user interacts with the
   view when auto-update is off, strange things can happen.
 
-  Setting auto-update to TRUE does not tqrepaint the view; you must call
-  tqrepaint() to do this.
+  Setting auto-update to TRUE does not repaint the view; you must call
+  repaint() to do this.
 
-  \sa autoUpdate(), tqrepaint()
+  \sa autoUpdate(), repaint()
 */
 
 void QtTableView::setAutoUpdate( bool enable )
@@ -962,7 +962,7 @@ void QtTableView::updateCell( int row, int col, bool erase )
     TQRect uR = TQRect( xPos, yPos,
 		      cellW ? cellW : cellWidth(col),
 		      cellH ? cellH : cellHeight(row) );
-    tqrepaint( uR.intersect(viewRect()), erase );
+    repaint( uR.intersect(viewRect()), erase );
 }
 
 
@@ -1378,7 +1378,7 @@ void QtTableView::paintEvent( TQPaintEvent *e )
 
     // Note that this needs to be done regardless whether we do
     // eraseInPaint or not. Reason: a subclass may implement
-    // flicker-freeness and encourage the use of tqrepaint(FALSE).
+    // flicker-freeness and encourage the use of repaint(FALSE).
     // The subclass, however, cannot draw all pixels, just those
     // inside the cells. So QtTableView is reponsible for all pixels
     // outside the cells.
@@ -1430,7 +1430,7 @@ void QtTableView::wheelEvent( TQWheelEvent * e )
 
 void QtTableView::updateView()
 {
-    tqrepaint( viewRect() );
+    repaint( viewRect() );
 }
 
 /*!
@@ -1526,7 +1526,7 @@ void QtTableView::setHorScrollBar( bool on, bool update )
 	else
 	    sbDirty = sbDirty | verMask;
 	if ( hideScrollBar && isVisible() )
-	    tqrepaint( hScrollBar->x(), hScrollBar->y(),
+	    repaint( hScrollBar->x(), hScrollBar->y(),
 		     width() - hScrollBar->x(), hScrollBar->height() );
     }
     if ( update )
@@ -1565,7 +1565,7 @@ void QtTableView::setVerScrollBar( bool on, bool update )
 	else
 	    sbDirty = sbDirty | horMask;
 	if ( hideScrollBar && isVisible() )
-	    tqrepaint( vScrollBar->x(), vScrollBar->y(),
+	    repaint( vScrollBar->x(), vScrollBar->y(),
 		     vScrollBar->width(), height() - vScrollBar->y() );
     }
     if ( update )
@@ -2010,7 +2010,7 @@ void QtTableView::updateScrollBars( uint f )
 	if ( sbDirty & horValue )
 	    hScrollBar->setValue( xOffs );
 
-			// show scrollbar only when it has a sane tqgeometry
+			// show scrollbar only when it has a sane geometry
 	if ( !hScrollBar->isVisible() )
 	    hScrollBar->show();
     }
@@ -2034,7 +2034,7 @@ void QtTableView::updateScrollBars( uint f )
 	if ( sbDirty & verValue )
 	    vScrollBar->setValue( yOffs );
 
-			// show scrollbar only when it has a sane tqgeometry
+			// show scrollbar only when it has a sane geometry
 	if ( !vScrollBar->isVisible() )
 	    vScrollBar->show();
     }
@@ -2257,7 +2257,7 @@ void QtTableView::showOrHideScrollBars()
   Call this function when the table view's total size is changed;
   typically because the result of cellHeight() or cellWidth() have changed.
 
-  This function does not tqrepaint the widget.
+  This function does not repaint the widget.
 */
 
 void QtTableView::updateTableSize()
diff --git a/cervisia/qttableview.h b/cervisia/qttableview.h
index ce2af64b..b3c8ff8a 100644
--- a/cervisia/qttableview.h
+++ b/cervisia/qttableview.h
@@ -32,9 +32,9 @@ public:
     virtual void setPalette( const TQPalette & );
     void	show();
 
-    void	tqrepaint( bool erase=TRUE );
-    void	tqrepaint( int x, int y, int w, int h, bool erase=TRUE );
-    void	tqrepaint( const TQRect &, bool erase=TRUE );
+    void	repaint( bool erase=TRUE );
+    void	repaint( int x, int y, int w, int h, bool erase=TRUE );
+    void	repaint( const TQRect &, bool erase=TRUE );
 
 protected:
     QtTableView( TQWidget *parent=0, const char *name=0, WFlags f=0 );
@@ -236,11 +236,11 @@ inline TQRect QtTableView::cellUpdateRect() const
 inline bool QtTableView::autoUpdate() const
 { return isUpdatesEnabled(); }
 
-inline void QtTableView::tqrepaint( bool erase )
-{ tqrepaint( 0, 0, width(), height(), erase ); }
+inline void QtTableView::repaint( bool erase )
+{ repaint( 0, 0, width(), height(), erase ); }
 
-inline void QtTableView::tqrepaint( const TQRect &r, bool erase )
-{ tqrepaint( r.x(), r.y(), r.width(), r.height(), erase ); }
+inline void QtTableView::repaint( const TQRect &r, bool erase )
+{ repaint( r.x(), r.y(), r.width(), r.height(), erase ); }
 
 inline void QtTableView::updateScrollBars()
 { updateScrollBars( 0 ); }
diff --git a/cervisia/resolvedlg.cpp b/cervisia/resolvedlg.cpp
index a2aceced..dacb0d0f 100644
--- a/cervisia/resolvedlg.cpp
+++ b/cervisia/resolvedlg.cpp
@@ -222,7 +222,7 @@ bool ResolveDialog::parseFile(const TQString &name)
     int advanced1, advanced2;
     enum { Normal, VersionA, VersionB } state;
 
-    setCaption(i18n("CVS Resolve: %1").tqarg(name));
+    setCaption(i18n("CVS Resolve: %1").arg(name));
 
     fname = name;
   
@@ -383,9 +383,9 @@ void ResolveDialog::updateNofN()
 {
     TQString str;
     if (markeditem >= 0)
-        str = i18n("%1 of %2").tqarg(markeditem+1).tqarg(items.count());
+        str = i18n("%1 of %2").arg(markeditem+1).arg(items.count());
     else
-        str = i18n("%1 conflicts").tqarg(items.count());
+        str = i18n("%1 conflicts").arg(items.count());
     nofnlabel->setText(str);
 
     backbutton->setEnabled(markeditem != -1);
@@ -424,9 +424,9 @@ void ResolveDialog::updateHighlight(int newitem)
         diff2->setCenterLine(item->linenoB);
         merge->setCenterOffset(item->offsetM);
     }
-    diff1->tqrepaint();
-    diff2->tqrepaint();
-    merge->tqrepaint();
+    diff1->repaint();
+    diff2->repaint();
+    merge->repaint();
     updateNofN();
 }
 
@@ -456,7 +456,7 @@ void ResolveDialog::updateMergedVersion(ResolveItem* item,
     while ( (item = items.next()) != 0 )
         item->offsetM += difference;
 
-    merge->tqrepaint();
+    merge->repaint();
 }
 
 
@@ -562,9 +562,9 @@ void ResolveDialog::editClicked()
     }
 
     delete dlg;
-    diff1->tqrepaint();
-    diff2->tqrepaint();
-    merge->tqrepaint();
+    diff1->repaint();
+    diff2->repaint();
+    merge->repaint();
 }
 
 
diff --git a/cervisia/settingsdlg.cpp b/cervisia/settingsdlg.cpp
index d1350323..fcd5f8e9 100644
--- a/cervisia/settingsdlg.cpp
+++ b/cervisia/settingsdlg.cpp
@@ -73,7 +73,7 @@ void FontButton::chooseFont()
         return;
 
     setFont(newFont);
-    tqrepaint(false);
+    repaint(false);
 }
 
 
diff --git a/cervisia/updateview_items.cpp b/cervisia/updateview_items.cpp
index 99276c3c..9e0abc22 100644
--- a/cervisia/updateview_items.cpp
+++ b/cervisia/updateview_items.cpp
@@ -508,7 +508,7 @@ void UpdateFileItem::setStatus(EntryStatus status)
         m_entry.m_status = status;
         const bool visible(applyFilter(updateView()->filter()));
         if (visible)
-            tqrepaint();
+            repaint();
     }
     m_undefined = false;
 }
@@ -584,7 +584,7 @@ void UpdateFileItem::setRevTag(const TQString& rev, const TQString& tag)
     if (isVisible())
     {
         widthChanged();
-        tqrepaint();
+        repaint();
     }
 }
 
diff --git a/cervisia/updateview_items.h b/cervisia/updateview_items.h
index b3a034c3..73694646 100644
--- a/cervisia/updateview_items.h
+++ b/cervisia/updateview_items.h
@@ -50,7 +50,7 @@ public:
     const Cervisia::Entry& entry() const { return m_entry; }
 
     // Returns the path (relative to the repository).
-    // TQString() for the root item and its (direct) tqchildren.
+    // TQString() for the root item and its (direct) children.
     // If it's not TQString() it ends with '/'.
     TQString dirPath() const;
 
diff --git a/cervisia/updateview_visitors.cpp b/cervisia/updateview_visitors.cpp
index 8232d98c..0dae046b 100644
--- a/cervisia/updateview_visitors.cpp
+++ b/cervisia/updateview_visitors.cpp
@@ -47,7 +47,7 @@ void ApplyFilterVisitor::preVisit(UpdateDirItem* item)
 void ApplyFilterVisitor::postVisit(UpdateDirItem* item)
 {
     // a UpdateDirItem is visible if
-    // - it has visible tqchildren
+    // - it has visible children
     // - it is not opened
     // - empty directories are not hidden
     // - it has no parent (top level item)
-- 
cgit v1.2.1