Hello community,
here is the log from the commit of package kcodecs for openSUSE:Factory checked in at 2015-03-16 09:26:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kcodecs (Old)
and /work/SRC/openSUSE:Factory/.kcodecs.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcodecs"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kcodecs/kcodecs.changes 2015-02-16 17:30:15.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kcodecs.new/kcodecs.changes 2015-03-16 09:26:51.000000000 +0100
@@ -1,0 +2,7 @@
+Sat Mar 7 16:58:32 UTC 2015 - hrvoje.senjan@gmail.com
+
+- Update to 5.8.0
+ * For more details please see:
+ https://www.kde.org/announcements/kde-frameworks-5.8.0.php
+
+-------------------------------------------------------------------
Old:
----
kcodecs-5.7.0.tar.xz
New:
----
kcodecs-5.8.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kcodecs.spec ++++++
--- /var/tmp/diff_new_pack.lOjIoc/_old 2015-03-16 09:26:52.000000000 +0100
+++ /var/tmp/diff_new_pack.lOjIoc/_new 2015-03-16 09:26:52.000000000 +0100
@@ -17,12 +17,12 @@
%define lname libKF5Codecs5
-%define _tar_path 5.7
+%define _tar_path 5.8
Name: kcodecs
Version: %{_tar_path}.0
Release: 0
BuildRequires: cmake >= 2.8.12
-BuildRequires: extra-cmake-modules >= 1.7.0
+BuildRequires: extra-cmake-modules >= 1.8.0
BuildRequires: fdupes
BuildRequires: kf5-filesystem
BuildRequires: libqt5-linguist-devel >= 5.2.0
++++++ kcodecs-5.7.0.tar.xz -> kcodecs-5.8.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.7.0/CMakeLists.txt new/kcodecs-5.8.0/CMakeLists.txt
--- old/kcodecs-5.7.0/CMakeLists.txt 2015-02-08 16:12:41.000000000 +0100
+++ new/kcodecs-5.8.0/CMakeLists.txt 2015-03-07 15:38:38.000000000 +0100
@@ -2,7 +2,7 @@
project(KCodecs)
-find_package(ECM 1.7.0 REQUIRED NO_MODULE)
+find_package(ECM 1.8.0 REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} )
@@ -21,7 +21,7 @@
include(ECMPoQmTools)
-set(KF5_VERSION "5.7.0") # handled by release scripts
+set(KF5_VERSION "5.8.0") # handled by release scripts
ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KCODECS
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kcodecs_version.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.7.0/autotests/kcharsetstest.cpp new/kcodecs-5.8.0/autotests/kcharsetstest.cpp
--- old/kcodecs-5.7.0/autotests/kcharsetstest.cpp 2015-02-08 16:12:41.000000000 +0100
+++ new/kcodecs-5.8.0/autotests/kcharsetstest.cpp 2015-03-07 15:38:38.000000000 +0100
@@ -154,7 +154,7 @@
Q_FOREACH (QString encodingName, singleton->availableEncodingNames()) {
bool ok = false;
-#if QT_VERSION <= QT_VERSION_CHECK(5, 4, 0)
+#if QT_VERSION <= QT_VERSION_CHECK(5, 5, 0)
if (encodingName == QString::fromLatin1("ISO 8859-16") // ICU bug?
|| encodingName == QString::fromLatin1("jis7")
|| encodingName == QString::fromLatin1("winsami2")) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.7.0/po/fr/kcodecs5_qt.po new/kcodecs-5.8.0/po/fr/kcodecs5_qt.po
--- old/kcodecs-5.7.0/po/fr/kcodecs5_qt.po 2015-02-08 16:12:41.000000000 +0100
+++ new/kcodecs-5.8.0/po/fr/kcodecs5_qt.po 2015-03-07 15:38:38.000000000 +0100
@@ -24,10 +24,10 @@
"PO-Revision-Date: 2014-07-02 13:50+0200\n"
"Last-Translator: Sebastien Renard \n"
"Language-Team: French \n"
+"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: Lokalize 1.5\n"
"X-Environment: kde\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.7.0/po/ja/kcodecs5_qt.po new/kcodecs-5.8.0/po/ja/kcodecs5_qt.po
--- old/kcodecs-5.7.0/po/ja/kcodecs5_qt.po 2015-02-08 16:12:41.000000000 +0100
+++ new/kcodecs-5.8.0/po/ja/kcodecs5_qt.po 2015-03-07 15:38:38.000000000 +0100
@@ -1,13 +1,17 @@
-# Translation of libkpimutils into Japanese.
-# This file is distributed under the same license as the kdepimlibs package.
-# Taiki Komoda , 2002.
-# Shinichi Tsunoda , 2004, 2005.
-# Tadashi Jokagi , 2004.
-# Yukiko Bando , 2006, 2007, 2008.
+# Translation of kdelibs4 into Japanese.
+# This file is distributed under the same license as the kdelibs package.
+# Taiki Komoda , 2002, 2004, 2006, 2010.
+# Noboru Sinohara , 2004.
+# Toyohiro Asukai , 2004.
+# Kurose Shushi , 2004.
+# AWASHIRO Ikuya , 2004.
+# Shinichi Tsunoda , 2005.
+# Yukiko Bando , 2006, 2007, 2008, 2009, 2010.
+# Fumiaki Okushi , 2006, 2007, 2008, 2010, 2011.
#
msgid ""
msgstr ""
-"Project-Id-Version: libkpimutils\n"
+"Project-Id-Version: kdelibs4\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2014-03-23 01:50+0000\n"
"PO-Revision-Date: 2011-08-27 14:05-0700\n"
@@ -20,6 +24,7 @@
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Accelerator-Marker: &\n"
"X-Text-Markup: qtrich\n"
+"X-Generator: Lokalize 1.1\n"
"X-Qt-Contexts: true\n"
#: kcharsets.cpp:168
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.7.0/po/ru/kcodecs5_qt.po new/kcodecs-5.8.0/po/ru/kcodecs5_qt.po
--- old/kcodecs-5.7.0/po/ru/kcodecs5_qt.po 2015-02-08 16:12:41.000000000 +0100
+++ new/kcodecs-5.8.0/po/ru/kcodecs5_qt.po 2015-03-07 15:38:38.000000000 +0100
@@ -8,7 +8,7 @@
# Andrey Cherepanov , 2005-2007, 2008, 2009, 2011.
# Nick Shaforostoff , 2004, 2006, 2007, 2008, 2009.
# Nick Shaforostoff , 2009.
-# Alexander Potashev , 2009, 2010, 2011, 2014.
+# Alexander Potashev , 2009, 2010, 2011, 2014, 2015.
# Yury G. Kudryashov , 2011.
# Yuri Efremov , 2012.
# Inga Barinova , 2012.
@@ -19,7 +19,7 @@
"Project-Id-Version: kdelibs4\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2014-03-23 01:50+0000\n"
-"PO-Revision-Date: 2014-12-07 01:36+0400\n"
+"PO-Revision-Date: 2015-03-01 06:19+0300\n"
"Last-Translator: Alexander Potashev \n"
"Language-Team: Russian \n"
"Language: ru\n"
@@ -248,6 +248,8 @@
"The email address you entered is not valid because it does not seem to "
"contain an actual email address, i.e. something of the form joe@example.org."
msgstr ""
+"Введённый вами адрес электронной почты некорректен, потому что не содержит "
+"собственно адреса в формате joe@example.org."
#: kemailaddress.cpp:574
msgctxt "QObject|"
@@ -264,6 +266,8 @@
"The email address you have entered is not valid because it contains an "
"invalid display name."
msgstr ""
+"Введённый вами адрес электронной почты некорректен, потому что содержит "
+"недопустимое имя контакта."
#: kemailaddress.cpp:580
msgctxt "QObject|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.7.0/po/zh_TW/kcodecs5_qt.po new/kcodecs-5.8.0/po/zh_TW/kcodecs5_qt.po
--- old/kcodecs-5.7.0/po/zh_TW/kcodecs5_qt.po 2015-02-08 16:12:41.000000000 +0100
+++ new/kcodecs-5.8.0/po/zh_TW/kcodecs5_qt.po 2015-03-07 15:38:38.000000000 +0100
@@ -10,15 +10,15 @@
# Goodhorse , 2008.
# Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv dot tw>, 2006-2009, 2010.
# Franklin Weng , 2010, 2011, 2012.
-# Franklin Weng , 2010, 2011, 2012, 2013, 2014.
+# Franklin Weng , 2010, 2011, 2012, 2013, 2014, 2015.
msgid ""
msgstr ""
"Project-Id-Version: kdelibs4\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2014-03-23 01:50+0000\n"
-"PO-Revision-Date: 2014-04-22 10:07+0800\n"
-"Last-Translator: Franklin Weng <franklin at goodhorse dot idv dot tw>\n"
-"Language-Team: Chinese Traditional \n"
+"PO-Revision-Date: 2015-02-15 20:36+0800\n"
+"Last-Translator: Franklin Weng \n"
+"Language-Team: Chinese Traditional \n"
"Language: zh_TW\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -136,6 +136,8 @@
"The email address you entered is not valid because it contains more than one "
"@. You will not create valid messages if you do not change your address."
msgstr ""
+"您輸入的電子郵件地址是不合法的,因為有一個以上的 @ 符號。您必須改變您的電子郵"
+"件地址才能建立訊息。"
#: kemailaddress.cpp:535
msgctxt "QObject|"
@@ -143,61 +145,60 @@
"The email address you entered is not valid because it does not contain a @. "
"You will not create valid messages if you do not change your address."
msgstr ""
+"您輸入的電子郵件地址是不合法的,因為沒有任何的 @ 符號。您必須改變您的電子郵件"
+"地址才能建立訊息。"
#: kemailaddress.cpp:540
msgctxt "QObject|"
msgid "You have to enter something in the email address field."
-msgstr ""
+msgstr "您必須輸入電子郵件地址。"
#: kemailaddress.cpp:542
msgctxt "QObject|"
msgid ""
"The email address you entered is not valid because it does not contain a "
"local part."
-msgstr ""
+msgstr "您輸入的電子郵件地址是不合法的,因為沒有包含區域部份。"
#: kemailaddress.cpp:545
msgctxt "QObject|"
msgid ""
"The email address you entered is not valid because it does not contain a "
"domain part."
-msgstr ""
+msgstr "您輸入的電子郵件地址是不合法的,因為沒有包含網域部份。"
#: kemailaddress.cpp:548
msgctxt "QObject|"
msgid ""
"The email address you entered is not valid because it contains unclosed "
"comments/brackets."
-msgstr ""
+msgstr "您輸入的電子郵件地址是不合法的,因為有不對稱的註解或括號。"
#: kemailaddress.cpp:551
-#, fuzzy
-#| msgctxt "@info"
-#| msgid "The date you entered is invalid"
msgctxt "QObject|"
msgid "The email address you entered is valid."
-msgstr "您輸入的日期不合法"
+msgstr "您輸入的電子郵件地址是合法的。"
#: kemailaddress.cpp:553
msgctxt "QObject|"
msgid ""
"The email address you entered is not valid because it contains an unclosed "
"angle bracket."
-msgstr ""
+msgstr "您輸入的電子郵件地址是不合法的,因為有不對稱的尖括號。"
#: kemailaddress.cpp:556
msgctxt "QObject|"
msgid ""
"The email address you entered is not valid because it contains too many "
"closing angle brackets."
-msgstr ""
+msgstr "您輸入的電子郵件地址是不合法的,因為有太多不對稱的尖括號。"
#: kemailaddress.cpp:559
msgctxt "QObject|"
msgid ""
"The email address you have entered is not valid because it contains an "
"unexpected comma."
-msgstr ""
+msgstr "您輸入的電子郵件地址是不合法的,因為有非預期的逗號。"
#: kemailaddress.cpp:562
msgctxt "QObject|"
@@ -206,34 +207,36 @@
"This probably means you have used an escaping type character like a '\\' as "
"the last character in your email address."
msgstr ""
+"您輸入的電子郵件地址是不合法的,因為在不該結束的地方結束。這可能是您用了跳脫"
+"字元,如 '\\' 做為電子郵件地址的最後一個字元。"
#: kemailaddress.cpp:567
msgctxt "QObject|"
msgid ""
"The email address you entered is not valid because it contains quoted text "
"which does not end."
-msgstr ""
+msgstr "您輸入的電子郵件地址是不合法的,因為有引號,但沒有結束。"
#: kemailaddress.cpp:570 kemailaddress.cpp:649
msgctxt "QObject|"
msgid ""
"The email address you entered is not valid because it does not seem to "
"contain an actual email address, i.e. something of the form joe@example.org."
-msgstr ""
+msgstr "您輸入的電子郵件地址是不合法的,因為格式似乎不正確。"
#: kemailaddress.cpp:574
msgctxt "QObject|"
msgid ""
"The email address you entered is not valid because it contains an illegal "
"character."
-msgstr ""
+msgstr "您輸入的電子郵件地址是不合法的,因為有不合法的字元。"
#: kemailaddress.cpp:577
msgctxt "QObject|"
msgid ""
"The email address you have entered is not valid because it contains an "
"invalid display name."
-msgstr ""
+msgstr "您輸入的電子郵件地址是不合法的,因為有不合法的顯示名稱。"
#: kemailaddress.cpp:580
msgctxt "QObject|"
@@ -241,11 +244,13 @@
"The email address you entered is not valid because it does not contain a "
"'.'. You will not create valid messages if you do not change your address."
msgstr ""
+"您輸入的電子郵件地址是不合法的,因為沒有任何的點(.)符號。您必須改變您的電子"
+"郵件地址才能建立訊息。"
#: kemailaddress.cpp:586
msgctxt "QObject|"
msgid "Unknown problem with email address"
-msgstr ""
+msgstr "電子郵件地址有不明的錯誤。"
#: kencodingprober.cpp:238 kencodingprober.cpp:279
msgctxt "KEncodingProber|@item Text character set"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.7.0/src/kcodecs.cpp new/kcodecs-5.8.0/src/kcodecs.cpp
--- old/kcodecs-5.7.0/src/kcodecs.cpp 2015-02-08 16:12:41.000000000 +0100
+++ new/kcodecs-5.8.0/src/kcodecs.cpp 2015-03-07 15:38:38.000000000 +0100
@@ -123,7 +123,8 @@
void KCodecs::base64Encode(const QByteArray &in, QByteArray &out,
bool insertLFs)
{
- out = base64Encode(in, insertLFs);
+ Q_UNUSED(insertLFs);
+ out = base64Encode(in);
}
QByteArray KCodecs::base64Decode(const QByteArray &in)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.7.0/src/kcodecsbase64.cpp new/kcodecs-5.8.0/src/kcodecsbase64.cpp
--- old/kcodecs-5.7.0/src/kcodecsbase64.cpp 2015-02-08 16:12:41.000000000 +0100
+++ new/kcodecs-5.8.0/src/kcodecsbase64.cpp 2015-03-07 15:38:38.000000000 +0100
@@ -96,9 +96,9 @@
virtual ~Base64Decoder() {}
bool decode(const char *&scursor, const char *const send,
- char *&dcursor, const char *const dend);
+ char *&dcursor, const char *const dend) Q_DECL_OVERRIDE;
// ### really needs no finishing???
- bool finish(char *&dcursor, const char *const dend)
+ bool finish(char *&dcursor, const char *const dend) Q_DECL_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);
+ char *&dcursor, const char *const dend) Q_DECL_OVERRIDE;
- bool finish(char *&dcursor, const char *const dend);
+ bool finish(char *&dcursor, const char *const dend) Q_DECL_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);
- bool finish(char *&dcursor, const char *const dend);
+ char *&dcursor, const char *const dend) Q_DECL_OVERRIDE;
+ bool finish(char *&dcursor, const char *const dend) Q_DECL_OVERRIDE;
};
Encoder *Base64Codec::makeEncoder(Codec::NewlineType newline) const
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.7.0/src/kcodecsbase64.h new/kcodecs-5.8.0/src/kcodecsbase64.h
--- old/kcodecs-5.7.0/src/kcodecsbase64.h 2015-02-08 16:12:41.000000000 +0100
+++ new/kcodecs-5.8.0/src/kcodecsbase64.h 2015-03-07 15:38:38.000000000 +0100
@@ -78,7 +78,7 @@
@copydoc
Codec::name()
*/
- const char *name() const
+ const char *name() const Q_DECL_OVERRIDE
{
return "base64";
}
@@ -87,7 +87,7 @@
@copydoc
Codec::maxEncodedSizeFor()
*/
- int maxEncodedSizeFor(int insize, NewlineType newline) const
+ int maxEncodedSizeFor(int insize, NewlineType newline) const Q_DECL_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
+ int maxDecodedSizeFor(int insize, NewlineType newline = Codec::NewlineLF) const Q_DECL_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;
+ Encoder *makeEncoder(NewlineType newline = Codec::NewlineLF) const Q_DECL_OVERRIDE;
/**
@copydoc
Codec::makeDecoder()
*/
- Decoder *makeDecoder(NewlineType newline = Codec::NewlineLF) const;
+ Decoder *makeDecoder(NewlineType newline = Codec::NewlineLF) const Q_DECL_OVERRIDE;
};
/**
@@ -156,7 +156,7 @@
@copydoc
Codec::name()
*/
- const char *name() const
+ const char *name() const Q_DECL_OVERRIDE
{
return "b";
}
@@ -165,7 +165,7 @@
@copydoc
Codec::maxEncodedSizeFor()
*/
- int maxEncodedSizeFor(int insize, NewlineType newline = Codec::NewlineLF) const
+ int maxEncodedSizeFor(int insize, NewlineType newline = Codec::NewlineLF) const Q_DECL_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
+ int maxDecodedSizeFor(int insize, NewlineType newline = Codec::NewlineLF) const Q_DECL_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;
+ Encoder *makeEncoder(NewlineType newline = Codec::NewlineLF) const Q_DECL_OVERRIDE;
};
} // namespace KCodecs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.7.0/src/kcodecsidentity.cpp new/kcodecs-5.8.0/src/kcodecsidentity.cpp
--- old/kcodecs-5.7.0/src/kcodecsidentity.cpp 2015-02-08 16:12:41.000000000 +0100
+++ new/kcodecs-5.8.0/src/kcodecsidentity.cpp 2015-03-07 15:38:38.000000000 +0100
@@ -55,15 +55,15 @@
~IdentityEnDecoder() {}
bool encode(const char *&scursor, const char *const send,
- char *&dcursor, const char *const dend)
+ char *&dcursor, const char *const dend) Q_DECL_OVERRIDE
{
return decode(scursor, send, dcursor, dend);
}
bool decode(const char *&scursor, const char *const send,
- char *&dcursor, const char *const dend);
+ char *&dcursor, const char *const dend) Q_DECL_OVERRIDE;
- bool finish(char *&dcursor, const char *const dend)
+ bool finish(char *&dcursor, const char *const dend) Q_DECL_OVERRIDE
{
Q_UNUSED(dcursor);
Q_UNUSED(dend);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.7.0/src/kcodecsidentity.h new/kcodecs-5.8.0/src/kcodecsidentity.h
--- old/kcodecs-5.7.0/src/kcodecsidentity.h 2015-02-08 16:12:41.000000000 +0100
+++ new/kcodecs-5.8.0/src/kcodecsidentity.h 2015-03-07 15:38:38.000000000 +0100
@@ -65,19 +65,19 @@
@copydoc
QByteArray Codec::encode()
*/
- QByteArray encode(const QByteArray &src, Codec::NewlineType newline = Codec::NewlineLF) const;
+ QByteArray encode(const QByteArray &src, Codec::NewlineType newline = Codec::NewlineLF) const Q_DECL_OVERRIDE;
/**
@copydoc
QByteArray Codec::decode()
*/
- QByteArray decode(const QByteArray &src, Codec::NewlineType newline = Codec::NewlineLF) const;
+ QByteArray decode(const QByteArray &src, Codec::NewlineType newline = Codec::NewlineLF) const Q_DECL_OVERRIDE;
/**
@copydoc
Codec::maxEncodedSizeFor()
*/
- int maxEncodedSizeFor(int insize, Codec::NewlineType newline = Codec::NewlineLF) const
+ int maxEncodedSizeFor(int insize, Codec::NewlineType newline = Codec::NewlineLF) const Q_DECL_OVERRIDE
{
if (newline == Codec::NewlineCRLF) {
return 2 * insize;
@@ -90,7 +90,7 @@
@copydoc
Codec::maxDecodedSizeFor()
*/
- int maxDecodedSizeFor(int insize, Codec::NewlineType newline) const
+ int maxDecodedSizeFor(int insize, Codec::NewlineType newline) const Q_DECL_OVERRIDE
{
if (newline == Codec::NewlineCRLF) {
return 2 * insize;
@@ -103,13 +103,13 @@
@copydoc
Codec::makeEncoder()
*/
- Encoder *makeEncoder(Codec::NewlineType newline = Codec::NewlineCRLF) const;
+ Encoder *makeEncoder(Codec::NewlineType newline = Codec::NewlineCRLF) const Q_DECL_OVERRIDE;
/**
@copydoc
Codec::makeDecoder()
*/
- Decoder *makeDecoder(Codec::NewlineType newline = Codec::NewlineCRLF) const;
+ Decoder *makeDecoder(Codec::NewlineType newline = Codec::NewlineCRLF) const Q_DECL_OVERRIDE;
};
/**
@@ -135,7 +135,7 @@
@copydoc
Codec::name()
*/
- const char *name() const
+ const char *name() const Q_DECL_OVERRIDE
{
return "7bit";
}
@@ -164,7 +164,7 @@
@copydoc
Codec::name()
*/
- const char *name() const
+ const char *name() const Q_DECL_OVERRIDE
{
return "8bit";
}
@@ -193,7 +193,7 @@
@copydoc
Codec::name()
*/
- const char *name() const
+ const char *name() const Q_DECL_OVERRIDE
{
return "binary";
}
@@ -202,7 +202,7 @@
@copydoc
Codec::maxEncodedSizeFor()
*/
- int maxEncodedSizeFor(int insize, Codec::NewlineType newline = Codec::NewlineLF) const
+ int maxEncodedSizeFor(int insize, Codec::NewlineType newline = Codec::NewlineLF) const Q_DECL_OVERRIDE
{
Q_UNUSED(newline);
return insize;
@@ -212,7 +212,7 @@
@copydoc
Codec::maxDecodedSizeFor()
*/
- int maxDecodedSizeFor(int insize, Codec::NewlineType newline = Codec::NewlineLF) const
+ int maxDecodedSizeFor(int insize, Codec::NewlineType newline = Codec::NewlineLF) const Q_DECL_OVERRIDE
{
Q_UNUSED(newline);
return insize;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.7.0/src/kcodecsqp.cpp new/kcodecs-5.8.0/src/kcodecsqp.cpp
--- old/kcodecs-5.7.0/src/kcodecsqp.cpp 2015-02-08 16:12:41.000000000 +0100
+++ new/kcodecs-5.8.0/src/kcodecsqp.cpp 2015-03-07 15:38:38.000000000 +0100
@@ -148,9 +148,9 @@
virtual ~QuotedPrintableEncoder() {}
bool encode(const char *&scursor, const char *const send,
- char *&dcursor, const char *const dend);
+ char *&dcursor, const char *const dend) Q_DECL_OVERRIDE;
- bool finish(char *&dcursor, const char *const dend);
+ bool finish(char *&dcursor, const char *const dend) Q_DECL_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);
- bool finish(char *&dcursor, const char *const dend);
+ char *&dcursor, const char *const dend) Q_DECL_OVERRIDE;
+ bool finish(char *&dcursor, const char *const dend) Q_DECL_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);
- bool finish(char *&dcursor, const char *const dend);
+ char *&dcursor, const char *const dend) Q_DECL_OVERRIDE;
+ bool finish(char *&dcursor, const char *const dend) Q_DECL_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.7.0/src/kcodecsqp.h new/kcodecs-5.8.0/src/kcodecsqp.h
--- old/kcodecs-5.7.0/src/kcodecsqp.h 2015-02-08 16:12:41.000000000 +0100
+++ new/kcodecs-5.8.0/src/kcodecsqp.h 2015-03-07 15:38:38.000000000 +0100
@@ -72,7 +72,7 @@
@copydoc
Codec::name()
*/
- const char *name() const
+ const char *name() const Q_DECL_OVERRIDE
{
return "quoted-printable";
}
@@ -81,7 +81,7 @@
@copydoc
Codec::maxEncodedSizeFor()
*/
- int maxEncodedSizeFor(int insize, NewlineType newline = Codec::NewlineLF) const
+ int maxEncodedSizeFor(int insize, NewlineType newline = Codec::NewlineLF) const Q_DECL_OVERRIDE
{
// all chars encoded:
int result = 3 * insize;
@@ -95,19 +95,19 @@
@copydoc
Codec::maxDecodedSizeFor()
*/
- int maxDecodedSizeFor(int insize, NewlineType newline = Codec::NewlineLF) const;
+ int maxDecodedSizeFor(int insize, NewlineType newline = Codec::NewlineLF) const Q_DECL_OVERRIDE;
/**
@copydoc
Codec::makeEncoder()
*/
- Encoder *makeEncoder(NewlineType newline = Codec::NewlineLF) const;
+ Encoder *makeEncoder(NewlineType newline = Codec::NewlineLF) const Q_DECL_OVERRIDE;
/**
@copydoc
Codec::makeDecoder()
*/
- Decoder *makeDecoder(NewlineType newline = Codec::NewlineLF) const;
+ Decoder *makeDecoder(NewlineType newline = Codec::NewlineLF) const Q_DECL_OVERRIDE;
};
/**
@@ -134,7 +134,7 @@
@copydoc
Codec::name()
*/
- const char *name() const
+ const char *name() const Q_DECL_OVERRIDE
{
return "q";
}
@@ -143,7 +143,7 @@
@copydoc
Codec::maxEncodedSizeFor()
*/
- int maxEncodedSizeFor(int insize, Codec::NewlineType newline = Codec::NewlineLF) const
+ int maxEncodedSizeFor(int insize, Codec::NewlineType newline = Codec::NewlineLF) const Q_DECL_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;
+ int maxDecodedSizeFor(int insize, Codec::NewlineType newline = Codec::NewlineLF) const Q_DECL_OVERRIDE;
/**
@copydoc
Codec::makeEncoder()
*/
- Encoder *makeEncoder(Codec::NewlineType newline = Codec::NewlineLF) const;
+ Encoder *makeEncoder(Codec::NewlineType newline = Codec::NewlineLF) const Q_DECL_OVERRIDE;
/**
@copydoc
Codec::makeDecoder()
*/
- Decoder *makeDecoder(Codec::NewlineType newline = Codec::NewlineLF) const;
+ Decoder *makeDecoder(Codec::NewlineType newline = Codec::NewlineLF) const Q_DECL_OVERRIDE;
};
/**
@@ -193,7 +193,7 @@
@copydoc
Codec::name()
*/
- const char *name() const
+ const char *name() const Q_DECL_OVERRIDE
{
return "x-kmime-rfc2231";
}
@@ -202,7 +202,7 @@
@copydoc
Codec::maxEncodedSizeFor()
*/
- int maxEncodedSizeFor(int insize, Codec::NewlineType newline = Codec::NewlineLF) const
+ int maxEncodedSizeFor(int insize, Codec::NewlineType newline = Codec::NewlineLF) const Q_DECL_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;
+ int maxDecodedSizeFor(int insize, Codec::NewlineType newline = Codec::NewlineLF) const Q_DECL_OVERRIDE;
/**
@copydoc
Codec::makeEncoder()
*/
- Encoder *makeEncoder(Codec::NewlineType newline = Codec::NewlineLF) const;
+ Encoder *makeEncoder(Codec::NewlineType newline = Codec::NewlineLF) const Q_DECL_OVERRIDE;
/**
@copydoc
Codec::makeDecoder()
*/
- Decoder *makeDecoder(Codec::NewlineType newline = Codec::NewlineLF) const;
+ Decoder *makeDecoder(Codec::NewlineType newline = Codec::NewlineLF) const Q_DECL_OVERRIDE;
};
} // namespace KCodecs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.7.0/src/kcodecsuuencode.cpp new/kcodecs-5.8.0/src/kcodecsuuencode.cpp
--- old/kcodecs-5.7.0/src/kcodecsuuencode.cpp 2015-02-08 16:12:41.000000000 +0100
+++ new/kcodecs-5.8.0/src/kcodecsuuencode.cpp 2015-03-07 15:38:38.000000000 +0100
@@ -71,9 +71,9 @@
virtual ~UUDecoder() {}
bool decode(const char *&scursor, const char *const send,
- char *&dcursor, const char *const dend);
+ char *&dcursor, const char *const dend) Q_DECL_OVERRIDE;
// ### really needs no finishing???
- bool finish(char *&dcursor, const char *const dend)
+ bool finish(char *&dcursor, const char *const dend) Q_DECL_OVERRIDE
{
Q_UNUSED(dcursor);
Q_UNUSED(dend);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.7.0/src/kcodecsuuencode.h new/kcodecs-5.8.0/src/kcodecsuuencode.h
--- old/kcodecs-5.7.0/src/kcodecsuuencode.h 2015-02-08 16:12:41.000000000 +0100
+++ new/kcodecs-5.8.0/src/kcodecsuuencode.h 2015-03-07 15:38:38.000000000 +0100
@@ -62,7 +62,7 @@
@copydoc
Codec::name()
*/
- const char *name() const
+ const char *name() const Q_DECL_OVERRIDE
{
return "x-uuencode";
}
@@ -71,7 +71,7 @@
@copydoc
Codec::maxEncodedSizeFor()
*/
- int maxEncodedSizeFor(int insize, NewlineType newline = Codec::NewlineLF) const
+ int maxEncodedSizeFor(int insize, NewlineType newline = Codec::NewlineLF) const Q_DECL_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
+ int maxDecodedSizeFor(int insize, NewlineType newline = Codec::NewlineLF) const Q_DECL_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;
+ Encoder *makeEncoder(NewlineType newline = Codec::NewlineLF) const Q_DECL_OVERRIDE;
/**
@copydoc
Codec::makeEncoder()
*/
- Decoder *makeDecoder(NewlineType newline = Codec::NewlineLF) const;
+ Decoder *makeDecoder(NewlineType newline = Codec::NewlineLF) const Q_DECL_OVERRIDE;
};
} // namespace KCodecs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.7.0/src/probers/JpCntx.h new/kcodecs-5.8.0/src/probers/JpCntx.h
--- old/kcodecs-5.7.0/src/probers/JpCntx.h 2015-02-08 16:12:41.000000000 +0100
+++ new/kcodecs-5.8.0/src/probers/JpCntx.h 2015-03-07 15:38:38.000000000 +0100
@@ -27,6 +27,8 @@
#include "kcodecs_export.h"
+#include
+
#define NUM_OF_CATEGORY 6
#define ENOUGH_REL_THRESHOLD 100
@@ -102,9 +104,9 @@
{
//SJISContextAnalysis(){};
protected:
- int GetOrder(const char *str, unsigned int *charLen);
+ int GetOrder(const char *str, unsigned int *charLen) Q_DECL_OVERRIDE;
- int GetOrder(const char *str)
+ int GetOrder(const char *str) Q_DECL_OVERRIDE
{
//We only interested in Hiragana, so first byte is '\202'
if (*str == '\202' &&
@@ -119,8 +121,8 @@
class KCODECS_NO_EXPORT EUCJPContextAnalysis : public JapaneseContextAnalysis
{
protected:
- int GetOrder(const char *str, unsigned int *charLen);
- int GetOrder(const char *str)
+ int GetOrder(const char *str, unsigned int *charLen) Q_DECL_OVERRIDE;
+ int GetOrder(const char *str) Q_DECL_OVERRIDE
//We only interested in Hiragana, so first byte is '\244'
{
if (*str == '\244' &&
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.7.0/src/probers/nsUniversalDetector.h new/kcodecs-5.8.0/src/probers/nsUniversalDetector.h
--- old/kcodecs-5.7.0/src/probers/nsUniversalDetector.h 2015-02-08 16:12:41.000000000 +0100
+++ new/kcodecs-5.8.0/src/probers/nsUniversalDetector.h 2015-03-07 15:38:38.000000000 +0100
@@ -42,12 +42,12 @@
public:
nsUniversalDetector();
virtual ~nsUniversalDetector();
- nsProbingState HandleData(const char *aBuf, unsigned int aLen);
- const char *GetCharSetName();
- void Reset(void);
- float GetConfidence(void);
- nsProbingState GetState();
- void SetOpion() {};
+ 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 {};
protected:
nsInputState mInputState;
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org