diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-08-24 18:18:44 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-08-24 21:37:55 +0900 |
| commit | 944553d4b3c7f2673e6e877332659652f548159b (patch) | |
| tree | cffdceaaa95af6781191e2fd752b139fa593b315 /src/diff.cpp | |
| 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 <michele.calgaro@yahoo.it>
(cherry picked from commit 635077214fa90c14a6badc0c067c71d98aebd912)
Diffstat (limited to 'src/diff.cpp')
| -rw-r--r-- | src/diff.cpp | 3 |
1 files changed, 1 insertions, 2 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" |