diff options
| -rw-r--r-- | kdiff3.tdevelop | 191 | ||||
| -rw-r--r-- | src/diff.cpp | 3 | ||||
| -rw-r--r-- | src/difftextwindow.cpp | 15 | ||||
| -rw-r--r-- | src/directorymergewindow.cpp | 4 |
4 files changed, 8 insertions, 205 deletions
diff --git a/kdiff3.tdevelop b/kdiff3.tdevelop deleted file mode 100644 index 5fc04a9..0000000 --- a/kdiff3.tdevelop +++ /dev/null @@ -1,191 +0,0 @@ -<?xml version = '1.0'?> -<tdevelop> - <general> - <author>Joachim Eibl</author> - <email>joachim dot eibl at gmx dot de</email> - <version>0.9.92</version> - <projectmanagement>KDevKDEAutoProject</projectmanagement> - <primarylanguage>C++</primarylanguage> - <keywords> - <keyword>C++</keyword> - <keyword>Code</keyword> - <keyword>Qt</keyword> - <keyword>KDE</keyword> - </keywords> - <projectdirectory>.</projectdirectory> - <absoluteprojectpath>false</absoluteprojectpath> - <description/> - <ignoreparts/> - <secondaryLanguages/> - </general> - <kdevautoproject> - <general> - <activetarget>src/kdiff3</activetarget> - <useconfiguration>debug</useconfiguration> - </general> - <run> - <mainprogram>/daten/home/joachim/kdiff3-0.9.92a/debug/src/kdiff3</mainprogram> - <directoryradio>custom</directoryradio> - <customdirectory>/daten/home/joachim/kdiff3_testdir/</customdirectory> - <programargs/> - <terminal>true</terminal> - <autocompile>true</autocompile> - <envvars> - <envvar value="/home/joachim/kdiff3-0.9.92a/debug/src/.libs/libkdiff3part.so" name="LD_PRELOAD" /> - </envvars> - </run> - <configurations> - <optimized> - <builddir>optimized</builddir> - <ccompiler>GccOptions</ccompiler> - <cxxcompiler>GppOptions</cxxcompiler> - <f77compiler>G77Options</f77compiler> - <cxxflags>-O2 -g0</cxxflags> - </optimized> - <debug> - <configargs>--enable-debug=full --prefix=/opt/trinity</configargs> - <builddir>debug</builddir> - <ccompiler>kdevgccoptions</ccompiler> - <cxxcompiler>kdevgppoptions</cxxcompiler> - <f77compiler>kdevpgf77options</f77compiler> - <cxxflags>-O0</cxxflags> - <topsourcedir/> - <cppflags/> - <ldflags/> - <ccompilerbinary/> - <cxxcompilerbinary/> - <f77compilerbinary/> - <cflags/> - <f77flags/> - <envvars/> - </debug> - </configurations> - <make> - <envvars> - <envvar value="1" name="WANT_AUTOCONF_2_5" /> - <envvar value="1" name="WANT_AUTOMAKE_1_6" /> - </envvars> - <abortonerror>true</abortonerror> - <numberofjobs>1</numberofjobs> - <dontact>false</dontact> - <makebin/> - <prio>0</prio> - <runmultiplejobs>false</runmultiplejobs> - </make> - </kdevautoproject> - <kdevfileview> - <groups> - <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> - <group pattern="*.ui" name="User Interface" /> - <group pattern="*.png" name="Icons" /> - <group pattern="*.po;*.ts" name="Translations" /> - <group pattern="*" name="Others" /> - <hidenonprojectfiles>false</hidenonprojectfiles> - <hidenonlocation>false</hidenonlocation> - </groups> - <tree> - <hidepatterns></hidepatterns> - <hidenonprojectfiles>false</hidenonprojectfiles> - <showvcsfields>true</showvcsfields> - </tree> - </kdevfileview> - <kdevdoctreeview> - <ignoretocs> - <toc>gtk</toc> - <toc>gnustep</toc> - <toc>python</toc> - <toc>php</toc> - <toc>perl</toc> - </ignoretocs> - <projectdoc> - <userdocDir>doc/en/</userdocDir> - <apidocDir>debug/</apidocDir> - </projectdoc> - <ignoreqt_xml/> - <ignoredoxygen/> - <ignorekdocs/> - <ignoredevhelp/> - </kdevdoctreeview> - <kdevdebugger> - <general> - <dbgshell>libtool</dbgshell> - <programargs/> - <gdbpath/> - <configGdbScript/> - <runShellScript/> - <runGdbScript/> - <breakonloadinglibs>true</breakonloadinglibs> - <separatetty>false</separatetty> - <floatingtoolbar>false</floatingtoolbar> - </general> - <display> - <staticmembers>false</staticmembers> - <demanglenames>true</demanglenames> - <outputradix>10</outputradix> - </display> - </kdevdebugger> - <kdevfilecreate> - <filetypes/> - <useglobaltypes> - <type ext="ui" /> - <type ext="cpp" /> - <type ext="h" /> - </useglobaltypes> - </kdevfilecreate> - <kdevcvs> - <cvsoptions>-f</cvsoptions> - <commitoptions/> - <addoptions/> - <logoptions/> - <updateoptions>-dP</updateoptions> - <removeoptions>-f</removeoptions> - <revertoptions>-C -d -P</revertoptions> - <diffoptions>-u3 -p</diffoptions> - <rshoptions/> - </kdevcvs> - <kdevcppsupport> - <codecompletion> - <includeGlobalFunctions>true</includeGlobalFunctions> - <includeTypes>true</includeTypes> - <includeEnums>true</includeEnums> - <includeTypedefs>false</includeTypedefs> - <automaticCodeCompletion>true</automaticCodeCompletion> - <automaticArgumentsHint>true</automaticArgumentsHint> - <codeCompletionDelay>250</codeCompletionDelay> - <argumentsHintDelay>400</argumentsHintDelay> - <automaticHeaderCompletion>true</automaticHeaderCompletion> - <headerCompletionDelay>250</headerCompletionDelay> - </codecompletion> - <references/> - <creategettersetter> - <prefixGet/> - <prefixSet>set</prefixSet> - <prefixVariable>m_,_</prefixVariable> - <parameterName>theValue</parameterName> - <inlineGet>true</inlineGet> - <inlineSet>true</inlineSet> - </creategettersetter> - <qt> - <used>true</used> - <version>3</version> - <root>/usr/lib/qt3</root> - </qt> - </kdevcppsupport> - <cppsupportpart> - <filetemplates> - <interfacesuffix>.h</interfacesuffix> - <implementationsuffix>.cpp</implementationsuffix> - </filetemplates> - </cppsupportpart> - <kdevdocumentation> - <projectdoc> - <docsystem/> - <docurl/> - <usermanualurl/> - </projectdoc> - </kdevdocumentation> - <ctagspart> - <customArguments/> - <customTagfilePath/> - </ctagspart> -</tdevelop> 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; |