Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ansifilter for openSUSE:Factory checked in at 2023-06-19 22:50:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ansifilter (Old) and /work/SRC/openSUSE:Factory/.ansifilter.new.15902 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ansifilter" Mon Jun 19 22:50:26 2023 rev:15 rq:1093599 version:2.20 Changes: -------- --- /work/SRC/openSUSE:Factory/ansifilter/ansifilter.changes 2023-03-16 22:57:46.331292334 +0100 +++ /work/SRC/openSUSE:Factory/.ansifilter.new.15902/ansifilter.changes 2023-06-19 22:50:33.621561439 +0200 @@ -1,0 +2,8 @@ +Sat Jun 17 18:38:15 UTC 2023 - antoine.belv...@opensuse.org + +- Update to version 2.20: + * Fixed invalid array access (gl#saalen/ansifilter#35). + * CLI: Added `--no-default-fg` option to omit default foreground + color (gl#saalen/ansifilter#37). + +------------------------------------------------------------------- Old: ---- ansifilter-2.19.tar.bz2 ansifilter-2.19.tar.bz2.asc New: ---- ansifilter-2.20.tar.bz2 ansifilter-2.20.tar.bz2.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ansifilter.spec ++++++ --- /var/tmp/diff_new_pack.l3qdX4/_old 2023-06-19 22:50:34.433566193 +0200 +++ /var/tmp/diff_new_pack.l3qdX4/_new 2023-06-19 22:50:34.437566217 +0200 @@ -19,7 +19,7 @@ %bcond_without gui Name: ansifilter -Version: 2.19 +Version: 2.20 Release: 0 Summary: ANSI Terminal Escape Code Converter License: GPL-3.0-or-later ++++++ ansifilter-2.19.tar.bz2 -> ansifilter-2.20.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.19/ChangeLog.adoc new/ansifilter-2.20/ChangeLog.adoc --- old/ansifilter-2.19/ChangeLog.adoc 2023-02-27 21:06:43.000000000 +0100 +++ new/ansifilter-2.20/ChangeLog.adoc 2023-06-17 16:41:42.000000000 +0200 @@ -1,5 +1,12 @@ = Ansifilter ChangeLog +=== ansifilter 2.20 + +30.05.2023 + + - fixed invalid array access (https://gitlab.com/saalen/ansifilter/-/issues/35) + - CLI: added `--no-default-fg` option to omit default foreground color (https://gitlab.com/saalen/ansifilter/-/issues/37) + === ansifilter 2.19 23.02.2023 @@ -258,7 +265,7 @@ 16.04.2014 - added support for Erase Line, Save and Restore Cursor sequences - (thanks to Kovács Zoltán) + (thanks to Kov�cs Zolt�n) === ansifilter 1.7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.19/man/ansifilter.1 new/ansifilter-2.20/man/ansifilter.1 --- old/ansifilter-2.19/man/ansifilter.1 2023-02-27 21:06:43.000000000 +0100 +++ new/ansifilter-2.20/man/ansifilter.1 2023-06-17 16:41:42.000000000 +0200 @@ -72,6 +72,8 @@ Ignore ANSI formatting information .IP "\fB-w\fR, \fB--wrap\fR=<\fIlen\fR>" Wrap long lines +.IP "\fB-g\fR, \fB--no-default-fg\fR" +Omit default foreground color .IP "\fB--no-trailing-nl\fR" Omit trailing newline .IP "\fB--no-version-info\fR" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.19/sh-completion/gen-completions new/ansifilter-2.20/sh-completion/gen-completions --- old/ansifilter-2.19/sh-completion/gen-completions 2023-02-27 21:06:43.000000000 +0100 +++ new/ansifilter-2.20/sh-completion/gen-completions 2023-06-17 16:41:42.000000000 +0200 @@ -91,6 +91,10 @@ parser:flag "--no-trailing-nl" :description "Omit trailing newline" + +parser:flag "-g --no-default-fg" + :description "Omit default foreground color" + parser:flag "--no-version-info" :description "Omit version info comment" parser:flag "--wrap-no-numbers" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.19/src/cmdlineoptions.cpp new/ansifilter-2.20/src/cmdlineoptions.cpp --- old/ansifilter-2.19/src/cmdlineoptions.cpp 2023-02-27 21:06:43.000000000 +0100 +++ new/ansifilter-2.20/src/cmdlineoptions.cpp 2023-06-17 16:41:42.000000000 +0200 @@ -33,8 +33,8 @@ #include "platform_fs.h" #include "stringtools.h" -using namespace std; - +using namespace std; + const Arg_parser::Option options[] = { { 'a', "anchors", Arg_parser::maybe }, { 'd', "doc-title", Arg_parser::yes }, @@ -75,7 +75,8 @@ { 'S', "svg", Arg_parser::no }, { 'Q', "width", Arg_parser::yes }, { 'E', "height", Arg_parser::yes }, - { 'x', "max-size", Arg_parser::yes }, + { 'x', "max-size", Arg_parser::yes }, + { 'g', "no-default-fg", Arg_parser::no }, { 0, 0, Arg_parser::no } }; @@ -100,6 +101,7 @@ opt_applyDynStyles(false), opt_genDynStyles(false), opt_funny_anchors(false), + opt_omit_default_fg_color(false), encodingName("ISO-8859-1"), font("Courier New"), fontSize("10pt"), @@ -118,13 +120,13 @@ std::vector<char*> options; while (ss >> arg) { - ls.push_back(arg); + ls.push_back(arg); options.push_back(const_cast<char*>(ls.back().c_str())); } - options.push_back(0); + options.push_back(0); parseRuntimeOptions(options.size()-1, (const char**) &options[0], false); } - + parseRuntimeOptions(argc, argv); } @@ -144,29 +146,7 @@ const std::string & arg = parser.argument( argind ); if( !code ) break; switch( code ) { - /* tbd - case 'O': - { - const string tmp = StringTools::change_case ( arg ); - if ( tmp == "xhtml" ) - outputType = highlight::XHTML; - else if ( tmp == "tex" ) - outputType = highlight::TEX; - else if ( tmp == "latex" ) - outputType = highlight::LATEX; - else if ( tmp == "rtf" ) - outputType = highlight::RTF; - else if ( tmp == "svg" ) - outputType = highlight::SVG; - else if ( tmp == "bbcode" ) - outputType = highlight::BBCODE; - else if ( tmp == "odt" ) - outputType = highlight::ODTFLAT; - else - outputType = highlight::HTML; - } - break; - */ + case 'a': opt_anchors = true; if ( arg=="self" ) opt_funny_anchors=true; @@ -278,13 +258,16 @@ case 'y': opt_applyDynStyles=true; break; + case 'g': + opt_omit_default_fg_color = true; + break; case 'Q': width=arg; break; case 'E': height=arg; break; - + case 'x': { StringTools::str2num<off_t> ( maxFileSize, arg, std::dec ); switch (arg[arg.size()-1]) { @@ -392,10 +375,10 @@ } int CmdLineOptions::getAsciiArtWidth() const { - return asciiArtWidth; + return asciiArtWidth; } int CmdLineOptions::getAsciiArtHeight() const{ - return asciiArtHeight; + return asciiArtHeight; } string CmdLineOptions::getOutFileSuffix()const @@ -416,7 +399,7 @@ return ".bbcode"; case ansifilter::SVG: return ".svg"; - + default: return ".txt"; } @@ -482,8 +465,11 @@ bool CmdLineOptions::applyDynStyles() const { return opt_applyDynStyles; } - - +bool CmdLineOptions::omitDefaultForegroundColor() const +{ + return opt_omit_default_fg_color; +} + string CmdLineOptions::getDocumentTitle() const { return docTitle; @@ -523,4 +509,3 @@ { return maxFileSize; } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.19/src/cmdlineoptions.h new/ansifilter-2.20/src/cmdlineoptions.h --- old/ansifilter-2.19/src/cmdlineoptions.h 2023-02-27 21:06:43.000000000 +0100 +++ new/ansifilter-2.20/src/cmdlineoptions.h 2023-06-17 16:41:42.000000000 +0200 @@ -2,7 +2,7 @@ cmdlineoptions.h - description ------------------- begin : Sun Oct 13 2007 - copyright : (C) 2007-2018 by Andre Simon + copyright : (C) 2007-2023 by Andre Simon email : a.si...@mailbox.org ***************************************************************************/ @@ -70,7 +70,7 @@ /** \return path to color map*/ string getMapPath() const; - + /** \return True if version information should be printed*/ bool printVersion() const; @@ -106,33 +106,35 @@ /** \return True if input should be treated as codepage 437 ASCII art */ bool parseCP437() const; - + /** \return True if input should be treated as BIN ASCII art */ bool parseAsciiBin() const; /** \return True if input should be treated as Tundra ASCII art */ bool parseAsciiTundra() const; - + /** \return True if output should not be terminated with carriage return */ bool omitTrailingCR() const; /** \return True if output should not contain a version info comment */ bool omitVersionInfo() const; - + /** \return True if clear sequences (ESC K) should be ignored */ bool ignoreClearSeq() const; /** \return True if CSI sequences should be ignored */ bool ignoreCSISeq() const; - + /** \return True if output should contain dynamic style classes instead of inline styles */ bool applyDynStyles() const; - + /** \return True if dynamic styles should be saved to a file */ bool genDynStyles() const; - + bool addFunnyAnchors() const; + bool omitDefaultForegroundColor() const; + /** \return Document title */ string getDocumentTitle() const ; @@ -178,10 +180,11 @@ bool opt_omit_version_info; bool opt_ignoreClear; bool opt_ignoreCSI; - + bool opt_applyDynStyles; bool opt_genDynStyles; bool opt_funny_anchors; + bool opt_omit_default_fg_color; // name of single output file string outFilename; @@ -198,7 +201,7 @@ int wrapLineLen; int asciiArtWidth; int asciiArtHeight; - + off_t maxFileSize; /** list of all input file names */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.19/src/codegenerator.cpp new/ansifilter-2.20/src/codegenerator.cpp --- old/ansifilter-2.19/src/codegenerator.cpp 2023-02-27 21:06:43.000000000 +0100 +++ new/ansifilter-2.20/src/codegenerator.cpp 2023-06-17 16:41:42.000000000 +0200 @@ -122,12 +122,15 @@ asciiArtHeight(150), lineWrapLen(0) { - elementStyle.setFgColour(rgb2html(workingPalette[0])); } CodeGenerator::~CodeGenerator() {} +void CodeGenerator::setDefaultForegroundColor() +{ + elementStyle.setFgColour(rgb2html(workingPalette[0])); +} void CodeGenerator::setShowLineNumbers(bool flag) { @@ -1271,7 +1274,7 @@ // fix K sequences (iterm2/grep) isKSeq = line[seqEnd]=='K' && !ignClearSeq ; - isGrepOutput = isKSeq && isascii(line[seqEnd+1]) && line[seqEnd+1] !=13 && line[seqEnd+1] != 27; + isGrepOutput = isKSeq && line.length() > (seqEnd + 1) && isascii(line[seqEnd+1]) && line[seqEnd+1] !=13 && line[seqEnd+1] != 27; if ( line[seqEnd]=='s' || line[seqEnd]=='u' || (isKSeq && !isGrepOutput) ){ @@ -1299,7 +1302,7 @@ ++seqEnd; } - if (line[seqEnd+1]=='A') + if (line.length() > (seqEnd + 1) && line[seqEnd+1]=='A') seqEnd++; i=seqEnd+1; @@ -1308,7 +1311,7 @@ ) ) // DECSC seq { - if (line[seqEnd+1]==0x1b) + if (line.length() > (seqEnd + 1) && line[seqEnd+1]==0x1b) ++i; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.19/src/codegenerator.h new/ansifilter-2.20/src/codegenerator.h --- old/ansifilter-2.19/src/codegenerator.h 2023-02-27 21:06:43.000000000 +0100 +++ new/ansifilter-2.20/src/codegenerator.h 2023-06-17 16:41:42.000000000 +0200 @@ -189,6 +189,11 @@ */ bool setColorMap(const string& mapPath); + /** + Initialize default foreground color + */ + void setDefaultForegroundColor(); + /** tell parser to omit document header and footer \param flag true if output should be fragmented */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.19/src/elementstyle.cpp new/ansifilter-2.20/src/elementstyle.cpp --- old/ansifilter-2.19/src/elementstyle.cpp 2023-02-27 21:06:43.000000000 +0100 +++ new/ansifilter-2.20/src/elementstyle.cpp 2023-06-17 16:41:42.000000000 +0200 @@ -87,8 +87,8 @@ void ElementStyle::setReset(bool b) { - - + + reset=b; if (reset) { setFgColour("#000000"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.19/src/main.cpp new/ansifilter-2.20/src/main.cpp --- old/ansifilter-2.19/src/main.cpp 2023-02-27 21:06:43.000000000 +0100 +++ new/ansifilter-2.20/src/main.cpp 2023-06-17 16:41:42.000000000 +0200 @@ -83,6 +83,7 @@ cout << " -s, --font-size=<fs> Set HTML/RTF/SVG font size\n"; cout << " -p, --plain Ignore ANSI formatting information\n"; cout << " -w, --wrap=<len> Wrap long lines\n"; + cout << " -g, --no-default-fg Omit default foreground color\n"; cout << " --no-trailing-nl Omit trailing newline\n"; cout << " --no-version-info Omit version info comment\n"; cout << " --wrap-no-numbers Omit line numbers of wrapped lines (assumes -l)\n"; @@ -138,6 +139,10 @@ string mapPath = options.getMapPath(); bool failure=false; + if (!options.omitDefaultForegroundColor()) { + generator->setDefaultForegroundColor(); + } + if (!generator->setColorMap(mapPath)){ std::cerr <<"could not read map file: " << mapPath << "\n"; return EXIT_FAILURE; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.19/src/qt-gui/ansifilter-gui.pro new/ansifilter-2.20/src/qt-gui/ansifilter-gui.pro --- old/ansifilter-2.19/src/qt-gui/ansifilter-gui.pro 2023-02-27 21:06:43.000000000 +0100 +++ new/ansifilter-2.20/src/qt-gui/ansifilter-gui.pro 2023-06-17 16:41:42.000000000 +0200 @@ -28,3 +28,5 @@ macx-clang:ICON = $${PWD}/ansifilter.icns macx:ICON = $${PWD}/ansifilter.icns + +CONFIG += c++14 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.19/src/qt-gui/moc_mydialog.cpp new/ansifilter-2.20/src/qt-gui/moc_mydialog.cpp --- old/ansifilter-2.19/src/qt-gui/moc_mydialog.cpp 2023-02-27 21:06:43.000000000 +0100 +++ new/ansifilter-2.20/src/qt-gui/moc_mydialog.cpp 2023-06-17 16:41:42.000000000 +0200 @@ -1,83 +1,151 @@ /**************************************************************************** ** Meta object code from reading C++ file 'mydialog.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.3) +** Created by: The Qt Meta Object Compiler version 68 (Qt 6.5.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#include <memory> #include "mydialog.h" -#include <QtCore/qbytearray.h> +#include <QtGui/qtextcursor.h> #include <QtCore/qmetatype.h> + +#if __has_include(<QtCore/qtmochelpers.h>) +#include <QtCore/qtmochelpers.h> +#else +QT_BEGIN_MOC_NAMESPACE +#endif + + +#include <memory> + #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'mydialog.h' doesn't include <QObject>." -#elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.15.3. It" +#elif Q_MOC_OUTPUT_REVISION != 68 +#error "This file was generated using the moc from 6.5.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif -QT_BEGIN_MOC_NAMESPACE +#ifndef Q_CONSTINIT +#define Q_CONSTINIT +#endif + QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED -struct qt_meta_stringdata_MyDialog_t { - QByteArrayData data[22]; - char stringdata0[454]; +QT_WARNING_DISABLE_GCC("-Wuseless-cast") +namespace { + +#ifdef QT_MOC_HAS_STRINGDATA +struct qt_meta_stringdata_CLASSMyDialogENDCLASS_t {}; +static constexpr auto qt_meta_stringdata_CLASSMyDialogENDCLASS = QtMocHelpers::stringData( + "MyDialog", + "on_pbSaveAs_clicked", + "", + "on_pbFileOpen_clicked", + "on_pbAbout_clicked", + "on_pbClipboard_clicked", + "on_pbSelectMapFile_clicked", + "on_cbParseAsciiArt_clicked", + "on_cbIgnClearSeq_clicked", + "on_cbIgnCSISeq_clicked", + "on_cbIgnoreSequences_stateChanged", + "on_cbWatchFile_stateChanged", + "on_sbWidth_valueChanged", + "i", + "on_sbHeight_valueChanged", + "on_comboFont_currentIndexChanged", + "idx", + "on_comboAnsiFormat_currentIndexChanged", + "on_comboEncoding_currentIndexChanged", + "onFileChanged", + "path", + "plausibility" +); +#else // !QT_MOC_HAS_STRING_DATA +struct qt_meta_stringdata_CLASSMyDialogENDCLASS_t { + uint offsetsAndSizes[44]; + char stringdata0[9]; + char stringdata1[20]; + char stringdata2[1]; + char stringdata3[22]; + char stringdata4[19]; + char stringdata5[23]; + char stringdata6[27]; + char stringdata7[27]; + char stringdata8[25]; + char stringdata9[23]; + char stringdata10[34]; + char stringdata11[28]; + char stringdata12[24]; + char stringdata13[2]; + char stringdata14[25]; + char stringdata15[33]; + char stringdata16[4]; + char stringdata17[39]; + char stringdata18[37]; + char stringdata19[14]; + char stringdata20[5]; + char stringdata21[13]; }; -#define QT_MOC_LITERAL(idx, ofs, len) \ - Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ - qptrdiff(offsetof(qt_meta_stringdata_MyDialog_t, stringdata0) + ofs \ - - idx * sizeof(QByteArrayData)) \ - ) -static const qt_meta_stringdata_MyDialog_t qt_meta_stringdata_MyDialog = { +#define QT_MOC_LITERAL(ofs, len) \ + uint(sizeof(qt_meta_stringdata_CLASSMyDialogENDCLASS_t::offsetsAndSizes) + ofs), len +Q_CONSTINIT static const qt_meta_stringdata_CLASSMyDialogENDCLASS_t qt_meta_stringdata_CLASSMyDialogENDCLASS = { { -QT_MOC_LITERAL(0, 0, 8), // "MyDialog" -QT_MOC_LITERAL(1, 9, 19), // "on_pbSaveAs_clicked" -QT_MOC_LITERAL(2, 29, 0), // "" -QT_MOC_LITERAL(3, 30, 21), // "on_pbFileOpen_clicked" -QT_MOC_LITERAL(4, 52, 18), // "on_pbAbout_clicked" -QT_MOC_LITERAL(5, 71, 22), // "on_pbClipboard_clicked" -QT_MOC_LITERAL(6, 94, 26), // "on_pbSelectMapFile_clicked" -QT_MOC_LITERAL(7, 121, 26), // "on_cbParseAsciiArt_clicked" -QT_MOC_LITERAL(8, 148, 24), // "on_cbIgnClearSeq_clicked" -QT_MOC_LITERAL(9, 173, 22), // "on_cbIgnCSISeq_clicked" -QT_MOC_LITERAL(10, 196, 33), // "on_cbIgnoreSequences_stateCha..." -QT_MOC_LITERAL(11, 230, 27), // "on_cbWatchFile_stateChanged" -QT_MOC_LITERAL(12, 258, 23), // "on_sbWidth_valueChanged" -QT_MOC_LITERAL(13, 282, 1), // "i" -QT_MOC_LITERAL(14, 284, 24), // "on_sbHeight_valueChanged" -QT_MOC_LITERAL(15, 309, 32), // "on_comboFont_currentIndexChanged" -QT_MOC_LITERAL(16, 342, 3), // "idx" -QT_MOC_LITERAL(17, 346, 38), // "on_comboAnsiFormat_currentInd..." -QT_MOC_LITERAL(18, 385, 36), // "on_comboEncoding_currentIndex..." -QT_MOC_LITERAL(19, 422, 13), // "onFileChanged" -QT_MOC_LITERAL(20, 436, 4), // "path" -QT_MOC_LITERAL(21, 441, 12) // "plausibility" - + QT_MOC_LITERAL(0, 8), // "MyDialog" + QT_MOC_LITERAL(9, 19), // "on_pbSaveAs_clicked" + QT_MOC_LITERAL(29, 0), // "" + QT_MOC_LITERAL(30, 21), // "on_pbFileOpen_clicked" + QT_MOC_LITERAL(52, 18), // "on_pbAbout_clicked" + QT_MOC_LITERAL(71, 22), // "on_pbClipboard_clicked" + QT_MOC_LITERAL(94, 26), // "on_pbSelectMapFile_clicked" + QT_MOC_LITERAL(121, 26), // "on_cbParseAsciiArt_clicked" + QT_MOC_LITERAL(148, 24), // "on_cbIgnClearSeq_clicked" + QT_MOC_LITERAL(173, 22), // "on_cbIgnCSISeq_clicked" + QT_MOC_LITERAL(196, 33), // "on_cbIgnoreSequences_stateCha..." + QT_MOC_LITERAL(230, 27), // "on_cbWatchFile_stateChanged" + QT_MOC_LITERAL(258, 23), // "on_sbWidth_valueChanged" + QT_MOC_LITERAL(282, 1), // "i" + QT_MOC_LITERAL(284, 24), // "on_sbHeight_valueChanged" + QT_MOC_LITERAL(309, 32), // "on_comboFont_currentIndexChanged" + QT_MOC_LITERAL(342, 3), // "idx" + QT_MOC_LITERAL(346, 38), // "on_comboAnsiFormat_currentInd..." + QT_MOC_LITERAL(385, 36), // "on_comboEncoding_currentIndex..." + QT_MOC_LITERAL(422, 13), // "onFileChanged" + QT_MOC_LITERAL(436, 4), // "path" + QT_MOC_LITERAL(441, 12) // "plausibility" }, - "MyDialog\0on_pbSaveAs_clicked\0\0" - "on_pbFileOpen_clicked\0on_pbAbout_clicked\0" - "on_pbClipboard_clicked\0" - "on_pbSelectMapFile_clicked\0" - "on_cbParseAsciiArt_clicked\0" - "on_cbIgnClearSeq_clicked\0" - "on_cbIgnCSISeq_clicked\0" - "on_cbIgnoreSequences_stateChanged\0" - "on_cbWatchFile_stateChanged\0" - "on_sbWidth_valueChanged\0i\0" - "on_sbHeight_valueChanged\0" - "on_comboFont_currentIndexChanged\0idx\0" - "on_comboAnsiFormat_currentIndexChanged\0" - "on_comboEncoding_currentIndexChanged\0" - "onFileChanged\0path\0plausibility" + "MyDialog", + "on_pbSaveAs_clicked", + "", + "on_pbFileOpen_clicked", + "on_pbAbout_clicked", + "on_pbClipboard_clicked", + "on_pbSelectMapFile_clicked", + "on_cbParseAsciiArt_clicked", + "on_cbIgnClearSeq_clicked", + "on_cbIgnCSISeq_clicked", + "on_cbIgnoreSequences_stateChanged", + "on_cbWatchFile_stateChanged", + "on_sbWidth_valueChanged", + "i", + "on_sbHeight_valueChanged", + "on_comboFont_currentIndexChanged", + "idx", + "on_comboAnsiFormat_currentIndexChanged", + "on_comboEncoding_currentIndexChanged", + "onFileChanged", + "path", + "plausibility" }; #undef QT_MOC_LITERAL +#endif // !QT_MOC_HAS_STRING_DATA +} // unnamed namespace -static const uint qt_meta_data_MyDialog[] = { +Q_CONSTINIT static const uint qt_meta_data_CLASSMyDialogENDCLASS[] = { // content: - 8, // revision + 11, // revision 0, // classname 0, 0, // classinfo 17, 14, // methods @@ -87,24 +155,24 @@ 0, // flags 0, // signalCount - // slots: name, argc, parameters, tag, flags - 1, 0, 99, 2, 0x0a /* Public */, - 3, 0, 100, 2, 0x0a /* Public */, - 4, 0, 101, 2, 0x0a /* Public */, - 5, 0, 102, 2, 0x0a /* Public */, - 6, 0, 103, 2, 0x0a /* Public */, - 7, 0, 104, 2, 0x0a /* Public */, - 8, 0, 105, 2, 0x0a /* Public */, - 9, 0, 106, 2, 0x0a /* Public */, - 10, 0, 107, 2, 0x0a /* Public */, - 11, 0, 108, 2, 0x0a /* Public */, - 12, 1, 109, 2, 0x0a /* Public */, - 14, 1, 112, 2, 0x0a /* Public */, - 15, 1, 115, 2, 0x0a /* Public */, - 17, 1, 118, 2, 0x0a /* Public */, - 18, 1, 121, 2, 0x0a /* Public */, - 19, 1, 124, 2, 0x0a /* Public */, - 21, 0, 127, 2, 0x0a /* Public */, + // slots: name, argc, parameters, tag, flags, initial metatype offsets + 1, 0, 116, 2, 0x0a, 1 /* Public */, + 3, 0, 117, 2, 0x0a, 2 /* Public */, + 4, 0, 118, 2, 0x0a, 3 /* Public */, + 5, 0, 119, 2, 0x0a, 4 /* Public */, + 6, 0, 120, 2, 0x0a, 5 /* Public */, + 7, 0, 121, 2, 0x0a, 6 /* Public */, + 8, 0, 122, 2, 0x0a, 7 /* Public */, + 9, 0, 123, 2, 0x0a, 8 /* Public */, + 10, 0, 124, 2, 0x0a, 9 /* Public */, + 11, 0, 125, 2, 0x0a, 10 /* Public */, + 12, 1, 126, 2, 0x0a, 11 /* Public */, + 14, 1, 129, 2, 0x0a, 13 /* Public */, + 15, 1, 132, 2, 0x0a, 15 /* Public */, + 17, 1, 135, 2, 0x0a, 17 /* Public */, + 18, 1, 138, 2, 0x0a, 19 /* Public */, + 19, 1, 141, 2, 0x0a, 21 /* Public */, + 21, 0, 144, 2, 0x0a, 23 /* Public */, // slots: parameters QMetaType::Void, @@ -128,6 +196,59 @@ 0 // eod }; +Q_CONSTINIT const QMetaObject MyDialog::staticMetaObject = { { + QMetaObject::SuperData::link<QDialog::staticMetaObject>(), + qt_meta_stringdata_CLASSMyDialogENDCLASS.offsetsAndSizes, + qt_meta_data_CLASSMyDialogENDCLASS, + qt_static_metacall, + nullptr, + qt_incomplete_metaTypeArray<qt_meta_stringdata_CLASSMyDialogENDCLASS_t, + // Q_OBJECT / Q_GADGET + QtPrivate::TypeAndForceComplete<MyDialog, std::true_type>, + // method 'on_pbSaveAs_clicked' + QtPrivate::TypeAndForceComplete<void, std::false_type>, + // method 'on_pbFileOpen_clicked' + QtPrivate::TypeAndForceComplete<void, std::false_type>, + // method 'on_pbAbout_clicked' + QtPrivate::TypeAndForceComplete<void, std::false_type>, + // method 'on_pbClipboard_clicked' + QtPrivate::TypeAndForceComplete<void, std::false_type>, + // method 'on_pbSelectMapFile_clicked' + QtPrivate::TypeAndForceComplete<void, std::false_type>, + // method 'on_cbParseAsciiArt_clicked' + QtPrivate::TypeAndForceComplete<void, std::false_type>, + // method 'on_cbIgnClearSeq_clicked' + QtPrivate::TypeAndForceComplete<void, std::false_type>, + // method 'on_cbIgnCSISeq_clicked' + QtPrivate::TypeAndForceComplete<void, std::false_type>, + // method 'on_cbIgnoreSequences_stateChanged' + QtPrivate::TypeAndForceComplete<void, std::false_type>, + // method 'on_cbWatchFile_stateChanged' + QtPrivate::TypeAndForceComplete<void, std::false_type>, + // method 'on_sbWidth_valueChanged' + QtPrivate::TypeAndForceComplete<void, std::false_type>, + QtPrivate::TypeAndForceComplete<int, std::false_type>, + // method 'on_sbHeight_valueChanged' + QtPrivate::TypeAndForceComplete<void, std::false_type>, + QtPrivate::TypeAndForceComplete<int, std::false_type>, + // method 'on_comboFont_currentIndexChanged' + QtPrivate::TypeAndForceComplete<void, std::false_type>, + QtPrivate::TypeAndForceComplete<int, std::false_type>, + // method 'on_comboAnsiFormat_currentIndexChanged' + QtPrivate::TypeAndForceComplete<void, std::false_type>, + QtPrivate::TypeAndForceComplete<int, std::false_type>, + // method 'on_comboEncoding_currentIndexChanged' + QtPrivate::TypeAndForceComplete<void, std::false_type>, + QtPrivate::TypeAndForceComplete<int, std::false_type>, + // method 'onFileChanged' + QtPrivate::TypeAndForceComplete<void, std::false_type>, + QtPrivate::TypeAndForceComplete<const QString &, std::false_type>, + // method 'plausibility' + QtPrivate::TypeAndForceComplete<void, std::false_type> + >, + nullptr +} }; + void MyDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) { if (_c == QMetaObject::InvokeMetaMethod) { @@ -144,28 +265,18 @@ case 7: _t->on_cbIgnCSISeq_clicked(); break; case 8: _t->on_cbIgnoreSequences_stateChanged(); break; case 9: _t->on_cbWatchFile_stateChanged(); break; - case 10: _t->on_sbWidth_valueChanged((*reinterpret_cast< int(*)>(_a[1]))); break; - case 11: _t->on_sbHeight_valueChanged((*reinterpret_cast< int(*)>(_a[1]))); break; - case 12: _t->on_comboFont_currentIndexChanged((*reinterpret_cast< int(*)>(_a[1]))); break; - case 13: _t->on_comboAnsiFormat_currentIndexChanged((*reinterpret_cast< int(*)>(_a[1]))); break; - case 14: _t->on_comboEncoding_currentIndexChanged((*reinterpret_cast< int(*)>(_a[1]))); break; - case 15: _t->onFileChanged((*reinterpret_cast< const QString(*)>(_a[1]))); break; + case 10: _t->on_sbWidth_valueChanged((*reinterpret_cast< std::add_pointer_t<int>>(_a[1]))); break; + case 11: _t->on_sbHeight_valueChanged((*reinterpret_cast< std::add_pointer_t<int>>(_a[1]))); break; + case 12: _t->on_comboFont_currentIndexChanged((*reinterpret_cast< std::add_pointer_t<int>>(_a[1]))); break; + case 13: _t->on_comboAnsiFormat_currentIndexChanged((*reinterpret_cast< std::add_pointer_t<int>>(_a[1]))); break; + case 14: _t->on_comboEncoding_currentIndexChanged((*reinterpret_cast< std::add_pointer_t<int>>(_a[1]))); break; + case 15: _t->onFileChanged((*reinterpret_cast< std::add_pointer_t<QString>>(_a[1]))); break; case 16: _t->plausibility(); break; default: ; } } } -QT_INIT_METAOBJECT const QMetaObject MyDialog::staticMetaObject = { { - QMetaObject::SuperData::link<QDialog::staticMetaObject>(), - qt_meta_stringdata_MyDialog.data, - qt_meta_data_MyDialog, - qt_static_metacall, - nullptr, - nullptr -} }; - - const QMetaObject *MyDialog::metaObject() const { return QObject::d_ptr->metaObject ? QObject::d_ptr->dynamicMetaObject() : &staticMetaObject; @@ -174,7 +285,7 @@ void *MyDialog::qt_metacast(const char *_clname) { if (!_clname) return nullptr; - if (!strcmp(_clname, qt_meta_stringdata_MyDialog.stringdata0)) + if (!strcmp(_clname, qt_meta_stringdata_CLASSMyDialogENDCLASS.stringdata0)) return static_cast<void*>(this); return QDialog::qt_metacast(_clname); } @@ -190,10 +301,9 @@ _id -= 17; } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { if (_id < 17) - *reinterpret_cast<int*>(_a[0]) = -1; + *reinterpret_cast<QMetaType *>(_a[0]) = QMetaType(); _id -= 17; } return _id; } QT_WARNING_POP -QT_END_MOC_NAMESPACE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.19/src/qt-gui/mydialog.cpp new/ansifilter-2.20/src/qt-gui/mydialog.cpp --- old/ansifilter-2.19/src/qt-gui/mydialog.cpp 2023-02-27 21:06:43.000000000 +0100 +++ new/ansifilter-2.20/src/qt-gui/mydialog.cpp 2023-06-17 16:41:42.000000000 +0200 @@ -321,6 +321,7 @@ QString title(QFileInfo(outFileName).fileName()); unique_ptr<ansifilter::CodeGenerator> generator(ansifilter::CodeGenerator::getInstance(getOutputType())); + generator->setDefaultForegroundColor(); generator->setTitle( (dlg.leTitle->text().isEmpty()? title : dlg.leTitle->text()).toStdString()); generator->setEncoding(dlg.comboEncoding->currentText().toStdString()); generator->setFragmentCode(dlg.cbFragment->isChecked()); @@ -405,6 +406,7 @@ } unique_ptr<ansifilter::CodeGenerator> generator(ansifilter::CodeGenerator::getInstance(ansifilter::TEXT)); + generator->setDefaultForegroundColor(); generator->setPreformatting ( ansifilter::WRAP_SIMPLE, static_cast<unsigned int>(dlg.spinBoxWrap->value())); generator->setIgnoreClearSeq(dlg.cbIgnClearSeq->isChecked()); generator->setIgnoreCSISeq(dlg.cbIgnCSISeq->isChecked()); @@ -442,7 +444,7 @@ dlg.lblInFilePath->setText(inputFileName); unique_ptr<ansifilter::CodeGenerator> generator(ansifilter::CodeGenerator::getInstance(ansifilter::HTML)); - + generator->setDefaultForegroundColor(); generator->setEncoding(dlg.comboEncoding->currentText().toStdString()); generator->setFragmentCode(false); generator->setPlainOutput(dlg.cbIgnoreSequences->isChecked()); @@ -493,7 +495,7 @@ QMessageBox::about(this, "ANSIFilter Information", QString("ANSIFilter GUI %1\n" - "(c) 2007-2021 Andre Simon\n\n" + "(c) 2007-2023 Andre Simon\n\n" "Built with Qt version %2\n\n" "Released under the terms of the GNU GPL license.\n\n" "%3\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.19/src/qt-gui/mydialog.h new/ansifilter-2.20/src/qt-gui/mydialog.h --- old/ansifilter-2.19/src/qt-gui/mydialog.h 2023-02-27 21:06:43.000000000 +0100 +++ new/ansifilter-2.20/src/qt-gui/mydialog.h 2023-06-17 16:41:42.000000000 +0200 @@ -37,7 +37,7 @@ public: Ui::Dialog dlg; //The same constructor that we used last time with QDialog default parameters - MyDialog(QWidget * parent = 0, Qt::WindowFlags f = 0); + MyDialog(QWidget * parent = 0, Qt::WindowFlags f = Qt::Window); void setInputFileName(const char* fName) { @@ -46,7 +46,7 @@ } virtual ~MyDialog() {} - + protected: void closeEvent(QCloseEvent *event); @@ -93,4 +93,3 @@ }; #endif - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.19/src/qt-gui/ui_ansifilter.h new/ansifilter-2.20/src/qt-gui/ui_ansifilter.h --- old/ansifilter-2.19/src/qt-gui/ui_ansifilter.h 2023-02-27 21:06:43.000000000 +0100 +++ new/ansifilter-2.20/src/qt-gui/ui_ansifilter.h 2023-06-17 16:41:42.000000000 +0200 @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'ansifilter.ui' ** -** Created by: Qt User Interface Compiler version 5.15.3 +** Created by: Qt User Interface Compiler version 6.5.0 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ @@ -100,7 +100,7 @@ void setupUi(QDialog *Dialog) { if (Dialog->objectName().isEmpty()) - Dialog->setObjectName(QString::fromUtf8("Dialog")); + Dialog->setObjectName("Dialog"); Dialog->setWindowModality(Qt::NonModal); Dialog->resize(784, 791); QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); @@ -113,9 +113,9 @@ icon.addFile(QString::fromUtf8(":/ansifilter.xpm"), QSize(), QIcon::Normal, QIcon::Off); Dialog->setWindowIcon(icon); horizontalLayout_4 = new QHBoxLayout(Dialog); - horizontalLayout_4->setObjectName(QString::fromUtf8("horizontalLayout_4")); + horizontalLayout_4->setObjectName("horizontalLayout_4"); groupBox = new QGroupBox(Dialog); - groupBox->setObjectName(QString::fromUtf8("groupBox")); + groupBox->setObjectName("groupBox"); QSizePolicy sizePolicy1(QSizePolicy::Maximum, QSizePolicy::Preferred); sizePolicy1.setHorizontalStretch(0); sizePolicy1.setVerticalStretch(0); @@ -123,11 +123,11 @@ groupBox->setSizePolicy(sizePolicy1); groupBox->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop); verticalLayout_2 = new QVBoxLayout(groupBox); - verticalLayout_2->setObjectName(QString::fromUtf8("verticalLayout_2")); + verticalLayout_2->setObjectName("verticalLayout_2"); gridLayout_4 = new QGridLayout(); - gridLayout_4->setObjectName(QString::fromUtf8("gridLayout_4")); + gridLayout_4->setObjectName("gridLayout_4"); pbFileOpen = new QPushButton(groupBox); - pbFileOpen->setObjectName(QString::fromUtf8("pbFileOpen")); + pbFileOpen->setObjectName("pbFileOpen"); QSizePolicy sizePolicy2(QSizePolicy::Minimum, QSizePolicy::Minimum); sizePolicy2.setHorizontalStretch(0); sizePolicy2.setVerticalStretch(0); @@ -141,7 +141,7 @@ gridLayout_4->addItem(horizontalSpacer_5, 0, 1, 1, 1); pbSaveAs = new QPushButton(groupBox); - pbSaveAs->setObjectName(QString::fromUtf8("pbSaveAs")); + pbSaveAs->setObjectName("pbSaveAs"); QSizePolicy sizePolicy3(QSizePolicy::Minimum, QSizePolicy::Preferred); sizePolicy3.setHorizontalStretch(0); sizePolicy3.setVerticalStretch(0); @@ -151,7 +151,7 @@ gridLayout_4->addWidget(pbSaveAs, 1, 0, 1, 1); pbClipboard = new QPushButton(groupBox); - pbClipboard->setObjectName(QString::fromUtf8("pbClipboard")); + pbClipboard->setObjectName("pbClipboard"); sizePolicy3.setHeightForWidth(pbClipboard->sizePolicy().hasHeightForWidth()); pbClipboard->setSizePolicy(sizePolicy3); @@ -161,7 +161,7 @@ verticalLayout_2->addLayout(gridLayout_4); gridLayout = new QGridLayout(); - gridLayout->setObjectName(QString::fromUtf8("gridLayout")); + gridLayout->setObjectName("gridLayout"); horizontalSpacer_4 = new QSpacerItem(13, 20, QSizePolicy::Minimum, QSizePolicy::Minimum); gridLayout->addItem(horizontalSpacer_4, 1, 0, 1, 1); @@ -179,7 +179,7 @@ gridLayout->addItem(horizontalSpacer_2, 1, 2, 1, 1); lblDrop = new QLabel(groupBox); - lblDrop->setObjectName(QString::fromUtf8("lblDrop")); + lblDrop->setObjectName("lblDrop"); lblDrop->setEnabled(false); lblDrop->setMaximumSize(QSize(48, 48)); lblDrop->setPixmap(QPixmap(QString::fromUtf8(":/Actions-drop-icon.png"))); @@ -191,9 +191,9 @@ verticalLayout_2->addLayout(gridLayout); horizontalLayout_6 = new QHBoxLayout(); - horizontalLayout_6->setObjectName(QString::fromUtf8("horizontalLayout_6")); + horizontalLayout_6->setObjectName("horizontalLayout_6"); label_4 = new QLabel(groupBox); - label_4->setObjectName(QString::fromUtf8("label_4")); + label_4->setObjectName("label_4"); horizontalLayout_6->addWidget(label_4); @@ -206,7 +206,7 @@ comboFormat->addItem(QString()); comboFormat->addItem(QString()); comboFormat->addItem(QString()); - comboFormat->setObjectName(QString::fromUtf8("comboFormat")); + comboFormat->setObjectName("comboFormat"); comboFormat->setEnabled(true); horizontalLayout_6->addWidget(comboFormat); @@ -215,9 +215,9 @@ verticalLayout_2->addLayout(horizontalLayout_6); gridLayout_2 = new QGridLayout(); - gridLayout_2->setObjectName(QString::fromUtf8("gridLayout_2")); + gridLayout_2->setObjectName("gridLayout_2"); cbIgnoreSequences = new QCheckBox(groupBox); - cbIgnoreSequences->setObjectName(QString::fromUtf8("cbIgnoreSequences")); + cbIgnoreSequences->setObjectName("cbIgnoreSequences"); QSizePolicy sizePolicy4(QSizePolicy::Maximum, QSizePolicy::Fixed); sizePolicy4.setHorizontalStretch(0); sizePolicy4.setVerticalStretch(0); @@ -227,14 +227,14 @@ gridLayout_2->addWidget(cbIgnoreSequences, 0, 0, 1, 1); horizontalLayout_2 = new QHBoxLayout(); - horizontalLayout_2->setObjectName(QString::fromUtf8("horizontalLayout_2")); + horizontalLayout_2->setObjectName("horizontalLayout_2"); lblSvgDim = new QLabel(groupBox); - lblSvgDim->setObjectName(QString::fromUtf8("lblSvgDim")); + lblSvgDim->setObjectName("lblSvgDim"); horizontalLayout_2->addWidget(lblSvgDim); leSvgWidth = new QLineEdit(groupBox); - leSvgWidth->setObjectName(QString::fromUtf8("leSvgWidth")); + leSvgWidth->setObjectName("leSvgWidth"); QSizePolicy sizePolicy5(QSizePolicy::Expanding, QSizePolicy::Minimum); sizePolicy5.setHorizontalStretch(0); sizePolicy5.setVerticalStretch(0); @@ -245,7 +245,7 @@ horizontalLayout_2->addWidget(leSvgWidth); leSvgHeight = new QLineEdit(groupBox); - leSvgHeight->setObjectName(QString::fromUtf8("leSvgHeight")); + leSvgHeight->setObjectName("leSvgHeight"); sizePolicy5.setHeightForWidth(leSvgHeight->sizePolicy().hasHeightForWidth()); leSvgHeight->setSizePolicy(sizePolicy5); leSvgHeight->setMaximumSize(QSize(60, 16777215)); @@ -256,30 +256,30 @@ gridLayout_2->addLayout(horizontalLayout_2, 3, 1, 1, 1); cbOmitVersion = new QCheckBox(groupBox); - cbOmitVersion->setObjectName(QString::fromUtf8("cbOmitVersion")); + cbOmitVersion->setObjectName("cbOmitVersion"); gridLayout_2->addWidget(cbOmitVersion, 1, 0, 1, 1); cbIgnClearSeq = new QCheckBox(groupBox); - cbIgnClearSeq->setObjectName(QString::fromUtf8("cbIgnClearSeq")); + cbIgnClearSeq->setObjectName("cbIgnClearSeq"); cbIgnClearSeq->setToolTipDuration(-5); gridLayout_2->addWidget(cbIgnClearSeq, 1, 1, 1, 1); cbFragment = new QCheckBox(groupBox); - cbFragment->setObjectName(QString::fromUtf8("cbFragment")); + cbFragment->setObjectName("cbFragment"); sizePolicy4.setHeightForWidth(cbFragment->sizePolicy().hasHeightForWidth()); cbFragment->setSizePolicy(sizePolicy4); gridLayout_2->addWidget(cbFragment, 0, 1, 1, 1); cbIgnCSISeq = new QCheckBox(groupBox); - cbIgnCSISeq->setObjectName(QString::fromUtf8("cbIgnCSISeq")); + cbIgnCSISeq->setObjectName("cbIgnCSISeq"); gridLayout_2->addWidget(cbIgnCSISeq, 2, 1, 1, 1); cbDeriveStyles = new QCheckBox(groupBox); - cbDeriveStyles->setObjectName(QString::fromUtf8("cbDeriveStyles")); + cbDeriveStyles->setObjectName("cbDeriveStyles"); gridLayout_2->addWidget(cbDeriveStyles, 2, 0, 1, 1); @@ -291,17 +291,17 @@ verticalLayout_2->addItem(verticalSpacer_4); gbAsciiArt = new QGroupBox(groupBox); - gbAsciiArt->setObjectName(QString::fromUtf8("gbAsciiArt")); + gbAsciiArt->setObjectName("gbAsciiArt"); gbAsciiArt->setEnabled(true); sizePolicy3.setHeightForWidth(gbAsciiArt->sizePolicy().hasHeightForWidth()); gbAsciiArt->setSizePolicy(sizePolicy3); gbAsciiArt->setFlat(false); gridLayout_5 = new QGridLayout(gbAsciiArt); - gridLayout_5->setObjectName(QString::fromUtf8("gridLayout_5")); + gridLayout_5->setObjectName("gridLayout_5"); horizontalLayout_3 = new QHBoxLayout(); - horizontalLayout_3->setObjectName(QString::fromUtf8("horizontalLayout_3")); + horizontalLayout_3->setObjectName("horizontalLayout_3"); cbParseAsciiArt = new QCheckBox(gbAsciiArt); - cbParseAsciiArt->setObjectName(QString::fromUtf8("cbParseAsciiArt")); + cbParseAsciiArt->setObjectName("cbParseAsciiArt"); horizontalLayout_3->addWidget(cbParseAsciiArt); @@ -309,7 +309,7 @@ comboAnsiFormat->addItem(QString()); comboAnsiFormat->addItem(QString()); comboAnsiFormat->addItem(QString()); - comboAnsiFormat->setObjectName(QString::fromUtf8("comboAnsiFormat")); + comboAnsiFormat->setObjectName("comboAnsiFormat"); comboAnsiFormat->setEnabled(false); comboAnsiFormat->setEditable(false); comboAnsiFormat->setMaxVisibleItems(3); @@ -321,20 +321,20 @@ gridLayout_5->addLayout(horizontalLayout_3, 0, 0, 1, 1); artSizeFrame = new QFrame(gbAsciiArt); - artSizeFrame->setObjectName(QString::fromUtf8("artSizeFrame")); + artSizeFrame->setObjectName("artSizeFrame"); artSizeFrame->setEnabled(false); artSizeFrame->setFrameShape(QFrame::StyledPanel); artSizeFrame->setFrameShadow(QFrame::Raised); horizontalLayout_7 = new QHBoxLayout(artSizeFrame); - horizontalLayout_7->setObjectName(QString::fromUtf8("horizontalLayout_7")); + horizontalLayout_7->setObjectName("horizontalLayout_7"); lblWidth = new QLabel(artSizeFrame); - lblWidth->setObjectName(QString::fromUtf8("lblWidth")); + lblWidth->setObjectName("lblWidth"); lblWidth->setEnabled(false); horizontalLayout_7->addWidget(lblWidth); sbWidth = new QSpinBox(artSizeFrame); - sbWidth->setObjectName(QString::fromUtf8("sbWidth")); + sbWidth->setObjectName("sbWidth"); sbWidth->setEnabled(false); sbWidth->setMinimum(60); sbWidth->setMaximum(320); @@ -348,13 +348,13 @@ horizontalLayout_7->addItem(horizontalSpacer); lblHeight = new QLabel(artSizeFrame); - lblHeight->setObjectName(QString::fromUtf8("lblHeight")); + lblHeight->setObjectName("lblHeight"); lblHeight->setEnabled(false); horizontalLayout_7->addWidget(lblHeight); sbHeight = new QSpinBox(artSizeFrame); - sbHeight->setObjectName(QString::fromUtf8("sbHeight")); + sbHeight->setObjectName("sbHeight"); sbHeight->setEnabled(false); sbHeight->setMinimum(80); sbHeight->setMaximum(500); @@ -370,9 +370,9 @@ verticalLayout_2->addWidget(gbAsciiArt); gridLayout_3 = new QGridLayout(); - gridLayout_3->setObjectName(QString::fromUtf8("gridLayout_3")); + gridLayout_3->setObjectName("gridLayout_3"); lblTitle = new QLabel(groupBox); - lblTitle->setObjectName(QString::fromUtf8("lblTitle")); + lblTitle->setObjectName("lblTitle"); QSizePolicy sizePolicy6(QSizePolicy::Maximum, QSizePolicy::Minimum); sizePolicy6.setHorizontalStretch(0); sizePolicy6.setVerticalStretch(0); @@ -382,7 +382,7 @@ gridLayout_3->addWidget(lblTitle, 0, 0, 1, 1); leTitle = new QLineEdit(groupBox); - leTitle->setObjectName(QString::fromUtf8("leTitle")); + leTitle->setObjectName("leTitle"); QSizePolicy sizePolicy7(QSizePolicy::Preferred, QSizePolicy::Fixed); sizePolicy7.setHorizontalStretch(0); sizePolicy7.setVerticalStretch(0); @@ -392,17 +392,17 @@ gridLayout_3->addWidget(leTitle, 0, 1, 1, 2); lblStyleFile = new QLabel(groupBox); - lblStyleFile->setObjectName(QString::fromUtf8("lblStyleFile")); + lblStyleFile->setObjectName("lblStyleFile"); gridLayout_3->addWidget(lblStyleFile, 1, 0, 1, 1); leStyleFile = new QLineEdit(groupBox); - leStyleFile->setObjectName(QString::fromUtf8("leStyleFile")); + leStyleFile->setObjectName("leStyleFile"); gridLayout_3->addWidget(leStyleFile, 1, 1, 1, 2); lblEncoding = new QLabel(groupBox); - lblEncoding->setObjectName(QString::fromUtf8("lblEncoding")); + lblEncoding->setObjectName("lblEncoding"); sizePolicy1.setHeightForWidth(lblEncoding->sizePolicy().hasHeightForWidth()); lblEncoding->setSizePolicy(sizePolicy1); @@ -423,7 +423,7 @@ comboEncoding->addItem(QString()); comboEncoding->addItem(QString()); comboEncoding->addItem(QString()); - comboEncoding->setObjectName(QString::fromUtf8("comboEncoding")); + comboEncoding->setObjectName("comboEncoding"); sizePolicy7.setHeightForWidth(comboEncoding->sizePolicy().hasHeightForWidth()); comboEncoding->setSizePolicy(sizePolicy7); comboEncoding->setEditable(true); @@ -431,19 +431,19 @@ gridLayout_3->addWidget(comboEncoding, 2, 2, 1, 1); label_3 = new QLabel(groupBox); - label_3->setObjectName(QString::fromUtf8("label_3")); + label_3->setObjectName("label_3"); gridLayout_3->addWidget(label_3, 3, 0, 1, 1); spinBoxWrap = new QSpinBox(groupBox); - spinBoxWrap->setObjectName(QString::fromUtf8("spinBoxWrap")); + spinBoxWrap->setObjectName("spinBoxWrap"); gridLayout_3->addWidget(spinBoxWrap, 3, 2, 1, 1); comboFont = new QFontComboBox(groupBox); - comboFont->setObjectName(QString::fromUtf8("comboFont")); + comboFont->setObjectName("comboFont"); QFont font; - font.setFamily(QString::fromUtf8("Liberation Mono")); + font.setFamilies({QString::fromUtf8("Liberation Mono")}); comboFont->setCurrentFont(font); gridLayout_3->addWidget(comboFont, 4, 0, 1, 2); @@ -452,14 +452,14 @@ verticalLayout_2->addLayout(gridLayout_3); horizontalLayout = new QHBoxLayout(); - horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout")); + horizontalLayout->setObjectName("horizontalLayout"); label_5 = new QLabel(groupBox); - label_5->setObjectName(QString::fromUtf8("label_5")); + label_5->setObjectName("label_5"); horizontalLayout->addWidget(label_5); leColorMapPath = new QLineEdit(groupBox); - leColorMapPath->setObjectName(QString::fromUtf8("leColorMapPath")); + leColorMapPath->setObjectName("leColorMapPath"); QSizePolicy sizePolicy8(QSizePolicy::Expanding, QSizePolicy::Maximum); sizePolicy8.setHorizontalStretch(0); sizePolicy8.setVerticalStretch(0); @@ -469,7 +469,7 @@ horizontalLayout->addWidget(leColorMapPath); pbSelectMapFile = new QPushButton(groupBox); - pbSelectMapFile->setObjectName(QString::fromUtf8("pbSelectMapFile")); + pbSelectMapFile->setObjectName("pbSelectMapFile"); QSizePolicy sizePolicy9(QSizePolicy::Fixed, QSizePolicy::Fixed); sizePolicy9.setHorizontalStretch(0); sizePolicy9.setVerticalStretch(0); @@ -487,21 +487,20 @@ verticalLayout_2->addItem(verticalSpacer); horizontalLayout_5 = new QHBoxLayout(); - horizontalLayout_5->setObjectName(QString::fromUtf8("horizontalLayout_5")); + horizontalLayout_5->setObjectName("horizontalLayout_5"); pbAbout = new QPushButton(groupBox); - pbAbout->setObjectName(QString::fromUtf8("pbAbout")); + pbAbout->setObjectName("pbAbout"); sizePolicy3.setHeightForWidth(pbAbout->sizePolicy().hasHeightForWidth()); pbAbout->setSizePolicy(sizePolicy3); horizontalLayout_5->addWidget(pbAbout); pbExit = new QPushButton(groupBox); - pbExit->setObjectName(QString::fromUtf8("pbExit")); + pbExit->setObjectName("pbExit"); sizePolicy3.setHeightForWidth(pbExit->sizePolicy().hasHeightForWidth()); pbExit->setSizePolicy(sizePolicy3); QFont font1; font1.setBold(true); - font1.setWeight(75); pbExit->setFont(font1); horizontalLayout_5->addWidget(pbExit); @@ -513,21 +512,21 @@ horizontalLayout_4->addWidget(groupBox); verticalLayout = new QVBoxLayout(); - verticalLayout->setObjectName(QString::fromUtf8("verticalLayout")); + verticalLayout->setObjectName("verticalLayout"); lblInFilePath = new QLabel(Dialog); - lblInFilePath->setObjectName(QString::fromUtf8("lblInFilePath")); + lblInFilePath->setObjectName("lblInFilePath"); verticalLayout->addWidget(lblInFilePath); textEdit = new QTextEdit(Dialog); - textEdit->setObjectName(QString::fromUtf8("textEdit")); + textEdit->setObjectName("textEdit"); QSizePolicy sizePolicy10(QSizePolicy::Expanding, QSizePolicy::Expanding); sizePolicy10.setHorizontalStretch(1); sizePolicy10.setVerticalStretch(1); sizePolicy10.setHeightForWidth(textEdit->sizePolicy().hasHeightForWidth()); textEdit->setSizePolicy(sizePolicy10); QFont font2; - font2.setFamily(QString::fromUtf8("Monospace")); + font2.setFamilies({QString::fromUtf8("Monospace")}); font2.setPointSize(10); textEdit->setFont(font2); textEdit->setAcceptDrops(false); @@ -536,7 +535,7 @@ verticalLayout->addWidget(textEdit); cbWatchFile = new QCheckBox(Dialog); - cbWatchFile->setObjectName(QString::fromUtf8("cbWatchFile")); + cbWatchFile->setObjectName("cbWatchFile"); cbWatchFile->setEnabled(false); verticalLayout->addWidget(cbWatchFile); @@ -555,7 +554,7 @@ QWidget::setTabOrder(comboFont, textEdit); retranslateUi(Dialog); - QObject::connect(pbExit, SIGNAL(clicked()), Dialog, SLOT(close())); + QObject::connect(pbExit, &QPushButton::clicked, Dialog, qOverload<>(&QDialog::close)); QMetaObject::connectSlotsByName(Dialog); } // setupUi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.19/src/version.h new/ansifilter-2.20/src/version.h --- old/ansifilter-2.19/src/version.h 2023-02-27 21:06:43.000000000 +0100 +++ new/ansifilter-2.20/src/version.h 2023-06-17 16:41:42.000000000 +0200 @@ -27,7 +27,7 @@ #include <string> -#define ANSIFILTER_VERSION "2.19" +#define ANSIFILTER_VERSION "2.20" #define ANSIFILTER_URL "http://www.andre-simon.de/"; #define ANSIFILTER_EMAIL "a.si...@mailbox.org"
