diff options
| author | Michele Calgaro <[email protected]> | 2023-08-24 18:18:44 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2023-08-24 21:37:55 +0900 |
| commit | 944553d4b3c7f2673e6e877332659652f548159b (patch) | |
| tree | cffdceaaa95af6781191e2fd752b139fa593b315 /src | |
| parent | 773f93a5d60cd257d7ec4e3e9979087b65fc3dd5 (diff) | |
| download | kdiff3-944553d4b3c7f2673e6e877332659652f548159b.tar.gz kdiff3-944553d4b3c7f2673e6e877332659652f548159b.zip | |
Drop USE_QT4 code and unnecessary .tdevelop project file
Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 635077214fa90c14a6badc0c067c71d98aebd912)
Diffstat (limited to 'src')
| -rw-r--r-- | src/diff.cpp | 3 | ||||
| -rw-r--r-- | src/difftextwindow.cpp | 15 | ||||
| -rw-r--r-- | src/directorymergewindow.cpp | 4 |
3 files changed, 8 insertions, 14 deletions
diff --git a/src/diff.cpp b/src/diff.cpp index 9475095..2bf58eb 100644 --- a/src/diff.cpp +++ b/src/diff.cpp @@ -361,7 +361,6 @@ static bool convertFileEncoding( const TQString& fileNameIn, TQTextCodec* pCodec return false; TQTextStream inStream( &in ); inStream.setCodec( pCodecIn ); - //inStream.setAutoDetectUnicode( false ); //not available in TQt3, will always detect UCS2 TQFile out( fileNameOut ); if ( ! out.open( IO_WriteOnly ) ) @@ -379,7 +378,7 @@ static TQTextCodec* detectEncoding( const char* buf, long size, long& skipBytes { if (size>=2) { - skipBytes = 0; // In TQt3 UTF-16LE can only be used if autodetected. + skipBytes = 0; if (buf[0]=='\xFF' && buf[1]=='\xFE' ) return TQTextCodec::codecForName( "ISO-10646-UCS2" );// "UTF-16LE" diff --git a/src/difftextwindow.cpp b/src/difftextwindow.cpp index 5a2ffe2..628f731 100644 --- a/src/difftextwindow.cpp +++ b/src/difftextwindow.cpp @@ -847,8 +847,7 @@ void DiffTextWindowData::writeLine( if ( m_pOptionDialog->m_bShowWhiteSpaceCharacters && m_pOptionDialog->m_bShowWhiteSpace) { p.fillRect( xOffset + fontWidth*outPos, yOffset+fontAscent, - fontWidth*spaces-1, fontDescent, c ); // QT3 - //fontWidth*spaces-1, fontDescent, c ); // QT4 + fontWidth*spaces-1, fontDescent, c ); } } else @@ -952,13 +951,13 @@ void DiffTextWindow::paintEvent( TQPaintEvent* e ) int endLine = min2( d->m_firstLine + getNofVisibleLines()+2, getNofLines() ); //if ( invalidRect.size()==size() ) - { // double buffering, obsolete with TQt4 - TQPainter painter(this); // Remove for TQt4 - TQPixmap pixmap( invalidRect.size() );// Remove for TQt4 + { + TQPainter painter(this); + TQPixmap pixmap( invalidRect.size() ); - MyPainter p( TQT_TQPAINTDEVICE(&pixmap), d->m_pOptionDialog->m_bRightToLeftLanguage, width(), fontMetrics().width('W') ); // For TQt4 change pixmap to this + MyPainter p( TQT_TQPAINTDEVICE(&pixmap), d->m_pOptionDialog->m_bRightToLeftLanguage, width(), fontMetrics().width('W') ); - p.translate( -invalidRect.x(), -invalidRect.y() );// Remove for TQt4 + p.translate( -invalidRect.x(), -invalidRect.y() ); p.setFont( font() ); p.TQPainter::fillRect( invalidRect, d->m_pOptionDialog->m_bgColor ); @@ -967,7 +966,7 @@ void DiffTextWindow::paintEvent( TQPaintEvent* e ) // p.drawLine( m_invalidRect.x(), m_invalidRect.y(), m_invalidRect.right(), m_invalidRect.bottom() ); // For test only p.end(); - painter.drawPixmap( invalidRect.x(), invalidRect.y(), pixmap );// Remove for TQt4 + painter.drawPixmap( invalidRect.x(), invalidRect.y(), pixmap ); } // else // { // no double buffering diff --git a/src/directorymergewindow.cpp b/src/directorymergewindow.cpp index 3ca33e7..ed00a15 100644 --- a/src/directorymergewindow.cpp +++ b/src/directorymergewindow.cpp @@ -217,11 +217,7 @@ void DirectoryMergeWindow::fastFileComparison( } pp.setInformation( i18n("Comparing file..."), 0, false ); -#ifdef USE_QT4 - typedef qint64 t_FileSize; -#else // USE_QT4 typedef TQFile::Offset t_FileSize; -#endif // USE_QT4 t_FileSize fullSize = file1.size(); t_FileSize sizeLeft = fullSize; |