diff options
author | Timothy Pearson <[email protected]> | 2011-12-16 09:56:04 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2011-12-16 09:56:04 -0600 |
commit | 303e108109ce526c414e8770119134dcc2f2d7bd (patch) | |
tree | 16e7fdb1b604f30ac7b9cb7bbaeae90c34f438a6 /src/difftextwindow.cpp | |
parent | f3372e7bea9bbc288e039d85d660450220a637d8 (diff) | |
download | kdiff3-303e108109ce526c414e8770119134dcc2f2d7bd.tar.gz kdiff3-303e108109ce526c414e8770119134dcc2f2d7bd.zip |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit f3372e7bea9bbc288e039d85d660450220a637d8.
Diffstat (limited to 'src/difftextwindow.cpp')
-rw-r--r-- | src/difftextwindow.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/difftextwindow.cpp b/src/difftextwindow.cpp index d5fb8a9..3c570e4 100644 --- a/src/difftextwindow.cpp +++ b/src/difftextwindow.cpp @@ -28,8 +28,8 @@ #include <tqlineedit.h> #include <tqlabel.h> #include <tqpushbutton.h> -#include <layout.h> -#include <textcodec.h> +#include <tqlayout.h> +#include <tqtextcodec.h> #include <optiondialog.h> #include <math.h> #include <cstdlib> @@ -860,9 +860,9 @@ void DiffTextWindowData::writeLine( else { p.fillRect( xOffset + fontWidth*outPos, yOffset, - fontWidth*(spaces), fontHeight, m_pDiffTextWindow->colorGroup().highlight() ); + fontWidth*(spaces), fontHeight, m_pDiffTextWindow->tqcolorGroup().highlight() ); - p.setPen( m_pDiffTextWindow->colorGroup().highlightedText() ); + p.setPen( m_pDiffTextWindow->tqcolorGroup().highlightedText() ); p.drawText( xOffset + fontWidth*outPos, yOffset + fontAscent, s ); m_selection.bSelectionContainsData = true; @@ -875,7 +875,7 @@ void DiffTextWindowData::writeLine( if( m_selection.lineWithin( line ) && m_selection.lineWithin( line+1 ) ) { p.fillRect( xOffset + fontWidth*outPos, yOffset, - deviceWidth, fontHeight, m_pDiffTextWindow->colorGroup().highlight() ); + deviceWidth, fontHeight, m_pDiffTextWindow->tqcolorGroup().highlight() ); } } @@ -1656,7 +1656,7 @@ void DiffTextWindowFrame::setFirstLine( int firstLine ) s += " " + TQString::number( l+1 ); d->m_pTopLine->setText( s ); - d->m_pTopLine->repaint(); + d->m_pTopLine->tqrepaint(); } } |