Hello community, here is the log from the commit of package kcodecs for openSUSE:Factory checked in at 2018-05-18 14:19:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcodecs (Old) and /work/SRC/openSUSE:Factory/.kcodecs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcodecs" Fri May 18 14:19:17 2018 rev:53 rq:607540 version:5.46.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kcodecs/kcodecs.changes 2018-04-19 15:15:43.752361595 +0200 +++ /work/SRC/openSUSE:Factory/.kcodecs.new/kcodecs.changes 2018-05-18 14:20:17.643125749 +0200 @@ -1,0 +2,10 @@ +Sun May 13 21:03:00 UTC 2018 - [email protected] + +- Update to 5.46.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.46.0.php +- Changes since 5.45.0: + * Add missing override + +------------------------------------------------------------------- Old: ---- kcodecs-5.45.0.tar.xz New: ---- kcodecs-5.46.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcodecs.spec ++++++ --- /var/tmp/diff_new_pack.wtZrXq/_old 2018-05-18 14:20:18.251103438 +0200 +++ /var/tmp/diff_new_pack.wtZrXq/_new 2018-05-18 14:20:18.251103438 +0200 @@ -18,13 +18,13 @@ %bcond_without lang %define lname libKF5Codecs5 -%define _tar_path 5.45 +%define _tar_path 5.46 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} Name: kcodecs -Version: 5.45.0 +Version: 5.46.0 Release: 0 Summary: Provides a collection of methods to manipulate strings using various encoding License: LGPL-2.1-or-later ++++++ kcodecs-5.45.0.tar.xz -> kcodecs-5.46.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.45.0/CMakeLists.txt new/kcodecs-5.46.0/CMakeLists.txt --- old/kcodecs-5.45.0/CMakeLists.txt 2018-04-07 21:33:14.000000000 +0200 +++ new/kcodecs-5.46.0/CMakeLists.txt 2018-05-05 14:56:02.000000000 +0200 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.45.0") # handled by release scripts +set(KF5_VERSION "5.46.0") # handled by release scripts project(KCodecs VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.45.0 NO_MODULE) +find_package(ECM 5.46.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.45.0/po/zh_CN/kcodecs5_qt.po new/kcodecs-5.46.0/po/zh_CN/kcodecs5_qt.po --- old/kcodecs-5.45.0/po/zh_CN/kcodecs5_qt.po 2018-04-07 21:33:14.000000000 +0200 +++ new/kcodecs-5.46.0/po/zh_CN/kcodecs5_qt.po 2018-05-05 14:56:02.000000000 +0200 @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2018-04-05 09:22-0400\n" +"PO-Revision-Date: 2018-04-26 05:22-0400\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.45.0/src/kcodecsbase64.cpp new/kcodecs-5.46.0/src/kcodecsbase64.cpp --- old/kcodecs-5.45.0/src/kcodecsbase64.cpp 2018-04-07 21:33:14.000000000 +0200 +++ new/kcodecs-5.46.0/src/kcodecsbase64.cpp 2018-05-05 14:56:02.000000000 +0200 @@ -96,9 +96,9 @@ virtual ~Base64Decoder() {} bool decode(const char *&scursor, const char *const send, - char *&dcursor, const char *const dend) Q_DECL_OVERRIDE; + char *&dcursor, const char *const dend) override; // ### really needs no finishing??? - bool finish(char *&dcursor, const char *const dend) Q_DECL_OVERRIDE + bool finish(char *&dcursor, const char *const dend) override { Q_UNUSED(dcursor); Q_UNUSED(dend); @@ -134,9 +134,9 @@ virtual ~Base64Encoder() {} bool encode(const char *&scursor, const char *const send, - char *&dcursor, const char *const dend) Q_DECL_OVERRIDE; + char *&dcursor, const char *const dend) override; - bool finish(char *&dcursor, const char *const dend) Q_DECL_OVERRIDE; + bool finish(char *&dcursor, const char *const dend) override; protected: bool writeBase64(uchar ch, char *&dcursor, const char *const dend) @@ -156,8 +156,8 @@ public: bool encode(const char *&scursor, const char *const send, - char *&dcursor, const char *const dend) Q_DECL_OVERRIDE; - bool finish(char *&dcursor, const char *const dend) Q_DECL_OVERRIDE; + char *&dcursor, const char *const dend) override; + bool finish(char *&dcursor, const char *const dend) override; }; Encoder *Base64Codec::makeEncoder(Codec::NewlineType newline) const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.45.0/src/kcodecsbase64.h new/kcodecs-5.46.0/src/kcodecsbase64.h --- old/kcodecs-5.45.0/src/kcodecsbase64.h 2018-04-07 21:33:14.000000000 +0200 +++ new/kcodecs-5.46.0/src/kcodecsbase64.h 2018-05-05 14:56:02.000000000 +0200 @@ -72,13 +72,13 @@ /** Destroys the codec. */ - virtual ~Base64Codec() {} + virtual ~Base64Codec() override {} /** @copydoc Codec::name() */ - const char *name() const Q_DECL_OVERRIDE + const char *name() const override { return "base64"; } @@ -87,7 +87,7 @@ @copydoc Codec::maxEncodedSizeFor() */ - int maxEncodedSizeFor(int insize, NewlineType newline) const Q_DECL_OVERRIDE + int maxEncodedSizeFor(int insize, NewlineType newline) const override { // first, the total number of 4-char packets will be: int totalNumPackets = (insize + 2) / 3; @@ -103,7 +103,7 @@ @copydoc Codec::maxDecodedSizeFor() */ - int maxDecodedSizeFor(int insize, NewlineType newline = Codec::NewlineLF) const Q_DECL_OVERRIDE + int maxDecodedSizeFor(int insize, NewlineType newline = Codec::NewlineLF) const override { // assuming all characters are part of the base64 stream (which // does almost never hold due to required linebreaking; but @@ -123,13 +123,13 @@ @copydoc Codec::makeEncoder() */ - Encoder *makeEncoder(NewlineType newline = Codec::NewlineLF) const Q_DECL_OVERRIDE; + Encoder *makeEncoder(NewlineType newline = Codec::NewlineLF) const override; /** @copydoc Codec::makeDecoder() */ - Decoder *makeDecoder(NewlineType newline = Codec::NewlineLF) const Q_DECL_OVERRIDE; + Decoder *makeDecoder(NewlineType newline = Codec::NewlineLF) const override; }; /** @@ -156,7 +156,7 @@ @copydoc Codec::name() */ - const char *name() const Q_DECL_OVERRIDE + const char *name() const override { return "b"; } @@ -165,7 +165,7 @@ @copydoc Codec::maxEncodedSizeFor() */ - int maxEncodedSizeFor(int insize, NewlineType newline = Codec::NewlineLF) const Q_DECL_OVERRIDE + int maxEncodedSizeFor(int insize, NewlineType newline = Codec::NewlineLF) const override { Q_UNUSED(newline); // Each (begun) 3-octet triple becomes a 4 char quartet, so: @@ -176,7 +176,7 @@ @copydoc Codec::maxDecodedSizeFor() */ - int maxDecodedSizeFor(int insize, NewlineType newline = Codec::NewlineLF) const Q_DECL_OVERRIDE + int maxDecodedSizeFor(int insize, NewlineType newline = Codec::NewlineLF) const override { Q_UNUSED(newline); // Each 4-char quartet becomes a 3-octet triple, the last one @@ -188,7 +188,7 @@ @copydoc Codec::makeEncoder() */ - Encoder *makeEncoder(NewlineType newline = Codec::NewlineLF) const Q_DECL_OVERRIDE; + Encoder *makeEncoder(NewlineType newline = Codec::NewlineLF) const override; }; } // namespace KCodecs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.45.0/src/kcodecsidentity.cpp new/kcodecs-5.46.0/src/kcodecsidentity.cpp --- old/kcodecs-5.45.0/src/kcodecsidentity.cpp 2018-04-07 21:33:14.000000000 +0200 +++ new/kcodecs-5.46.0/src/kcodecsidentity.cpp 2018-05-05 14:56:02.000000000 +0200 @@ -55,15 +55,15 @@ ~IdentityEnDecoder() {} bool encode(const char *&scursor, const char *const send, - char *&dcursor, const char *const dend) Q_DECL_OVERRIDE + char *&dcursor, const char *const dend) override { return decode(scursor, send, dcursor, dend); } bool decode(const char *&scursor, const char *const send, - char *&dcursor, const char *const dend) Q_DECL_OVERRIDE; + char *&dcursor, const char *const dend) override; - bool finish(char *&dcursor, const char *const dend) Q_DECL_OVERRIDE + bool finish(char *&dcursor, const char *const dend) override { Q_UNUSED(dcursor); Q_UNUSED(dend); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.45.0/src/kcodecsidentity.h new/kcodecs-5.46.0/src/kcodecsidentity.h --- old/kcodecs-5.45.0/src/kcodecsidentity.h 2018-04-07 21:33:14.000000000 +0200 +++ new/kcodecs-5.46.0/src/kcodecsidentity.h 2018-05-05 14:56:02.000000000 +0200 @@ -56,7 +56,7 @@ /** Destroys the codec. */ - ~IdentityCodec() {} + ~IdentityCodec() override {} using Codec::encode; using Codec::decode; @@ -65,19 +65,19 @@ @copydoc QByteArray Codec::encode() */ - QByteArray encode(const QByteArray &src, Codec::NewlineType newline = Codec::NewlineLF) const Q_DECL_OVERRIDE; + QByteArray encode(const QByteArray &src, Codec::NewlineType newline = Codec::NewlineLF) const override; /** @copydoc QByteArray Codec::decode() */ - QByteArray decode(const QByteArray &src, Codec::NewlineType newline = Codec::NewlineLF) const Q_DECL_OVERRIDE; + QByteArray decode(const QByteArray &src, Codec::NewlineType newline = Codec::NewlineLF) const override; /** @copydoc Codec::maxEncodedSizeFor() */ - int maxEncodedSizeFor(int insize, Codec::NewlineType newline = Codec::NewlineLF) const Q_DECL_OVERRIDE + int maxEncodedSizeFor(int insize, Codec::NewlineType newline = Codec::NewlineLF) const override { if (newline == Codec::NewlineCRLF) { return 2 * insize; @@ -90,7 +90,7 @@ @copydoc Codec::maxDecodedSizeFor() */ - int maxDecodedSizeFor(int insize, Codec::NewlineType newline) const Q_DECL_OVERRIDE + int maxDecodedSizeFor(int insize, Codec::NewlineType newline) const override { if (newline == Codec::NewlineCRLF) { return 2 * insize; @@ -103,13 +103,13 @@ @copydoc Codec::makeEncoder() */ - Encoder *makeEncoder(Codec::NewlineType newline = Codec::NewlineCRLF) const Q_DECL_OVERRIDE; + Encoder *makeEncoder(Codec::NewlineType newline = Codec::NewlineCRLF) const override; /** @copydoc Codec::makeDecoder() */ - Decoder *makeDecoder(Codec::NewlineType newline = Codec::NewlineCRLF) const Q_DECL_OVERRIDE; + Decoder *makeDecoder(Codec::NewlineType newline = Codec::NewlineCRLF) const override; }; /** @@ -129,13 +129,13 @@ /** Destroys the codec. */ - ~SevenBitCodec() {} + ~SevenBitCodec() override {} /** @copydoc Codec::name() */ - const char *name() const Q_DECL_OVERRIDE + const char *name() const override { return "7bit"; } @@ -158,13 +158,13 @@ /** Destroys the codec. */ - ~EightBitCodec() {} + ~EightBitCodec() override {} /** @copydoc Codec::name() */ - const char *name() const Q_DECL_OVERRIDE + const char *name() const override { return "8bit"; } @@ -187,13 +187,13 @@ /** Destroys the codec. */ - ~BinaryCodec() {} + ~BinaryCodec() override {} /** @copydoc Codec::name() */ - const char *name() const Q_DECL_OVERRIDE + const char *name() const override { return "binary"; } @@ -202,7 +202,7 @@ @copydoc Codec::maxEncodedSizeFor() */ - int maxEncodedSizeFor(int insize, Codec::NewlineType newline = Codec::NewlineLF) const Q_DECL_OVERRIDE + int maxEncodedSizeFor(int insize, Codec::NewlineType newline = Codec::NewlineLF) const override { Q_UNUSED(newline); return insize; @@ -212,7 +212,7 @@ @copydoc Codec::maxDecodedSizeFor() */ - int maxDecodedSizeFor(int insize, Codec::NewlineType newline = Codec::NewlineLF) const Q_DECL_OVERRIDE + int maxDecodedSizeFor(int insize, Codec::NewlineType newline = Codec::NewlineLF) const override { Q_UNUSED(newline); return insize; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.45.0/src/kcodecsqp.cpp new/kcodecs-5.46.0/src/kcodecsqp.cpp --- old/kcodecs-5.45.0/src/kcodecsqp.cpp 2018-04-07 21:33:14.000000000 +0200 +++ new/kcodecs-5.46.0/src/kcodecsqp.cpp 2018-05-05 14:56:02.000000000 +0200 @@ -148,9 +148,9 @@ virtual ~QuotedPrintableEncoder() {} bool encode(const char *&scursor, const char *const send, - char *&dcursor, const char *const dend) Q_DECL_OVERRIDE; + char *&dcursor, const char *const dend) override; - bool finish(char *&dcursor, const char *const dend) Q_DECL_OVERRIDE; + bool finish(char *&dcursor, const char *const dend) override; }; class QuotedPrintableDecoder : public Decoder @@ -198,8 +198,8 @@ virtual ~QuotedPrintableDecoder() {} bool decode(const char *&scursor, const char *const send, - char *&dcursor, const char *const dend) Q_DECL_OVERRIDE; - bool finish(char *&dcursor, const char *const dend) Q_DECL_OVERRIDE; + char *&dcursor, const char *const dend) override; + bool finish(char *&dcursor, const char *const dend) override; }; class Rfc2047QEncodingEncoder : public Encoder @@ -248,8 +248,8 @@ virtual ~Rfc2047QEncodingEncoder() {} bool encode(const char *&scursor, const char *const send, - char *&dcursor, const char *const dend) Q_DECL_OVERRIDE; - bool finish(char *&dcursor, const char *const dend) Q_DECL_OVERRIDE; + char *&dcursor, const char *const dend) override; + bool finish(char *&dcursor, const char *const dend) override; }; // this doesn't access any member variables, so it can be defined static diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.45.0/src/kcodecsqp.h new/kcodecs-5.46.0/src/kcodecsqp.h --- old/kcodecs-5.45.0/src/kcodecsqp.h 2018-04-07 21:33:14.000000000 +0200 +++ new/kcodecs-5.46.0/src/kcodecsqp.h 2018-05-05 14:56:02.000000000 +0200 @@ -66,13 +66,13 @@ /** Destroys the codec. */ - virtual ~QuotedPrintableCodec() {} + ~QuotedPrintableCodec() override {} /** @copydoc Codec::name() */ - const char *name() const Q_DECL_OVERRIDE + const char *name() const override { return "quoted-printable"; } @@ -81,7 +81,7 @@ @copydoc Codec::maxEncodedSizeFor() */ - int maxEncodedSizeFor(int insize, NewlineType newline = Codec::NewlineLF) const Q_DECL_OVERRIDE + int maxEncodedSizeFor(int insize, NewlineType newline = Codec::NewlineLF) const override { // all chars encoded: int result = 3 * insize; @@ -95,19 +95,19 @@ @copydoc Codec::maxDecodedSizeFor() */ - int maxDecodedSizeFor(int insize, NewlineType newline = Codec::NewlineLF) const Q_DECL_OVERRIDE; + int maxDecodedSizeFor(int insize, NewlineType newline = Codec::NewlineLF) const override; /** @copydoc Codec::makeEncoder() */ - Encoder *makeEncoder(NewlineType newline = Codec::NewlineLF) const Q_DECL_OVERRIDE; + Encoder *makeEncoder(NewlineType newline = Codec::NewlineLF) const override; /** @copydoc Codec::makeDecoder() */ - Decoder *makeDecoder(NewlineType newline = Codec::NewlineLF) const Q_DECL_OVERRIDE; + Decoder *makeDecoder(NewlineType newline = Codec::NewlineLF) const override; }; /** @@ -128,13 +128,13 @@ /** Destroys the codec. */ - virtual ~Rfc2047QEncodingCodec() {} + ~Rfc2047QEncodingCodec() override {} /** @copydoc Codec::name() */ - const char *name() const Q_DECL_OVERRIDE + const char *name() const override { return "q"; } @@ -143,7 +143,7 @@ @copydoc Codec::maxEncodedSizeFor() */ - int maxEncodedSizeFor(int insize, Codec::NewlineType newline = Codec::NewlineLF) const Q_DECL_OVERRIDE + int maxEncodedSizeFor(int insize, Codec::NewlineType newline = Codec::NewlineLF) const override { Q_UNUSED(newline); // this one is simple: We don't do linebreaking, so all that can @@ -155,19 +155,19 @@ @copydoc Codec::maxDecodedSizeFor() */ - int maxDecodedSizeFor(int insize, Codec::NewlineType newline = Codec::NewlineLF) const Q_DECL_OVERRIDE; + int maxDecodedSizeFor(int insize, Codec::NewlineType newline = Codec::NewlineLF) const override; /** @copydoc Codec::makeEncoder() */ - Encoder *makeEncoder(Codec::NewlineType newline = Codec::NewlineLF) const Q_DECL_OVERRIDE; + Encoder *makeEncoder(Codec::NewlineType newline = Codec::NewlineLF) const override; /** @copydoc Codec::makeDecoder() */ - Decoder *makeDecoder(Codec::NewlineType newline = Codec::NewlineLF) const Q_DECL_OVERRIDE; + Decoder *makeDecoder(Codec::NewlineType newline = Codec::NewlineLF) const override; }; /** @@ -187,13 +187,13 @@ /** Destroys the codec. */ - virtual ~Rfc2231EncodingCodec() {} + ~Rfc2231EncodingCodec() override {} /** @copydoc Codec::name() */ - const char *name() const Q_DECL_OVERRIDE + const char *name() const override { return "x-kmime-rfc2231"; } @@ -202,7 +202,7 @@ @copydoc Codec::maxEncodedSizeFor() */ - int maxEncodedSizeFor(int insize, Codec::NewlineType newline = Codec::NewlineLF) const Q_DECL_OVERRIDE + int maxEncodedSizeFor(int insize, Codec::NewlineType newline = Codec::NewlineLF) const override { Q_UNUSED(newline); // same as for "q" encoding: @@ -213,19 +213,19 @@ @copydoc Codec::maxDecodedSizeFor() */ - int maxDecodedSizeFor(int insize, Codec::NewlineType newline = Codec::NewlineLF) const Q_DECL_OVERRIDE; + int maxDecodedSizeFor(int insize, Codec::NewlineType newline = Codec::NewlineLF) const override; /** @copydoc Codec::makeEncoder() */ - Encoder *makeEncoder(Codec::NewlineType newline = Codec::NewlineLF) const Q_DECL_OVERRIDE; + Encoder *makeEncoder(Codec::NewlineType newline = Codec::NewlineLF) const override; /** @copydoc Codec::makeDecoder() */ - Decoder *makeDecoder(Codec::NewlineType newline = Codec::NewlineLF) const Q_DECL_OVERRIDE; + Decoder *makeDecoder(Codec::NewlineType newline = Codec::NewlineLF) const override; }; } // namespace KCodecs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.45.0/src/kcodecsuuencode.cpp new/kcodecs-5.46.0/src/kcodecsuuencode.cpp --- old/kcodecs-5.45.0/src/kcodecsuuencode.cpp 2018-04-07 21:33:14.000000000 +0200 +++ new/kcodecs-5.46.0/src/kcodecsuuencode.cpp 2018-05-05 14:56:02.000000000 +0200 @@ -71,9 +71,9 @@ virtual ~UUDecoder() {} bool decode(const char *&scursor, const char *const send, - char *&dcursor, const char *const dend) Q_DECL_OVERRIDE; + char *&dcursor, const char *const dend) override; // ### really needs no finishing??? - bool finish(char *&dcursor, const char *const dend) Q_DECL_OVERRIDE + bool finish(char *&dcursor, const char *const dend) override { Q_UNUSED(dcursor); Q_UNUSED(dend); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.45.0/src/kcodecsuuencode.h new/kcodecs-5.46.0/src/kcodecsuuencode.h --- old/kcodecs-5.45.0/src/kcodecsuuencode.h 2018-04-07 21:33:14.000000000 +0200 +++ new/kcodecs-5.46.0/src/kcodecsuuencode.h 2018-05-05 14:56:02.000000000 +0200 @@ -56,13 +56,13 @@ /** Destroys the codec. */ - virtual ~UUCodec() {} + ~UUCodec() override {} /** @copydoc Codec::name() */ - const char *name() const Q_DECL_OVERRIDE + const char *name() const override { return "x-uuencode"; } @@ -71,7 +71,7 @@ @copydoc Codec::maxEncodedSizeFor() */ - int maxEncodedSizeFor(int insize, NewlineType newline = Codec::NewlineLF) const Q_DECL_OVERRIDE + int maxEncodedSizeFor(int insize, NewlineType newline = Codec::NewlineLF) const override { Q_UNUSED(newline); return insize; // we have no encoder! @@ -81,7 +81,7 @@ @copydoc Codec::maxDecodedSizeFor() */ - int maxDecodedSizeFor(int insize, NewlineType newline = Codec::NewlineLF) const Q_DECL_OVERRIDE + int maxDecodedSizeFor(int insize, NewlineType newline = Codec::NewlineLF) const override { // assuming all characters are part of the uuencode stream (which // does almost never hold due to required linebreaking; but @@ -100,13 +100,13 @@ @copydoc Codec::makeEncoder() */ - Encoder *makeEncoder(NewlineType newline = Codec::NewlineLF) const Q_DECL_OVERRIDE; + Encoder *makeEncoder(NewlineType newline = Codec::NewlineLF) const override; /** @copydoc Codec::makeEncoder() */ - Decoder *makeDecoder(NewlineType newline = Codec::NewlineLF) const Q_DECL_OVERRIDE; + Decoder *makeDecoder(NewlineType newline = Codec::NewlineLF) const override; }; } // namespace KCodecs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.45.0/src/probers/CharDistribution.h new/kcodecs-5.46.0/src/probers/CharDistribution.h --- old/kcodecs-5.45.0/src/probers/CharDistribution.h 2018-04-07 21:33:14.000000000 +0200 +++ new/kcodecs-5.46.0/src/probers/CharDistribution.h 2018-05-05 14:56:02.000000000 +0200 @@ -39,11 +39,11 @@ CharDistributionAnalysis() { Reset(); - }; - virtual ~CharDistributionAnalysis() {}; + } + virtual ~CharDistributionAnalysis() {} //feed a block of data and do distribution analysis - void HandleData(const char * /* aBuf */, unsigned int /* aLen */) {}; + void HandleData(const char * /* aBuf */, unsigned int /* aLen */) {} //Feed a character with known length void HandleOneChar(const char *aStr, unsigned int aCharLen) @@ -62,7 +62,7 @@ } } } - }; + } //return confidence base on existing data float GetConfidence(); @@ -73,18 +73,18 @@ mDone = false; mTotalChars = 0; mFreqChars = 0; - }; + } //This function is for future extension. Caller can use this function to control //analyser's behavior - void SetOpion() {}; + void SetOpion() {} //It is not necessary to receive all data to draw conclusion. For charset detection, // certain amount of data is enough bool GotEnoughData() { return mTotalChars > ENOUGH_DATA_THRESHOLD; - }; + } protected: //we do not handle character base on its original encoding string, but @@ -93,7 +93,7 @@ virtual int GetOrder(const char * /* str */) { return -1; - }; + } //If this flag is set to true, detection is done and conclusion has been made bool mDone; @@ -124,14 +124,14 @@ // first byte range: 0xb0 -- 0xfe // second byte range: 0xa1 -- 0xfe //no validation needed here. State machine has done that - int GetOrder(const char *str) Q_DECL_OVERRIDE + int GetOrder(const char *str) override { if ((unsigned char)*str >= (unsigned char)0xb0) { return 94 * ((unsigned char)str[0] - (unsigned char)0xb0) + (unsigned char)str[1] - (unsigned char)0xa1; } else { return -1; } - }; + } }; class KCODECS_NO_EXPORT GB2312DistributionAnalysis : public CharDistributionAnalysis @@ -143,14 +143,14 @@ // first byte range: 0xb0 -- 0xfe // second byte range: 0xa1 -- 0xfe //no validation needed here. State machine has done that - int GetOrder(const char *str) Q_DECL_OVERRIDE + int GetOrder(const char *str) override { if ((unsigned char)*str >= (unsigned char)0xb0 && (unsigned char)str[1] >= (unsigned char)0xa1) { return 94 * ((unsigned char)str[0] - (unsigned char)0xb0) + (unsigned char)str[1] - (unsigned char)0xa1; } else { return -1; } - }; + } }; class KCODECS_NO_EXPORT Big5DistributionAnalysis : public CharDistributionAnalysis @@ -162,7 +162,7 @@ // first byte range: 0xa4 -- 0xfe // second byte range: 0x40 -- 0x7e , 0xa1 -- 0xfe //no validation needed here. State machine has done that - int GetOrder(const char *str) Q_DECL_OVERRIDE + int GetOrder(const char *str) override { if ((unsigned char)*str >= (unsigned char)0xa4) if ((unsigned char)str[1] >= (unsigned char)0xa1) { @@ -173,7 +173,7 @@ else { return -1; } - }; + } }; class KCODECS_NO_EXPORT SJISDistributionAnalysis : public CharDistributionAnalysis @@ -185,7 +185,7 @@ // first byte range: 0x81 -- 0x9f , 0xe0 -- 0xfe // second byte range: 0x40 -- 0x7e, 0x81 -- oxfe //no validation needed here. State machine has done that - int GetOrder(const char *str) Q_DECL_OVERRIDE + int GetOrder(const char *str) override { int order; if ((unsigned char)*str >= (unsigned char)0x81 && (unsigned char)*str <= (unsigned char)0x9f) { @@ -200,7 +200,7 @@ order--; } return order; - }; + } }; class KCODECS_NO_EXPORT EUCJPDistributionAnalysis : public CharDistributionAnalysis @@ -212,14 +212,14 @@ // first byte range: 0xa0 -- 0xfe // second byte range: 0xa1 -- 0xfe //no validation needed here. State machine has done that - int GetOrder(const char *str) Q_DECL_OVERRIDE + int GetOrder(const char *str) override { if ((unsigned char)*str >= (unsigned char)0xa0) { return 94 * ((unsigned char)str[0] - (unsigned char)0xa1) + (unsigned char)str[1] - (unsigned char)0xa1; } else { return -1; } - }; + } }; } #endif //CharDistribution_h__ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.45.0/src/probers/ChineseGroupProber.h new/kcodecs-5.46.0/src/probers/ChineseGroupProber.h --- old/kcodecs-5.45.0/src/probers/ChineseGroupProber.h 2018-04-07 21:33:14.000000000 +0200 +++ new/kcodecs-5.46.0/src/probers/ChineseGroupProber.h 2018-05-05 14:56:02.000000000 +0200 @@ -35,18 +35,18 @@ public: ChineseGroupProber(); virtual ~ChineseGroupProber(); - nsProbingState HandleData(const char *aBuf, unsigned int aLen) Q_DECL_OVERRIDE; - const char *GetCharSetName() Q_DECL_OVERRIDE; - nsProbingState GetState(void) Q_DECL_OVERRIDE + nsProbingState HandleData(const char *aBuf, unsigned int aLen) override; + const char *GetCharSetName() override; + nsProbingState GetState(void) override { return mState; - }; - void Reset(void) Q_DECL_OVERRIDE; - float GetConfidence(void) Q_DECL_OVERRIDE; - void SetOpion() Q_DECL_OVERRIDE {}; + } + void Reset(void) override; + float GetConfidence(void) override; + void SetOpion() override {} #ifdef DEBUG_PROBE - void DumpStatus() Q_DECL_OVERRIDE; + void DumpStatus() override; #endif protected: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.45.0/src/probers/JapaneseGroupProber.h new/kcodecs-5.46.0/src/probers/JapaneseGroupProber.h --- old/kcodecs-5.45.0/src/probers/JapaneseGroupProber.h 2018-04-07 21:33:14.000000000 +0200 +++ new/kcodecs-5.46.0/src/probers/JapaneseGroupProber.h 2018-05-05 14:56:02.000000000 +0200 @@ -38,18 +38,18 @@ public: JapaneseGroupProber(); virtual ~JapaneseGroupProber(); - nsProbingState HandleData(const char *aBuf, unsigned int aLen) Q_DECL_OVERRIDE; - const char *GetCharSetName() Q_DECL_OVERRIDE; - nsProbingState GetState(void) Q_DECL_OVERRIDE + nsProbingState HandleData(const char *aBuf, unsigned int aLen) override; + const char *GetCharSetName() override; + nsProbingState GetState(void) override { return mState; - }; - void Reset(void) Q_DECL_OVERRIDE; - float GetConfidence(void) Q_DECL_OVERRIDE; - void SetOpion() Q_DECL_OVERRIDE {}; + } + void Reset(void) override; + float GetConfidence(void) override; + void SetOpion() override {} #ifdef DEBUG_PROBE - void DumpStatus() Q_DECL_OVERRIDE; + void DumpStatus() override; #endif protected: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.45.0/src/probers/JpCntx.h new/kcodecs-5.46.0/src/probers/JpCntx.h --- old/kcodecs-5.45.0/src/probers/JpCntx.h 2018-04-07 21:33:14.000000000 +0200 +++ new/kcodecs-5.46.0/src/probers/JpCntx.h 2018-05-05 14:56:02.000000000 +0200 @@ -44,8 +44,8 @@ JapaneseContextAnalysis() { Reset(); - }; - virtual ~JapaneseContextAnalysis() {}; + } + virtual ~JapaneseContextAnalysis() {} void HandleData(const char *aBuf, unsigned int aLen); @@ -69,15 +69,15 @@ mRelSample[(int)jp2CharContext[mLastCharOrder][order]]++; } mLastCharOrder = order; - }; + } float GetConfidence(); void Reset(void); - void SetOpion() {}; + void SetOpion() {} bool GotEnoughData() { return mTotalRel > ENOUGH_REL_THRESHOLD; - }; + } protected: virtual int GetOrder(const char *str, unsigned int *charLen) = 0; @@ -104,9 +104,9 @@ { //SJISContextAnalysis(){}; protected: - int GetOrder(const char *str, unsigned int *charLen) Q_DECL_OVERRIDE; + int GetOrder(const char *str, unsigned int *charLen) override; - int GetOrder(const char *str) Q_DECL_OVERRIDE + int GetOrder(const char *str) override { //We only interested in Hiragana, so first byte is '\202' if (*str == '\202' && @@ -115,14 +115,14 @@ return (unsigned char) * (str + 1) - (unsigned char)0x9f; } return -1; - }; + } }; class KCODECS_NO_EXPORT EUCJPContextAnalysis : public JapaneseContextAnalysis { protected: - int GetOrder(const char *str, unsigned int *charLen) Q_DECL_OVERRIDE; - int GetOrder(const char *str) Q_DECL_OVERRIDE + int GetOrder(const char *str, unsigned int *charLen) override; + int GetOrder(const char *str) override //We only interested in Hiragana, so first byte is '\244' { if (*str == '\244' && @@ -131,7 +131,7 @@ return (unsigned char) * (str + 1) - (unsigned char)0xa1; } return -1; - }; + } }; } #endif /* __JPCNTX_H__ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.45.0/src/probers/UnicodeGroupProber.h new/kcodecs-5.46.0/src/probers/UnicodeGroupProber.h --- old/kcodecs-5.45.0/src/probers/UnicodeGroupProber.h 2018-04-07 21:33:14.000000000 +0200 +++ new/kcodecs-5.46.0/src/probers/UnicodeGroupProber.h 2018-05-05 14:56:02.000000000 +0200 @@ -35,21 +35,21 @@ { public: UnicodeGroupProber(void); - virtual ~UnicodeGroupProber(void); - nsProbingState HandleData(const char *aBuf, unsigned int aLen) Q_DECL_OVERRIDE; - const char *GetCharSetName() Q_DECL_OVERRIDE + ~UnicodeGroupProber(void) override; + nsProbingState HandleData(const char *aBuf, unsigned int aLen) override; + const char *GetCharSetName() override { return mDetectedCharset; - }; - nsProbingState GetState(void) Q_DECL_OVERRIDE + } + nsProbingState GetState(void) override { return mState; - }; - void Reset(void) Q_DECL_OVERRIDE; - float GetConfidence() Q_DECL_OVERRIDE; - void SetOpion() Q_DECL_OVERRIDE {}; + } + void Reset(void) override; + float GetConfidence() override; + void SetOpion() override {} #ifdef DEBUG_PROBE - void DumpStatus() Q_DECL_OVERRIDE; + void DumpStatus() override; #endif protected: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.45.0/src/probers/nsBig5Prober.h new/kcodecs-5.46.0/src/probers/nsBig5Prober.h --- old/kcodecs-5.45.0/src/probers/nsBig5Prober.h 2018-04-07 21:33:14.000000000 +0200 +++ new/kcodecs-5.46.0/src/probers/nsBig5Prober.h 2018-05-05 14:56:02.000000000 +0200 @@ -37,23 +37,23 @@ { mCodingSM = new nsCodingStateMachine(&Big5SMModel); Reset(); - }; + } virtual ~nsBig5Prober(void) { delete mCodingSM; - }; - nsProbingState HandleData(const char *aBuf, unsigned int aLen) Q_DECL_OVERRIDE; - const char *GetCharSetName() Q_DECL_OVERRIDE + } + nsProbingState HandleData(const char *aBuf, unsigned int aLen) override; + const char *GetCharSetName() override { return "Big5"; - }; - nsProbingState GetState(void) Q_DECL_OVERRIDE + } + nsProbingState GetState(void) override { return mState; - }; - void Reset(void) Q_DECL_OVERRIDE; - float GetConfidence(void) Q_DECL_OVERRIDE; - void SetOpion() Q_DECL_OVERRIDE {}; + } + void Reset(void) override; + float GetConfidence(void) override; + void SetOpion() override {}; protected: void GetDistribution(unsigned int aCharLen, const char *aStr); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.45.0/src/probers/nsCharSetProber.h new/kcodecs-5.46.0/src/probers/nsCharSetProber.h --- old/kcodecs-5.45.0/src/probers/nsCharSetProber.h 2018-04-07 21:33:14.000000000 +0200 +++ new/kcodecs-5.46.0/src/probers/nsCharSetProber.h 2018-05-05 14:56:02.000000000 +0200 @@ -40,7 +40,7 @@ class KCODECS_NO_EXPORT nsCharSetProber { public: - virtual ~nsCharSetProber() {}; + virtual ~nsCharSetProber() {} virtual const char *GetCharSetName() = 0; virtual nsProbingState HandleData(const char *aBuf, unsigned int aLen) = 0; virtual nsProbingState GetState(void) = 0; @@ -49,7 +49,7 @@ virtual void SetOpion() = 0; #ifdef DEBUG_PROBE - void DumpStatus() Q_DECL_OVERRIDE {}; + void DumpStatus() override {}; #endif // Helper functions used in the Latin1 and Group probers. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.45.0/src/probers/nsCodingStateMachine.h new/kcodecs-5.46.0/src/probers/nsCodingStateMachine.h --- old/kcodecs-5.45.0/src/probers/nsCodingStateMachine.h 2018-04-07 21:33:14.000000000 +0200 +++ new/kcodecs-5.46.0/src/probers/nsCodingStateMachine.h 2018-05-05 14:56:02.000000000 +0200 @@ -56,7 +56,7 @@ { mCurrentState = eStart; mModel = sm; - }; + } nsSMState NextState(char c) { //for each byte we get its class KCODECS_NO_EXPORT , if it is first byte, we also get byte length @@ -70,19 +70,19 @@ mModel->stateTable); mCurrentBytePos++; return mCurrentState; - }; + } unsigned int GetCurrentCharLen(void) { return mCurrentCharLen; - }; + } void Reset(void) { mCurrentState = eStart; - }; + } const char *GetCodingStateMachine() { return mModel->name; - }; + } #ifdef DEBUG_PROBE const char *DumpCurrentState() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.45.0/src/probers/nsEUCJPProber.h new/kcodecs-5.46.0/src/probers/nsEUCJPProber.h --- old/kcodecs-5.45.0/src/probers/nsEUCJPProber.h 2018-04-07 21:33:14.000000000 +0200 +++ new/kcodecs-5.46.0/src/probers/nsEUCJPProber.h 2018-05-05 14:56:02.000000000 +0200 @@ -43,23 +43,23 @@ { mCodingSM = new nsCodingStateMachine(&EUCJPSMModel); Reset(); - }; + } virtual ~nsEUCJPProber(void) { delete mCodingSM; - }; - nsProbingState HandleData(const char *aBuf, unsigned int aLen) Q_DECL_OVERRIDE; - const char *GetCharSetName() Q_DECL_OVERRIDE + } + nsProbingState HandleData(const char *aBuf, unsigned int aLen) override; + const char *GetCharSetName() override { return "EUC-JP"; - }; - nsProbingState GetState(void) Q_DECL_OVERRIDE + } + nsProbingState GetState(void) override { return mState; - }; - void Reset(void) Q_DECL_OVERRIDE; - float GetConfidence(void) Q_DECL_OVERRIDE; - void SetOpion() Q_DECL_OVERRIDE {}; + } + void Reset(void) override; + float GetConfidence(void) override; + void SetOpion() override {}; protected: nsCodingStateMachine *mCodingSM; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.45.0/src/probers/nsEUCKRProber.h new/kcodecs-5.46.0/src/probers/nsEUCKRProber.h --- old/kcodecs-5.45.0/src/probers/nsEUCKRProber.h 2018-04-07 21:33:14.000000000 +0200 +++ new/kcodecs-5.46.0/src/probers/nsEUCKRProber.h 2018-05-05 14:56:02.000000000 +0200 @@ -37,23 +37,23 @@ { mCodingSM = new nsCodingStateMachine(&EUCKRSMModel); Reset(); - }; - virtual ~nsEUCKRProber(void) + } + ~nsEUCKRProber(void) override { delete mCodingSM; - }; - nsProbingState HandleData(const char *aBuf, unsigned int aLen) Q_DECL_OVERRIDE; - const char *GetCharSetName() Q_DECL_OVERRIDE + } + nsProbingState HandleData(const char *aBuf, unsigned int aLen) override; + const char *GetCharSetName() override { return "EUC-KR"; - }; - nsProbingState GetState(void) Q_DECL_OVERRIDE + } + nsProbingState GetState(void) override { return mState; - }; - void Reset(void) Q_DECL_OVERRIDE; - float GetConfidence(void) Q_DECL_OVERRIDE; - void SetOpion() Q_DECL_OVERRIDE {}; + } + void Reset(void) override; + float GetConfidence(void) override; + void SetOpion() override {}; protected: void GetDistribution(unsigned int aCharLen, const char *aStr); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.45.0/src/probers/nsEscCharsetProber.h new/kcodecs-5.46.0/src/probers/nsEscCharsetProber.h --- old/kcodecs-5.45.0/src/probers/nsEscCharsetProber.h 2018-04-07 21:33:14.000000000 +0200 +++ new/kcodecs-5.46.0/src/probers/nsEscCharsetProber.h 2018-05-05 14:56:02.000000000 +0200 @@ -36,21 +36,21 @@ public: nsEscCharSetProber(void); virtual ~nsEscCharSetProber(void); - nsProbingState HandleData(const char *aBuf, unsigned int aLen) Q_DECL_OVERRIDE; - const char *GetCharSetName() Q_DECL_OVERRIDE + nsProbingState HandleData(const char *aBuf, unsigned int aLen) override; + const char *GetCharSetName() override { return mDetectedCharset; - }; - nsProbingState GetState(void) Q_DECL_OVERRIDE + } + nsProbingState GetState(void) override { return mState; - }; - void Reset(void) Q_DECL_OVERRIDE; - float GetConfidence(void) Q_DECL_OVERRIDE + } + void Reset(void) override; + float GetConfidence(void) override { return (float)0.99; - }; - void SetOpion() Q_DECL_OVERRIDE {}; + } + void SetOpion() override {} protected: void GetDistribution(unsigned int aCharLen, const char *aStr); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.45.0/src/probers/nsGB2312Prober.h new/kcodecs-5.46.0/src/probers/nsGB2312Prober.h --- old/kcodecs-5.45.0/src/probers/nsGB2312Prober.h 2018-04-07 21:33:14.000000000 +0200 +++ new/kcodecs-5.46.0/src/probers/nsGB2312Prober.h 2018-05-05 14:56:02.000000000 +0200 @@ -39,23 +39,23 @@ { mCodingSM = new nsCodingStateMachine(&GB18030SMModel); Reset(); - }; - virtual ~nsGB18030Prober(void) + } + ~nsGB18030Prober(void) override { delete mCodingSM; - }; - nsProbingState HandleData(const char *aBuf, unsigned int aLen) Q_DECL_OVERRIDE; - const char *GetCharSetName() Q_DECL_OVERRIDE + } + nsProbingState HandleData(const char *aBuf, unsigned int aLen) override; + const char *GetCharSetName() override { return "gb18030"; - }; - nsProbingState GetState(void) Q_DECL_OVERRIDE + } + nsProbingState GetState(void) override { return mState; - }; - void Reset(void) Q_DECL_OVERRIDE; - float GetConfidence(void) Q_DECL_OVERRIDE; - void SetOpion() Q_DECL_OVERRIDE {}; + } + void Reset(void) override; + float GetConfidence(void) override; + void SetOpion() override {} protected: void GetDistribution(unsigned int aCharLen, const char *aStr); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.45.0/src/probers/nsHebrewProber.h new/kcodecs-5.46.0/src/probers/nsHebrewProber.h --- old/kcodecs-5.45.0/src/probers/nsHebrewProber.h 2018-04-07 21:33:14.000000000 +0200 +++ new/kcodecs-5.46.0/src/probers/nsHebrewProber.h 2018-05-05 14:56:02.000000000 +0200 @@ -38,18 +38,18 @@ Reset(); } - virtual ~nsHebrewProber(void) {} - nsProbingState HandleData(const char *aBuf, unsigned int aLen) Q_DECL_OVERRIDE; - const char *GetCharSetName() Q_DECL_OVERRIDE; - void Reset(void) Q_DECL_OVERRIDE; + virtual ~nsHebrewProber(void) override {} + nsProbingState HandleData(const char *aBuf, unsigned int aLen) override; + const char *GetCharSetName() override; + void Reset(void) override; - nsProbingState GetState(void) Q_DECL_OVERRIDE; + nsProbingState GetState(void) override; - float GetConfidence(void) Q_DECL_OVERRIDE + float GetConfidence(void) override { return (float)0.0; } - void SetOpion() Q_DECL_OVERRIDE {}; + void SetOpion() override {} void SetModelProbers(nsCharSetProber *logicalPrb, nsCharSetProber *visualPrb) { @@ -58,7 +58,7 @@ } #ifdef DEBUG_PROBE - void DumpStatus() Q_DECL_OVERRIDE; + void DumpStatus() override; #endif protected: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.45.0/src/probers/nsLatin1Prober.h new/kcodecs-5.46.0/src/probers/nsLatin1Prober.h --- old/kcodecs-5.45.0/src/probers/nsLatin1Prober.h 2018-04-07 21:33:14.000000000 +0200 +++ new/kcodecs-5.46.0/src/probers/nsLatin1Prober.h 2018-05-05 14:56:02.000000000 +0200 @@ -36,23 +36,23 @@ nsLatin1Prober(void) { Reset(); - }; - virtual ~nsLatin1Prober(void) {}; - nsProbingState HandleData(const char *aBuf, unsigned int aLen) Q_DECL_OVERRIDE; - const char *GetCharSetName() Q_DECL_OVERRIDE + } + ~nsLatin1Prober(void) override {} + nsProbingState HandleData(const char *aBuf, unsigned int aLen) override; + const char *GetCharSetName() override { return "windows-1252"; - }; - nsProbingState GetState(void) Q_DECL_OVERRIDE + } + nsProbingState GetState(void) override { return mState; - }; - void Reset(void) Q_DECL_OVERRIDE; - float GetConfidence(void) Q_DECL_OVERRIDE; - void SetOpion() Q_DECL_OVERRIDE {}; + } + void Reset(void) override; + float GetConfidence(void) override; + void SetOpion() override {} #ifdef DEBUG_PROBE - void DumpStatus() Q_DECL_OVERRIDE; + void DumpStatus() override; #endif protected: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.45.0/src/probers/nsMBCSGroupProber.h new/kcodecs-5.46.0/src/probers/nsMBCSGroupProber.h --- old/kcodecs-5.45.0/src/probers/nsMBCSGroupProber.h 2018-04-07 21:33:14.000000000 +0200 +++ new/kcodecs-5.46.0/src/probers/nsMBCSGroupProber.h 2018-05-05 14:56:02.000000000 +0200 @@ -39,19 +39,19 @@ { public: nsMBCSGroupProber(); - virtual ~nsMBCSGroupProber(); - nsProbingState HandleData(const char *aBuf, unsigned int aLen) Q_DECL_OVERRIDE; - const char *GetCharSetName() Q_DECL_OVERRIDE; - nsProbingState GetState(void) Q_DECL_OVERRIDE + ~nsMBCSGroupProber() override; + nsProbingState HandleData(const char *aBuf, unsigned int aLen) override; + const char *GetCharSetName() override; + nsProbingState GetState(void) override { return mState; - }; - void Reset(void) Q_DECL_OVERRIDE; - float GetConfidence(void) Q_DECL_OVERRIDE; - void SetOpion() Q_DECL_OVERRIDE {}; + } + void Reset(void) override; + float GetConfidence(void) override; + void SetOpion() override {} #ifdef DEBUG_PROBE - void DumpStatus() Q_DECL_OVERRIDE; + void DumpStatus() override; #endif protected: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.45.0/src/probers/nsSBCSGroupProber.h new/kcodecs-5.46.0/src/probers/nsSBCSGroupProber.h --- old/kcodecs-5.45.0/src/probers/nsSBCSGroupProber.h 2018-04-07 21:33:14.000000000 +0200 +++ new/kcodecs-5.46.0/src/probers/nsSBCSGroupProber.h 2018-05-05 14:56:02.000000000 +0200 @@ -49,18 +49,18 @@ public: nsSBCSGroupProber(); virtual ~nsSBCSGroupProber(); - nsProbingState HandleData(const char *aBuf, unsigned int aLen) Q_DECL_OVERRIDE; - const char *GetCharSetName() Q_DECL_OVERRIDE; - nsProbingState GetState(void) Q_DECL_OVERRIDE + nsProbingState HandleData(const char *aBuf, unsigned int aLen) override; + const char *GetCharSetName() override; + nsProbingState GetState(void) override { return mState; - }; - void Reset(void) Q_DECL_OVERRIDE; - float GetConfidence(void) Q_DECL_OVERRIDE; - void SetOpion() Q_DECL_OVERRIDE {}; + } + void Reset(void) override; + float GetConfidence(void) override; + void SetOpion() override {} #ifdef DEBUG_PROBE - void DumpStatus() Q_DECL_OVERRIDE; + void DumpStatus() override; #endif protected: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.45.0/src/probers/nsSBCharSetProber.h new/kcodecs-5.46.0/src/probers/nsSBCharSetProber.h --- old/kcodecs-5.45.0/src/probers/nsSBCharSetProber.h 2018-04-07 21:33:14.000000000 +0200 +++ new/kcodecs-5.46.0/src/probers/nsSBCharSetProber.h 2018-05-05 14:56:02.000000000 +0200 @@ -60,15 +60,15 @@ Reset(); } - const char *GetCharSetName() Q_DECL_OVERRIDE; - nsProbingState HandleData(const char *aBuf, unsigned int aLen) Q_DECL_OVERRIDE; - nsProbingState GetState(void) Q_DECL_OVERRIDE + const char *GetCharSetName() override; + nsProbingState HandleData(const char *aBuf, unsigned int aLen) override; + nsProbingState GetState(void) override { return mState; - }; - void Reset(void) Q_DECL_OVERRIDE; - float GetConfidence(void) Q_DECL_OVERRIDE; - void SetOpion() Q_DECL_OVERRIDE {}; + } + void Reset(void) override; + float GetConfidence(void) override; + void SetOpion() override {} // This feature is not implemented yet. any current language model // contain this parameter as false. No one is looking at this @@ -79,10 +79,10 @@ bool KeepEnglishLetters() { return mModel->keepEnglishLetter; - }; // (not implemented) + } // (not implemented) #ifdef DEBUG_PROBE - void DumpStatus() Q_DECL_OVERRIDE; + void DumpStatus() override; #endif protected: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.45.0/src/probers/nsSJISProber.h new/kcodecs-5.46.0/src/probers/nsSJISProber.h --- old/kcodecs-5.45.0/src/probers/nsSJISProber.h 2018-04-07 21:33:14.000000000 +0200 +++ new/kcodecs-5.46.0/src/probers/nsSJISProber.h 2018-05-05 14:56:02.000000000 +0200 @@ -56,23 +56,23 @@ { mCodingSM = new nsCodingStateMachine(&SJISSMModel); Reset(); - }; - virtual ~nsSJISProber(void) + } + ~nsSJISProber(void) override { delete mCodingSM; - }; - nsProbingState HandleData(const char *aBuf, unsigned int aLen) Q_DECL_OVERRIDE; - const char *GetCharSetName() Q_DECL_OVERRIDE + } + nsProbingState HandleData(const char *aBuf, unsigned int aLen) override; + const char *GetCharSetName() override { return "Shift_JIS"; - }; - nsProbingState GetState(void) Q_DECL_OVERRIDE + } + nsProbingState GetState(void) override { return mState; - }; - void Reset(void) Q_DECL_OVERRIDE; - float GetConfidence(void) Q_DECL_OVERRIDE; - void SetOpion() Q_DECL_OVERRIDE {}; + } + void Reset(void) override; + float GetConfidence(void) override; + void SetOpion() override {}; protected: nsCodingStateMachine *mCodingSM; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.45.0/src/probers/nsUniversalDetector.h new/kcodecs-5.46.0/src/probers/nsUniversalDetector.h --- old/kcodecs-5.45.0/src/probers/nsUniversalDetector.h 2018-04-07 21:33:14.000000000 +0200 +++ new/kcodecs-5.46.0/src/probers/nsUniversalDetector.h 2018-05-05 14:56:02.000000000 +0200 @@ -42,12 +42,12 @@ public: nsUniversalDetector(); virtual ~nsUniversalDetector(); - nsProbingState HandleData(const char *aBuf, unsigned int aLen) Q_DECL_OVERRIDE; - const char *GetCharSetName() Q_DECL_OVERRIDE; - void Reset(void) Q_DECL_OVERRIDE; - float GetConfidence(void) Q_DECL_OVERRIDE; - nsProbingState GetState() Q_DECL_OVERRIDE; - void SetOpion() Q_DECL_OVERRIDE {}; + nsProbingState HandleData(const char *aBuf, unsigned int aLen) override; + const char *GetCharSetName() override; + void Reset(void) override; + float GetConfidence(void) override; + nsProbingState GetState() override; + void SetOpion() override {} protected: nsInputState mInputState;
