Hello community, here is the log from the commit of package sonnet for openSUSE:Factory checked in at 2017-03-03 17:29:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sonnet (Old) and /work/SRC/openSUSE:Factory/.sonnet.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sonnet" Fri Mar 3 17:29:22 2017 rev:40 rq:461499 version:5.31.0 Changes: -------- --- /work/SRC/openSUSE:Factory/sonnet/sonnet.changes 2017-02-03 20:02:09.807224715 +0100 +++ /work/SRC/openSUSE:Factory/.sonnet.new/sonnet.changes 2017-03-03 17:29:23.685492026 +0100 @@ -1,0 +2,7 @@ +Thu Feb 9 10:20:41 UTC 2017 - [email protected] + +- Update to 5.31.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.31.0.php + +------------------------------------------------------------------- Old: ---- sonnet-5.30.0.tar.xz New: ---- sonnet-5.31.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sonnet.spec ++++++ --- /var/tmp/diff_new_pack.AyP9Sd/_old 2017-03-03 17:29:24.233414612 +0100 +++ /var/tmp/diff_new_pack.AyP9Sd/_new 2017-03-03 17:29:24.233414612 +0100 @@ -18,9 +18,9 @@ %bcond_without lang %define sonum 5 -%define _tar_path 5.30 +%define _tar_path 5.31 Name: sonnet -Version: 5.30.0 +Version: 5.31.0 Release: 0 #BuildRequires: aspell-devel BuildRequires: cmake >= 3.0 @@ -30,12 +30,12 @@ BuildRequires: fdupes BuildRequires: kf5-filesystem %if %{with lang} -BuildRequires: cmake(Qt5LinguistTools) >= 5.5.0 +BuildRequires: cmake(Qt5LinguistTools) >= 5.6.0 %endif BuildRequires: myspell-dictionaries -BuildRequires: cmake(Qt5Core) >= 5.5.0 -BuildRequires: cmake(Qt5Test) >= 5.5.0 -BuildRequires: cmake(Qt5Widgets) >= 5.5.0 +BuildRequires: cmake(Qt5Core) >= 5.6.0 +BuildRequires: cmake(Qt5Test) >= 5.6.0 +BuildRequires: cmake(Qt5Widgets) >= 5.6.0 BuildRequires: pkgconfig(hunspell) Summary: KDE spell checking library License: LGPL-2.1+ @@ -82,7 +82,7 @@ Requires: extra-cmake-modules Requires: libKF5SonnetCore%sonum = %{version} Requires: libKF5SonnetUi%sonum = %{version} -Requires: cmake(Qt5Core) >= 5.5.0 +Requires: cmake(Qt5Core) >= 5.6.0 %description devel Sonnet is a plugin-based spell checking library for Qt-based ++++++ sonnet-5.30.0.tar.xz -> sonnet-5.31.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.30.0/CMakeLists.txt new/sonnet-5.31.0/CMakeLists.txt --- old/sonnet-5.30.0/CMakeLists.txt 2017-01-08 22:06:43.000000000 +0100 +++ new/sonnet-5.31.0/CMakeLists.txt 2017-02-05 12:21:19.000000000 +0100 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.30.0") # handled by release scripts +set(KF5_VERSION "5.31.0") # handled by release scripts project(Sonnet VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.30.0 NO_MODULE) +find_package(ECM 5.31.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) @@ -16,7 +16,7 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) -set(REQUIRED_QT_VERSION 5.5.0) +set(REQUIRED_QT_VERSION 5.6.0) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.30.0/cmake/FindHUNSPELL.cmake new/sonnet-5.31.0/cmake/FindHUNSPELL.cmake --- old/sonnet-5.30.0/cmake/FindHUNSPELL.cmake 2017-01-08 22:06:43.000000000 +0100 +++ new/sonnet-5.31.0/cmake/FindHUNSPELL.cmake 2017-02-05 12:21:19.000000000 +0100 @@ -14,7 +14,7 @@ FIND_PATH(HUNSPELL_INCLUDE_DIR hunspell/hunspell.hxx ) -FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.6 hunspell-1.5 hunspell-1.4 hunspell-1.3 hunspell-1.2) +FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell hunspell-1.6 hunspell-1.5 hunspell-1.4 hunspell-1.3 hunspell-1.2) # handle the QUIETLY and REQUIRED arguments and set HUNSPELL_FOUND to TRUE if # all listed variables are TRUE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.30.0/data/CMakeLists.txt new/sonnet-5.31.0/data/CMakeLists.txt --- old/sonnet-5.30.0/data/CMakeLists.txt 2017-01-08 22:06:43.000000000 +0100 +++ new/sonnet-5.31.0/data/CMakeLists.txt 2017-02-05 12:21:19.000000000 +0100 @@ -10,7 +10,7 @@ ecm_mark_nongui_executable(gentrigrams) TARGET_LINK_LIBRARIES(parsetrigrams PUBLIC Qt5::Core) -TARGET_LINK_LIBRARIES(gentrigrams PUBLIC Qt5::Core) +TARGET_LINK_LIBRARIES(gentrigrams PUBLIC Qt5::Core KF5::SonnetCore) INSTALL(TARGETS parsetrigrams EXPORT KF5SonnetTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) INSTALL(TARGETS gentrigrams EXPORT KF5SonnetTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.30.0/data/gentrigrams.cpp new/sonnet-5.31.0/data/gentrigrams.cpp --- old/sonnet-5.30.0/data/gentrigrams.cpp 2017-01-08 22:06:43.000000000 +0100 +++ new/sonnet-5.31.0/data/gentrigrams.cpp 2017-02-05 12:21:19.000000000 +0100 @@ -25,6 +25,7 @@ #include <QtCore/QHash> #include <QtCore/QString> #include <QtCore/QDebug> +#include "guesslanguage.h" int main(int argc, char *argv[]) { @@ -75,9 +76,8 @@ qDebug() << "Weeding out..."; QMap<int, QString>::iterator i = orderedTrigrams.begin(); - while (orderedTrigrams.size() > 300) { - orderedTrigrams.erase(i); - i++; + while (orderedTrigrams.size() > Sonnet::MAXGRAMS) { + i = orderedTrigrams.erase(i); } qDebug() << "Weeded!"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.30.0/data/trigrams/el_GR new/sonnet-5.31.0/data/trigrams/el_GR --- old/sonnet-5.30.0/data/trigrams/el_GR 1970-01-01 01:00:00.000000000 +0100 +++ new/sonnet-5.31.0/data/trigrams/el_GR 2017-02-05 12:21:19.000000000 +0100 @@ -0,0 +1,300 @@ + το 0 +αι 1 +ου 2 + κα 3 + τη 4 +του 5 +και 6 +ης 7 +το 8 + στ 9 +ος 10 +ς τ 11 + απ 12 +ια 13 +της 14 +ην 15 +να 16 +την 17 + με 18 +α τ 19 +ων 20 +τα 21 +τικ 22 +ας 23 + πο 24 +ει 25 +ία 26 +ται 27 +ική 28 +ι τ 29 +που 30 +στο 31 + πρ 32 +αν 33 +ες 34 +ους 35 +πό 36 +ς π 37 +από 38 + να 39 +με 40 +σε 41 +στη 42 +ικό 43 +ση 44 +ον 45 + αν 46 +ς κ 47 +ό τ 48 + δι 49 +των 50 +τον 51 +τη 52 +ε τ 53 +ετα 54 +ις 55 + επ 56 + συ 57 +υς 58 +ματ 59 +περ 60 +ίνα 61 +ερι 62 +κή 63 + εί 64 +ντα 65 +ς α 66 + πα 67 + πε 68 +ές 69 +ιστ 70 +ν τ 71 +οι 72 +κατ 73 +τερ 74 +ός 75 + τα 76 +για 77 +ς σ 78 + σε 79 +ι σ 80 +μέν 81 + γι 82 + τω 83 +προ 84 +ής 85 +ς ε 86 +α π 87 +ναι 88 +ν π 89 +είν 90 +δια 91 +η τ 92 +ν α 93 +νικ 94 +ατα 95 +ως 96 +οπο 97 +ίας 98 +κό 99 +ουν 100 +μα 101 +ών 102 +παρ 103 +ν κ 104 +ικά 105 +α α 106 +σει 107 +οντ 108 +ταν 109 +α κ 110 +ι α 111 +α σ 112 +αντ 113 +ικο 114 +ο τ 115 +ν ε 116 +ού 117 +κά 118 +στα 119 +αυτ 120 +υν 121 +στι 122 +α ε 123 +ς μ 124 + αυ 125 +ρα 126 +απο 127 +α μ 128 + οι 129 +ατο 130 +ι π 131 +εί 132 +ιο 133 +ανα 134 +πολ 135 +ίου 136 +αρα 137 +σης 138 +ν σ 139 +ρισ 140 +ένα 141 +μετ 142 + δε 143 +εις 144 +ά τ 145 + υπ 146 +τις 147 +επι 148 +ο π 149 +τά 150 +ι μ 151 + εκ 152 +συν 153 +αστ 154 +ι κ 155 +ρικ 156 +ισμ 157 + εν 158 +ερο 159 +ημα 160 +ποι 161 +ή τ 162 +ι ο 163 +λογ 164 +ολο 165 + αρ 166 + έν 167 + χρ 168 +χει 169 +ο κ 170 +ριο 171 +ντι 172 +ούν 173 +η σ 174 +νει 175 +ι ε 176 + μέ 177 +ς δ 178 +κού 179 +αλλ 180 +τε 181 + μι 182 +ο σ 183 +ρος 184 +τητ 185 +φορ 186 +ατι 187 +κής 188 +ατά 189 +νου 190 +ρου 191 +τρο 192 +νων 193 + τι 194 +τος 195 +ηση 196 +ποί 197 +εια 198 + οπ 199 +γρα 200 +νο 201 + πλ 202 +λικ 203 +εία 204 +εν 205 +στρ 206 +σία 207 +ουρ 208 +ροσ 209 +νομ 210 +τρα 211 +άλλ 212 +ς ο 213 +τι 214 +α δ 215 +ότη 216 +ο α 217 +ότε 218 +ν μ 219 +ρο 220 +ηκε 221 +ε σ 222 +ουσ 223 +μεν 224 +λου 225 +ερα 226 +μερ 227 +καν 228 +κές 229 + κά 230 +κε 231 +νη 232 +τασ 233 +τας 234 +ν ο 235 +αρχ 236 +δικ 237 +στε 238 + τρ 239 + έχ 240 +θηκ 241 +μπο 242 +ρία 243 +μια 244 +ικέ 245 + εξ 246 +τελ 247 +υ π 248 +ητα 249 +πορ 250 +ι η 251 +ο μ 252 + κο 253 +μικ 254 +ε α 255 +υ κ 256 +υ α 257 +λλά 258 +λλη 259 +λλο 260 +ς γ 261 +ρατ 262 +ένο 263 + μο 264 +η π 265 + ότ 266 +ε μ 267 +ούς 268 +ίες 269 +ολι 270 +ρεί 271 +ραγ 272 +ιακ 273 +κών 274 +η κ 275 +η μ 276 +ήμα 277 +λει 278 +νία 279 +ορε 280 +ιος 281 +σημ 282 +ιών 283 +σαν 284 +μου 285 +έχε 286 +ότι 287 +ίο 288 +όνο 289 +καλ 290 +δεν 291 +ποτ 292 +σμό 293 + μπ 294 +ι ν 295 +ραφ 296 + μα 297 +υ ε 298 +τες 299 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.30.0/examples/configdialog.cpp new/sonnet-5.31.0/examples/configdialog.cpp --- old/sonnet-5.30.0/examples/configdialog.cpp 2017-01-08 22:06:43.000000000 +0100 +++ new/sonnet-5.31.0/examples/configdialog.cpp 2017-02-05 12:21:19.000000000 +0100 @@ -29,7 +29,7 @@ { QApplication app(argc, argv); - ConfigDialog *dialog = new ConfigDialog(0); + ConfigDialog *dialog = new ConfigDialog(nullptr); dialog->show(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.30.0/examples/dialogexample.cpp new/sonnet-5.31.0/examples/dialogexample.cpp --- old/sonnet-5.30.0/examples/dialogexample.cpp 2017-01-08 22:06:43.000000000 +0100 +++ new/sonnet-5.31.0/examples/dialogexample.cpp 2017-02-05 12:21:19.000000000 +0100 @@ -28,7 +28,7 @@ using namespace Sonnet; TestDialog::TestDialog() - : QObject(0) + : QObject(nullptr) { } @@ -37,7 +37,7 @@ void TestDialog::check(const QString &buffer) { Sonnet::Dialog *dlg = new Sonnet::Dialog( - new BackgroundChecker(this), 0); + new BackgroundChecker(this), nullptr); connect(dlg, SIGNAL(done(QString)), SLOT(doneChecking(QString))); dlg->setBuffer(buffer); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.30.0/po/ast/sonnet5_qt.po new/sonnet-5.31.0/po/ast/sonnet5_qt.po --- old/sonnet-5.30.0/po/ast/sonnet5_qt.po 2017-01-08 22:06:43.000000000 +0100 +++ new/sonnet-5.31.0/po/ast/sonnet5_qt.po 2017-02-05 12:21:19.000000000 +0100 @@ -1,8 +1,8 @@ -# enolp <[email protected]>, 2016. +# enolp <[email protected]>, 2016, 2017. msgid "" msgstr "" "Project-Id-Version: \n" -"PO-Revision-Date: 2016-12-22 04:16+0100\n" +"PO-Revision-Date: 2017-01-21 03:34+0100\n" "Last-Translator: enolp <[email protected]>\n" "Language-Team: Asturian <[email protected]>\n" "Language: ast\n" @@ -135,7 +135,7 @@ #: ui/configdialog.cpp:50 msgctxt "Sonnet::ConfigDialog|" msgid "Spell Checking Configuration" -msgstr "" +msgstr "Configuración de comprobación ortográfica" #: ui/configui.ui:41 msgctxt "SonnetConfigUI|" @@ -205,17 +205,17 @@ #: ui/dialog.cpp:244 msgctxt "Sonnet::Dialog|" msgid "Spell check stopped." -msgstr "" +msgstr "Paróse la comprobación ortográfica" #: ui/dialog.cpp:254 msgctxt "Sonnet::Dialog|" msgid "Spell check canceled." -msgstr "" +msgstr "Encaboxóse la comprobación ortográfica." #: ui/dialog.cpp:430 ui/dialog.cpp:433 msgctxt "Sonnet::Dialog|" msgid "Spell check complete." -msgstr "" +msgstr "Completóse la comprobación ortográfica." #: ui/highlighter.cpp:229 ui/highlighter.cpp:251 msgctxt "Sonnet::Highlighter|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.30.0/po/gl/sonnet5_qt.po new/sonnet-5.31.0/po/gl/sonnet5_qt.po --- old/sonnet-5.30.0/po/gl/sonnet5_qt.po 2017-01-08 22:06:43.000000000 +0100 +++ new/sonnet-5.31.0/po/gl/sonnet5_qt.po 2017-02-05 12:21:19.000000000 +0100 @@ -9,13 +9,13 @@ # Marce Villarino <[email protected]>, 2009, 2010, 2011, 2012. # Xosé <[email protected]>, 2010. # Marce Villarino <[email protected]>, 2011, 2012, 2013, 2014. -# Adrián Chaves Fernández (Gallaecio) <[email protected]>, 2015. +# Adrián Chaves Fernández (Gallaecio) <[email protected]>, 2015, 2017. 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: 2015-11-19 06:43+0100\n" +"PO-Revision-Date: 2017-01-29 14:03+0100\n" "Last-Translator: Adrián Chaves Fernández (Gallaecio) <adriyetichaves@gmail." "com>\n" "Language-Team: Galician <[email protected]>\n" @@ -217,7 +217,7 @@ #: ui/dialog.cpp:223 msgctxt "Sonnet::Dialog|progress label" msgid "Spell checking in progress..." -msgstr "Estase a corrixir a ortografía..." +msgstr "Estase a corrixir a ortografía…" #: ui/dialog.cpp:244 msgctxt "Sonnet::Dialog|" @@ -269,15 +269,15 @@ msgstr "" "<qt><p>Considerouse que esta palabra é «descoñecida» porque non coincide con " "ningunha entrada no dicionario que está a usar. Podería ser unha palabra " -"dunha lingua foránea.</p>\n" -"<p>Se non ten ningunha gralla, pode engadir a palabra ao dicionario se preme " -"<b>Engadir ao dicionario</b>. Se non quere engadir a palabra descoñecida ao " -"dicionario, pero quere deixala tal e como está, prema <b>Ignorar</b> ou " -"<b>Ignorar todas</b>.</p>\n" -"<p>Porén, se a palabra está mal escrita, pode tentar atopar a forma correcta " -"na lista de embaixo. Se non atopa unha substitución axeitada, pode escribila " -"no campo de texto e premer <b>Substituír</b> ou <b>Substituír todas</b>.</" -"p>\n" +"doutro idioma.</p>\n" +"<p>Se a palabra está ben escrita, pode engadir a palabra ao dicionario se " +"preme <b>Engadir ao dicionario</b>. Se non quere engadir a palabra " +"descoñecida ao dicionario, pero quere deixala tal e como está, prema " +"<b>Ignorar</b> ou <b>Ignorar todas</b>.</p>\n" +"<p>Porén, se a palabra está mal escrita, pode intentar atopar a forma " +"correcta na lista de embaixo. Se non atopa unha substitución axeitada, pode " +"escribila no campo de texto e premer <b>Substituír</b> ou <b>Substituír " +"todas</b>.</p>\n" "</qt>" #: ui/sonnetui.ui:47 @@ -337,7 +337,7 @@ #: ui/sonnetui.ui:96 msgctxt "SonnetUi|" msgid "... the <b>misspelled</b> word shown in context ..." -msgstr "...a palabra <b>incorrecta</b> mostrada no seu contexto..." +msgstr "…a palabra <b>incorrecta</b> mostrada no seu contexto…" #: ui/sonnetui.ui:106 msgctxt "SonnetUi|" @@ -355,7 +355,7 @@ "<p>A palabra descoñecida foi detectada e considerada como descoñecida porque " "non está no dicionario.<br>\n" "Prema aquí se considera que a palabra descoñecida non é incorrecta e quere " -"evitar que volte ser considerada como errada. Se quere que fique como está, " +"evitar que volte ser considerada como errada. Se quere que quede como está, " "pero non quere engadila ao dicionario, prema <b>Ignorar</b> ou <b>Ignorar " "todas</b> no seu canto.</p>\n" "</qt>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.30.0/src/core/backgroundchecker.h new/sonnet-5.31.0/src/core/backgroundchecker.h --- old/sonnet-5.30.0/src/core/backgroundchecker.h 2017-01-08 22:06:43.000000000 +0100 +++ new/sonnet-5.31.0/src/core/backgroundchecker.h 2017-02-05 12:21:19.000000000 +0100 @@ -56,8 +56,8 @@ { Q_OBJECT public: - explicit BackgroundChecker(QObject *parent = 0); - explicit BackgroundChecker(const Speller &speller, QObject *parent = 0); + explicit BackgroundChecker(QObject *parent = nullptr); + explicit BackgroundChecker(const Speller &speller, QObject *parent = nullptr); ~BackgroundChecker(); /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.30.0/src/core/client_p.h new/sonnet-5.31.0/src/core/client_p.h --- old/sonnet-5.30.0/src/core/client_p.h 2017-01-08 22:06:43.000000000 +0100 +++ new/sonnet-5.31.0/src/core/client_p.h 2017-02-05 12:21:19.000000000 +0100 @@ -43,7 +43,7 @@ { Q_OBJECT public: - explicit Client(QObject *parent = 0); + explicit Client(QObject *parent = nullptr); /** * @returns how reliable the answer is (higher is better). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.30.0/src/core/guesslanguage.cpp new/sonnet-5.31.0/src/core/guesslanguage.cpp --- old/sonnet-5.30.0/src/core/guesslanguage.cpp 2017-01-08 22:06:43.000000000 +0100 +++ new/sonnet-5.31.0/src/core/guesslanguage.cpp 2017-02-05 12:21:19.000000000 +0100 @@ -61,9 +61,6 @@ namespace Sonnet { -// Amount of trigrams in each file -static const int MAXGRAMS = 300; - class GuessLanguagePrivate { public: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.30.0/src/core/guesslanguage.h new/sonnet-5.31.0/src/core/guesslanguage.h --- old/sonnet-5.30.0/src/core/guesslanguage.h 2017-01-08 22:06:43.000000000 +0100 +++ new/sonnet-5.31.0/src/core/guesslanguage.h 2017-02-05 12:21:19.000000000 +0100 @@ -28,6 +28,9 @@ namespace Sonnet { +// Amount of trigrams in each file +static const int MAXGRAMS = 300; + class GuessLanguagePrivate; /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.30.0/src/core/loader.cpp new/sonnet-5.31.0/src/core/loader.cpp --- old/sonnet-5.30.0/src/core/loader.cpp 2017-01-08 22:06:43.000000000 +0100 +++ new/sonnet-5.31.0/src/core/loader.cpp 2017-02-05 12:21:19.000000000 +0100 @@ -61,7 +61,7 @@ Loader *Loader::openLoader() { if (s_loader.isDestroyed()) { - return 0; + return nullptr; } return s_loader(); @@ -78,7 +78,7 @@ Loader::~Loader() { qCDebug(SONNET_LOG_CORE) << "Removing loader: " << this; - delete d->settings; d->settings = 0; + delete d->settings; d->settings = nullptr; delete d; } @@ -96,7 +96,7 @@ if (lClients.isEmpty()) { qCWarning(SONNET_LOG_CORE) << "No language dictionaries for the language:" << plang; - return 0; + return nullptr; } QVectorIterator<Client *> itr(lClients); @@ -115,7 +115,7 @@ } } - return 0; + return nullptr; } QSharedPointer<SpellerPlugin> Loader::cachedSpeller(const QString& language) @@ -191,19 +191,19 @@ { "yeyo", QT_TRANSLATE_NOOP3("Sonnet::Loader", "with yeyo, modern and old russian", "dictionary variant") }, { "yo", QT_TRANSLATE_NOOP3("Sonnet::Loader", "with yo, old russian", "dictionary variant") }, { "extended", QT_TRANSLATE_NOOP3("Sonnet::Loader", "extended", "dictionary variant") }, - { 0, 0 } + { nullptr, nullptr } }; minusPos = currentDictionary.indexOf(QLatin1Char('-')); if (minusPos != -1) { variantName = currentDictionary.right(currentDictionary.length() - minusPos - 1); - while (variantList[variantCount].variantShortName != 0) + while (variantList[variantCount].variantShortName != nullptr) if (QLatin1String(variantList[variantCount].variantShortName) == variantName) { break; } else { variantCount++; } - if (variantList[variantCount].variantShortName != 0) { + if (variantList[variantCount].variantShortName != nullptr) { variantEnglish = variantList[variantCount].variantEnglishName; } else { variantEnglish = variantName.toLatin1(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.30.0/src/core/speller.cpp new/sonnet-5.31.0/src/core/speller.cpp --- old/sonnet-5.30.0/src/core/speller.cpp 2017-01-08 22:06:43.000000000 +0100 +++ new/sonnet-5.31.0/src/core/speller.cpp 2017-02-05 12:21:19.000000000 +0100 @@ -34,7 +34,7 @@ class SpellerPrivate { public: - SpellerPrivate() : settings(0) + SpellerPrivate() : settings(nullptr) { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.30.0/src/plugins/hspell/hspellclient.h new/sonnet-5.31.0/src/plugins/hspell/hspellclient.h --- old/sonnet-5.30.0/src/plugins/hspell/hspellclient.h 2017-01-08 22:06:43.000000000 +0100 +++ new/sonnet-5.31.0/src/plugins/hspell/hspellclient.h 2017-02-05 12:21:19.000000000 +0100 @@ -41,7 +41,7 @@ Q_INTERFACES(Sonnet::Client) Q_PLUGIN_METADATA(IID "org.kde.Sonnet.HSpellClient") public: - explicit HSpellClient(QObject *parent = 0); + explicit HSpellClient(QObject *parent = nullptr); ~HSpellClient(); int reliability() const Q_DECL_OVERRIDE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.30.0/src/plugins/voikko/voikkoclient.cpp new/sonnet-5.31.0/src/plugins/voikko/voikkoclient.cpp --- old/sonnet-5.30.0/src/plugins/voikko/voikkoclient.cpp 2017-01-08 22:06:43.000000000 +0100 +++ new/sonnet-5.31.0/src/plugins/voikko/voikkoclient.cpp 2017-02-05 12:21:19.000000000 +0100 @@ -27,13 +27,13 @@ { qCDebug(SONNET_VOIKKO) << "Initializing Voikko spell checker plugin."; - char **dictionaries = voikkoListSupportedSpellingLanguages(Q_NULLPTR); + char **dictionaries = voikkoListSupportedSpellingLanguages(nullptr); if (!dictionaries) { return; } - for (int i = 0; dictionaries[i] != Q_NULLPTR; ++i) { + for (int i = 0; dictionaries[i] != nullptr; ++i) { QString language = QString::fromUtf8(dictionaries[i]); m_supportedLanguages.append(language); qCDebug(SONNET_VOIKKO) << "Found dictionary for langauge:" << language; @@ -55,7 +55,7 @@ VoikkoDict *speller = new VoikkoDict(language); if (speller->initFailed()) { delete speller; - return Q_NULLPTR; + return nullptr; } return speller; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.30.0/src/plugins/voikko/voikkoclient.h new/sonnet-5.31.0/src/plugins/voikko/voikkoclient.h --- old/sonnet-5.30.0/src/plugins/voikko/voikkoclient.h 2017-01-08 22:06:43.000000000 +0100 +++ new/sonnet-5.31.0/src/plugins/voikko/voikkoclient.h 2017-02-05 12:21:19.000000000 +0100 @@ -31,7 +31,7 @@ Q_PLUGIN_METADATA(IID "org.kde.Sonnet.VoikkoClient") public: - explicit VoikkoClient(QObject *parent = Q_NULLPTR); + explicit VoikkoClient(QObject *parent = nullptr); ~VoikkoClient(); int reliability() const Q_DECL_OVERRIDE; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.30.0/src/plugins/voikko/voikkodict.cpp new/sonnet-5.31.0/src/plugins/voikko/voikkodict.cpp --- old/sonnet-5.30.0/src/plugins/voikko/voikkodict.cpp 2017-01-08 22:06:43.000000000 +0100 +++ new/sonnet-5.31.0/src/plugins/voikko/voikkodict.cpp 2017-02-05 12:21:19.000000000 +0100 @@ -152,7 +152,7 @@ const char *error; m_handle = voikkoInit(&error, language.toUtf8().data(), 0); - if (error != Q_NULLPTR) { + if (error != nullptr) { qCWarning(SONNET_VOIKKO) << "Failed to initialize Voikko spelling backend. Reason:" << error; } else { // Continue to load user's own words @@ -301,7 +301,7 @@ return suggestions; } - for (int i = 0; voikkoSuggestions[i] != Q_NULLPTR; ++i) { + for (int i = 0; voikkoSuggestions[i] != nullptr; ++i) { QString suggestion = QString::fromWCharArray(voikkoSuggestions[i]); suggestions.append(suggestion); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.30.0/src/ui/dialog.cpp new/sonnet-5.31.0/src/ui/dialog.cpp --- old/sonnet-5.30.0/src/ui/dialog.cpp 2017-01-08 22:06:43.000000000 +0100 +++ new/sonnet-5.31.0/src/ui/dialog.cpp 2017-02-05 12:21:19.000000000 +0100 @@ -86,7 +86,7 @@ } else { progressDialog->deleteLater(); } - progressDialog = NULL; + progressDialog = nullptr; } } }; @@ -105,7 +105,7 @@ d->showCompletionMessageBox = false; d->spellCheckContinuedAfterReplacement = true; d->progressDialogTimeout = -1; - d->progressDialog = NULL; + d->progressDialog = nullptr; initGui(); initConnections(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.30.0/src/ui/dictionarycombobox.h new/sonnet-5.31.0/src/ui/dictionarycombobox.h --- old/sonnet-5.30.0/src/ui/dictionarycombobox.h 2017-01-08 22:06:43.000000000 +0100 +++ new/sonnet-5.31.0/src/ui/dictionarycombobox.h 2017-02-05 12:21:19.000000000 +0100 @@ -43,7 +43,7 @@ /** * Constructor */ - explicit DictionaryComboBox(QWidget *parent = 0); + explicit DictionaryComboBox(QWidget *parent = nullptr); /** * Destructor diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.30.0/src/ui/highlighter.cpp new/sonnet-5.31.0/src/ui/highlighter.cpp --- old/sonnet-5.30.0/src/ui/highlighter.cpp 2017-01-08 22:06:43.000000000 +0100 +++ new/sonnet-5.31.0/src/ui/highlighter.cpp 2017-02-05 12:21:19.000000000 +0100 @@ -64,8 +64,8 @@ { public: HighlighterPrivate(Highlighter *qq, const QColor &col) - : textEdit(Q_NULLPTR), - plainTextEdit(Q_NULLPTR), + : textEdit(nullptr), + plainTextEdit(nullptr), spellColor(col), q(qq) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.30.0/src/ui/spellcheckdecorator.cpp new/sonnet-5.31.0/src/ui/spellcheckdecorator.cpp --- old/sonnet-5.30.0/src/ui/spellcheckdecorator.cpp 2017-01-08 22:06:43.000000000 +0100 +++ new/sonnet-5.31.0/src/ui/spellcheckdecorator.cpp 2017-02-05 12:21:19.000000000 +0100 @@ -37,9 +37,9 @@ public: Private(SpellCheckDecorator *installer, QPlainTextEdit *textEdit) : q(installer) - , m_textEdit(Q_NULLPTR) + , m_textEdit(nullptr) , m_plainTextEdit(textEdit) - , m_highlighter(Q_NULLPTR) + , m_highlighter(nullptr) { createDefaultHighlighter(); // Catch pressing the "menu" key @@ -51,8 +51,8 @@ Private(SpellCheckDecorator *installer, QTextEdit *textEdit) : q(installer) , m_textEdit(textEdit) - , m_plainTextEdit(Q_NULLPTR) - , m_highlighter(0) + , m_plainTextEdit(nullptr) + , m_highlighter(nullptr) { createDefaultHighlighter(); // Catch pressing the "menu" key
