Hello community, here is the log from the commit of package kjsembed for openSUSE:Factory checked in at 2018-06-22 13:21:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kjsembed (Old) and /work/SRC/openSUSE:Factory/.kjsembed.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kjsembed" Fri Jun 22 13:21:36 2018 rev:55 rq:616774 version:5.47.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kjsembed/kjsembed.changes 2018-05-18 14:22:29.222297422 +0200 +++ /work/SRC/openSUSE:Factory/.kjsembed.new/kjsembed.changes 2018-06-22 13:21:44.620896679 +0200 @@ -1,0 +2,10 @@ +Tue Jun 12 21:26:06 UTC 2018 - [email protected] + +- Update to 5.47.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.47.0.php +- Changes since 5.46.0: + * Use override + +------------------------------------------------------------------- Old: ---- kjsembed-5.46.0.tar.xz New: ---- kjsembed-5.47.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kjsembed.spec ++++++ --- /var/tmp/diff_new_pack.nyHba0/_old 2018-06-22 13:21:45.264872883 +0200 +++ /var/tmp/diff_new_pack.nyHba0/_new 2018-06-22 13:21:45.264872883 +0200 @@ -18,13 +18,13 @@ %bcond_without lang %define lname libKF5JsEmbed5 -%define _tar_path 5.46 +%define _tar_path 5.47 # 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: kjsembed -Version: 5.46.0 +Version: 5.47.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 3.0 ++++++ kjsembed-5.46.0.tar.xz -> kjsembed-5.47.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.46.0/CMakeLists.txt new/kjsembed-5.47.0/CMakeLists.txt --- old/kjsembed-5.46.0/CMakeLists.txt 2018-05-05 14:59:06.000000000 +0200 +++ new/kjsembed-5.47.0/CMakeLists.txt 2018-06-02 20:01:29.000000000 +0200 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.46.0") # handled by release scripts -set(KF5_DEP_VERSION "5.46.0") # handled by release scripts +set(KF5_VERSION "5.47.0") # handled by release scripts +set(KF5_DEP_VERSION "5.47.0") # handled by release scripts project(KJsEmbed VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.46.0 NO_MODULE) +find_package(ECM 5.47.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/kjsembed-5.46.0/examples/kjsconsole/kjs_object_model.h new/kjsembed-5.47.0/examples/kjsconsole/kjs_object_model.h --- old/kjsembed-5.46.0/examples/kjsconsole/kjs_object_model.h 2018-05-05 14:59:06.000000000 +0200 +++ new/kjsembed-5.47.0/examples/kjsconsole/kjs_object_model.h 2018-06-02 20:01:29.000000000 +0200 @@ -39,13 +39,13 @@ explicit KJSObjectModel(KJS::Interpreter *js, QObject *parent = nullptr); ~KJSObjectModel(); - QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE; - Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; - QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; - QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - QModelIndex parent(const QModelIndex &index) const Q_DECL_OVERRIDE; - int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; + QVariant data(const QModelIndex &index, int role) const override; + Qt::ItemFlags flags(const QModelIndex &index) const override; + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; + QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; + QModelIndex parent(const QModelIndex &index) const override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + int columnCount(const QModelIndex &parent = QModelIndex()) const override; void updateModel(KJS::JSObject *m_root); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.46.0/examples/kjsconsole/numberedtextview.h new/kjsembed-5.47.0/examples/kjsconsole/numberedtextview.h --- old/kjsembed-5.46.0/examples/kjsconsole/numberedtextview.h 2018-05-05 14:59:06.000000000 +0200 +++ new/kjsembed-5.47.0/examples/kjsconsole/numberedtextview.h 2018-06-02 20:01:29.000000000 +0200 @@ -50,10 +50,10 @@ int bugLine() const; void setTextEdit(QTextEdit *edit); - void paintEvent(QPaintEvent *ev) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *ev) override; protected: - bool event(QEvent *ev) Q_DECL_OVERRIDE; + bool event(QEvent *ev) override; private: QTextEdit *edit; @@ -111,7 +111,7 @@ int bugLine() const; /** @internal Used to get tooltip events from the view for the hover signal. */ - bool eventFilter(QObject *obj, QEvent *event) Q_DECL_OVERRIDE; + bool eventFilter(QObject *obj, QEvent *event) override; QString text() const; void setText(const QString &text); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.46.0/po/id/kjsembed5.po new/kjsembed-5.47.0/po/id/kjsembed5.po --- old/kjsembed-5.46.0/po/id/kjsembed5.po 2018-05-05 14:59:06.000000000 +0200 +++ new/kjsembed-5.47.0/po/id/kjsembed5.po 2018-06-02 20:01:29.000000000 +0200 @@ -9,7 +9,7 @@ "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2016-11-19 20:12+0100\n" -"PO-Revision-Date: 2018-04-03 06:32+0700\n" +"PO-Revision-Date: 2018-05-23 20:07+0700\n" "Last-Translator: Wantoyo <[email protected]>\n" "Language-Team: Indonesian <[email protected]>\n" "Language: id\n" @@ -22,7 +22,7 @@ #: kjsembed/builtins.cpp:83 kjsembed/builtins.cpp:117 #, kde-format msgid "Error encountered while processing include '%1' line %2: %3" -msgstr "Galat terjadi ketika memproses penyertaan '%1' baris %2: %3" +msgstr "Error terjadi ketika memproses penyertaan '%1' baris %2: %3" #: kjsembed/builtins.cpp:87 #, kde-format @@ -98,7 +98,7 @@ #: kjsembed/qformbuilder_binding.cpp:56 #, kde-format msgid "There was an error reading the file '%1'" -msgstr "Terjadi galat ketika membaca file '%1'" +msgstr "Terjadi error ketika membaca file '%1'" #: kjsembed/qformbuilder_binding.cpp:64 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.46.0/po/zh_CN/kjsembed5.po new/kjsembed-5.47.0/po/zh_CN/kjsembed5.po --- old/kjsembed-5.46.0/po/zh_CN/kjsembed5.po 2018-05-05 14:59:06.000000000 +0200 +++ new/kjsembed-5.47.0/po/zh_CN/kjsembed5.po 2018-06-02 20:01:29.000000000 +0200 @@ -15,7 +15,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2016-11-19 20:12+0100\n" -"PO-Revision-Date: 2018-04-26 05:22-0400\n" +"PO-Revision-Date: 2018-05-18 06:23-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/kjsembed-5.46.0/src/kjsembed/QBrush_bind.h new/kjsembed-5.47.0/src/kjsembed/QBrush_bind.h --- old/kjsembed-5.46.0/src/kjsembed/QBrush_bind.h 2018-05-05 14:59:06.000000000 +0200 +++ new/kjsembed-5.47.0/src/kjsembed/QBrush_bind.h 2018-06-02 20:01:29.000000000 +0200 @@ -13,7 +13,7 @@ public: QBrushBinding(KJS::ExecState *exec, const QBrush &value); static const KJS::ClassInfo info; - const KJS::ClassInfo *classInfo() const Q_DECL_OVERRIDE + const KJS::ClassInfo *classInfo() const override { return &info; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.46.0/src/kjsembed/binding_support.h new/kjsembed-5.47.0/src/kjsembed/binding_support.h --- old/kjsembed-5.46.0/src/kjsembed/binding_support.h 2018-05-05 14:59:06.000000000 +0200 +++ new/kjsembed-5.47.0/src/kjsembed/binding_support.h 2018-06-02 20:01:29.000000000 +0200 @@ -248,11 +248,11 @@ ProxyBinding(KJS::ExecState *exec); virtual ~ProxyBinding() {} - bool implementsCall() const Q_DECL_OVERRIDE + bool implementsCall() const override { return true; } - bool implementsConstruct() const Q_DECL_OVERRIDE + bool implementsConstruct() const override { return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.46.0/src/kjsembed/brush.h new/kjsembed-5.47.0/src/kjsembed/brush.h --- old/kjsembed-5.46.0/src/kjsembed/brush.h 2018-05-05 14:59:06.000000000 +0200 +++ new/kjsembed-5.47.0/src/kjsembed/brush.h 2018-06-02 20:01:29.000000000 +0200 @@ -36,7 +36,7 @@ { public: BrushBinding(KJS::ExecState *exec, const QBrush &value); - const KJS::ClassInfo *classInfo() const Q_DECL_OVERRIDE + const KJS::ClassInfo *classInfo() const override { return &info; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.46.0/src/kjsembed/color.h new/kjsembed-5.47.0/src/kjsembed/color.h --- old/kjsembed-5.46.0/src/kjsembed/color.h 2018-05-05 14:59:06.000000000 +0200 +++ new/kjsembed-5.47.0/src/kjsembed/color.h 2018-06-02 20:01:29.000000000 +0200 @@ -35,7 +35,7 @@ { public: ColorBinding(KJS::ExecState *exec, const QColor &value); - const KJS::ClassInfo *classInfo() const Q_DECL_OVERRIDE + const KJS::ClassInfo *classInfo() const override { return &info; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.46.0/src/kjsembed/dom.h new/kjsembed-5.47.0/src/kjsembed/dom.h --- old/kjsembed-5.46.0/src/kjsembed/dom.h 2018-05-05 14:59:06.000000000 +0200 +++ new/kjsembed-5.47.0/src/kjsembed/dom.h 2018-06-02 20:01:29.000000000 +0200 @@ -42,7 +42,7 @@ public: DomNodeBinding(KJS::ExecState *exec, const QDomNode &value); private: - const KJS::ClassInfo *classInfo() const Q_DECL_OVERRIDE + const KJS::ClassInfo *classInfo() const override { return &info; } @@ -54,7 +54,7 @@ public: DomDocumentBinding(KJS::ExecState *exec, const QDomDocument &value); private: - const KJS::ClassInfo *classInfo() const Q_DECL_OVERRIDE + const KJS::ClassInfo *classInfo() const override { return &info; } @@ -66,7 +66,7 @@ public: DomElementBinding(KJS::ExecState *exec, const QDomElement &value); private: - const KJS::ClassInfo *classInfo() const Q_DECL_OVERRIDE + const KJS::ClassInfo *classInfo() const override { return &info; } @@ -78,7 +78,7 @@ public: DomAttrBinding(KJS::ExecState *exec, const QDomAttr &value); private: - const KJS::ClassInfo *classInfo() const Q_DECL_OVERRIDE + const KJS::ClassInfo *classInfo() const override { return &info; } @@ -90,7 +90,7 @@ public: DomDocumentTypeBinding(KJS::ExecState *exec, const QDomDocumentType &value); private: - const KJS::ClassInfo *classInfo() const Q_DECL_OVERRIDE + const KJS::ClassInfo *classInfo() const override { return &info; } @@ -102,7 +102,7 @@ public: DomNodeListBinding(KJS::ExecState *exec, const QDomNodeList &value); private: - const KJS::ClassInfo *classInfo() const Q_DECL_OVERRIDE + const KJS::ClassInfo *classInfo() const override { return &info; } @@ -114,7 +114,7 @@ public: DomNamedNodeMapBinding(KJS::ExecState *exec, const QDomNamedNodeMap &value); private: - const KJS::ClassInfo *classInfo() const Q_DECL_OVERRIDE + const KJS::ClassInfo *classInfo() const override { return &info; } @@ -126,7 +126,7 @@ public: DomTextBinding(KJS::ExecState *exec, const QDomText &value); private: - const KJS::ClassInfo *classInfo() const Q_DECL_OVERRIDE + const KJS::ClassInfo *classInfo() const override { return &info; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.46.0/src/kjsembed/eventproxy.h new/kjsembed-5.47.0/src/kjsembed/eventproxy.h --- old/kjsembed-5.46.0/src/kjsembed/eventproxy.h 2018-05-05 14:59:06.000000000 +0200 +++ new/kjsembed-5.47.0/src/kjsembed/eventproxy.h 2018-06-02 20:01:29.000000000 +0200 @@ -59,7 +59,7 @@ void removeFilter(QEvent::Type t); /** Reimplemented to forward events to JS. */ - bool eventFilter(QObject *watched, QEvent *e) Q_DECL_OVERRIDE; + bool eventFilter(QObject *watched, QEvent *e) override; protected: bool callHandler(QEvent *e); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.46.0/src/kjsembed/font.h new/kjsembed-5.47.0/src/kjsembed/font.h --- old/kjsembed-5.46.0/src/kjsembed/font.h 2018-05-05 14:59:06.000000000 +0200 +++ new/kjsembed-5.47.0/src/kjsembed/font.h 2018-06-02 20:01:29.000000000 +0200 @@ -35,7 +35,7 @@ { public: FontBinding(KJS::ExecState *exec, const QFont &value); - const KJS::ClassInfo *classInfo() const Q_DECL_OVERRIDE + const KJS::ClassInfo *classInfo() const override { return &info; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.46.0/src/kjsembed/image.h new/kjsembed-5.47.0/src/kjsembed/image.h --- old/kjsembed-5.46.0/src/kjsembed/image.h 2018-05-05 14:59:06.000000000 +0200 +++ new/kjsembed-5.47.0/src/kjsembed/image.h 2018-06-02 20:01:29.000000000 +0200 @@ -35,7 +35,7 @@ { public: ImageBinding(KJS::ExecState *exec, const QImage &value); - const KJS::ClassInfo *classInfo() const Q_DECL_OVERRIDE + const KJS::ClassInfo *classInfo() const override { return &info; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.46.0/src/kjsembed/object_binding.h new/kjsembed-5.47.0/src/kjsembed/object_binding.h --- old/kjsembed-5.46.0/src/kjsembed/object_binding.h 2018-05-05 14:59:06.000000000 +0200 +++ new/kjsembed-5.47.0/src/kjsembed/object_binding.h 2018-06-02 20:01:29.000000000 +0200 @@ -141,9 +141,9 @@ m_value = new Pointer<T>(ptr); } - KJS::UString toString(KJS::ExecState *exec) const Q_DECL_OVERRIDE; - KJS::UString className() const Q_DECL_OVERRIDE; - KJS::JSType type() const Q_DECL_OVERRIDE; + KJS::UString toString(KJS::ExecState *exec) const override; + KJS::UString className() const override; + KJS::JSType type() const override; Ownership ownership() const; void setOwnership(Ownership owner); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.46.0/src/kjsembed/pen.h new/kjsembed-5.47.0/src/kjsembed/pen.h --- old/kjsembed-5.46.0/src/kjsembed/pen.h 2018-05-05 14:59:06.000000000 +0200 +++ new/kjsembed-5.47.0/src/kjsembed/pen.h 2018-06-02 20:01:29.000000000 +0200 @@ -37,7 +37,7 @@ PenBinding(KJS::ExecState *exec, const QPen &value); private: - const KJS::ClassInfo *classInfo() const Q_DECL_OVERRIDE + const KJS::ClassInfo *classInfo() const override { return &info; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.46.0/src/kjsembed/pixmap.h new/kjsembed-5.47.0/src/kjsembed/pixmap.h --- old/kjsembed-5.46.0/src/kjsembed/pixmap.h 2018-05-05 14:59:06.000000000 +0200 +++ new/kjsembed-5.47.0/src/kjsembed/pixmap.h 2018-06-02 20:01:29.000000000 +0200 @@ -35,7 +35,7 @@ { public: PixmapBinding(KJS::ExecState *exec, const QPixmap &value); - const KJS::ClassInfo *classInfo() const Q_DECL_OVERRIDE + const KJS::ClassInfo *classInfo() const override { return &info; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.46.0/src/kjsembed/point.h new/kjsembed-5.47.0/src/kjsembed/point.h --- old/kjsembed-5.46.0/src/kjsembed/point.h 2018-05-05 14:59:06.000000000 +0200 +++ new/kjsembed-5.47.0/src/kjsembed/point.h 2018-06-02 20:01:29.000000000 +0200 @@ -35,7 +35,7 @@ { public: PointBinding(KJS::ExecState *exec, const QPoint &value); - const KJS::ClassInfo *classInfo() const Q_DECL_OVERRIDE + const KJS::ClassInfo *classInfo() const override { return &info; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.46.0/src/kjsembed/pointer.h new/kjsembed-5.47.0/src/kjsembed/pointer.h --- old/kjsembed-5.46.0/src/kjsembed/pointer.h 2018-05-05 14:59:06.000000000 +0200 +++ new/kjsembed-5.47.0/src/kjsembed/pointer.h 2018-06-02 20:01:29.000000000 +0200 @@ -52,18 +52,18 @@ { } - void cleanup() Q_DECL_OVERRIDE + void cleanup() override { // qDebug("delete pointer %s %0x", typeid(ValueType).name(), ptr ); delete ptr; ptr = nullptr; } - const std::type_info &type() const Q_DECL_OVERRIDE + const std::type_info &type() const override { return typeid(ValueType); } - void *voidStar() Q_DECL_OVERRIDE + void *voidStar() override { return (void *)ptr; } @@ -83,17 +83,17 @@ //qDebug("delete value"); } - void cleanup() Q_DECL_OVERRIDE + void cleanup() override { } - const std::type_info &type() const Q_DECL_OVERRIDE + const std::type_info &type() const override { return typeid(ValueType); } - void *voidStar() Q_DECL_OVERRIDE + void *voidStar() override { return (void *)&value; } @@ -110,17 +110,17 @@ { ; } - void cleanup() Q_DECL_OVERRIDE + void cleanup() override { ; } - const std::type_info &type() const Q_DECL_OVERRIDE + const std::type_info &type() const override { return typeid(NullPtr); } - void *voidStar() Q_DECL_OVERRIDE + void *voidStar() override { return &ptr; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.46.0/src/kjsembed/qobject_binding.h new/kjsembed-5.47.0/src/kjsembed/qobject_binding.h --- old/kjsembed-5.46.0/src/kjsembed/qobject_binding.h 2018-05-05 14:59:06.000000000 +0200 +++ new/kjsembed-5.47.0/src/kjsembed/qobject_binding.h 2018-06-02 20:01:29.000000000 +0200 @@ -131,20 +131,20 @@ * Set the value \p value of the property \p propertyName . */ void put(KJS::ExecState *exec, const KJS::Identifier &propertyName, KJS::JSValue *value, - int attr = KJS::None) Q_DECL_OVERRIDE; + int attr = KJS::None) override; using JSObject::put; /** * \return true if the property \p propertyName can be changed else false is returned. */ - bool canPut(KJS::ExecState *exec, const KJS::Identifier &propertyName) const Q_DECL_OVERRIDE; + bool canPut(KJS::ExecState *exec, const KJS::Identifier &propertyName) const override; /** * Called to ask if we have a callback for the named property. * We return the callback in the property slot. */ bool getOwnPropertySlot(KJS::ExecState *exec, const KJS::Identifier &propertyName, - KJS::PropertySlot &slot) Q_DECL_OVERRIDE; + KJS::PropertySlot &slot) override; using JSObject::getOwnPropertySlot; /** @@ -156,13 +156,13 @@ * \return a string-representation of the QObject. For example for a QWidget-instance that * has the QObject::objectName "mywidget" the string "mywidget (QWidget)" is returned. */ - KJS::UString toString(KJS::ExecState *exec) const Q_DECL_OVERRIDE; + KJS::UString toString(KJS::ExecState *exec) const override; /** * \return the QObject's classname. For example for a QWidget-instance the string "QWidget" * is returned. */ - KJS::UString className() const Q_DECL_OVERRIDE; + KJS::UString className() const override; /** * Add the QObject \p object to the internal QObjectCleanupHandler to watch the @@ -197,12 +197,12 @@ { public: SlotBinding(KJS::ExecState *exec, const QMetaMethod &memberName); - KJS::JSValue *callAsFunction(KJS::ExecState *exec, KJS::JSObject *self, const KJS::List &args) Q_DECL_OVERRIDE; - bool implementsCall() const Q_DECL_OVERRIDE + KJS::JSValue *callAsFunction(KJS::ExecState *exec, KJS::JSObject *self, const KJS::List &args) override; + bool implementsCall() const override { return true; } - bool implementsConstruct() const Q_DECL_OVERRIDE + bool implementsConstruct() const override { return false; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.46.0/src/kjsembed/size.h new/kjsembed-5.47.0/src/kjsembed/size.h --- old/kjsembed-5.46.0/src/kjsembed/size.h 2018-05-05 14:59:06.000000000 +0200 +++ new/kjsembed-5.47.0/src/kjsembed/size.h 2018-06-02 20:01:29.000000000 +0200 @@ -34,7 +34,7 @@ { public: SizeBinding(KJS::ExecState *exec, const QSize &value); - const KJS::ClassInfo *classInfo() const Q_DECL_OVERRIDE + const KJS::ClassInfo *classInfo() const override { return &info; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.46.0/src/kjsembed/slotproxy.h new/kjsembed-5.47.0/src/kjsembed/slotproxy.h --- old/kjsembed-5.46.0/src/kjsembed/slotproxy.h 2018-05-05 14:59:06.000000000 +0200 +++ new/kjsembed-5.47.0/src/kjsembed/slotproxy.h 2018-06-02 20:01:29.000000000 +0200 @@ -46,9 +46,9 @@ ~SlotProxy(); //Meta object stuff QMetaObject staticMetaObject; - const QMetaObject *metaObject() const Q_DECL_OVERRIDE; - void *qt_metacast(const char *_clname) Q_DECL_OVERRIDE; - int qt_metacall(QMetaObject::Call _c, int _id, void **_a) Q_DECL_OVERRIDE; + const QMetaObject *metaObject() const override; + void *qt_metacast(const char *_clname) override; + int qt_metacall(QMetaObject::Call _c, int _id, void **_a) override; private: KJS::JSValue *callMethod(const QByteArray &methodName, void **_a); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.46.0/src/kjsembed/static_binding.h new/kjsembed-5.47.0/src/kjsembed/static_binding.h --- old/kjsembed-5.46.0/src/kjsembed/static_binding.h 2018-05-05 14:59:06.000000000 +0200 +++ new/kjsembed-5.47.0/src/kjsembed/static_binding.h 2018-06-02 20:01:29.000000000 +0200 @@ -45,8 +45,8 @@ /** * Executes the callback for this method. */ - KJS::JSValue *callAsFunction(KJS::ExecState *exec, KJS::JSObject *self, const KJS::List &args) Q_DECL_OVERRIDE; - bool implementsConstruct() const Q_DECL_OVERRIDE + KJS::JSValue *callAsFunction(KJS::ExecState *exec, KJS::JSObject *self, const KJS::List &args) override; + bool implementsConstruct() const override { return false; } @@ -84,7 +84,7 @@ */ void addStaticMethods(KJS::ExecState *exec, const Method *methods); - bool implementsConstruct() const Q_DECL_OVERRIDE + bool implementsConstruct() const override { return true; } @@ -92,16 +92,16 @@ * Calls the callback that will in turn create a new instance of this object with * the arguments passed in with args. */ - KJS::JSObject *construct(KJS::ExecState *exec, const KJS::List &args) Q_DECL_OVERRIDE; + KJS::JSObject *construct(KJS::ExecState *exec, const KJS::List &args) override; using KJS::JSObject::construct; - KJS::JSValue *callAsFunction(KJS::ExecState *exec, KJS::JSObject * /*self*/, const KJS::List &args) Q_DECL_OVERRIDE + KJS::JSValue *callAsFunction(KJS::ExecState *exec, KJS::JSObject * /*self*/, const KJS::List &args) override { return construct(exec, args); } void setDefaultValue(KJS::JSValue *value); - KJS::JSValue *defaultValue(KJS::ExecState *exec, KJS::JSType hint) const Q_DECL_OVERRIDE; + KJS::JSValue *defaultValue(KJS::ExecState *exec, KJS::JSType hint) const override; /** * Add the constructor to an object. This is usually the global scope. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.46.0/src/kjsembed/url.h new/kjsembed-5.47.0/src/kjsembed/url.h --- old/kjsembed-5.46.0/src/kjsembed/url.h 2018-05-05 14:59:06.000000000 +0200 +++ new/kjsembed-5.47.0/src/kjsembed/url.h 2018-06-02 20:01:29.000000000 +0200 @@ -35,7 +35,7 @@ { public: UrlBinding(KJS::ExecState *exec, const QUrl &value); - const KJS::ClassInfo *classInfo() const Q_DECL_OVERRIDE + const KJS::ClassInfo *classInfo() const override { return &info; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.46.0/src/kjsembed/value_binding.h new/kjsembed-5.47.0/src/kjsembed/value_binding.h --- old/kjsembed-5.46.0/src/kjsembed/value_binding.h 2018-05-05 14:59:06.000000000 +0200 +++ new/kjsembed-5.47.0/src/kjsembed/value_binding.h 2018-06-02 20:01:29.000000000 +0200 @@ -112,8 +112,8 @@ ValueBinding(KJS::ExecState *exec, const char *typeName); virtual ~ValueBinding(); - KJS::UString toString(KJS::ExecState *exec) const Q_DECL_OVERRIDE; - KJS::UString className() const Q_DECL_OVERRIDE + KJS::UString toString(KJS::ExecState *exec) const override; + KJS::UString className() const override { return m_name; } @@ -155,7 +155,7 @@ static const KJS::ClassInfo info; private: - const KJS::ClassInfo *classInfo() const Q_DECL_OVERRIDE + const KJS::ClassInfo *classInfo() const override { return &info; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.46.0/src/kjsembed/variant_binding.h new/kjsembed-5.47.0/src/kjsembed/variant_binding.h --- old/kjsembed-5.46.0/src/kjsembed/variant_binding.h 2018-05-05 14:59:06.000000000 +0200 +++ new/kjsembed-5.47.0/src/kjsembed/variant_binding.h 2018-06-02 20:01:29.000000000 +0200 @@ -94,8 +94,8 @@ void *pointer(); - KJS::UString toString(KJS::ExecState *) const Q_DECL_OVERRIDE; - KJS::UString className() const Q_DECL_OVERRIDE; + KJS::UString toString(KJS::ExecState *) const override; + KJS::UString className() const override; /** * Return the wrapped QVariant @@ -124,7 +124,7 @@ static const KJS::ClassInfo info; private: - const KJS::ClassInfo *classInfo() const Q_DECL_OVERRIDE + const KJS::ClassInfo *classInfo() const override { return &info; }
