Hello community, here is the log from the commit of package khtml for openSUSE:Factory checked in at 2018-07-21 10:13:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/khtml (Old) and /work/SRC/openSUSE:Factory/.khtml.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "khtml" Sat Jul 21 10:13:00 2018 rev:54 rq:623284 version:5.48.0 Changes: -------- --- /work/SRC/openSUSE:Factory/khtml/khtml.changes 2018-06-22 13:20:15.520190906 +0200 +++ /work/SRC/openSUSE:Factory/.khtml.new/khtml.changes 2018-07-21 10:13:05.207130696 +0200 @@ -1,0 +2,10 @@ +Mon Jul 16 04:37:40 UTC 2018 - [email protected] + +- Update to 5.48.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.48.0.php +- Changes since 5.47.0: + * Use override + +------------------------------------------------------------------- Old: ---- khtml-5.47.0.tar.xz New: ---- khtml-5.48.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ khtml.spec ++++++ --- /var/tmp/diff_new_pack.QDwDXf/_old 2018-07-21 10:13:05.859130544 +0200 +++ /var/tmp/diff_new_pack.QDwDXf/_new 2018-07-21 10:13:05.863130543 +0200 @@ -18,15 +18,14 @@ %bcond_without lang %define lname libKF5KHtml5 -%define _tar_path 5.47 +%define _tar_path 5.48 # 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}')} +%{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} Name: khtml -Version: 5.47.0 +Version: 5.48.0 Release: 0 -%define kf5_version %{version} Summary: HTML rendering engine License: LGPL-2.1-or-later Group: System/GUI/KDE ++++++ khtml-5.47.0.tar.xz -> khtml-5.48.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khtml-5.47.0/CMakeLists.txt new/khtml-5.48.0/CMakeLists.txt --- old/khtml-5.47.0/CMakeLists.txt 2018-06-02 19:56:14.000000000 +0200 +++ new/khtml-5.48.0/CMakeLists.txt 2018-07-08 00:30:52.000000000 +0200 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.47.0") # handled by release scripts -set(KF5_DEP_VERSION "5.47.0") # handled by release scripts +set(KF5_VERSION "5.48.0") # handled by release scripts +set(KF5_DEP_VERSION "5.48.0") # handled by release scripts project(KHtml VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.47.0 NO_MODULE) +find_package(ECM 5.48.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) @@ -24,7 +24,7 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) -# Most of KJS doesn't even require Qt, thus we can't use Q_DECL_OVERRIDE +# Most of KJS doesn't even require Qt, thus we can't use override string(REPLACE "-Wsuggest-override" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") find_package(KF5Archive ${KF5_DEP_VERSION} REQUIRED) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khtml-5.47.0/po/id/khtml5.po new/khtml-5.48.0/po/id/khtml5.po --- old/khtml-5.47.0/po/id/khtml5.po 2018-06-02 19:56:14.000000000 +0200 +++ new/khtml-5.48.0/po/id/khtml5.po 2018-07-08 00:30:52.000000000 +0200 @@ -9,7 +9,7 @@ "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2016-12-11 02:37+0100\n" -"PO-Revision-Date: 2018-05-29 08:22+0700\n" +"PO-Revision-Date: 2018-06-16 08:03+0700\n" "Last-Translator: Wantoyo <[email protected]>\n" "Language-Team: Indonesian <[email protected]>\n" "Language: id\n" @@ -1524,7 +1524,7 @@ #: khtmlview.cpp:1900 #, kde-format msgid "Access Keys activated" -msgstr "Tombol Akses diaktifkan" +msgstr "Kunci Akses diaktifkan" #: kjserrordlg.cpp:9 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khtml-5.47.0/po/nl/khtml5.po new/khtml-5.48.0/po/nl/khtml5.po --- old/khtml-5.47.0/po/nl/khtml5.po 2018-06-02 19:56:14.000000000 +0200 +++ new/khtml-5.48.0/po/nl/khtml5.po 2018-07-08 00:30:52.000000000 +0200 @@ -13,13 +13,13 @@ # Kristof Bal <[email protected]>, 2008, 2009. # Freek de Kruijf <[email protected]>, 2009, 2010. # Freek de Kruijf <[email protected]>, 2010, 2011, 2012. -# Freek de Kruijf <[email protected]>, 2010, 2011, 2013, 2014, 2015, 2016, 2017. +# Freek de Kruijf <[email protected]>, 2010, 2011, 2013, 2014, 2015, 2016, 2017, 2018. msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2016-12-11 02:37+0100\n" -"PO-Revision-Date: 2017-01-02 17:04+0100\n" +"PO-Revision-Date: 2018-06-27 11:41+0100\n" "Last-Translator: Freek de Kruijf <[email protected]>\n" "Language-Team: Dutch <[email protected]>\n" "Language: nl\n" @@ -108,7 +108,7 @@ #: ecma/debugger/debugwindow.cpp:190 #, kde-format msgid "Step Over" -msgstr "Overstappen" +msgstr "Overslaan" #: ecma/debugger/debugwindow.cpp:196 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khtml-5.47.0/po/zh_CN/khtml5.po new/khtml-5.48.0/po/zh_CN/khtml5.po --- old/khtml-5.47.0/po/zh_CN/khtml5.po 2018-06-02 19:56:14.000000000 +0200 +++ new/khtml-5.48.0/po/zh_CN/khtml5.po 2018-07-08 00:30:52.000000000 +0200 @@ -15,7 +15,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2016-12-11 02:37+0100\n" -"PO-Revision-Date: 2018-05-18 06:23-0400\n" +"PO-Revision-Date: 2018-07-03 17:34\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/khtml-5.47.0/src/ecma/kjs_data.cpp new/khtml-5.48.0/src/ecma/kjs_data.cpp --- old/khtml-5.47.0/src/ecma/kjs_data.cpp 2018-06-02 19:56:14.000000000 +0200 +++ new/khtml-5.48.0/src/ecma/kjs_data.cpp 2018-07-08 00:30:52.000000000 +0200 @@ -105,7 +105,7 @@ class JSMessageData : public DOM::MessageEventImpl::Data { public: - DOM::MessageEventImpl::DataType messageDataType() const Q_DECL_OVERRIDE + DOM::MessageEventImpl::DataType messageDataType() const override { return DOM::MessageEventImpl::JS_VALUE; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khtml-5.47.0/src/ecma/kjs_navigator.cpp new/khtml-5.48.0/src/ecma/kjs_navigator.cpp --- old/khtml-5.47.0/src/ecma/kjs_navigator.cpp 2018-06-02 19:56:14.000000000 +0200 +++ new/khtml-5.48.0/src/ecma/kjs_navigator.cpp 2018-07-08 00:30:52.000000000 +0200 @@ -84,9 +84,9 @@ m_pluginsEnabled(pluginsEnabled) {} using KJS::JSObject::getOwnPropertySlot; - bool getOwnPropertySlot(ExecState *exec, const Identifier &propertyName, PropertySlot &slot) Q_DECL_OVERRIDE; + bool getOwnPropertySlot(ExecState *exec, const Identifier &propertyName, PropertySlot &slot) override; JSValue *getValueProperty(ExecState *exec, int token) const; - const ClassInfo *classInfo() const Q_DECL_OVERRIDE + const ClassInfo *classInfo() const override { return &info; } @@ -109,8 +109,8 @@ : PluginBase(exec, pluginsEnabled), m_pluginsEnabled(pluginsEnabled) {} using KJS::JSObject::getOwnPropertySlot; - bool getOwnPropertySlot(ExecState *exec, const Identifier &propertyName, PropertySlot &slot) Q_DECL_OVERRIDE; - const ClassInfo *classInfo() const Q_DECL_OVERRIDE + bool getOwnPropertySlot(ExecState *exec, const Identifier &propertyName, PropertySlot &slot) override; + const ClassInfo *classInfo() const override { return &info; } @@ -136,8 +136,8 @@ m_info = info; } using KJS::JSObject::getOwnPropertySlot; - bool getOwnPropertySlot(ExecState *exec, const Identifier &propertyName, PropertySlot &slot) Q_DECL_OVERRIDE; - const ClassInfo *classInfo() const Q_DECL_OVERRIDE + bool getOwnPropertySlot(ExecState *exec, const Identifier &propertyName, PropertySlot &slot) override; + const ClassInfo *classInfo() const override { return &info; } @@ -163,8 +163,8 @@ m_info = info; } using KJS::JSObject::getOwnPropertySlot; - bool getOwnPropertySlot(ExecState *exec, const Identifier &propertyName, PropertySlot &slot) Q_DECL_OVERRIDE; - const ClassInfo *classInfo() const Q_DECL_OVERRIDE + bool getOwnPropertySlot(ExecState *exec, const Identifier &propertyName, PropertySlot &slot) override; + const ClassInfo *classInfo() const override { return &info; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khtml-5.47.0/src/ecma/kjs_proxy.cpp new/khtml-5.48.0/src/ecma/kjs_proxy.cpp --- old/khtml-5.47.0/src/ecma/kjs_proxy.cpp 2018-06-02 19:56:14.000000000 +0200 +++ new/khtml-5.48.0/src/ecma/kjs_proxy.cpp 2018-07-08 00:30:52.000000000 +0200 @@ -162,11 +162,11 @@ { public: TestFunctionImp() : JSObject() {} - bool implementsCall() const Q_DECL_OVERRIDE + bool implementsCall() const override { return true; } - JSValue *callAsFunction(ExecState *exec, JSObject *thisObj, const List &args) Q_DECL_OVERRIDE; + JSValue *callAsFunction(ExecState *exec, JSObject *thisObj, const List &args) override; }; JSValue *TestFunctionImp::callAsFunction(ExecState *exec, JSObject * /*thisObj*/, const List &args) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khtml-5.47.0/src/ecma/kjs_scriptable.cpp new/khtml-5.48.0/src/ecma/kjs_scriptable.cpp --- old/khtml-5.47.0/src/ecma/kjs_scriptable.cpp 2018-06-02 19:56:14.000000000 +0200 +++ new/khtml-5.48.0/src/ecma/kjs_scriptable.cpp 2018-07-08 00:30:52.000000000 +0200 @@ -532,7 +532,7 @@ class ScriptableOperationsMarker: public JSObject { public: - void mark() Q_DECL_OVERRIDE + void mark() override { JSObject::mark(); ScriptableOperations::self()->mark(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khtml-5.47.0/src/ecma/kjs_window.cpp new/khtml-5.48.0/src/ecma/kjs_window.cpp --- old/khtml-5.47.0/src/ecma/kjs_window.cpp 2018-06-02 19:56:14.000000000 +0200 +++ new/khtml-5.48.0/src/ecma/kjs_window.cpp 2018-07-08 00:30:52.000000000 +0200 @@ -89,9 +89,9 @@ History(ExecState *exec, KHTMLPart *p) : JSObject(exec->lexicalInterpreter()->builtinObjectPrototype()), part(p) { } using KJS::JSObject::getOwnPropertySlot; - bool getOwnPropertySlot(ExecState *exec, const Identifier &propertyName, PropertySlot &slot) Q_DECL_OVERRIDE; + bool getOwnPropertySlot(ExecState *exec, const Identifier &propertyName, PropertySlot &slot) override; JSValue *getValueProperty(ExecState *exec, int token) const; - const ClassInfo *classInfo() const Q_DECL_OVERRIDE + const ClassInfo *classInfo() const override { return &info; } @@ -108,8 +108,8 @@ External(ExecState *exec, KHTMLPart *p) : JSObject(exec->lexicalInterpreter()->builtinObjectPrototype()), part(p) { } using KJS::JSObject::getOwnPropertySlot; - bool getOwnPropertySlot(ExecState *exec, const Identifier &propertyName, PropertySlot &slot) Q_DECL_OVERRIDE; - const ClassInfo *classInfo() const Q_DECL_OVERRIDE + bool getOwnPropertySlot(ExecState *exec, const Identifier &propertyName, PropertySlot &slot) override; + const ClassInfo *classInfo() const override { return &info; } @@ -1801,7 +1801,7 @@ DelayedGoHistory(int _steps): steps(_steps) {} - bool execute(Window *win) Q_DECL_OVERRIDE + bool execute(Window *win) override { win->goHistory(steps); return true; @@ -2148,7 +2148,7 @@ class DelayedClose: public Window::DelayedAction { public: - bool execute(Window *win) Q_DECL_OVERRIDE + bool execute(Window *win) override { win->scheduleClose(); return false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khtml-5.47.0/src/html/html_documentimpl.cpp new/khtml-5.48.0/src/html/html_documentimpl.cpp --- old/khtml-5.47.0/src/html/html_documentimpl.cpp 2018-06-02 19:56:14.000000000 +0200 +++ new/khtml-5.48.0/src/html/html_documentimpl.cpp 2018-07-08 00:30:52.000000000 +0200 @@ -350,28 +350,28 @@ HTMLTextTokenizer(DOM::HTMLDocumentImpl *doc): m_doc(doc) {} - void begin() Q_DECL_OVERRIDE; - void write(const TokenizerString &str, bool appendData) Q_DECL_OVERRIDE; + void begin() override; + void write(const TokenizerString &str, bool appendData) override; - void end() Q_DECL_OVERRIDE + void end() override { emit finishedParsing(); }; - void finish() Q_DECL_OVERRIDE + void finish() override { end(); }; // We don't support any inline scripts here - bool isWaitingForScripts() const Q_DECL_OVERRIDE + bool isWaitingForScripts() const override { return false; } - bool isExecutingScript() const Q_DECL_OVERRIDE + bool isExecutingScript() const override { return false; } - void executeScriptsWaitingForStylesheets() Q_DECL_OVERRIDE {}; + void executeScriptsWaitingForStylesheets() override {}; private: DOM::HTMLDocumentImpl *m_doc; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khtml-5.47.0/src/html/html_miscimpl.cpp new/khtml-5.48.0/src/html/html_miscimpl.cpp --- old/khtml-5.47.0/src/html/html_miscimpl.cpp 2018-06-02 19:56:14.000000000 +0200 +++ new/khtml-5.48.0/src/html/html_miscimpl.cpp 2018-07-08 00:30:52.000000000 +0200 @@ -59,7 +59,7 @@ CollectionCache(): Cache(DocumentImpl::TV_IDNameHref) {} - void clear(DocumentImpl *doc) Q_DECL_OVERRIDE + void clear(DocumentImpl *doc) override { Cache::clear(doc); qDeleteAll(nameCache); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khtml-5.47.0/src/imload/canvasimage.cpp new/khtml-5.48.0/src/imload/canvasimage.cpp --- old/khtml-5.47.0/src/imload/canvasimage.cpp 2018-06-02 19:56:14.000000000 +0200 +++ new/khtml-5.48.0/src/imload/canvasimage.cpp 2018-07-08 00:30:52.000000000 +0200 @@ -33,10 +33,10 @@ class TrivialImageOwner : public ImageOwner { public: - void imageHasGeometry(Image *, int, int) Q_DECL_OVERRIDE {} - void imageChange(Image *, QRect) Q_DECL_OVERRIDE {} - void imageError(Image *) Q_DECL_OVERRIDE {}; - void imageDone(Image *) Q_DECL_OVERRIDE {}; + void imageHasGeometry(Image *, int, int) override {} + void imageChange(Image *, QRect) override {} + void imageError(Image *) override {}; + void imageDone(Image *) override {}; }; ImageOwner *CanvasImage::s_trivialOwner = nullptr; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khtml-5.47.0/src/imload/decoders/gifloader.cpp new/khtml-5.48.0/src/imload/decoders/gifloader.cpp --- old/khtml-5.47.0/src/imload/decoders/gifloader.cpp 2018-06-02 19:56:14.000000000 +0200 +++ new/khtml-5.48.0/src/imload/decoders/gifloader.cpp 2018-07-08 00:30:52.000000000 +0200 @@ -196,7 +196,7 @@ } } - void paint(int dx, int dy, QPainter *p, int sx, int sy, int width, int height) Q_DECL_OVERRIDE + void paint(int dx, int dy, QPainter *p, int sx, int sy, int width, int height) override { if (!width || !height) { return; //Nothing to draw. @@ -235,7 +235,7 @@ #endif } - AnimProvider *clone(PixmapPlane *plane) Q_DECL_OVERRIDE + AnimProvider *clone(PixmapPlane *plane) override { if (frame0->height == 0 || frame0->width == 0 || plane->height == 0 || plane->width == 0) { @@ -274,7 +274,7 @@ { } - int processData(uchar *data, int length) Q_DECL_OVERRIDE + int processData(uchar *data, int length) override { //Collect data in the buffer int pos = buffer.size(); @@ -346,7 +346,7 @@ << map->Colors[c].Blue; } - int processEOF() Q_DECL_OVERRIDE + int processEOF() override { //Feed the buffered data to libUnGif #if GIFLIB_MAJOR >= 5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khtml-5.47.0/src/imload/decoders/jpegloader.cpp new/khtml-5.48.0/src/imload/decoders/jpegloader.cpp --- old/khtml-5.47.0/src/imload/decoders/jpegloader.cpp 2018-06-02 19:56:14.000000000 +0200 +++ new/khtml-5.48.0/src/imload/decoders/jpegloader.cpp 2018-07-08 00:30:52.000000000 +0200 @@ -57,7 +57,7 @@ public: JPEGLoader(); ~JPEGLoader(); - int processData(uchar *data, int length) Q_DECL_OVERRIDE; + int processData(uchar *data, int length) override; }; ImageLoaderProvider::Type JPEGLoaderProvider::type() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khtml-5.47.0/src/imload/decoders/pngloader.cpp new/khtml-5.48.0/src/imload/decoders/pngloader.cpp --- old/khtml-5.47.0/src/imload/decoders/pngloader.cpp 2018-06-02 19:56:14.000000000 +0200 +++ new/khtml-5.48.0/src/imload/decoders/pngloader.cpp 2018-07-08 00:30:52.000000000 +0200 @@ -233,7 +233,7 @@ //### CHECKME! } - int processData(uchar *data, int length) Q_DECL_OVERRIDE + int processData(uchar *data, int length) override { if (done) { return Done; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khtml-5.47.0/src/imload/decoders/qimageioloader.cpp new/khtml-5.48.0/src/imload/decoders/qimageioloader.cpp --- old/khtml-5.47.0/src/imload/decoders/qimageioloader.cpp 2018-06-02 19:56:14.000000000 +0200 +++ new/khtml-5.48.0/src/imload/decoders/qimageioloader.cpp 2018-07-08 00:30:52.000000000 +0200 @@ -50,7 +50,7 @@ { } - int processData(uchar *data, int length) Q_DECL_OVERRIDE + int processData(uchar *data, int length) override { //Collect data in the buffer int pos = array.size(); @@ -59,7 +59,7 @@ return length; } - int processEOF() Q_DECL_OVERRIDE + int processEOF() override { QBuffer buffer(&array); buffer.open(QIODevice::ReadOnly); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khtml-5.47.0/src/java/kjavaappletviewer.cpp new/khtml-5.48.0/src/java/kjavaappletviewer.cpp --- old/khtml-5.47.0/src/java/kjavaappletviewer.cpp 2018-06-02 19:56:14.000000000 +0200 +++ new/khtml-5.48.0/src/java/kjavaappletviewer.cpp 2018-07-08 00:30:52.000000000 +0200 @@ -217,7 +217,7 @@ ~CoverWidget() {} KJavaAppletWidget *appletWidget() const; protected: - void resizeEvent(QResizeEvent *e) Q_DECL_OVERRIDE; + void resizeEvent(QResizeEvent *e) override; }; inline CoverWidget::CoverWidget(QWidget *parent) @@ -248,7 +248,7 @@ setPixmap(KJavaAppletViewerFactory::iconLoader()->loadIcon("java", KIconLoader::Small)); } protected: - void mousePressEvent(QMouseEvent *) Q_DECL_OVERRIDE + void mousePressEvent(QMouseEvent *) override { serverMaintainer()->server->showConsole(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khtml-5.47.0/src/khtml_part.cpp new/khtml-5.48.0/src/khtml_part.cpp --- old/khtml-5.47.0/src/khtml_part.cpp 2018-06-02 19:56:14.000000000 +0200 +++ new/khtml-5.48.0/src/khtml_part.cpp 2018-07-08 00:30:52.000000000 +0200 @@ -176,7 +176,7 @@ m_cachedSheet->deref(this); } } - void setStyleSheet(const DOM::DOMString &, const DOM::DOMString &sheet, const DOM::DOMString &, const DOM::DOMString &/*mimetype*/) Q_DECL_OVERRIDE + void setStyleSheet(const DOM::DOMString &, const DOM::DOMString &sheet, const DOM::DOMString &, const DOM::DOMString &/*mimetype*/) override { if (m_part) { m_part->setUserStyleSheet(sheet.string()); @@ -184,7 +184,7 @@ delete this; } - void error(int, const QString &) Q_DECL_OVERRIDE + void error(int, const QString &) override { delete this; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khtml-5.47.0/src/misc/paintbuffer.cpp new/khtml-5.48.0/src/misc/paintbuffer.cpp --- old/khtml-5.47.0/src/misc/paintbuffer.cpp 2018-06-02 19:56:14.000000000 +0200 +++ new/khtml-5.48.0/src/misc/paintbuffer.cpp 2018-07-08 00:30:52.000000000 +0200 @@ -43,7 +43,7 @@ m_reset = false; } - void timerEvent(QTimerEvent *e) Q_DECL_OVERRIDE + void timerEvent(QTimerEvent *e) override { assert(m_timer == e->timerId()); Q_UNUSED(e); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khtml-5.47.0/src/rendering/render_form.cpp new/khtml-5.48.0/src/rendering/render_form.cpp --- old/khtml-5.47.0/src/rendering/render_form.cpp 2018-06-02 19:56:14.000000000 +0200 +++ new/khtml-5.48.0/src/rendering/render_form.cpp 2018-07-08 00:30:52.000000000 +0200 @@ -93,7 +93,7 @@ clearButtonOverlay = 0; } - QRect subElementRect(SubElement element, const QStyleOption *option, const QWidget *widget) const Q_DECL_OVERRIDE + QRect subElementRect(SubElement element, const QStyleOption *option, const QWidget *widget) const override { QRect r = QProxyStyle::subElementRect(element, option, widget); switch (element) { @@ -107,7 +107,7 @@ return r; } - void drawControl(ControlElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget) const Q_DECL_OVERRIDE + void drawControl(ControlElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget) const override { if (element == QStyle::CE_ComboBoxLabel) { const QStyleOptionComboBox *o = qstyleoption_cast<const QStyleOptionComboBox *>(option); @@ -129,7 +129,7 @@ QProxyStyle::drawControl(element, option, painter, widget); } - void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *painter, const QWidget *widget) const Q_DECL_OVERRIDE + void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *painter, const QWidget *widget) const override { if ((cc == QStyle::CC_ComboBox) && noBorder) { if (const QStyleOptionComboBox *cbOpt = qstyleoption_cast<const QStyleOptionComboBox *>(opt)) { @@ -177,7 +177,7 @@ QProxyStyle::drawComplexControl(cc, opt, painter, widget); } - QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, SubControl sc, const QWidget *widget) const Q_DECL_OVERRIDE + QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, SubControl sc, const QWidget *widget) const override { // Make sure we give combo popup's enough room to display contents; // Qt doesn't do this by default @@ -785,7 +785,7 @@ { public: CompletionWidget(QWidget *parent = nullptr) : KCompletionBox(parent) {} - QPoint globalPositionHint() const Q_DECL_OVERRIDE + QPoint globalPositionHint() const override { QWidget *pw = parentWidget(); KHTMLWidget *kwp = dynamic_cast<KHTMLWidget *>(pw); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khtml-5.47.0/src/rendering/render_line.cpp new/khtml-5.48.0/src/rendering/render_line.cpp --- old/khtml-5.47.0/src/rendering/render_line.cpp 2018-06-02 19:56:14.000000000 +0200 +++ new/khtml-5.48.0/src/rendering/render_line.cpp 2018-07-08 00:30:52.000000000 +0200 @@ -62,8 +62,8 @@ m_markupBox = markupBox; } - void paint(RenderObject::PaintInfo &i, int _tx, int _ty) Q_DECL_OVERRIDE; - bool nodeAtPoint(RenderObject::NodeInfo &info, int _x, int _y, int _tx, int _ty) Q_DECL_OVERRIDE; + void paint(RenderObject::PaintInfo &i, int _tx, int _ty) override; + bool nodeAtPoint(RenderObject::NodeInfo &info, int _x, int _y, int _tx, int _ty) override; private: DOM::DOMString m_str; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khtml-5.47.0/src/svg/SVGParserUtilities.cpp new/khtml-5.48.0/src/svg/SVGParserUtilities.cpp --- old/khtml-5.47.0/src/svg/SVGParserUtilities.cpp 2018-06-02 19:56:14.000000000 +0200 +++ new/khtml-5.48.0/src/svg/SVGParserUtilities.cpp 2018-07-08 00:30:52.000000000 +0200 @@ -748,7 +748,7 @@ } private: - void svgMoveTo(double x1, double y1, bool closed, bool abs = true) Q_DECL_OVERRIDE + void svgMoveTo(double x1, double y1, bool closed, bool abs = true) override { current.setX(narrowPrecisionToFloat(abs ? x1 : current.x() + x1)); current.setY(narrowPrecisionToFloat(abs ? y1 : current.y() + y1)); @@ -757,13 +757,13 @@ } m_path->moveTo(current); } - void svgLineTo(double x1, double y1, bool abs = true) Q_DECL_OVERRIDE + void svgLineTo(double x1, double y1, bool abs = true) override { current.setX(narrowPrecisionToFloat(abs ? x1 : current.x() + x1)); current.setY(narrowPrecisionToFloat(abs ? y1 : current.y() + y1)); m_path->addLineTo(current); } - void svgCurveToCubic(double x1, double y1, double x2, double y2, double x, double y, bool abs = true) Q_DECL_OVERRIDE + void svgCurveToCubic(double x1, double y1, double x2, double y2, double x, double y, bool abs = true) override { if (!abs) { x1 += current.x(); @@ -775,7 +775,7 @@ current.setY(narrowPrecisionToFloat(abs ? y : current.y() + y)); m_path->addBezierCurveTo(FloatPoint::narrowPrecision(x1, y1), FloatPoint::narrowPrecision(x2, y2), current); } - void svgClosePath() Q_DECL_OVERRIDE + void svgClosePath() override { m_path->closeSubpath(); } @@ -799,7 +799,7 @@ } private: - void svgMoveTo(double x1, double y1, bool, bool abs = true) Q_DECL_OVERRIDE + void svgMoveTo(double x1, double y1, bool, bool abs = true) override { ExceptionCode ec = 0; @@ -809,7 +809,7 @@ m_pathSegList->appendItem(SVGPathElement::createSVGPathSegMovetoRel(narrowPrecisionToFloat(x1), narrowPrecisionToFloat(y1)), ec); } } - void svgLineTo(double x1, double y1, bool abs = true) Q_DECL_OVERRIDE + void svgLineTo(double x1, double y1, bool abs = true) override { ExceptionCode ec = 0; @@ -819,7 +819,7 @@ m_pathSegList->appendItem(SVGPathElement::createSVGPathSegLinetoRel(narrowPrecisionToFloat(x1), narrowPrecisionToFloat(y1)), ec); } } - void svgLineToHorizontal(double x, bool abs) Q_DECL_OVERRIDE + void svgLineToHorizontal(double x, bool abs) override { ExceptionCode ec = 0; @@ -829,7 +829,7 @@ m_pathSegList->appendItem(SVGPathElement::createSVGPathSegLinetoHorizontalRel(narrowPrecisionToFloat(x)), ec); } } - void svgLineToVertical(double y, bool abs) Q_DECL_OVERRIDE + void svgLineToVertical(double y, bool abs) override { ExceptionCode ec = 0; @@ -839,7 +839,7 @@ m_pathSegList->appendItem(SVGPathElement::createSVGPathSegLinetoVerticalRel(narrowPrecisionToFloat(y)), ec); } } - void svgCurveToCubic(double x1, double y1, double x2, double y2, double x, double y, bool abs = true) Q_DECL_OVERRIDE + void svgCurveToCubic(double x1, double y1, double x2, double y2, double x, double y, bool abs = true) override { ExceptionCode ec = 0; @@ -852,7 +852,7 @@ narrowPrecisionToFloat(x1), narrowPrecisionToFloat(y1), narrowPrecisionToFloat(x2), narrowPrecisionToFloat(y2)), ec); } - void svgCurveToCubicSmooth(double x, double y, double x2, double y2, bool abs) Q_DECL_OVERRIDE + void svgCurveToCubicSmooth(double x, double y, double x2, double y2, bool abs) override { ExceptionCode ec = 0; @@ -863,7 +863,7 @@ m_pathSegList->appendItem(SVGPathElement::createSVGPathSegCurvetoCubicSmoothRel(narrowPrecisionToFloat(x2), narrowPrecisionToFloat(y2), narrowPrecisionToFloat(x), narrowPrecisionToFloat(y)), ec); } - void svgCurveToQuadratic(double x, double y, double x1, double y1, bool abs) Q_DECL_OVERRIDE + void svgCurveToQuadratic(double x, double y, double x1, double y1, bool abs) override { ExceptionCode ec = 0; @@ -874,7 +874,7 @@ m_pathSegList->appendItem(SVGPathElement::createSVGPathSegCurvetoQuadraticRel(narrowPrecisionToFloat(x1), narrowPrecisionToFloat(y1), narrowPrecisionToFloat(x), narrowPrecisionToFloat(y)), ec); } - void svgCurveToQuadraticSmooth(double x, double y, bool abs) Q_DECL_OVERRIDE + void svgCurveToQuadraticSmooth(double x, double y, bool abs) override { ExceptionCode ec = 0; @@ -884,7 +884,7 @@ m_pathSegList->appendItem(SVGPathElement::createSVGPathSegCurvetoQuadraticSmoothRel(narrowPrecisionToFloat(x), narrowPrecisionToFloat(y)), ec); } } - void svgArcTo(double x, double y, double r1, double r2, double angle, bool largeArcFlag, bool sweepFlag, bool abs) Q_DECL_OVERRIDE + void svgArcTo(double x, double y, double r1, double r2, double angle, bool largeArcFlag, bool sweepFlag, bool abs) override { ExceptionCode ec = 0; @@ -897,7 +897,7 @@ narrowPrecisionToFloat(r1), narrowPrecisionToFloat(r2), narrowPrecisionToFloat(angle), largeArcFlag, sweepFlag), ec); } - void svgClosePath() Q_DECL_OVERRIDE + void svgClosePath() override { ExceptionCode ec = 0; m_pathSegList->appendItem(SVGPathElement::createSVGPathSegClosePath(), ec); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khtml-5.47.0/src/xpath/functions.cpp new/khtml-5.48.0/src/xpath/functions.cpp --- old/khtml-5.47.0/src/xpath/functions.cpp 2018-06-02 19:56:14.000000000 +0200 +++ new/khtml-5.48.0/src/xpath/functions.cpp 2018-07-08 00:30:52.000000000 +0200 @@ -65,28 +65,28 @@ class FunLast : public Function { public: - bool isConstant() const Q_DECL_OVERRIDE; + bool isConstant() const override; private: - Value doEvaluate() const Q_DECL_OVERRIDE; + Value doEvaluate() const override; }; class FunPosition : public Function { public: - bool isConstant() const Q_DECL_OVERRIDE; + bool isConstant() const override; private: - Value doEvaluate() const Q_DECL_OVERRIDE; + Value doEvaluate() const override; }; class FunCount : public Function { public: - bool isConstant() const Q_DECL_OVERRIDE; + bool isConstant() const override; private: - Value doEvaluate() const Q_DECL_OVERRIDE; + Value doEvaluate() const override; }; // Base for various node-property functions, that have @@ -95,170 +95,170 @@ class NodeFunction : public Function { private: - Value doEvaluate() const Q_DECL_OVERRIDE; + Value doEvaluate() const override; virtual Value evaluateOnNode(DOM::NodeImpl *node) const = 0; }; class FunLocalName : public NodeFunction { public: - bool isConstant() const Q_DECL_OVERRIDE; + bool isConstant() const override; private: - Value evaluateOnNode(DOM::NodeImpl *node) const Q_DECL_OVERRIDE; + Value evaluateOnNode(DOM::NodeImpl *node) const override; }; class FunNamespaceURI : public NodeFunction { public: - bool isConstant() const Q_DECL_OVERRIDE; + bool isConstant() const override; private: - Value evaluateOnNode(DOM::NodeImpl *node) const Q_DECL_OVERRIDE; + Value evaluateOnNode(DOM::NodeImpl *node) const override; }; class FunName : public NodeFunction { public: - bool isConstant() const Q_DECL_OVERRIDE; + bool isConstant() const override; private: - Value evaluateOnNode(DOM::NodeImpl *node) const Q_DECL_OVERRIDE; + Value evaluateOnNode(DOM::NodeImpl *node) const override; }; class FunId : public Function { private: - Value doEvaluate() const Q_DECL_OVERRIDE; + Value doEvaluate() const override; }; class FunString : public Function { private: - Value doEvaluate() const Q_DECL_OVERRIDE; + Value doEvaluate() const override; }; class FunConcat : public Function { private: - Value doEvaluate() const Q_DECL_OVERRIDE; + Value doEvaluate() const override; }; class FunStartsWith : public Function { private: - Value doEvaluate() const Q_DECL_OVERRIDE; + Value doEvaluate() const override; }; class FunContains : public Function { private: - Value doEvaluate() const Q_DECL_OVERRIDE; + Value doEvaluate() const override; }; class FunSubstringBefore : public Function { private: - Value doEvaluate() const Q_DECL_OVERRIDE; + Value doEvaluate() const override; }; class FunSubstringAfter : public Function { private: - Value doEvaluate() const Q_DECL_OVERRIDE; + Value doEvaluate() const override; }; class FunSubstring : public Function { private: - Value doEvaluate() const Q_DECL_OVERRIDE; + Value doEvaluate() const override; }; class FunStringLength : public Function { private: - Value doEvaluate() const Q_DECL_OVERRIDE; + Value doEvaluate() const override; }; class FunNormalizeSpace : public Function { private: - Value doEvaluate() const Q_DECL_OVERRIDE; + Value doEvaluate() const override; }; class FunTranslate : public Function { private: - Value doEvaluate() const Q_DECL_OVERRIDE; + Value doEvaluate() const override; }; class FunBoolean : public Function { private: - Value doEvaluate() const Q_DECL_OVERRIDE; + Value doEvaluate() const override; }; class FunNot : public Function { private: - Value doEvaluate() const Q_DECL_OVERRIDE; + Value doEvaluate() const override; }; class FunTrue : public Function { public: - bool isConstant() const Q_DECL_OVERRIDE; + bool isConstant() const override; private: - Value doEvaluate() const Q_DECL_OVERRIDE; + Value doEvaluate() const override; }; class FunFalse : public Function { public: - bool isConstant() const Q_DECL_OVERRIDE; + bool isConstant() const override; private: - Value doEvaluate() const Q_DECL_OVERRIDE; + Value doEvaluate() const override; }; class FunLang : public Function { public: - bool isConstant() const Q_DECL_OVERRIDE; + bool isConstant() const override; private: - Value doEvaluate() const Q_DECL_OVERRIDE; + Value doEvaluate() const override; }; class FunNumber : public Function { private: - Value doEvaluate() const Q_DECL_OVERRIDE; + Value doEvaluate() const override; }; class FunSum : public Function { private: - Value doEvaluate() const Q_DECL_OVERRIDE; + Value doEvaluate() const override; }; class FunFloor : public Function { private: - Value doEvaluate() const Q_DECL_OVERRIDE; + Value doEvaluate() const override; }; class FunCeiling : public Function { private: - Value doEvaluate() const Q_DECL_OVERRIDE; + Value doEvaluate() const override; }; class FunRound : public Function { private: - Value doEvaluate() const Q_DECL_OVERRIDE; + Value doEvaluate() const override; }; DEFINE_FUNCTION_CREATOR(FunLast)
