<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/966a8dcbf65898371e47565e19b16e7c3629d483">https://github.com/macports/macports-ports/commit/966a8dcbf65898371e47565e19b16e7c3629d483</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 966a8dcbf65898371e47565e19b16e7c3629d483
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Jun 27 10:37:09 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> xxdiff: update version 3.2->4.0.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/44526
</span>---
devel/xxdiff/Portfile | 78 +-
devel/xxdiff/files/bison3.patch | 90 --
devel/xxdiff/files/patch-no_hack.diff | 12 +
devel/xxdiff/files/patch-qt5.diff | 2443 ++++++++++++++++++++++++++++++
devel/xxdiff/files/patch-xxdiff.pro.diff | 33 +
5 files changed, 2539 insertions(+), 117 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/xxdiff/Portfile b/devel/xxdiff/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d324eb8..2855f6a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/xxdiff/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/xxdiff/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,9 +2,18 @@
</span>
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.major} < 14} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +qt4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset qt4]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qmake5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qt4 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> name xxdiff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.0.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories devel
platforms darwin
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,43 +29,58 @@ homepage http://furius.ca/xxdiff/
</span> depends_build-append port:bison \
port:flex
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:qt3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libGLU
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# xxdiff links with libGLU if it is installed; so make sure it is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# installed already. See also: https://trac.macports.org/ticket/47693
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> master_sites sourceforge:project/xxdiff/xxdiff/${version}/
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 301ff399a1e4be8b68c38c3e27c0b1ad \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 ab2848fd9279f55b5db270f319ad4791154ecf82 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 12e7527f39713b925f05b687c2ad8b60459bb670
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/41600#comment:47
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles bison3.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 1bd4a5bde100026e562d540f230c609f9b3c06cc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 bf58ddda9d7a887f4f5cae20070ed5f2e0d65f575af20860738c6e2742c3a000 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1981869
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# add upstream support for Qt 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# MacPorts uses newser bison; respect MacPorts compiler flags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# macOS hack no longer seems to work
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see ports/macosx/README.macosx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-qt5.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-xxdiff.pro.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-no_hack.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# "Configure" and build adapted from README.build.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.dir ${worksrcpath}/src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.dir ${configure.dir}
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# from README.build: "You will need GNU make."
</span> build.type gnu
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.dir ${worksrcpath}/src
</span> configure.cmd ${build.cmd}
configure.pre_args -f Makefile.bootstrap
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args QTDIR='${prefix}' makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args QMAKE=${qt_qmake_cmd} all
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.dir ${configure.dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args QTDIR='${prefix}'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset qt4]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5.spec_cmd QMAKESPEC=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append QMAKESPEC=${qt_qmake_spec}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
destroot {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see adm/release_bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 ${worksrcpath}/bin/xxdiff.app/Contents/MacOS/xxdiff ${destroot}${prefix}/bin
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Destroot xxdiff.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall ${worksrcpath}/bin/xxdiff ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall ${worksrcpath}/src/xxdiff.1 ${destroot}${prefix}/share/man/man1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/bin/xxdiff.app ${destroot}${applications_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${applications_dir}/xxdiff.app/Contents/MacOS/xxdiff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Destroot xxdiff documentation.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${prefix}/share/doc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${worksrcpath}/doc ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete ${destroot}${prefix}/share/doc/${name}/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete ${destroot}${prefix}/share/doc/${name}/xxdiff-scripts.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete ${destroot}${prefix}/share/doc/${name}/xxdiff-scripts.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set script [open "${destroot}${applications_dir}/xxdiff.app/Contents/MacOS/xxdiff" w 0755]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${script} "#!/bin/sh"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${script} ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${script} "${prefix}/bin/xxdiff --prompt-for-files \"\$@\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close ${script}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 ${worksrcpath}/src/xxdiff.1 ${destroot}${prefix}/share/man/man1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach fl {README CHANGES} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 ${worksrcpath}/${fl} ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${destroot}${prefix}/share/doc/${name} "${worksrcpath}/bin/xxdiff.app/Contents/MacOS/xxdiff --help-html > xxdiff-doc.html"
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant qt4 description {build using Qt4} {}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/xxdiff/files/bison3.patch b/devel/xxdiff/files/bison3.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a5f14d7..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/xxdiff/files/bison3.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,90 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Replace YYPARSE_PARAM (which Bison 3 no longer supports) with
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-%parse-param and update function prototypes as necessary.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: src/resParser.y
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/resParser.y.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/resParser.y
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -37,14 +37,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <qrect.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <qstylefactory.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--// The parser input is the resources object to fill in.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define RESOURCES ( static_cast<XxResources*>(resources) )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define YYPARSE_PARAM resources
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Declare lexer from other compilation unit.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int resParserlex( YYSTYPE* yylval );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--void resParsererror( const char* msg );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void resParsererror( XxResources* RESOURCES, const char* msg );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Declare some parser functions and data defined in resParser.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace XxResParserNS {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -144,7 +140,12 @@ using namespace XxResParserNS; // Make s
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- %type <num> boolkwd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- %start xxdiffrc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--%pure_parser
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+%define api.pure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+%code requires {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #include <resources.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+%parse-param {XxResources* RESOURCES}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- %%
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xxdiffrc : stmts
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -188,7 +189,7 @@ prefgeometry : PREFGEOMETRY COLON GEOMSP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RESOURCES->setPreferredGeometry( geometry );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- yyerror( "Bad geometry specification." );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ yyerror( RESOURCES, "Bad geometry specification." );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Should never happen, the lexer regexp should be tough
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // enough.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -216,7 +217,7 @@ style : STYLE COLON STRING
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- err += QString( "\nValid styles are: " );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- err += styles.join( ", " );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- yyerror( err.latin1() );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ yyerror( RESOURCES, err.latin1() );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if (QT_VERSION >= 0x030000)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -230,7 +231,7 @@ accel : ACCEL DOT ACCELNAME COLON STRIN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char buf[2048];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ::snprintf( buf, 2048,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "Unrecognized accelerator: %s\n", $5 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- yyerror( buf );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ yyerror( RESOURCES, buf );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: src/resParser.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/resParser.cpp.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/resParser.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -69,11 +69,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *============================================================================*/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Parser routine defined in the yacc parser.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--extern int resParserparse( void* );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+extern int resParserparse( XxResources* );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //------------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--void resParsererror( const char* msg )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void resParsererror( XxResources* RESOURCES, const char* msg )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Send errors to stdout so we can filter out the debug info shmeglu while
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // debugging parser.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -786,7 +786,7 @@ int parseFromKeywordList(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QString os;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QTextOStream oss( &os );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- oss << "Unknown " << errmsg << ": " << name << flush;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- resParsererror( os.latin1() );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ resParsererror( NULL, os.latin1() );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- num = ERROR_TOKEN;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return ERROR_TOKEN;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/xxdiff/files/patch-no_hack.diff b/devel/xxdiff/files/patch-no_hack.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..7c37897
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/xxdiff/files/patch-no_hack.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/cmdline.cpp.orig 2019-06-27 09:26:20.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/cmdline.cpp 2019-06-27 09:31:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -202,8 +202,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "Copies the input streams/files into temporary files to perform diffing. "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "This is useful if you want to diff FIFOs."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-// Hack for os x - programs are run with an argument line -psn_0_36306945
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { "prompt-for-files", 'p', true, 'p',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { "prompt-for-files", 0, false, 'p',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "If no files are specified on the command line, show a file dialog so that "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "the user can select them. This option is ignored if any files are specified."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ },
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/xxdiff/files/patch-qt5.diff b/devel/xxdiff/files/patch-qt5.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..a1eb53e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/xxdiff/files/patch-qt5.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,2443 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Only in /Users/macports/Git/Dayo/xxdiff: .hg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Only in .: .hg_archival.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./CHANGES ./CHANGES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./CHANGES 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./CHANGES 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,6 +5,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Current Development Version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ---------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++* Applied patch from Vadim Zhukov <persgray at gmail dot com> for more general
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ local encoding conversion.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++* Fixed coredump on long lines by allowing line length up to 2^32.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (Thanks to Jim Diamond for finding the issue.)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Version 5.0b1: Port to Qt5 by Rene J.V. Bertin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++----------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++* Switch to Qt5 (tested with 5.6, probably ok with older versions too)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++* Add keyboard shortcuts for "Save as left" and "Save as right"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++* Prevent accidental wheel-zoom when pressing the Ctrl key while inertial scroll events are coming in.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Version 4.0.1: Port to Qt4 by Alexandre Feblot
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ----------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./README ./README
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./README 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./README 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -206,7 +206,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Reporting Bugs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ==============
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-* `Reporting Bugs <http://sourceforge.net/tracker/?group_id=2198>`_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++* `Reporting Bugs <https://sourceforge.net/p/xxdiff/bugs/>`_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *(bugs and feature requests)*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ **PLEASE!** report bugs using the bug tracker instead of email. It is extremely
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./VERSION ./VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./VERSION 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./VERSION 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1 +1 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-4.0.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++4.0.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Only in .: dayo.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./doc/xxdiff-integration.html ./doc/xxdiff-integration.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./doc/xxdiff-integration.html 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./doc/xxdiff-integration.html 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,7 +3,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <head>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <title>Integrating xxdiff with scripts</title>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <meta name="author" content="Martin Blais <blais@furius.ca>" />
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <meta name="date" content="2004-01-21" />
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -13,7 +13,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <div id="project-header">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <a href="http://furius.ca/"><img src="http://furius.ca/home/furius-logo-w.png" id="logo"></a>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <div id="project-home"><a href="http://furius.ca/xxdiff">Project Home</a></div>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <div id="project-home"><a href="..">Project Home</a></div>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </div>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <div class="document" id="integrating-xxdiff-with-scripts">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./doc/xxdiff-secrets.html ./doc/xxdiff-secrets.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./doc/xxdiff-secrets.html 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./doc/xxdiff-secrets.html 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,7 +3,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <head>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <title>The Almost Secret Features of xxdiff</title>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <meta name="author" content="Martin Blais <blais@furius.ca>" />
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <link rel="stylesheet" href="../style.css" type="text/css" />
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12,7 +12,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <div id="project-header">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <a href="http://furius.ca/"><img src="http://furius.ca/home/furius-logo-w.png" id="logo"></a>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <div id="project-home"><a href="http://furius.ca/xxdiff">Project Home</a></div>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <div id="project-home"><a href="..">Project Home</a></div>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </div>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <div class="document" id="the-almost-secret-features-of-xxdiff">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./index.html ./index.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./index.html 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./index.html 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,14 +3,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <head>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-<meta name="generator" content="Docutils 0.10: http://docutils.sourceforge.net/" />
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <title>xxdiff: Graphical File And Directories Comparator And Merge Tool</title>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <link rel="stylesheet" href="style.css" type="text/css" />
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </head>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <body>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <div id="project-header">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <a href="/"><img src="/home/furius-logo-w.png" id="logo"></a>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <a href="http://furius.ca/"><img src="http://furius.ca/home/furius-logo-w.png" id="logo"></a>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </div>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -223,7 +223,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <div class="section" id="reporting-bugs">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <h1><a class="toc-backref" href="#id12">Reporting Bugs</a></h1>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <ul class="simple">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-<li><a class="reference external" href="http://sourceforge.net/tracker/?group_id=2198">Reporting Bugs</a>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++<li><a class="reference external" href="https://sourceforge.net/p/xxdiff/bugs/">Reporting Bugs</a>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <em>(bugs and feature requests)</em></li>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </ul>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <p><strong>PLEASE!</strong> report bugs using the bug tracker instead of email. It is extremely
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/Makefile.bootstrap ./src/Makefile.bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/Makefile.bootstrap 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/Makefile.bootstrap 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,19 +5,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Rule to generate the qmake Makefile for building xxdiff.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE ?= /usr/bin/qmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE ?= qmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++MAKEDIR ?= .
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKEOPTS =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ all: Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OS := $(shell uname -s)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(OS),Darwin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Default is an Xcode project, so force a makefile build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- export QMAKESPEC=macx-g++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ export QMAKESPEC=macx-clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Makefile.qmake: xxdiff.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(QMAKE) -o Makefile.qmake $<
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Makefile.qmake: $(MAKEDIR)/xxdiff.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(QMAKE) $(QMAKEOPTS) -o Makefile.qmake $<
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Makefile: Makefile.qmake Makefile.extra
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cat $^ > Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Makefile: Makefile.qmake $(MAKEDIR)/Makefile.extra
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "MAKEDIR = $(MAKEDIR)" > Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cat $^ >> Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/Makefile.extra ./src/Makefile.extra
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/Makefile.extra 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/Makefile.extra 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4,7 +4,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Extra targets.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-EXTRA_FILES = version.h doc.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++EXTRA_FILES = version.h $(MAKEDIR)/doc.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .SUFFIXES: .html .txt .h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,8 +23,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Automatically generate a simple include file with version number in it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-version.h: ../VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo "#define XX_VERSION \"`cat ../VERSION`\"" > $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++version.h: $(MAKEDIR)/../VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "#define XX_VERSION \"`cat $(MAKEDIR)/../VERSION`\"" > $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Dependencies for the generated version file.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ proginfo.o: version.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,8 +41,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sed -e 's/\"/\\\"/g;s/$$/\\n\\/;1s/^/char text[]=\"/;$$s/\\$$/\"\;/' $< > $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Dependencies for the generated documentation file.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-help.o: doc.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-help.obj: doc.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++help.o: $(MAKEDIR)/doc.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++help.obj: $(MAKEDIR)/doc.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Convert the reStructuredText documentation to html. (this is only used by the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # author, directly, manually, not that important for xxdiff packagers.)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -60,13 +60,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -f $(EXTRA_FILES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Override the qmake we use because the one in the path might be different.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE = qmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Note: we would need to add this to be correct. Danger! If the Makefile gets
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # remade, this file does not get appended again to the new makefile!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ all: Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Makefile: xxdiff.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(MAKE) -f Makefile.bootstrap Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Makefile: $(MAKEDIR)/xxdiff.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(MAKE) -f $(MAKEDIR)/Makefile.bootstrap Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/accelUtil.cpp ./src/accelUtil.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/accelUtil.cpp 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/accelUtil.cpp 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,7 +27,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <accelUtil.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <resources.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QKeySequence>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QKeySequence>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <iostream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -49,7 +49,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QString cval = val.trimmed().toLower();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QKeySequence keyseq = QKeySequence::fromString( cval );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- accel = (int)keyseq;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ accel = keyseq[0];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Check that converting back gets the original value
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ( cval == keyseq.toString().toLower() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -59,7 +59,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void XxAccelUtil::write( std::ostream& os, int accel )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- os << QKeySequence( accel ).toString().toAscii().constData();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ os << QKeySequence( accel ).toString().toLocal8Bit().constData();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XX_NAMESPACE_END
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/accelUtil.h ./src/accelUtil.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/accelUtil.h 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/accelUtil.h 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32,7 +32,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef INCL_QT_QSTRING
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QString>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QString>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define INCL_QT_QSTRING
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/app.cpp ./src/app.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/app.cpp 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/app.cpp 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -49,31 +49,31 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <central.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <borderLabel.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QMainWindow>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QMenu>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QMenuBar>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QLayout>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QScrollBar>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QLabel>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QStyleFactory>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QFont>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QMessageBox>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QFileDialog>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QShortcut>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QWhatsThis>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QClipboard>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QProcess>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QToolBar>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QAction>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QTextStream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QFile>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QSplitter>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QRegExp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QCheckBox>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QDateTime>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QPixmap>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QHBoxLayout>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QVBoxLayout>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QMainWindow>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QMenu>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QMenuBar>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QLayout>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QScrollBar>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QLabel>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QStyleFactory>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QFont>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QMessageBox>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QFileDialog>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QShortcut>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QWhatsThis>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QClipboard>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QProcess>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QToolBar>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QAction>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QTextStream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QFile>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QSplitter>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QRegExp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QCheckBox>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QDateTime>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QPixmap>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QHBoxLayout>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QVBoxLayout>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef XX_KDE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -179,7 +179,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XxMainWindow(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XxApp* app,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QWidget* parent = 0,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Qt::WFlags f = Qt::Window
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Qt::WindowFlags f = Qt::Window
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -197,11 +197,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XxMainWindow::XxMainWindow(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XxApp* app,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QWidget* parent,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Qt::WFlags f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Qt::WindowFlags f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ) :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QkMainWindow( parent, f ),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _app( app )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-{}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (void)_app; // suppress "unused" warning
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -243,14 +245,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Read in the resources and create resources object.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _resources = buildResources();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-// We do not force the style anymore.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-// #ifndef XX_KDE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-// // By default, if not specified, force SGI style.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-// if ( !_cmdline._forceStyle ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-// _style = QStyleFactory::create( _resources->getStyleKey() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-// setStyle( _style );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-// }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-// #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef XX_KDE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ( !_cmdline._forceStyle ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _style = QStyleFactory::create( _resources->getStyleKey() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (_style) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ setStyle( _style );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef XX_KDE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( _cmdline._forceFont == false ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2283,12 +2285,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( _resources->getBoolOpt( BOOL_DIRDIFF_RECURSIVE ) ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dirdiff_command = _resources->getCommand(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CMD_DIFF_DIRECTORIES_REC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ).toAscii();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ).toLocal8Bit();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dirdiff_command = _resources->getCommand(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CMD_DIFF_DIRECTORIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ).toAscii();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ).toLocal8Bit();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::auto_ptr<XxDiffs> tmp(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dirsBuilder->process( dirdiff_command.constData(), *_files[0], *_files[1] )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3522,7 +3524,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QString * tmpTitle = new QString();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tmpTitle->sprintf( "--title%d=%s",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ii+1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _cmdline._userFilenames[ii].toLatin1().constData() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _cmdline._userFilenames[ii].toLocal8Bit().constData() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ titles[ii] = tmpTitle;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3547,7 +3549,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( filenames.count() > 0 ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Spawn a diff.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QString command = argv()[0];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QString command = arguments()[0];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( filenames.count() == 1 ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ command += QString(" --single ");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/app.h ./src/app.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/app.h 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/app.h 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -48,12 +48,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef INCL_QT_QAPPLICATION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QApplication>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QApplication>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define INCL_QT_QAPPLICATION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef INCL_QT_QFILEINFO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QFileInfo>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QFileInfo>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define INCL_QT_QFILEINFO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/app.inline.h ./src/app.inline.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/app.inline.h 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/app.inline.h 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,7 +37,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef INCL_QT_QSCROLLBAR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QScrollBar>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QScrollBar>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define INCL_QT_QSCROLLBAR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/borderLabel.cpp ./src/borderLabel.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/borderLabel.cpp 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/borderLabel.cpp 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,13 +27,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <borderLabel.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <app.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QPainter>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QBrush>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QPen>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QColor>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QPainter>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QBrush>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QPen>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QColor>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QApplication>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QLabel>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QApplication>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QLabel>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/borderLabel.h ./src/borderLabel.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/borderLabel.h 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/borderLabel.h 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,7 +36,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef INCL_QT_QLABEL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QLabel>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QLabel>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define INCL_QT_QLABEL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/buffer.cpp ./src/buffer.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/buffer.cpp 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/buffer.cpp 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,10 +28,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <exceptions.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <util.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QFontMetrics>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QFont>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QRect>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QDir>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QFontMetrics>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QFont>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QRect>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QDir>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <iostream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -52,20 +52,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //------------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-const char* strnchr( const char* s, int c, const char* end )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const char* pc = s;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- while ( pc < end ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ( *pc == c ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return pc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pc++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-//------------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-//
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char* strnstr( const char* haystack, const uint n, const char* needle )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char* p = haystack;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -213,7 +199,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( _deleteFile == true ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XxUtil::removeFile( _name.toLatin1().constData() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ XxUtil::removeFile( _name.toLocal8Bit().constData() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -282,7 +268,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void XxBuffer::loadFile( const QFileInfo& finfo )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Read file into buffer.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FILE* fp = fopen( _name.toLatin1().constData(), "r" );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ FILE* fp = fopen( _name.toLocal8Bit().constData(), "r" );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( fp == 0 ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ throw XxIoError( XX_EXC_PARAMS );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -377,7 +363,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ it != _directoryEntries.end();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ++it ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int len = (*it).length();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ::strncpy( bufferPtr, (*it).toLatin1().constData(), len );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ::strncpy( bufferPtr, (*it).toLocal8Bit().constData(), len );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bufferPtr[len] = _newlineChar;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bufferPtr += len + 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -433,7 +419,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _index.push_back( ii + 1 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef XX_ENABLED_BUFFER_LINE_LENGTHS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _lengths.push_back( ii - prev );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- prev = static_cast<short>( ii + 1 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ prev = static_cast<unsigned int>( ii + 1 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -457,7 +443,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::swap( _index, oldIndex );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef XX_ENABLED_BUFFER_LINE_LENGTHS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- std::vector<short> oldLengths;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ std::vector<unsigned int> oldLengths;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::swap( _lengths, oldLengths );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -710,7 +696,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const QString& format
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _lnBuffer.sprintf( format.toLatin1().constData(), lineNumber );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _lnBuffer.sprintf( format.toLocal8Bit().constData(), lineNumber );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return _lnBuffer;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -721,7 +707,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool found = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint len;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char* text = getTextLine( lineno, len );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ( strnstr( text, len, searchText.toLatin1().constData() ) != 0 ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ( strnstr( text, len, searchText.toLocal8Bit().constData() ) != 0 ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ found = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return found;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/buffer.h ./src/buffer.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/buffer.h 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/buffer.h 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -51,17 +51,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef INCL_QT_QSTRING
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QString>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QString>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define INCL_QT_QSTRING
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef INCL_QT_QSTRINGLIST
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QStringList>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QStringList>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define INCL_QT_QSTRINGLIST
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef INCL_QT_QFILEINFO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QFileInfo>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QFileInfo>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define INCL_QT_QFILEINFO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -268,16 +268,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define XX_ENABLED_BUFFER_LINE_LENGTHS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef XX_ENABLED_BUFFER_LINE_LENGTHS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // Important note: due to the use of the short datatype to record line
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // lengths, xxdiff is limited to lines of length up to 64k characters. We
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // consider this reasonable for all purposes. However, this could be easily
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // changed to int below if necessary.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- //
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // We had to introduce an explicit vector of lengths because since the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // unmerge feature was introduced, we're sharing the very text buffer that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // the multiple buffers use we cannot anymore rely on buffer lines appearing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // next to each other in the data array.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- std::vector<short> _lengths;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ std::vector<unsigned int> _lengths;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Indirection index for reindexed files. This array contains the line
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/builderDirs2.cpp ./src/builderDirs2.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/builderDirs2.cpp 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/builderDirs2.cpp 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,12 +30,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <util.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <buffer.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QString>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QByteArray>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QStringList>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QTextStream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QFile>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QProcess>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QString>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QByteArray>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QStringList>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QTextStream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QFile>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QProcess>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdexcept>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -130,17 +130,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool parseDiffLine(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const QString& line,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const QString& dir1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int len1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const QString& dir2,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int len2,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DirDiffType& type,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QString& filename,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int& onlyDir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QByteArray lineBa = line.toLatin1();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QByteArray lineBa = line.toLocal8Bit();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char* buf = lineBa.constData();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QByteArray bytes1 = dir1.toLocal8Bit();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QByteArray bytes2 = dir2.toLocal8Bit();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const int len1 = bytes1.size();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const int len2 = bytes2.size();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool error;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char* bufPtr = buf;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ onlyDir = -1; /* don't take chances with chance */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -152,8 +155,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //int len = colonPtr - bufPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int cmp1 = ::strncmp( bufPtr, dir1.toLatin1().constData(), len1 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int cmp2 = ::strncmp( bufPtr, dir2.toLatin1().constData(), len2 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int cmp1 = ::strncmp( bufPtr, bytes1.constData(), len1 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int cmp2 = ::strncmp( bufPtr, bytes2.constData(), len2 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Note: you cannot compare the lengths because these might be directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // diffs.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( cmp1 == 0 && cmp2 == 0 ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -179,7 +182,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ++dnamePtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( colonPtr - dnamePtr > 0 ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QString aname( QString::fromLatin1( dnamePtr, colonPtr - dnamePtr ) );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QString aname( QString::fromLocal8Bit( dnamePtr, colonPtr - dnamePtr ) );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ filename += aname;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( filename.at( filename.length() - 1 ) != '/' ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ filename.append( '/' );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -187,7 +190,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Note: need to remove \n
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QString bname( QString::fromLatin1( colonPtr + 2 ) );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QString bname( QString::fromLocal8Bit( colonPtr + 2 ) );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ filename += bname;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ type = ONLY_IN;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -205,7 +208,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int mlen = andPtr - filenamePtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( mlen > 0 ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- filename = QString::fromLatin1( filenamePtr, mlen );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ filename = QString::fromLocal8Bit( filenamePtr, mlen );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ filename = QString();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -236,7 +239,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int mlen = andPtr - filenamePtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( mlen > 0 ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- filename = QString::fromLatin1( filenamePtr, mlen );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ filename = QString::fromLocal8Bit( filenamePtr, mlen );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ filename = QString();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -267,7 +270,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for ( unsigned int ii = 0; ii < entries.count(); ++ii ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XX_TRACE( entries[ii] );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XX_TRACE( "filename \"" << filename.toLatin1().constData() << "\"" );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ XX_TRACE( "filename \"" << filename.toLocal8Bit().constData() << "\"" );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ throw XxInternalError( XX_EXC_PARAMS );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -320,8 +323,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QString path1 = buffer1.getName();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QString path2 = buffer2.getName();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const int len1 = path1.length();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const int len2 = path2.length();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while ( true ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( ! diffProc.canReadLine() ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -335,7 +336,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QString filename;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int onlyDir = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( parseDiffLine(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- line, path1, len1, path2, len2, type, filename, onlyDir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ line, path1, path2, type, filename, onlyDir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ) == true ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XX_LOCAL_TRACE( "ERROR" );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ errors << "Diff error:" << endl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -346,7 +347,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef LOCAL_TRACE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XX_TRACE( line
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ << typeString[ type ] << " "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- << filename.toLatin1().constData() << " "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ << filename.toLocal8Bit().constData() << " "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ << onlyDir );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( type == UNKNOWN ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ throw XxInternalError( XX_EXC_PARAMS );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -402,11 +403,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for ( QStringList::ConstIterator iter = entries1.begin();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ iter != entries1.end(); ++iter ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XX_TRACE( (*iter).toLatin1().constData() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ XX_TRACE( (*iter).toLocal8Bit().constData() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for ( QStringList::ConstIterator iter = entries2.begin();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ iter != entries2.end(); ++iter ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XX_TRACE( (*iter).toLatin1().constData() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ XX_TRACE( (*iter).toLocal8Bit().constData() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -419,9 +420,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QString path1 = buffer1.getName();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QString path2 = buffer2.getName();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const int len1 = path1.length();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const int len2 = path2.length();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while ( true ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( ! diffProc.canReadLine() ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( ! diffProc.waitForReadyRead() ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -434,7 +432,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QString filename;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int onlyDir = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( parseDiffLine(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- line, path1, len1, path2, len2, type, filename, onlyDir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ line, path1, path2, type, filename, onlyDir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ) == true ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XX_LOCAL_TRACE( "ERROR" );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ errors << "Diff error:" << endl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -445,7 +443,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef LOCAL_TRACE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XX_TRACE( line
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ << typeString[ type ] << " "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- << filename.toLatin1().constData() << " "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ << filename.toLocal8Bit().constData() << " "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ << onlyDir );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( type == UNKNOWN ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ throw XxInternalError( XX_EXC_PARAMS );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/builderFiles2.cpp ./src/builderFiles2.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/builderFiles2.cpp 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/builderFiles2.cpp 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,11 +31,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <diffutils.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <buffer.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QString>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QByteArray>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QTextStream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QFile>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QProcess>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QString>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QByteArray>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QTextStream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QFile>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QProcess>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdexcept>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -86,7 +86,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * this code taken from "ediff.c" by David MacKenzie, a published,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * uncopyrighted program to translate diff output into plain English
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QByteArray lineBa = line.toLatin1();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QByteArray lineBa = line.toLocal8Bit();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char* buf = lineBa.constData();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool error = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -221,7 +221,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XxBuilderFiles2::XxBuilderFiles2( bool useInternalDiff ) :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XxBuilder(),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _useInternalDiff( useInternalDiff )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-{}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (void)_useInternalDiff; // suppress "unused" warning
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //------------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -306,7 +308,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch ( type ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case XxLine::INSERT_1: {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XX_LOCAL_TRACE( XxLine::mapToString( type ).toLatin1().constData() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ XX_LOCAL_TRACE( XxLine::mapToString( type ).toLocal8Bit().constData() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XX_LOCAL_TRACE( "Output: f1n1=" << f1n1 << " f1n2=" << f1n2 <<
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ " f2n1=" << f2n1 << " f2n2=" << f2n2 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -327,7 +329,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case XxLine::INSERT_2: {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XX_LOCAL_TRACE( XxLine::mapToString( type ).toLatin1().constData() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ XX_LOCAL_TRACE( XxLine::mapToString( type ).toLocal8Bit().constData() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XX_LOCAL_TRACE( "Output: f1n1=" << f1n1 << " f1n2=" << f1n2 <<
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ " f2n1=" << f2n1 << " f2n2=" << f2n2 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -348,7 +350,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case XxLine::DIFF_ALL: {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XX_LOCAL_TRACE( XxLine::mapToString( type ).toLatin1().constData() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ XX_LOCAL_TRACE( XxLine::mapToString( type ).toLocal8Bit().constData() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XX_LOCAL_TRACE( "Output: f1n1=" << f1n1 << " f1n2=" << f1n2 <<
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ " f2n1=" << f2n1 << " f2n2=" << f2n2 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -381,7 +383,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case XxLine::SAME: {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XX_LOCAL_TRACE( XxLine::mapToString( type ).toLatin1().constData() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ XX_LOCAL_TRACE( XxLine::mapToString( type ).toLocal8Bit().constData() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Used to ignore a line */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/builderFiles3.cpp ./src/builderFiles3.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/builderFiles3.cpp 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/builderFiles3.cpp 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,11 +30,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <util.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <buffer.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QString>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QByteArray>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QTextStream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QFile>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QProcess>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QString>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QByteArray>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QTextStream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QFile>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QProcess>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdexcept>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -209,7 +209,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QByteArray lineBa = line.toLatin1();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QByteArray lineBa = line.toLocal8Bit();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char* buf = lineBa.constData();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XX_LOCAL_TRACE( "" );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -485,7 +485,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef XX_DEBUG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XX_LOCAL_TRACE( "ParseDiffLine results: " );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XX_LOCAL_TRACE( XxLine::mapToString( type ).toLatin1().constData() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ XX_LOCAL_TRACE( XxLine::mapToString( type ).toLocal8Bit().constData() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XX_LOCAL_TRACE( " sno=" << sno );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XX_LOCAL_TRACE( " f1n1=" << f1n1 << " f1n2=" << f1n2 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XX_LOCAL_TRACE( " f2n1=" << f2n1 << " f2n2=" << f2n2 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/builderSingle.cpp ./src/builderSingle.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/builderSingle.cpp 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/builderSingle.cpp 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,7 +28,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <diffs.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <buffer.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QTextStream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QTextStream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <iostream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/builderUnmerge.cpp ./src/builderUnmerge.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/builderUnmerge.cpp 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/builderUnmerge.cpp 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,9 +29,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <buffer.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <resources.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QByteArray>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QTextStream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QRegExp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QByteArray>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QTextStream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QRegExp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <iostream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/central.cpp ./src/central.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/central.cpp 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/central.cpp 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -35,19 +35,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <borderLabel.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <help.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QPainter>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QBrush>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QPen>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QColor>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QLayout>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QShortcut>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QApplication>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QClipboard>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QHBoxLayout>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QFrame>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QLabel>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QVBoxLayout>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QPainter>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QBrush>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QPen>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QColor>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QLayout>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QShortcut>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QApplication>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QClipboard>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QHBoxLayout>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QFrame>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QLabel>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QVBoxLayout>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <math.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/central.h ./src/central.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/central.h 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/central.h 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -40,12 +40,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef INCL_QT_QMAINWINDOW
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QMainWindow>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QMainWindow>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define INCL_QT_QMAINWINDOW
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef INCL_QT_QFRAME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QFrame>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QFrame>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define INCL_QT_QFRAME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/cmdline.cpp ./src/cmdline.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/cmdline.cpp 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/cmdline.cpp 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,9 +36,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <kdeSupport.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QApplication>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QByteArray>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QTextStream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QApplication>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QByteArray>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QTextStream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*#define getopt xxdiff_getopt*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <getopt.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -289,8 +289,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "Sets the X display (default is $DISPLAY)."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { "style", 0, true, 's',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "Sets the application GUI style. Possible values are motif, windows, "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "and platinum. "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "Sets the application GUI style. Possible values are fusion, windows, "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "or QtCurve when that style has been installed. "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { "platform", 0, true, 'x',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "Sets the platform plugin to be used. For instance, on OS X one can use "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "cocoa or xcb as platform plugins."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { "geometry", 0, true, 'g',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "Sets the client geometry of the main widget."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -339,6 +343,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //------------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XxCmdline::XxCmdline() :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _forcePlatform( false ),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _forceStyle( false ),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _forceGeometry( false ),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _forceFont( false ),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -434,7 +439,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while ( true ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int c = getopt_long( argc,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ argv,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- shortOptions.toLatin1().constData(),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ shortOptions.toLocal8Bit().constData(),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ longOptions,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ &optionIndex );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( c == -1 ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -642,7 +647,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case 'd':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- case 's':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case 's': // --style
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case 'x': // --platform
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case 'G':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case 'g':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case 'F':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -762,7 +768,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( !_promptForFiles )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for ( ii = 0; ii < _nbFilenames; ++ii ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _filenames[ ii ] = QString::fromLatin1( argv[ optind + ii ] ).trimmed();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _filenames[ ii ] = QString::fromLocal8Bit( argv[ optind + ii ] ).trimmed();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -771,6 +777,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( strncmp( _qtOptions[ ii ], "-style", 6 ) == 0 ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _forceStyle = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else if ( strncmp( _qtOptions[ ii ], "-platform", 9 ) == 0 ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _forcePlatform = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if ( strncmp( _qtOptions[ ii ], "-geometry", 9 ) == 0 ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _forceGeometry = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/cmdline.h ./src/cmdline.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/cmdline.h 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/cmdline.h 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -117,6 +117,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*----- data members -----*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Cmdline-related variables.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bool _forcePlatform;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool _forceStyle;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool _forceGeometry;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool _forceFont;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/copyLabel.cpp ./src/copyLabel.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/copyLabel.cpp 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/copyLabel.cpp 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,13 +28,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <kdeSupport.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QToolTip>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QToolTip>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QApplication>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QClipboard>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QResizeEvent>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QMouseEvent>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QLabel>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QApplication>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QClipboard>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QResizeEvent>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QMouseEvent>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QLabel>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*==============================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/copyLabel.h ./src/copyLabel.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/copyLabel.h 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/copyLabel.h 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,7 +36,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef INCL_QT_QLABEL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QLabel>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QLabel>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define INCL_QT_QLABEL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/diffs.cpp ./src/diffs.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/diffs.cpp 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/diffs.cpp 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,7 +28,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <buffer.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <resources.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QTextStream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QTextStream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <list>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <algorithm>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -893,7 +893,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // for ( int ii = 0; ii < 4; ++ii ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // XX_TRACE( tags[ii].toLatin1().constData() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // XX_TRACE( tags[ii].toLocal8Bit().constData() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool foundUnsel = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/diffs.h ./src/diffs.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/diffs.h 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/diffs.h 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -40,7 +40,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef INCL_QT_QOBJECT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QObject>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QObject>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define INCL_QT_QOBJECT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/diffutils.cpp ./src/diffutils.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/diffutils.cpp 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/diffutils.cpp 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -246,7 +246,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for ( QStringList::Iterator it = out_args.begin();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ it != out_args.end();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ++it ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- argv[argc++] = strdup( (*it).toLatin1().constData() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ argv[argc++] = strdup( (*it).toLocal8Bit().constData() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ argv[argc] = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/diffutils.h ./src/diffutils.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/diffutils.h 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/diffutils.h 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32,7 +32,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef INCL_QT_QSTRING
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QString>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QString>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define INCL_QT_QSTRING
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/exceptions.cpp ./src/exceptions.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/exceptions.cpp 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/exceptions.cpp 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,7 +28,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <cmdline.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <help.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QTextStream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QTextStream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <iostream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h> // strerror
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -150,7 +150,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ oss << "Internal error." << endl << endl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ oss << "There has been an internal error within xxdiff." << endl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ << "To report bugs, please use the sourceforge bug tracker" << endl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- << "at http://sourceforge.net/tracker/?group_id=2198" << endl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ << "at https://sourceforge.net/p/xxdiff/bugs/" << endl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ << "and log the above information above and if possible," << endl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ << "the files that caused the error, and as much detail as" << endl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ << "you can to reproduce the error.";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -161,9 +161,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // I'll know what's going on at least when developing in debug mode.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef XX_DEBUG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::cerr << "Throwing exception:" << std::endl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- std::cerr << _msg.toLatin1().constData() << std::endl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ std::cerr << _msg.toLocal8Bit().constData() << std::endl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XX_NAMESPACE_END
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/exceptions.h ./src/exceptions.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/exceptions.h 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/exceptions.h 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,12 +33,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef INCL_QT_QSTRING
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QString>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QString>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define INCL_QT_QSTRING
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef INCL_QT_QTEXTSTREAM
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QTextStream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QTextStream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define INCL_QT_QTEXTSTREAM
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/getopt.c ./src/getopt.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/getopt.c 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/getopt.c 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -390,6 +390,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *const *argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char *optstring;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (void)argc; /* suppress "unused" warning */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (void)argv; /* suppress "unused" warning */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Start processing options with ARGV-element 1 (since ARGV-element 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ is the program name); the sequence of previously skipped
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ non-option ARGV-elements is empty. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/help.cpp ./src/help.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/help.cpp 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/help.cpp 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32,9 +32,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <resParser.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <kdeSupport.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QPixmap>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QTextStream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QVBoxLayout>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QPixmap>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QTextStream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QVBoxLayout>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace XX_NAMESPACE_PREFIX { namespace Manual {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if !defined(WINDOWS) && !defined(__CYGWIN__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -44,15 +44,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QDialog>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QMessageBox>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QLayout>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QLabel>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QPushButton>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QPalette>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QTextBrowser>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QByteArray>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QLineEdit>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QDialog>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QMessageBox>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QLayout>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QLabel>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QPushButton>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QPalette>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QTextBrowser>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QByteArray>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QLineEdit>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <iostream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -599,7 +599,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QString XxHelp::xmlize( const QString& in )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QByteArray inBa = in.toLatin1();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QByteArray inBa = in.toLocal8Bit();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char* inc = inBa.constData();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QString out;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for ( int ii = 0; ii < in.length(); ++ii ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/help.h ./src/help.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/help.h 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/help.h 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,7 +36,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef INCL_QT_QDIALOG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QDialog>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QDialog>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define INCL_QT_QDIALOG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/hordiffImp.cpp ./src/hordiffImp.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/hordiffImp.cpp 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/hordiffImp.cpp 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,7 +27,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <hordiffImp.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <resources.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QByteArray>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QByteArray>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef COMPILER_MIPSPRO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <cctype> // isspace()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/line.h ./src/line.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/line.h 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/line.h 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,7 +41,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef INCL_QT_QSTRING
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QString>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QString>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define INCL_QT_QSTRING
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/lineNumbers.cpp ./src/lineNumbers.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/lineNumbers.cpp 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/lineNumbers.cpp 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32,14 +32,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <buffer.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <text.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QPainter>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QBrush>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QPen>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QColor>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QApplication>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QClipboard>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QFrame>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QPainter>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QBrush>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QPen>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QColor>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QApplication>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QClipboard>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QFrame>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <math.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/lineNumbers.h ./src/lineNumbers.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/lineNumbers.h 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/lineNumbers.h 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,7 +36,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef INCL_QT_QFRAME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QFrame>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QFrame>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define INCL_QT_QFRAME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/main.cpp ./src/main.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/main.cpp 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/main.cpp 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -91,7 +91,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ catch ( const XxError& ex ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- std::cerr << ex.getMsg().toAscii().constData() << std::endl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ std::cerr << ex.getMsg().toLocal8Bit().constData() << std::endl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Note: we're casting for Windows MSVC streams which are broken.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ catch ( const std::exception& ex ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/markers.cpp ./src/markers.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/markers.cpp 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/markers.cpp 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26,20 +26,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <markers.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QFileDialog>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QFileInfo>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QString>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QDir>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QRadioButton>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QLineEdit>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QLabel>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QCheckBox>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QLayout>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QPushButton>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QHBoxLayout>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QVBoxLayout>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QFileDialog>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QFileInfo>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QString>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QDir>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QRadioButton>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QLineEdit>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QLabel>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QCheckBox>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QLayout>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QPushButton>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QHBoxLayout>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QVBoxLayout>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XX_NAMESPACE_BEGIN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -167,7 +167,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _buttonOk = new QPushButton;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _buttonOk->setText( trUtf8( "Ok" ) );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _buttonOk->setDefault( TRUE );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _buttonOk->setDefault( true );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hlayout->addWidget( _buttonOk );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hlayout->addItem( new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ) );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -253,7 +253,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Hack to embed XxMarkersWidget into the QFileDialog, since the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // convenient Qt3 addWidgets doesn't exist anymore
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QVBoxLayout *l = qFindChild<QVBoxLayout*>(this);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QVBoxLayout *l = this->findChild<QVBoxLayout*>(); //qFindChild<QVBoxLayout*>(this);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Q_ASSERT(l);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _markersWidget = new XxMarkersWidget( threeWay );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ l->addWidget(_markersWidget);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -272,7 +272,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XxMarkersFileDialog* dlg = new XxMarkersFileDialog(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- startWith, filter, TRUE, threeWay, parent
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ startWith, filter, true, threeWay, parent
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QString result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/markers.h ./src/markers.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/markers.h 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/markers.h 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,7 +37,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef INCL_STD_QFILEDIALOG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QFileDialog>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QFileDialog>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define INCL_STD_QFILEDIALOG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/merged.cpp ./src/merged.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/merged.cpp 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/merged.cpp 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,19 +31,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <diffs.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <buffer.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QPainter>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QBrush>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QPen>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QColor>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QMenu>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QMenuBar>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QLayout>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QCloseEvent>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QApplication>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QClipboard>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QHBoxLayout>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QVBoxLayout>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QPainter>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QBrush>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QPen>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QColor>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QMenu>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QMenuBar>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QLayout>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QCloseEvent>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QApplication>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QClipboard>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QHBoxLayout>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QVBoxLayout>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <math.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/merged.h ./src/merged.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/merged.h 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/merged.h 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -44,17 +44,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef INCL_QT_QMAINWINDOW
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QMainWindow>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QMainWindow>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define INCL_QT_QMAINWINDOW
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef INCL_QT_QFRAME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QFrame>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QFrame>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define INCL_QT_QFRAME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef INCL_QT_QWIDGET
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QWidget>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QWidget>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define INCL_QT_QWIDGET
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/optionsDialog.cpp ./src/optionsDialog.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/optionsDialog.cpp 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/optionsDialog.cpp 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32,24 +32,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <kdeSupport.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QTabWidget>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QTextEdit>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QLineEdit>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QCheckBox>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QRadioButton>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QPushButton>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QSpinBox>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QListWidgetItem>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QListWidget>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QColor>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QColorDialog>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QFontDialog>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QLabel>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QComboBox>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QString>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QPainter>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QMetaType>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QItemDelegate>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QTabWidget>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QTextEdit>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QLineEdit>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QCheckBox>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QRadioButton>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QPushButton>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QSpinBox>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QListWidgetItem>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QListWidget>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QColor>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QColorDialog>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QFontDialog>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QLabel>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QComboBox>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QString>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QPainter>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QMetaType>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QItemDelegate>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -143,6 +143,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XxColoredItem::XxColoredItem( XxColor color )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (void)_resources; // suppress "unused" warning
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XxColoredItemData data( color, XxResParser::getColorName( color ) );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ setData( Qt::DisplayRole, qVariantFromValue( data ) );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -153,39 +154,45 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// copied from Qt 4.8's qvariant.h:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// template<typename T> inline T qvariant_cast(const QVariant &variant)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// return qvariant_cast<T>(variant);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //------------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inline XxColor XxColoredItem::color() const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return qVariantValue<XxColoredItemData>( data( Qt::DisplayRole ) )._color;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return qvariant_cast<XxColoredItemData>( data( Qt::DisplayRole ) )._color;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //------------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inline QColor XxColoredItem::foreColor() const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return qVariantValue<XxColoredItemData>( data( Qt::DisplayRole ) )._foreColor;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return qvariant_cast<XxColoredItemData>( data( Qt::DisplayRole ) )._foreColor;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //------------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inline QColor XxColoredItem::backColor() const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return qVariantValue<XxColoredItemData>( data( Qt::DisplayRole ) )._backColor;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return qvariant_cast<XxColoredItemData>( data( Qt::DisplayRole ) )._backColor;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //------------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inline bool XxColoredItem::modified() const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return qVariantValue<XxColoredItemData>( data( Qt::DisplayRole ) )._modified;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return qvariant_cast<XxColoredItemData>( data( Qt::DisplayRole ) )._modified;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //------------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void XxColoredItem::setForeColor( const QColor& color)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XxColoredItemData data = qVariantValue<XxColoredItemData>( this->data( Qt::DisplayRole ) );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ XxColoredItemData data = qvariant_cast<XxColoredItemData>( this->data( Qt::DisplayRole ) );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ data._foreColor = color;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ setData( Qt::DisplayRole, qVariantFromValue( data ) );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -194,7 +201,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void XxColoredItem::setBackColor( const QColor& color)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XxColoredItemData data = qVariantValue<XxColoredItemData>( this->data( Qt::DisplayRole ) );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ XxColoredItemData data = qvariant_cast<XxColoredItemData>( this->data( Qt::DisplayRole ) );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ data._backColor = color;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ setData( Qt::DisplayRole, qVariantFromValue( data ) );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -203,7 +210,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void XxColoredItem::setModified( const bool modified )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XxColoredItemData data = qVariantValue<XxColoredItemData>( this->data( Qt::DisplayRole ) );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ XxColoredItemData data = qvariant_cast<XxColoredItemData>( this->data( Qt::DisplayRole ) );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ data._modified = modified;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ setData( Qt::DisplayRole, qVariantFromValue( data ) );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -260,7 +267,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ painter->save();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XxColoredItemData data = qVariantValue<XxColoredItemData>(index.data());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ XxColoredItemData data = qvariant_cast<XxColoredItemData>(index.data());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Font.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ painter->setFont( _resources->getFontText() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/overview.cpp ./src/overview.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/overview.cpp 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/overview.cpp 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,14 +30,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <diffs.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <buffer.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QPainter>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QBrush>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QPen>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QColor>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QWheelEvent>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QResizeEvent>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QFrame>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QMouseEvent>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QPainter>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QBrush>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QPen>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QColor>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QWheelEvent>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QResizeEvent>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QFrame>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QMouseEvent>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <math.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/overview.h ./src/overview.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/overview.h 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/overview.h 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,7 +36,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef INCL_QT_QFRAME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QFrame>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QFrame>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define INCL_QT_QFRAME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/resParser.cpp ./src/resParser.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/resParser.cpp 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/resParser.cpp 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -43,16 +43,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <kdeSupport.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QKeySequence>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QApplication>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QFont>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QFile>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QFileInfo>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QByteArray>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QString>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QStyleFactory>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QDesktopWidget>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QTextStream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QKeySequence>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QApplication>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QFont>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QFile>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QFileInfo>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QByteArray>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QString>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QStyleFactory>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QDesktopWidget>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QTextStream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdexcept>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <iostream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -701,7 +701,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int t = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int w = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int h = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QByteArray valBa = val.toLatin1();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QByteArray valBa = val.toLocal8Bit();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char* vchar = valBa.constData();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( sscanf( vchar, "%dx%d+%d+%d", &w, &h, &l, &t ) == 4 ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ geometry = QRect( l, t, w, h );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -794,7 +794,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QString os;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QTextStream oss( &os );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ oss << "Unknown " << errmsg << ": " << name << flush;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- resParsererror( NULL, os.toLatin1().constData() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ resParsererror( NULL, os.toLocal8Bit().constData() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ num = ERROR_TOKEN;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ERROR_TOKEN;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1180,7 +1180,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ astr = QKeySequence( aval ).toString();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os << accelStr << "." << accelList[ii]._name << ": \""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- << astr.toLatin1().constData() << "\"" << endl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ << astr.toLocal8Bit().constData() << "\"" << endl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const QFont& fontApp = res.getFontApp();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1232,7 +1232,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XxCommand bo = XxCommand(commandList[ii]._token);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const QString& b1 = res.getCommand( bo );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os << commandStr << "." << commandList[ii]._name << ": \""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- << b1.toLatin1().constData() << "\"" << endl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ << b1.toLocal8Bit().constData() << "\"" << endl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int nbcommandSwitch = sizeof(commandSwitchList)/sizeof(StringToken);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1242,7 +1242,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XxCommandSwitch bo = XxCommandSwitch(commandSwitchList[ii]._token);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const QString& b1 = res.getCommandSwitch( bo );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os << commandSwitchStr << "." << commandSwitchList[ii]._name << ": \""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- << b1.toLatin1().constData() << "\"" << endl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ << b1.toLocal8Bit().constData() << "\"" << endl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char* initSwitchStr = searchTokenName( kwdList, kwdList_size, INITSW );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1270,7 +1270,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XxTag bo = XxTag(tagList[ii]._token);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const QString& b1 = res.getTag( bo );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os << tagStr << "." << tagList[ii]._name << ": \""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- << b1.toLatin1().constData() << "\"" << endl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ << b1.toLocal8Bit().constData() << "\"" << endl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os << searchTokenName( kwdList, kwdList_size, CLIPBOARD_HEAD_FORMAT ) << ": \""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/resParser.h ./src/resParser.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/resParser.h 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/resParser.h 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,12 +36,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef INCL_QT_QSTRING
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QString>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QString>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define INCL_QT_QSTRING
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef INCL_QT_QTEXTSTREAM
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QTextStream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QTextStream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define INCL_QT_QTEXTSTREAM
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/resParser.y ./src/resParser.y
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/resParser.y 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/resParser.y 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,10 +28,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <resParser.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Qt imports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QString>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QStringList>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QRect>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QStyleFactory>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QString>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QStringList>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QRect>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QStyleFactory>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // The parser input is the resources object to fill in.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define RESOURCES ( static_cast<XxResources*>(resources) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -217,7 +217,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QString err = QString( "Requested style key does not exist." );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ err += QString( "\nValid styles are: " );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ err += styles.join( ", " );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- yyerror( NULL, err.toLatin1().constData() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ yyerror( NULL, err.toLocal8Bit().constData() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/resources.cpp ./src/resources.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/resources.cpp 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/resources.cpp 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,11 +31,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <exceptions.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <util.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QColor>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QObject>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QApplication> // to get desktop
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QRegExp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QStyleFactory>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QColor>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QObject>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QApplication> // to get desktop
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QRegExp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QStyleFactory>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <iostream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h> // ::strcmp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -98,9 +98,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _preferredGeometry = _defaultGeometry;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _styleKey = // Default style.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef Q_OS_MAC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "Macintosh (aqua)";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "Macintosh";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(Q_OS_WIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "Windows";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "Cleanlooks";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _maximize = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -117,6 +119,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _accelerators[ ACCEL_EXIT_MERGED ] = Qt::Key_M;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _accelerators[ ACCEL_EXIT_REJECT ] = Qt::Key_R;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _accelerators[ ACCEL_SAVE_AS_LEFT ] = Qt::CTRL | Qt::SHIFT | Qt::Key_L;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _accelerators[ ACCEL_SAVE_AS_RIGHT ] = Qt::CTRL | Qt::SHIFT | Qt::Key_R;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _accelerators[ ACCEL_SAVE_AS_MERGED ] = Qt::CTRL | Qt::Key_M;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _accelerators[ ACCEL_SEARCH ] = Qt::CTRL | Qt::Key_S;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -316,7 +320,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // "cmp -s" barfs on directories.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char* editor = getenv( "EDITOR" );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( editor != 0 ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _commands[ CMD_EDIT ] = QString::fromLatin1( editor );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _commands[ CMD_EDIT ] = QString::fromLocal8Bit( editor );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _commands[ CMD_EDIT ] = "xterm -e vi";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/resources.h ./src/resources.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/resources.h 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/resources.h 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32,22 +32,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef INCL_QT_QOBJECT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QObject>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QObject>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define INCL_QT_QOBJECT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef INCL_QT_QCOLOR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QColor>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QColor>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define INCL_QT_QCOLOR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef INCL_QT_QFONT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QFont>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QFont>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define INCL_QT_QFONT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef INCL_QT_QRECT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QRect>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QRect>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define INCL_QT_QFONT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/scrollView.cpp ./src/scrollView.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/scrollView.cpp 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/scrollView.cpp 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* -*- c-file-style: "xxdiff" -*- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* kate: backspace-indents true; indent-pasted-text true; indent-width 3; keep-extra-spaces true; remove-trailing-spaces modified; replace-tabs true; replace-tabs-save true; syntax Tcl/Tk; tab-indents true; tab-width 3; */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /******************************************************************************\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * $RCSfile$
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,11 +28,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <scrollView.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <app.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QScrollBar>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QSize>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QFont>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QFontMetrics>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QWheelEvent>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QScrollBar>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QSize>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QFont>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QFontMetrics>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QWheelEvent>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QElapsedTimer>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XX_NAMESPACE_BEGIN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -55,7 +57,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _displayHeight( 0 ),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _textWidth( 0 ),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _textHeight( 0 ),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _managingWheelEvent( false )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _managingWheelEvent( false ),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ accidentalModifier(false),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ lastWheelEventUnmodified(false)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Initialize to null. The derived classes create them.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _hscroll = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -67,12 +71,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _app, SIGNAL(textSizeChanged()),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ this, SLOT(adjustScrollbars())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef Q_OS_OSX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ lastWheelEvent = new QElapsedTimer;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ lastWheelEvent->start();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ lastWheelEvent = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //------------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XxScrollView::~XxScrollView()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (lastWheelEvent) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ delete lastWheelEvent;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //------------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -315,8 +328,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void XxScrollView::wheelEvent( QWheelEvent* e )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef Q_OS_OSX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ qint64 deltaT = lastWheelEvent->elapsed();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( e->modifiers() & Qt::ControlModifier ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef Q_OS_OSX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Pressing the Control/Command key within 200ms of the previous "unmodified" wheelevent
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // is not allowed to cause text zooming; this prevents zooming due to inertial scrolling.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (lastWheelEventUnmodified && deltaT < 200) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ accidentalModifier = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // hold the Control/Command key for 1s without scrolling to re-allow text zooming
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (deltaT > 1000) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ accidentalModifier = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ lastWheelEventUnmodified = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Interactive font resize feature with mouse wheel.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ( !accidentalModifier ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( e->delta() > 0 ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _app->fontSizeDecrease();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -324,13 +355,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _app->fontSizeIncrease();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( ! _managingWheelEvent ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _managingWheelEvent = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QApplication::sendEvent( _vscroll[0], e );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _managingWheelEvent = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ lastWheelEventUnmodified = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ accidentalModifier = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef Q_OS_OSX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ lastWheelEvent->start();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XX_NAMESPACE_END
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/scrollView.h ./src/scrollView.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/scrollView.h 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/scrollView.h 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,7 +36,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef INCL_QT_QWIDGET
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QWidget>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QWidget>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define INCL_QT_QWIDGET
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -47,6 +47,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class QScrollBar;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class QSize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class QWheelEvent;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++class QElapsedTimer;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XX_NAMESPACE_BEGIN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -176,6 +177,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //loop when the wheel event doesn't lead to a value change of the scrollbar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool _managingWheelEvent;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // state variables that help to prevent accidental text zooming
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // due to using the Ctrl key during inertial scrolling.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Qt/Mac does this behind the scenes.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QElapsedTimer *lastWheelEvent;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bool accidentalModifier;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bool lastWheelEventUnmodified;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XX_NAMESPACE_END
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/searchDialog.cpp ./src/searchDialog.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/searchDialog.cpp 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/searchDialog.cpp 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,9 +29,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <diffs.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <app.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QLineEdit>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QPushButton>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QComboBox>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QLineEdit>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QPushButton>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QComboBox>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XX_NAMESPACE_BEGIN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/suicideMessageBox.h ./src/suicideMessageBox.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/suicideMessageBox.h 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/suicideMessageBox.h 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32,7 +32,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef INCL_QT_QMESSAGEBOX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QMessageBox>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QMessageBox>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define INCL_QT_QMESSAGEBOX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/text.cpp ./src/text.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/text.cpp 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/text.cpp 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,18 +33,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <kdeSupport.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QPainter>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QBrush>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QPen>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QColor>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QMenu>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QApplication>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QClipboard>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QFrame>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QResizeEvent>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QMouseEvent>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QWheelEvent>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QPainter>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QBrush>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QPen>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QColor>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QMenu>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QApplication>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QClipboard>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QFrame>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QResizeEvent>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QMouseEvent>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QWheelEvent>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <math.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -148,7 +148,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XX_CHECK( rlen > 0 ); // always true, because xch < xend
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QString str( QString::fromLatin1( renderedText + xch, rlen ) );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QString str( QString::fromLocal8Bit( renderedText + xch, rlen ) );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int nw = fm.width( str, rlen );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef XX_DRAWTEXT_DRAWS_BACKGROUND
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -544,7 +544,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XX_CHECK( rlen > 0 ); // always true, because xch < xend
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- chunk = QString::fromLatin1( renderedText + xch, rlen );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ chunk = QString::fromLocal8Bit( renderedText + xch, rlen );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // FIXME check somehow that this actually corresponds to the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // rendered measure.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QRect brect = fm.boundingRect(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -859,7 +859,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( text != 0 ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QString adt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( len > 0 ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- adt = QString::fromLatin1( text, len );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ adt = QString::fromLocal8Bit( text, len );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( resources.getBoolOpt( BOOL_FORMAT_CLIPBOARD_TEXT )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ == true ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -947,7 +947,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( text != 0 ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QString adt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( len > 0 ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- adt = QString::fromLatin1( text, len );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ adt = QString::fromLocal8Bit( text, len );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( resources.getBoolOpt( BOOL_FORMAT_CLIPBOARD_TEXT )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ == true ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/text.h ./src/text.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/text.h 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/text.h 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,12 +36,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef INCL_QT_QFRAME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QFrame>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QFrame>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define INCL_QT_QFRAME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef INCL_QT_QFONTMETRICS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtGui/QFontMetrics>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QFontMetrics>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define INCL_QT_QFONTMETRICS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/util.cpp ./src/util.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/util.cpp 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/util.cpp 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,12 +28,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <exceptions.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <main.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QString>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QByteArray>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QTextStream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QFileInfo>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QRegExp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QDateTime>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QString>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QByteArray>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QTextStream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QFileInfo>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QRegExp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QDateTime>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <iostream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -68,50 +68,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-bool installSigChldHandler(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- void (*sigChldHandler)(int)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-// Disabled crud that doesn't work (it works only the first time, the second
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-// time around the handler is called immediately upon setting up the handler).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (void)sigChldHandler;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef DISABLED_ENABLED /* always false */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XX_ASSERT( sigChldHandler != 0 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XX_TRACE( "Installing SIGCHLD handler." );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // sigset_t spm_o;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // sigprocmask( SIG_NOP, 0, &spm_o );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // XX_TRACE( "is SIGCHLD member=" <<
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // sigismember( &spm_o, SIGCHLD ) );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // sigemptyset( &spm_o );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // sigaddset( &spm_o, SIGCHLD );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // sigprocmask( SIG_BLOCK, &spm_o, 0 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- //
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // Register a SIGCHLD handler.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- //
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // Note: under IRIX (untested with others), SA_NOCLDWAIT will not
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // allow a redo diff to work. I don't know why.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- struct sigaction sa;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sa.sa_flags = /*SA_SIGINFO | */SA_RESTART |
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SA_RESETHAND | SA_NOCLDWAIT | SA_NOCLDSTOP;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sa.sa_handler = sigChldHandler;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sigset_t ss;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sigemptyset( &ss );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sa.sa_mask = ss;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- //sa.sa_sigaction = 0; don't clear sa_sigaction for nothing...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // sa_handler and sa_sigaction may be sharing an union.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ( ::sigaction( SIGCHLD, &sa, 0 ) != 0 ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // Ignore error.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XX_TRACE( "Error calling sigaction." );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //------------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Returns permissions from QFileInfo in human readable format
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -190,14 +146,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case 'n': { // - File name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcat( pformat, "s" );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QString tmp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tmp.sprintf( pformat, filename.toLatin1().constData() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tmp.sprintf( pformat, filename.toLocal8Bit().constData() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target.append( tmp );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case 'N': { // - Quoted File name with dereference if symbolic link
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcat( pformat, "s" );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QString tmp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tmp.sprintf( pformat, filename.toLatin1().constData() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tmp.sprintf( pformat, filename.toLocal8Bit().constData() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( qfi.isSymLink() ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tmp.append( "' -> `" );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tmp.append( qfi.readLink() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -235,7 +191,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case 'U': { // - User name of owner
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcat( pformat, "s" );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QString tmp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tmp.sprintf( pformat,qfi.owner().toAscii().constData() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tmp.sprintf( pformat,qfi.owner().toLocal8Bit().constData() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target.append( tmp );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -249,7 +205,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case 'G': { // - Group name of owner
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcat( pformat, "s" );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QString tmp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tmp.sprintf( pformat,qfi.group().toAscii().constData() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tmp.sprintf( pformat,qfi.group().toLocal8Bit().constData() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target.append( tmp );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -280,7 +236,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // It's not the exact same as stat( 2 ) does, but this is ISO 8601
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // and stat uses some weird syntax of it's own.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tmp.sprintf( pformat,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- qfi.lastRead().toString( DATEFORMAT ).toAscii().constData() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ qfi.lastRead().toString( DATEFORMAT ).toLocal8Bit().constData() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target.append( tmp );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -297,7 +253,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // It's not the exact same as stat( 2 ) does, but this is ISO 8601
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // and stat uses some weird syntax of it's own.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tmp.sprintf( pformat,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- qfi.lastModified().toString( DATEFORMAT ).toAscii().constData() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ qfi.lastModified().toString( DATEFORMAT ).toLocal8Bit().constData() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target.append( tmp );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -383,7 +339,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // and stat uses some weird syntax of it's own.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tmp.sprintf(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pformat,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ( QDateTime::currentDateTime() ).toString( DATEFORMAT ).toAscii().constData()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ( QDateTime::currentDateTime() ).toString( DATEFORMAT ).toLocal8Bit().constData()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target.append( tmp );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -403,7 +359,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // and stat uses some weird syntax of it's own.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tmp.sprintf(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pformat,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ( QDateTime::currentDateTime() ).toString( DATEFORMAT ).toAscii().constData() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ( QDateTime::currentDateTime() ).toString( DATEFORMAT ).toLocal8Bit().constData() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target.append( tmp );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -448,7 +404,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QString cmd = QString("cp '") + src + QString("' '") + dest + QString("'");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FILE* f = popen( cmd.toLatin1().constData(), "r" );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ FILE* f = popen( cmd.toLocal8Bit().constData(), "r" );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int r = pclose( f );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return r;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -458,7 +414,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int XxUtil::removeFile( const QString& src )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XX_ASSERT( !src.isEmpty() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return unlink( src.toLatin1().constData() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return unlink( src.toLocal8Bit().constData() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //------------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -540,7 +496,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int fd, bytes, i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char buffer[1024];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fd = open( filename.toLatin1().constData(), O_RDONLY );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fd = open( filename.toLocal8Bit().constData(), O_RDONLY );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bytes = read( fd, (void *)buffer, 1024 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close( fd );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -574,7 +530,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( pid == 0 ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QByteArray commandBa = command.toLatin1();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QByteArray commandBa = command.toLocal8Bit();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char* argv[4];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ argv[0] = const_cast<char*>( "sh" );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ argv[1] = const_cast<char*>( "-c" );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -669,7 +625,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for ( QStringList::Iterator it = out_args.begin();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ it != out_args.end();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ++it ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ofs << (*it).toLatin1().constData() << std::endl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ofs << (*it).toLocal8Bit().constData() << std::endl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ofs << " ----------------------------------------" << std::endl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ofs.close();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -709,7 +665,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Including anyway for now, because I absolutely don't have time right now.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char* format = strdup( masterformat.toLatin1().constData() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ char* format = strdup( masterformat.toLocal8Bit().constData() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char* dest = (char*) malloc( strlen( format ) + 1 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char* b = format;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target = "";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -793,7 +749,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // use at() in case found+1 is past the end of the string
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QChar escapedChar = newFormat.at( found+1 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- switch( escapedChar.toAscii() ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ switch( escapedChar.toLatin1() ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case 'n':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ newFormat = newFormat.replace( found, 2, QChar( '\n' ) );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/util.h ./src/util.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/util.h 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/util.h 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32,17 +32,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef INCL_QT_QSTRING
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QString>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QString>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define INCL_QT_QSTRING
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef INCL_QT_QFILEINFO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QFileInfo>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QFileInfo>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define INCL_QT_QFILEINFO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef INCL_QT_QSTRINGLIST
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QtCore/QStringList>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QStringList>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define INCL_QT_QSTRINGLIST
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/version.h ./src/version.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/version.h 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/version.h 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1 +1 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define XX_VERSION "4.0.1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define XX_VERSION "5.0b1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./src/xxdiff.pro ./src/xxdiff.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/xxdiff.pro 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/xxdiff.pro 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,6 +29,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TEMPLATE = app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONFIG -= debug
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONFIG += qt warn_on thread
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QT = widgets gui core
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DESTDIR=../bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TARGET = xxdiff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -65,6 +66,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_YACC_HEADER = y.tab.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_YACC_SOURCE = y.tab.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Don't generate unused functions (warning suppression)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_LEXFLAGS = --noyy_push_state --noyy_pop_state --noyy_top_state
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LEXSOURCES = resParser.l
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ YACCSOURCES = resParser.y
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -106,6 +110,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #linux-g++:QMAKE_CXXFLAGS += -fcheck-memory-usage
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #linux-g++:QMAKE_LIBS += -lmpatrol -lbfd -liberty
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# auto_ptr deprecated in C++11, removed in C++17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++linux: QMAKE_CXXFLAGS += -std=c++03
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #----------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Max OS X with XFree86 port, macx-g++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -115,12 +121,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## macx-g++:QMAKE_CXXFLAGS += -D__GNU_LIBRARY__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## macx-g++:QMAKE_CXXFLAGS -= -fno-exceptions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #----------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Max OS X (macx-g++ for command line build)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macx {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Icon used to the application bundle
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # Icon used for the application bundle
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ICON = xxdiff.icns
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Special targets to quickly deploy a standalone mac package (just
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -149,13 +154,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bison23src.depends =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ YACCSOURCES = resParser_bison23.y
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_YACCFLAGS_MANGLE = -p resParser -b resParser
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ resParser_lex_obj.target = resParser_lex.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ resParser_lex_obj.depends = bison23lnk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # "register" deprecated in C++11 but the MacOS flex still uses it in files it generates
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QMAKE_LEXFLAGS += -Dregister=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # "public" rule
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ deploy.depends = $$dmg.target
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QMAKE_EXTRA_TARGETS += macdeployqt dmg deploy bison23src bison23lnk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QMAKE_CXXFLAGS -= -O2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QMAKE_CXXFLAGS += -mdynamic-no-pic -O3 -ftracer -msse2 -msse3 -mssse3 -ftree-vectorize
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QMAKE_EXTRA_TARGETS += macdeployqt dmg deploy bison23src bison23lnk resParser_lex_obj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QMAKE_CFLAGS_RELEASE -= -O2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QMAKE_CXXFLAGS_RELEASE -= -O2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QMAKE_CFLAGS += -mdynamic-no-pic -O3 -msse2 -msse3 -mssse3 -ftree-vectorize
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QMAKE_CXXFLAGS += -mdynamic-no-pic -O3 -msse2 -msse3 -mssse3 -ftree-vectorize
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #----------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -201,6 +213,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ main.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ overview.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ resParser.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ resParser_lex.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ resources.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ resources.inline.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ accelUtil.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Only in ./tools/git: xx-git-resolve
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -urb ./tools/index.html ./tools/index.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./tools/index.html 2016-05-15 15:55:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./tools/index.html 2019-06-26 09:20:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,14 +3,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <head>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-<meta name="generator" content="Docutils 0.8.1: http://docutils.sourceforge.net/" />
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <title>Version Control Tools and Other Utilities</title>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <link rel="stylesheet" href="../style.css" type="text/css" />
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </head>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <body>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <div id="project-header">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <a href="/"><img src="/home/furius-logo-w.png" id="logo"></a>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <a href="http://furius.ca/"><img src="http://furius.ca/home/furius-logo-w.png" id="logo"></a>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <div id="project-home"><a href="..">Project Home</a></div>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </div>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/xxdiff/files/patch-xxdiff.pro.diff b/devel/xxdiff/files/patch-xxdiff.pro.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..f09d415
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/xxdiff/files/patch-xxdiff.pro.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,33 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/xxdiff.pro.orig 2019-06-27 08:14:43.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/xxdiff.pro 2019-06-27 08:48:54.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -145,29 +145,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dmg.commands = @hdiutil create -ov -fs HFS+ -srcfolder $$BUNDLE -volname $$quote("xxdiff\\ $$VER") $$DMG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dmg.depends = $$macdeployqt.target $(TARGET)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Crappy crap to generate and use a specific bison source file that is compatible with bison 2.3 (the default on OSX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bison23lnk.target = resParser_yacc.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bison23lnk.commands = rm -f resParser_yacc.h resParser_yacc.cpp; ln -s resParser_bison23_yacc.cpp resParser_yacc.cpp; ln -s resParser_bison23_yacc.h resParser_yacc.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bison23lnk.depends = bison23src resParser_bison23_yacc.h resParser_bison23.y
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bison23src.target = resParser_bison23.y
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bison23src.commands = perl -pe \'s/define api.pure/pure-parser/\' resParser.y > resParser_bison23.y
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bison23src.depends =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- YACCSOURCES = resParser_bison23.y
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QMAKE_YACCFLAGS_MANGLE = -p resParser -b resParser
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- resParser_lex_obj.target = resParser_lex.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- resParser_lex_obj.depends = bison23lnk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # "register" deprecated in C++11 but the MacOS flex still uses it in files it generates
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_LEXFLAGS += -Dregister=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # "public" rule
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ deploy.depends = $$dmg.target
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QMAKE_EXTRA_TARGETS += macdeployqt dmg deploy bison23src bison23lnk resParser_lex_obj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QMAKE_CFLAGS_RELEASE -= -O2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QMAKE_CXXFLAGS_RELEASE -= -O2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QMAKE_CFLAGS += -mdynamic-no-pic -O3 -msse2 -msse3 -mssse3 -ftree-vectorize
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QMAKE_CXXFLAGS += -mdynamic-no-pic -O3 -msse2 -msse3 -mssse3 -ftree-vectorize
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QMAKE_EXTRA_TARGETS += macdeployqt dmg deploy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #----------------------------------------
</span></pre><pre style='margin:0'>
</pre>