Hello community,
here is the log from the commit of package kjsembed for openSUSE:Factory checked in at 2017-03-03 17:00:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kjsembed (Old)
and /work/SRC/openSUSE:Factory/.kjsembed.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kjsembed"
Fri Mar 3 17:00:42 2017 rev:39 rq:461439 version:5.31.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kjsembed/kjsembed.changes 2017-02-03 17:45:36.141599931 +0100
+++ /work/SRC/openSUSE:Factory/.kjsembed.new/kjsembed.changes 2017-03-03 17:00:44.744615342 +0100
@@ -1,0 +2,7 @@
+Thu Feb 9 09:31:29 UTC 2017 - hrvoje.senjan@gmail.com
+
+- Update to 5.31.0
+ * For more details please see:
+ https://www.kde.org/announcements/kde-frameworks-5.31.0.php
+
+-------------------------------------------------------------------
Old:
----
kjsembed-5.30.0.tar.xz
New:
----
kjsembed-5.31.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kjsembed.spec ++++++
--- /var/tmp/diff_new_pack.RVMs8V/_old 2017-03-03 17:00:45.432518061 +0100
+++ /var/tmp/diff_new_pack.RVMs8V/_new 2017-03-03 17:00:45.440516930 +0100
@@ -18,9 +18,9 @@
%bcond_without lang
%define lname libKF5JsEmbed5
-%define _tar_path 5.30
+%define _tar_path 5.31
Name: kjsembed
-Version: 5.30.0
+Version: 5.31.0
Release: 0
%define kf5_version %{version}
BuildRequires: cmake >= 3.0
@@ -30,11 +30,11 @@
BuildRequires: kf5-filesystem
BuildRequires: ki18n-devel >= %{_tar_path}
BuildRequires: kjs-devel >= %{_tar_path}
-BuildRequires: cmake(Qt5Core) >= 5.5.0
-BuildRequires: cmake(Qt5Svg) >= 5.5.0
-BuildRequires: cmake(Qt5UiTools) >= 5.5.0
-BuildRequires: cmake(Qt5Widgets) >= 5.5.0
-BuildRequires: cmake(Qt5Xml) >= 5.5.0
+BuildRequires: cmake(Qt5Core) >= 5.6.0
+BuildRequires: cmake(Qt5Svg) >= 5.6.0
+BuildRequires: cmake(Qt5UiTools) >= 5.6.0
+BuildRequires: cmake(Qt5Widgets) >= 5.6.0
+BuildRequires: cmake(Qt5Xml) >= 5.6.0
Summary: Binding Javascript object to QObjects
License: LGPL-2.1+
Group: System/GUI/KDE
++++++ kjsembed-5.30.0.tar.xz -> kjsembed-5.31.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.30.0/CMakeLists.txt new/kjsembed-5.31.0/CMakeLists.txt
--- old/kjsembed-5.30.0/CMakeLists.txt 2017-01-08 21:56:54.000000000 +0100
+++ new/kjsembed-5.31.0/CMakeLists.txt 2017-02-05 12:04:51.000000000 +0100
@@ -1,17 +1,17 @@
cmake_minimum_required(VERSION 3.0)
-set(KF5_VERSION "5.30.0") # handled by release scripts
-set(KF5_DEP_VERSION "5.30.0") # handled by release scripts
+set(KF5_VERSION "5.31.0") # handled by release scripts
+set(KF5_DEP_VERSION "5.31.0") # handled by release scripts
project(KJsEmbed 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)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
-set(REQUIRED_QT_VERSION 5.5.0)
+set(REQUIRED_QT_VERSION 5.6.0)
find_package(Qt5 "${REQUIRED_QT_VERSION}" CONFIG REQUIRED UiTools Widgets Xml Svg)
include(KDEInstallDirs)
include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.30.0/examples/kjsconsole/console.h new/kjsembed-5.31.0/examples/kjsconsole/console.h
--- old/kjsembed-5.30.0/examples/kjsconsole/console.h 2017-01-08 21:56:54.000000000 +0100
+++ new/kjsembed-5.31.0/examples/kjsconsole/console.h 2017-02-05 12:04:51.000000000 +0100
@@ -32,7 +32,7 @@
{
Q_OBJECT
public:
- Console(QWidget *parent = 0);
+ Console(QWidget *parent = nullptr);
~Console();
public Q_SLOTS:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.30.0/examples/kjsconsole/kjs_object_model.cpp new/kjsembed-5.31.0/examples/kjsconsole/kjs_object_model.cpp
--- old/kjsembed-5.30.0/examples/kjsconsole/kjs_object_model.cpp 2017-01-08 21:56:54.000000000 +0100
+++ new/kjsembed-5.31.0/examples/kjsconsole/kjs_object_model.cpp 2017-02-05 12:04:51.000000000 +0100
@@ -90,8 +90,8 @@
QModelIndex KJSObjectModel::index(int row, int column, const QModelIndex &parent) const
{
- KJS::JSObject *parentInstance = 0;
- Node *childItem = 0;
+ KJS::JSObject *parentInstance = nullptr;
+ Node *childItem = nullptr;
KJS::ExecState *exec = m_js->globalExec();
if (!parent.isValid()) {
@@ -130,7 +130,7 @@
Node *node = new Node;
node->instance = m_root;
node->name = "Objects";
- node->parent = 0;
+ node->parent = nullptr;
return createIndex(0, index.column(), node);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.30.0/examples/kjsconsole/kjs_object_model.h new/kjsembed-5.31.0/examples/kjsconsole/kjs_object_model.h
--- old/kjsembed-5.30.0/examples/kjsconsole/kjs_object_model.h 2017-01-08 21:56:54.000000000 +0100
+++ new/kjsembed-5.31.0/examples/kjsconsole/kjs_object_model.h 2017-02-05 12:04:51.000000000 +0100
@@ -36,7 +36,7 @@
{
Q_OBJECT
public:
- explicit KJSObjectModel(KJS::Interpreter *js, QObject *parent = 0);
+ explicit KJSObjectModel(KJS::Interpreter *js, QObject *parent = nullptr);
~KJSObjectModel();
QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.30.0/examples/kjsconsole/numberedtextview.cpp new/kjsembed-5.31.0/examples/kjsconsole/numberedtextview.cpp
--- old/kjsembed-5.30.0/examples/kjsconsole/numberedtextview.cpp 2017-01-08 21:56:54.000000000 +0100
+++ new/kjsembed-5.31.0/examples/kjsconsole/numberedtextview.cpp 2017-02-05 12:04:51.000000000 +0100
@@ -33,7 +33,7 @@
#include
NumberBar::NumberBar(QWidget *parent)
- : QWidget(parent), edit(0), m_stopLine(-1), m_currentLine(-1), m_bugLine(-1)
+ : QWidget(parent), edit(nullptr), m_stopLine(-1), m_currentLine(-1), m_bugLine(-1)
{
stopMarker = QPixmap(":/images/no.png");
currentMarker = QPixmap(":/images/next.png");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.30.0/examples/kjsconsole/numberedtextview.h new/kjsembed-5.31.0/examples/kjsconsole/numberedtextview.h
--- old/kjsembed-5.30.0/examples/kjsconsole/numberedtextview.h 2017-01-08 21:56:54.000000000 +0100
+++ new/kjsembed-5.31.0/examples/kjsconsole/numberedtextview.h 2017-02-05 12:04:51.000000000 +0100
@@ -79,7 +79,7 @@
Q_PROPERTY(int stopLine READ stopLine WRITE setStopLine)
Q_PROPERTY(int bugLine READ bugLine WRITE setBugLine)
public:
- NumberedTextView(QWidget *parent = 0);
+ NumberedTextView(QWidget *parent = nullptr);
~NumberedTextView();
/** Returns the QTextEdit of the main view. */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.30.0/po/gl/kjsembed5.po new/kjsembed-5.31.0/po/gl/kjsembed5.po
--- old/kjsembed-5.30.0/po/gl/kjsembed5.po 2017-01-08 21:56:54.000000000 +0100
+++ new/kjsembed-5.31.0/po/gl/kjsembed5.po 2017-02-05 12:04:51.000000000 +0100
@@ -224,7 +224,7 @@
#: kjsembed/quiloader_binding.cpp:115
#, kde-format
msgid "Failed to create Widget."
-msgstr "Produciuse un erro ao crear o Widget."
+msgstr "Produciuse un erro ao crear o Trebello."
#: kjsembed/quiloader_binding.cpp:129
#, kde-format
@@ -244,7 +244,7 @@
#: kjsembed/qwidget_binding.cpp:170
#, kde-format
msgid "Must supply a widget name."
-msgstr "Debe indicar un nome de widget."
+msgstr "Debe indicar un nome de trebello."
#: kjsembed/slotproxy.cpp:117
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.30.0/src/kjsembed/QBrush_bind.cpp new/kjsembed-5.31.0/src/kjsembed/QBrush_bind.cpp
--- old/kjsembed-5.30.0/src/kjsembed/QBrush_bind.cpp 2017-01-08 21:56:54.000000000 +0100
+++ new/kjsembed-5.31.0/src/kjsembed/QBrush_bind.cpp 2017-02-05 12:04:51.000000000 +0100
@@ -19,11 +19,11 @@
public: static const KJS::ClassInfo info;
};
-const KJS::ClassInfo QColorBinding::info = { "QColor", &VariantBinding::info, 0, 0 };
-const KJS::ClassInfo QPixmapBinding::info = { "QPixmap", &VariantBinding::info, 0, 0 };
-const KJS::ClassInfo QGradientBinding::info = { "QGradient", &ObjectBinding::info, 0, 0 };
+const KJS::ClassInfo QColorBinding::info = { "QColor", &VariantBinding::info, nullptr, nullptr };
+const KJS::ClassInfo QPixmapBinding::info = { "QPixmap", &VariantBinding::info, nullptr, nullptr };
+const KJS::ClassInfo QGradientBinding::info = { "QGradient", &ObjectBinding::info, nullptr, nullptr };
-const KJS::ClassInfo QBrushBinding::info = { "QBrush", &VariantBinding::info, 0, 0 };
+const KJS::ClassInfo QBrushBinding::info = { "QBrush", &VariantBinding::info, nullptr, nullptr };
QBrushBinding::QBrushBinding(KJS::ExecState *exec, const QBrush &value)
: VariantBinding(exec, value)
{
@@ -221,11 +221,11 @@
}
-const Enumerator KJSEmbed::QBrushData::p_enums[] = {{0, 0 }};
+const Enumerator KJSEmbed::QBrushData::p_enums[] = {{nullptr, 0 }};
NO_STATICS(KJSEmbed::QBrushData)
const Constructor KJSEmbed::QBrushData::p_constructor =
-{"QBrush", 0, KJS::DontDelete | KJS::ReadOnly, 0, &QBrushData::ctorMethod, p_statics, p_enums, KJSEmbed::QBrushData::p_methods };
+{"QBrush", 0, KJS::DontDelete | KJS::ReadOnly, nullptr, &QBrushData::ctorMethod, p_statics, p_enums, KJSEmbed::QBrushData::p_methods };
KJS::JSObject *KJSEmbed::QBrushData::ctorMethod(KJS::ExecState *exec, const KJS::List &args)
{
if (args.size() == 0) {
@@ -289,6 +289,6 @@
{ "setColor", 1, KJS::DontDelete | KJS::ReadOnly, &QBrushNS::setColor },
{ "gradient", 0, KJS::DontDelete | KJS::ReadOnly, &QBrushNS::gradient },
{ "isOpaque", 0, KJS::DontDelete | KJS::ReadOnly, &QBrushNS::isOpaque },
- {0, 0, 0, 0 }
+ {nullptr, 0, 0, nullptr }
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.30.0/src/kjsembed/binding_support.cpp new/kjsembed-5.31.0/src/kjsembed/binding_support.cpp
--- old/kjsembed-5.30.0/src/kjsembed/binding_support.cpp 2017-01-08 21:56:54.000000000 +0100
+++ new/kjsembed-5.31.0/src/kjsembed/binding_support.cpp 2017-02-05 12:04:51.000000000 +0100
@@ -175,7 +175,7 @@
KJS::JSValue *KJSEmbed::createQDateTime(KJS::ExecState * /* exec */, const QDateTime & /* value */)
{
// return new KJS::JSValue();
- return 0;
+ return nullptr;
}
QDate KJSEmbed::extractQDate(KJS::ExecState * /* exec */, const KJS::List & /* args */, int /* idx */, const QDate & /* defaultValue */)
@@ -191,7 +191,7 @@
KJS::JSValue *KJSEmbed::createQDate(KJS::ExecState * /*exec*/, const QDate & /*value*/)
{
// return new KJS::JSValue();
- return 0;
+ return nullptr;
}
QTime KJSEmbed::extractQTime(KJS::ExecState * /*exec*/, const KJS::List & /*args*/, int /*idx*/, const QTime & /*defaultValue*/)
@@ -207,7 +207,7 @@
KJS::JSValue *KJSEmbed::createQTime(KJS::ExecState * /*exec*/, const QTime &/*value*/)
{
// return new KJS::JSValue();
- return 0;
+ return nullptr;
}
QStringList KJSEmbed::extractQStringList(KJS::ExecState * /*exec*/, const KJS::List &/*args*/, int /*idx*/, const QStringList &/*defaultValue*/)
@@ -223,6 +223,6 @@
KJS::JSValue *KJSEmbed::createQStringList(KJS::ExecState * /*exec*/, const QStringList &/*value*/)
{
// return new KJS::JSValue();
- return 0;
+ return nullptr;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.30.0/src/kjsembed/brush.cpp new/kjsembed-5.31.0/src/kjsembed/brush.cpp
--- old/kjsembed-5.30.0/src/kjsembed/brush.cpp 2017-01-08 21:56:54.000000000 +0100
+++ new/kjsembed-5.31.0/src/kjsembed/brush.cpp 2017-02-05 12:04:51.000000000 +0100
@@ -32,7 +32,7 @@
using namespace KJSEmbed;
-const KJS::ClassInfo BrushBinding::info = { "QBrush", &VariantBinding::info, 0, 0 };
+const KJS::ClassInfo BrushBinding::info = { "QBrush", &VariantBinding::info, nullptr, nullptr };
BrushBinding::BrushBinding(KJS::ExecState *exec, const QBrush &value)
: VariantBinding(exec, value)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.30.0/src/kjsembed/builtins.cpp new/kjsembed-5.31.0/src/kjsembed/builtins.cpp
--- old/kjsembed-5.30.0/src/kjsembed/builtins.cpp 2017-01-08 21:56:54.000000000 +0100
+++ new/kjsembed-5.31.0/src/kjsembed/builtins.cpp 2017-02-05 12:04:51.000000000 +0100
@@ -134,7 +134,7 @@
if (args.size() == 1) {
(*KJSEmbed::conerr()) << "callAlert";
QString message = toQString(args[0]->toString(exec));
- QMessageBox::warning(0, i18n("Alert"), message, QMessageBox::Ok, QMessageBox::NoButton);
+ QMessageBox::warning(nullptr, i18n("Alert"), message, QMessageBox::Ok, QMessageBox::NoButton);
}
return KJS::jsNull();
}
@@ -144,7 +144,7 @@
Q_UNUSED(self)
if (args.size() == 1) {
QString message = toQString(args[0]->toString(exec));
- int result = QMessageBox::question(0, i18n("Confirm"), message, QMessageBox::Yes, QMessageBox::No);
+ int result = QMessageBox::question(nullptr, i18n("Confirm"), message, QMessageBox::Yes, QMessageBox::No);
if (result == QMessageBox::Yes) {
return KJS::jsBoolean(true);
}
@@ -196,5 +196,5 @@
{"isVariantType", 1, KJS::DontDelete | KJS::ReadOnly, &callIsVariantType},
{"isVariant", 1, KJS::DontDelete | KJS::ReadOnly, &callIsVariant},
{"isObject", 1, KJS::DontDelete | KJS::ReadOnly, &callIsObject},
- {0, 0, 0, 0 }
+ {nullptr, 0, 0, nullptr }
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.30.0/src/kjsembed/color.cpp new/kjsembed-5.31.0/src/kjsembed/color.cpp
--- old/kjsembed-5.30.0/src/kjsembed/color.cpp 2017-01-08 21:56:54.000000000 +0100
+++ new/kjsembed-5.31.0/src/kjsembed/color.cpp 2017-02-05 12:04:51.000000000 +0100
@@ -26,7 +26,7 @@
using namespace KJSEmbed;
-const KJS::ClassInfo ColorBinding::info = { "QColor", &VariantBinding::info, 0, 0 };
+const KJS::ClassInfo ColorBinding::info = { "QColor", &VariantBinding::info, nullptr, nullptr };
ColorBinding::ColorBinding(KJS::ExecState *exec, const QColor &value)
: VariantBinding(exec, value)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.30.0/src/kjsembed/dom.cpp new/kjsembed-5.31.0/src/kjsembed/dom.cpp
--- old/kjsembed-5.30.0/src/kjsembed/dom.cpp 2017-01-08 21:56:54.000000000 +0100
+++ new/kjsembed-5.31.0/src/kjsembed/dom.cpp 2017-02-05 12:04:51.000000000 +0100
@@ -26,7 +26,7 @@
using namespace KJSEmbed;
-const KJS::ClassInfo DomNodeBinding::info = { "QDomNode", &ValueBinding::info, 0, 0 };
+const KJS::ClassInfo DomNodeBinding::info = { "QDomNode", &ValueBinding::info, nullptr, nullptr };
DomNodeBinding::DomNodeBinding(KJS::ExecState *exec, const QDomNode &value)
: ValueBinding(exec, "QDomNode", value)
{
@@ -341,7 +341,7 @@
return new KJSEmbed::DomNodeBinding(exec, QDomNode());
END_CTOR
-const KJS::ClassInfo DomDocumentBinding::info = { "QDomDocument", &ValueBinding::info, 0, 0 };
+const KJS::ClassInfo DomDocumentBinding::info = { "QDomDocument", &ValueBinding::info, nullptr, nullptr };
DomDocumentBinding::DomDocumentBinding(KJS::ExecState *exec, const QDomDocument &value)
: ValueBinding(exec, "QDomDocument", value)
{
@@ -479,7 +479,7 @@
return new KJSEmbed::DomDocumentBinding(exec, QDomDocument(name));
END_CTOR
-const KJS::ClassInfo DomElementBinding::info = { "QDomElement", &ValueBinding::info, 0, 0 };
+const KJS::ClassInfo DomElementBinding::info = { "QDomElement", &ValueBinding::info, nullptr, nullptr };
DomElementBinding::DomElementBinding(KJS::ExecState *exec, const QDomElement &value)
: ValueBinding(exec, "QDomElement", value)
{
@@ -624,7 +624,7 @@
return new KJSEmbed::DomElementBinding(exec, QDomElement());
END_CTOR
-const KJS::ClassInfo DomAttrBinding::info = { "QDomAttr", &ValueBinding::info, 0, 0 };
+const KJS::ClassInfo DomAttrBinding::info = { "QDomAttr", &ValueBinding::info, nullptr, nullptr };
DomAttrBinding::DomAttrBinding(KJS::ExecState *exec, const QDomAttr &value)
: ValueBinding(exec, "QDomAttr", value)
{
@@ -673,7 +673,7 @@
return new KJSEmbed::DomAttrBinding(exec, QDomAttr());
END_CTOR
-const KJS::ClassInfo DomNodeListBinding::info = { "QDomNodeList", &ValueBinding::info, 0, 0 };
+const KJS::ClassInfo DomNodeListBinding::info = { "QDomNodeList", &ValueBinding::info, nullptr, nullptr };
DomNodeListBinding::DomNodeListBinding(KJS::ExecState *exec, const QDomNodeList &value)
: ValueBinding(exec, "QDomNodeList", value)
{
@@ -711,7 +711,7 @@
return new KJSEmbed::DomNodeListBinding(exec, QDomNodeList());
END_CTOR
-const KJS::ClassInfo DomDocumentTypeBinding::info = { "QDomDocumentType", &ValueBinding::info, 0, 0 };
+const KJS::ClassInfo DomDocumentTypeBinding::info = { "QDomDocumentType", &ValueBinding::info, nullptr, nullptr };
DomDocumentTypeBinding::DomDocumentTypeBinding(KJS::ExecState *exec, const QDomDocumentType &value)
: ValueBinding(exec, "QDomDocumentType", value)
{
@@ -762,7 +762,7 @@
return new KJSEmbed::DomDocumentTypeBinding(exec, QDomDocumentType());
END_CTOR
-const KJS::ClassInfo DomNamedNodeMapBinding::info = { "QDomNamedNodeMap", &ValueBinding::info, 0, 0 };
+const KJS::ClassInfo DomNamedNodeMapBinding::info = { "QDomNamedNodeMap", &ValueBinding::info, nullptr, nullptr };
DomNamedNodeMapBinding::DomNamedNodeMapBinding(KJS::ExecState *exec, const QDomNamedNodeMap &value)
: ValueBinding(exec, "QDomNamedNodeMap", value)
{
@@ -850,7 +850,7 @@
return new KJSEmbed::DomNamedNodeMapBinding(exec, QDomNamedNodeMap());
END_CTOR
-const KJS::ClassInfo DomTextBinding::info = { "QDomText", &ValueBinding::info, 0, 0 };
+const KJS::ClassInfo DomTextBinding::info = { "QDomText", &ValueBinding::info, nullptr, nullptr };
DomTextBinding::DomTextBinding(KJS::ExecState *exec, const QDomText &value)
: ValueBinding(exec, "QDomText", value)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.30.0/src/kjsembed/filedialog_binding.cpp new/kjsembed-5.31.0/src/kjsembed/filedialog_binding.cpp
--- old/kjsembed-5.30.0/src/kjsembed/filedialog_binding.cpp 2017-01-08 21:56:54.000000000 +0100
+++ new/kjsembed-5.31.0/src/kjsembed/filedialog_binding.cpp 2017-02-05 12:04:51.000000000 +0100
@@ -34,7 +34,7 @@
KJS::JSValue *callGetExistingDirectory(KJS::ExecState *exec, KJS::JSObject * /*self*/, const KJS::List &args)
{
- QWidget *parent = KJSEmbed::extractObject<QWidget>(exec, args, 0, 0);
+ QWidget *parent = KJSEmbed::extractObject<QWidget>(exec, args, 0, nullptr);
QString caption = KJSEmbed::extractVariant<QString>(exec, args, 1, QString());
QString dir = KJSEmbed::extractVariant<QString>(exec, args, 2, QString());
QFileDialog::Options options = (QFileDialog::Options)KJSEmbed::extractVariant<uint>(exec, args, 3, QFileDialog::ShowDirsOnly);
@@ -44,45 +44,45 @@
KJS::JSValue *callGetOpenFileName(KJS::ExecState *exec, KJS::JSObject * /*self*/, const KJS::List &args)
{
- QWidget *parent = KJSEmbed::extractObject<QWidget>(exec, args, 0, 0);
+ QWidget *parent = KJSEmbed::extractObject<QWidget>(exec, args, 0, nullptr);
QString caption = KJSEmbed::extractVariant<QString>(exec, args, 1, "");
QString dir = KJSEmbed::extractVariant<QString>(exec, args, 2, "");
QString filter = KJSEmbed::extractVariant<QString>(exec, args, 3, "");
// QString *selectedFilter = KJSEmbed::extractVariant<QString>(exec, args, 4, 0);
QFileDialog::Options options = (QFileDialog::Options)KJSEmbed::extractVariant<uint>(exec, args, 4, 0);
- return KJS::jsString(QFileDialog::getOpenFileName(parent, caption, dir, filter, 0, options));
+ return KJS::jsString(QFileDialog::getOpenFileName(parent, caption, dir, filter, nullptr, options));
}
KJS::JSValue *callGetOpenFileNames(KJS::ExecState *exec, KJS::JSObject * /*self*/, const KJS::List &args)
{
- QWidget *parent = KJSEmbed::extractObject<QWidget>(exec, args, 0, 0);
+ QWidget *parent = KJSEmbed::extractObject<QWidget>(exec, args, 0, nullptr);
QString caption = KJSEmbed::extractVariant<QString>(exec, args, 1, QString());
QString dir = KJSEmbed::extractVariant<QString>(exec, args, 2, QString());
QString filter = KJSEmbed::extractVariant<QString>(exec, args, 3, QString());
// QString *selectedFilter = KJSEmbed::extractVariant<QString>(exec, args, 4, 0);
QFileDialog::Options options = (QFileDialog::Options)KJSEmbed::extractVariant<uint>(exec, args, 4, 0);
- QStringList fileNames = QFileDialog::getOpenFileNames(parent, caption, dir, filter, 0, options);
+ QStringList fileNames = QFileDialog::getOpenFileNames(parent, caption, dir, filter, nullptr, options);
return convertToValue(exec, fileNames);
}
KJS::JSValue *callGetSaveFileName(KJS::ExecState *exec, KJS::JSObject * /*self*/, const KJS::List &args)
{
- QWidget *parent = KJSEmbed::extractObject<QWidget>(exec, args, 0, 0);
+ QWidget *parent = KJSEmbed::extractObject<QWidget>(exec, args, 0, nullptr);
QString caption = KJSEmbed::extractVariant<QString>(exec, args, 1, QString());
QString dir = KJSEmbed::extractVariant<QString>(exec, args, 2, QString());
QString filter = KJSEmbed::extractVariant<QString>(exec, args, 3, QString());
// QString *selectedFilter = KJSEmbed::extractVariant<QString>(exec, args, 4, 0);
QFileDialog::Options options = (QFileDialog::Options)KJSEmbed::extractVariant<uint>(exec, args, 4, 0);
- return KJS::jsString(QFileDialog::getSaveFileName(parent, caption, dir, filter, 0, options));
+ return KJS::jsString(QFileDialog::getSaveFileName(parent, caption, dir, filter, nullptr, options));
}
const Method FileDialog::FileDialogMethods[] = {
{"getExistingDirectory", 1, KJS::DontDelete | KJS::ReadOnly, &callGetExistingDirectory },
{"getOpenFileName", 1, KJS::DontDelete | KJS::ReadOnly, &callGetOpenFileName },
{"getOpenFileNames", 1, KJS::DontDelete | KJS::ReadOnly, &callGetOpenFileNames },
{"getSaveFileName", 0, KJS::DontDelete | KJS::ReadOnly, &callGetSaveFileName },
- {0, 0, 0, 0 }
+ {nullptr, 0, 0, nullptr }
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.30.0/src/kjsembed/font.cpp new/kjsembed-5.31.0/src/kjsembed/font.cpp
--- old/kjsembed-5.30.0/src/kjsembed/font.cpp 2017-01-08 21:56:54.000000000 +0100
+++ new/kjsembed-5.31.0/src/kjsembed/font.cpp 2017-02-05 12:04:51.000000000 +0100
@@ -26,7 +26,7 @@
#include
using namespace KJSEmbed;
-const KJS::ClassInfo FontBinding::info = { "QFont", &VariantBinding::info, 0, 0 };
+const KJS::ClassInfo FontBinding::info = { "QFont", &VariantBinding::info, nullptr, nullptr };
FontBinding::FontBinding(KJS::ExecState *exec, const QFont &value)
: VariantBinding(exec, value)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.30.0/src/kjsembed/image.cpp new/kjsembed-5.31.0/src/kjsembed/image.cpp
--- old/kjsembed-5.30.0/src/kjsembed/image.cpp 2017-01-08 21:56:54.000000000 +0100
+++ new/kjsembed-5.31.0/src/kjsembed/image.cpp 2017-02-05 12:04:51.000000000 +0100
@@ -30,7 +30,7 @@
using namespace KJSEmbed;
-const KJS::ClassInfo ImageBinding::info = { "QImage", &VariantBinding::info, 0, 0 };
+const KJS::ClassInfo ImageBinding::info = { "QImage", &VariantBinding::info, nullptr, nullptr };
ImageBinding::ImageBinding(KJS::ExecState *exec, const QImage &value)
: VariantBinding(exec, value)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.30.0/src/kjsembed/iosupport.cpp new/kjsembed-5.31.0/src/kjsembed/iosupport.cpp
--- old/kjsembed-5.30.0/src/kjsembed/iosupport.cpp 2017-01-08 21:56:54.000000000 +0100
+++ new/kjsembed-5.31.0/src/kjsembed/iosupport.cpp 2017-02-05 12:04:51.000000000 +0100
@@ -81,6 +81,6 @@
{"println", 1, KJS::DontDelete | KJS::ReadOnly, &callPrintLn },
{"readln", 0, KJS::DontDelete | KJS::ReadOnly, &callReadLine },
{"system", 1, KJS::DontDelete | KJS::ReadOnly, &callSystem },
- {0, 0, 0, 0 }
+ {nullptr, 0, 0, nullptr }
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.30.0/src/kjsembed/jseventmapper.cpp new/kjsembed-5.31.0/src/kjsembed/jseventmapper.cpp
--- old/kjsembed-5.30.0/src/kjsembed/jseventmapper.cpp 2017-01-08 21:56:54.000000000 +0100
+++ new/kjsembed-5.31.0/src/kjsembed/jseventmapper.cpp 2017-02-05 12:04:51.000000000 +0100
@@ -26,7 +26,7 @@
namespace KJSEmbed
{
-JSEventMapper *JSEventMapper::m_inst = 0;
+JSEventMapper *JSEventMapper::m_inst = nullptr;
/** Used internally for the event handler table. */
struct EventType {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.30.0/src/kjsembed/kjseglobal.cpp new/kjsembed-5.31.0/src/kjsembed/kjseglobal.cpp
--- old/kjsembed-5.30.0/src/kjsembed/kjseglobal.cpp 2017-01-08 21:56:54.000000000 +0100
+++ new/kjsembed-5.31.0/src/kjsembed/kjseglobal.cpp 2017-02-05 12:04:51.000000000 +0100
@@ -36,9 +36,9 @@
# include <QTextStream>
#endif
-static QTextStream *kjsembed_err = 0L;
-static QTextStream *kjsembed_in = 0L;
-static QTextStream *kjsembed_out = 0L;
+static QTextStream *kjsembed_err = nullptr;
+static QTextStream *kjsembed_in = nullptr;
+static QTextStream *kjsembed_out = nullptr;
#if defined(_WIN32) || defined(_WIN64)
static QFile win32_stdin;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.30.0/src/kjsembed/kjsembed.cpp new/kjsembed-5.31.0/src/kjsembed/kjsembed.cpp
--- old/kjsembed-5.30.0/src/kjsembed/kjsembed.cpp 2017-01-08 21:56:54.000000000 +0100
+++ new/kjsembed-5.31.0/src/kjsembed/kjsembed.cpp 2017-02-05 12:04:51.000000000 +0100
@@ -227,7 +227,7 @@
// qDebug() << "Loaded code: " << toQString(code);
- return interpreter->evaluate(fileName, 0, code, 0);
+ return interpreter->evaluate(fileName, 0, code, nullptr);
}
Engine::ExitStatus Engine::runFile(const KJS::UString &fileName)
@@ -245,7 +245,7 @@
Engine::ExitStatus Engine::execute(const KJS::UString &code)
{
- dptr->m_currentResult = dptr->m_interpreter->evaluate(KJS::UString(""), 0, code, 0);
+ dptr->m_currentResult = dptr->m_interpreter->evaluate(KJS::UString(""), 0, code, nullptr);
if (dptr->m_currentResult.complType() == KJS::Normal) {
return Engine::Success;
} else if (dptr->m_currentResult.complType() == KJS::ReturnValue) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.30.0/src/kjsembed/object_binding.cpp new/kjsembed-5.31.0/src/kjsembed/object_binding.cpp
--- old/kjsembed-5.30.0/src/kjsembed/object_binding.cpp 2017-01-08 21:56:54.000000000 +0100
+++ new/kjsembed-5.31.0/src/kjsembed/object_binding.cpp 2017-02-05 12:04:51.000000000 +0100
@@ -30,7 +30,7 @@
using namespace KJSEmbed;
-const KJS::ClassInfo ObjectBinding::info = { "ObjectBinding", 0, 0, 0 };
+const KJS::ClassInfo ObjectBinding::info = { "ObjectBinding", nullptr, nullptr, nullptr };
ObjectBinding::~ObjectBinding()
{
@@ -103,6 +103,6 @@
{"type", 0, KJS::DontDelete | KJS::ReadOnly, &callPointerName },
{"cast", 1, KJS::DontDelete | KJS::ReadOnly, &callPointerCast },
{"toString", 0, KJS::DontDelete | KJS::ReadOnly, &callPointerToString },
- {0, 0, 0, 0 }
+ {nullptr, 0, 0, nullptr }
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.30.0/src/kjsembed/object_binding.h new/kjsembed-5.31.0/src/kjsembed/object_binding.h
--- old/kjsembed-5.30.0/src/kjsembed/object_binding.h 2017-01-08 21:56:54.000000000 +0100
+++ new/kjsembed-5.31.0/src/kjsembed/object_binding.h 2017-02-05 12:04:51.000000000 +0100
@@ -121,7 +121,7 @@
if (m_value) {
return pointer_cast<T>(m_value);
} else {
- return 0;
+ return nullptr;
}
}
@@ -160,7 +160,7 @@
if (!arg) {
return defaultValue;
} else {
- T *returnValue = 0;
+ T *returnValue = nullptr;
KJSEmbed::ObjectBinding *imp = KJSEmbed::extractBindingImpKJSEmbed::ObjectBinding(exec, arg);
if (imp) {
// GCC 3.3 has problems calling template functions in another class from a template class.
@@ -181,7 +181,7 @@
* is returned.
*/
template< typename T>
-T *extractObject(KJS::ExecState *exec, const KJS::List &args, int idx, T *defaultValue = 0L)
+T *extractObject(KJS::ExecState *exec, const KJS::List &args, int idx, T *defaultValue = nullptr)
{
if (args.size() > idx) {
return extractObject<T>(exec, args[idx], defaultValue);
@@ -197,7 +197,7 @@
template< typename T>
KJS::JSValue *createObject(KJS::ExecState *exec, const KJS::UString &className, const T *value, KJSEmbed::ObjectBinding::Ownership owner = KJSEmbed::ObjectBinding::JSOwned)
{
- if (0 == value) {
+ if (nullptr == value) {
return KJS::jsNull();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.30.0/src/kjsembed/pen.cpp new/kjsembed-5.31.0/src/kjsembed/pen.cpp
--- old/kjsembed-5.30.0/src/kjsembed/pen.cpp 2017-01-08 21:56:54.000000000 +0100
+++ new/kjsembed-5.31.0/src/kjsembed/pen.cpp 2017-02-05 12:04:51.000000000 +0100
@@ -28,7 +28,7 @@
using namespace KJSEmbed;
-const KJS::ClassInfo PenBinding::info = { "QPen", &VariantBinding::info, 0, 0 };
+const KJS::ClassInfo PenBinding::info = { "QPen", &VariantBinding::info, nullptr, nullptr };
PenBinding::PenBinding(KJS::ExecState *exec, const QPen &value)
: VariantBinding(exec, value)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.30.0/src/kjsembed/pixmap.cpp new/kjsembed-5.31.0/src/kjsembed/pixmap.cpp
--- old/kjsembed-5.30.0/src/kjsembed/pixmap.cpp 2017-01-08 21:56:54.000000000 +0100
+++ new/kjsembed-5.31.0/src/kjsembed/pixmap.cpp 2017-02-05 12:04:51.000000000 +0100
@@ -31,7 +31,7 @@
using namespace KJSEmbed;
-const KJS::ClassInfo PixmapBinding::info = { "QPixmap", &VariantBinding::info, 0, 0 };
+const KJS::ClassInfo PixmapBinding::info = { "QPixmap", &VariantBinding::info, nullptr, nullptr };
PixmapBinding::PixmapBinding(KJS::ExecState *exec, const QPixmap &value)
: VariantBinding(exec, value)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.30.0/src/kjsembed/point.cpp new/kjsembed-5.31.0/src/kjsembed/point.cpp
--- old/kjsembed-5.30.0/src/kjsembed/point.cpp 2017-01-08 21:56:54.000000000 +0100
+++ new/kjsembed-5.31.0/src/kjsembed/point.cpp 2017-02-05 12:04:51.000000000 +0100
@@ -26,7 +26,7 @@
using namespace KJSEmbed;
-const KJS::ClassInfo PointBinding::info = { "QPoint", &VariantBinding::info, 0, 0 };
+const KJS::ClassInfo PointBinding::info = { "QPoint", &VariantBinding::info, nullptr, nullptr };
PointBinding::PointBinding(KJS::ExecState *exec, const QPoint &value)
: VariantBinding(exec, value)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.30.0/src/kjsembed/pointer.h new/kjsembed-5.31.0/src/kjsembed/pointer.h
--- old/kjsembed-5.30.0/src/kjsembed/pointer.h 2017-01-08 21:56:54.000000000 +0100
+++ new/kjsembed-5.31.0/src/kjsembed/pointer.h 2017-02-05 12:04:51.000000000 +0100
@@ -56,7 +56,7 @@
{
// qDebug("delete pointer %s %0x", typeid(ValueType).name(), ptr );
delete ptr;
- ptr = 0L;
+ ptr = nullptr;
}
const std::type_info &type() const Q_DECL_OVERRIDE
{
@@ -102,7 +102,7 @@
};
struct NullPtr : public PointerBase {
- NullPtr() : ptr(0)
+ NullPtr() : ptr(nullptr)
{
;
}
@@ -134,7 +134,7 @@
{
// qDebug("pointers %s %s", typeid(ValueType).name(), pointer->type().name() );
if (typeid(ValueType) != pointer->type()) {
- return 0L;
+ return nullptr;
}
Pointer<ValueType> *upcast = static_cast< Pointer<ValueType> *>(pointer);
return upcast->ptr;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.30.0/src/kjsembed/qaction_binding.cpp new/kjsembed-5.31.0/src/kjsembed/qaction_binding.cpp
--- old/kjsembed-5.30.0/src/kjsembed/qaction_binding.cpp 2017-01-08 21:56:54.000000000 +0100
+++ new/kjsembed-5.31.0/src/kjsembed/qaction_binding.cpp 2017-02-05 12:04:51.000000000 +0100
@@ -44,7 +44,7 @@
KJSO_QOBJECT_BIND(Action, QAction)
KJSO_START_CTOR(Action, QAction, 0)
-QObject *parent = KJSEmbed::extractObject<QObject>(exec, args, 0, 0);
+QObject *parent = KJSEmbed::extractObject<QObject>(exec, args, 0, nullptr);
QString actionName = KJSEmbed::extractQString(exec, args, 1);
QAction *action = uiLoader()->createAction(parent, actionName);
@@ -68,7 +68,7 @@
KJSO_START_CTOR(ActionGroup, QActionGroup, 0)
if (args.size() == 2)
{
- QObject *parent = KJSEmbed::extractObject<QObject>(exec, args, 0, 0);
+ QObject *parent = KJSEmbed::extractObject<QObject>(exec, args, 0, nullptr);
QString actionName = KJSEmbed::extractQString(exec, args, 1);
QActionGroup *action = uiLoader()->createActionGroup(parent, actionName);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.30.0/src/kjsembed/qlayout_binding.cpp new/kjsembed-5.31.0/src/kjsembed/qlayout_binding.cpp
--- old/kjsembed-5.30.0/src/kjsembed/qlayout_binding.cpp 2017-01-08 21:56:54.000000000 +0100
+++ new/kjsembed-5.31.0/src/kjsembed/qlayout_binding.cpp 2017-02-05 12:04:51.000000000 +0100
@@ -41,11 +41,11 @@
namespace LayoutNS
{
START_QOBJECT_METHOD(addWidget, QLayout)
-QWidget *w = KJSEmbed::extractObject<QWidget>(exec, args, 0, 0);
+QWidget *w = KJSEmbed::extractObject<QWidget>(exec, args, 0, nullptr);
object->addWidget(w);
END_QOBJECT_METHOD
START_QOBJECT_METHOD(removeWidget, QLayout)
-QWidget *w = KJSEmbed::extractObject<QWidget>(exec, args, 0, 0);
+QWidget *w = KJSEmbed::extractObject<QWidget>(exec, args, 0, nullptr);
object->removeWidget(w);
END_QOBJECT_METHOD
START_QOBJECT_METHOD(parentWidget, QLayout)
@@ -73,7 +73,7 @@
if (args.size() > 0)
{
QString layoutName = toQString(args[0]->toString(exec));
- QObject *parentObject = 0;
+ QObject *parentObject = nullptr;
KJSEmbed::QObjectBinding *parentImp = KJSEmbed::extractBindingImpKJSEmbed::QObjectBinding(exec, args[1]);
if (parentImp) {
parentObject = parentImp->object<QObject>();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.30.0/src/kjsembed/qobject_binding.cpp new/kjsembed-5.31.0/src/kjsembed/qobject_binding.cpp
--- old/kjsembed-5.30.0/src/kjsembed/qobject_binding.cpp 2017-01-08 21:56:54.000000000 +0100
+++ new/kjsembed-5.31.0/src/kjsembed/qobject_binding.cpp 2017-02-05 12:04:51.000000000 +0100
@@ -148,11 +148,11 @@
return KJS::throwError(exec, KJS::GeneralError, i18n("First argument must be a QObject."));
//return KJSEmbed::throwError(exec, i18n("First argument must be a QObject"));
}
- QObject *receiver = 0;
+ QObject *receiver = nullptr;
QObject *sender = senderImp->object<QObject>();
QByteArray signal = createSignal(args[1]->toString(exec).ascii());
QByteArray slot;
- KJSEmbed::QObjectBinding *receiverImp = 0;
+ KJSEmbed::QObjectBinding *receiverImp = nullptr;
if (args.size() >= 4) {
slot = createSlot(args[3]->toString(exec).ascii());
receiverImp = KJSEmbed::extractBindingImpKJSEmbed::QObjectBinding(exec, args[2]);
@@ -239,10 +239,10 @@
QObjectBinding::QObjectBinding(KJS::ExecState *exec, QObject *object)
: ObjectBinding(exec, object->metaObject()->className(), object)
- , m_evproxy(0)
+ , m_evproxy(nullptr)
, m_access(AllSlots | AllSignals | AllProperties | AllObjects)
{
- if (object->parent() != 0) {
+ if (object->parent() != nullptr) {
setOwnership(ObjectBinding::QObjOwned);
} else {
setOwnership(ObjectBinding::JSOwned);
@@ -262,7 +262,7 @@
{
if (m_cleanupHandler->isEmpty()) {
setOwnership(ObjectBinding::QObjOwned);
- } else if (object<QObject>()->parent() != 0) {
+ } else if (object<QObject>()->parent() != nullptr) {
setOwnership(ObjectBinding::QObjOwned);
m_cleanupHandler->remove(object<QObject>());
} else if (ownership() != ObjectBinding::JSOwned) {
@@ -308,7 +308,7 @@
return convertToValue(exec, val);
}
qDebug() << QString("propertyGetter called but no property, name was '%1'").arg(propertyName.ascii());
- return 0; // ERROR
+ return nullptr; // ERROR
}
QObjectBinding::AccessFlags QObjectBinding::access() const
@@ -411,7 +411,7 @@
const QString secondPart = i18np("but there is only %1 available", "but there are only %1 available", types.size());
errorText = i18nc("%1 is 'the slot asked for foo arguments', %2 is 'but there are only bar available'", "%1, %2.");
- return 0;
+ return nullptr;
}
QVariant::Type varianttype = QVariant::nameToType(types[idx].constData());
@@ -629,13 +629,13 @@
errorText = i18n("Failure to cast to %1 value from Type %2 (%3)",
types[idx].constData(), jsType, toQString(args[idx]->toString(exec)));
- return 0;
+ return nullptr;
}
KJS::JSValue *SlotBinding::callAsFunction(KJS::ExecState *exec, KJS::JSObject *self, const KJS::List &args)
{
QObjectBinding *imp = extractBindingImp<QObjectBinding>(exec, self);
- if (imp == 0) {
+ if (imp == nullptr) {
return KJS::jsNull();
}
@@ -666,7 +666,7 @@
QVariant::Type returnTypeId = QVariant::nameToType(metaMember.typeName());
int tp = QMetaType::type(metaMember.typeName());
- PointerBase *qtRet = new Value(0);
+ PointerBase *qtRet = new Value(nullptr);
bool returnIsMetaType = (
returnTypeId == QVariant::UserType ||
@@ -675,7 +675,7 @@
returnTypeId == QVariant::Rect || returnTypeId == QVariant::RectF ||
returnTypeId == QVariant::Color
);
- QVariant returnValue = returnIsMetaType ? QVariant(tp, (void *)0) : QVariant(returnTypeId);
+ QVariant returnValue = returnIsMetaType ? QVariant(tp, (void *)nullptr) : QVariant(returnTypeId);
QGenericReturnArgument returnArgument(metaMember.typeName(), &returnValue);
param[0] = returnIsMetaType ? qtRet->voidStar() : returnArgument.data();
@@ -694,7 +694,7 @@
success = object->qt_metacall(QMetaObject::InvokeMetaMethod, offset, param) < 0;
- KJS::JSValue *jsReturnValue = 0;
+ KJS::JSValue *jsReturnValue = nullptr;
if (success) {
switch (returnTypeId) {
case QVariant::Invalid: // fall through
@@ -741,7 +741,7 @@
KJS::JSObject *KJSEmbed::createQObject(KJS::ExecState *exec, QObject *value, KJSEmbed::ObjectBinding::Ownership owner)
{
- if (0 == value) {
+ if (nullptr == value) {
return new KJS::JSObject();
}
@@ -834,7 +834,7 @@
START_QOBJECT_METHOD(callSetParent, QObject)
if (imp->access() & QObjectBinding::SetParentObject)
{
- QObject *parent = KJSEmbed::extractObject<QObject>(exec, args, 0, 0);
+ QObject *parent = KJSEmbed::extractObject<QObject>(exec, args, 0, nullptr);
object->setParent(parent);
}
END_QOBJECT_METHOD
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.30.0/src/kjsembed/qobject_binding.h new/kjsembed-5.31.0/src/kjsembed/qobject_binding.h
--- old/kjsembed-5.30.0/src/kjsembed/qobject_binding.h 2017-01-08 21:56:54.000000000 +0100
+++ new/kjsembed-5.31.0/src/kjsembed/qobject_binding.h 2017-02-05 12:04:51.000000000 +0100
@@ -181,7 +181,7 @@
if (object) {
return qobject_cast(object);
} else {
- return 0;
+ return nullptr;
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.30.0/src/kjsembed/qpainter_binding.cpp new/kjsembed-5.31.0/src/kjsembed/qpainter_binding.cpp
--- old/kjsembed-5.30.0/src/kjsembed/qpainter_binding.cpp 2017-01-08 21:56:54.000000000 +0100
+++ new/kjsembed-5.31.0/src/kjsembed/qpainter_binding.cpp 2017-02-05 12:04:51.000000000 +0100
@@ -43,7 +43,7 @@
QPaintDevice *extractPaintDevice(KJS::ExecState *exec, KJS::JSValue *arg)
{
- QPaintDevice *device = 0;
+ QPaintDevice *device = nullptr;
ObjectBinding *imp = extractBindingImp<ObjectBinding>(exec, arg);
if (imp) {
@@ -346,7 +346,7 @@
QRect arg0 = KJSEmbed::extractVariant<QRect>(exec, args, 0);
int arg1 = KJSEmbed::extractInt(exec, args, 1);
QString arg2 = KJSEmbed::extractQString(exec, args, 2);
- QRect *arg3 = 0;
+ QRect *arg3 = nullptr;
object->drawText(arg0, arg1, arg2, arg3);
} else if (args.size() == 6)
{
@@ -356,7 +356,7 @@
int arg3 = KJSEmbed::extractInt(exec, args, 3);
int arg4 = KJSEmbed::extractInt(exec, args, 4);
QString arg5 = KJSEmbed::extractQString(exec, args, 5);
- QRect *arg6 = 0;
+ QRect *arg6 = nullptr;
object->drawText(arg0, arg1, arg2, arg3, arg4, arg5, arg6);
}
END_OBJECT_METHOD
@@ -479,7 +479,7 @@
object = new KJSEmbed::ObjectBinding(exec, "Painter", new QPainter(device));
} else {
KJS::throwError(exec, KJS::EvalError, QString("Cannot paint to object %1").arg(toQString(args[0]->toString(exec))));
- return 0L;
+ return nullptr;
}
} else
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.30.0/src/kjsembed/quiloader_binding.cpp new/kjsembed-5.31.0/src/kjsembed/quiloader_binding.cpp
--- old/kjsembed-5.30.0/src/kjsembed/quiloader_binding.cpp 2017-01-08 21:56:54.000000000 +0100
+++ new/kjsembed-5.31.0/src/kjsembed/quiloader_binding.cpp 2017-02-05 12:04:51.000000000 +0100
@@ -39,11 +39,11 @@
KJSO_START_CTOR(UiLoaderBinding, QUiLoader, 1)
{
- QUiLoader *uiLoader = 0;
+ QUiLoader *uiLoader = nullptr;
if (args.size() == 0) {
uiLoader = new QUiLoader();
} else if (args.size() == 1) {
- QObject *arg0 = KJSEmbed::extractObject<QObject>(exec, args, 0, 0);
+ QObject *arg0 = KJSEmbed::extractObject<QObject>(exec, args, 0, nullptr);
uiLoader = new QUiLoader(arg0);
} else {
return KJS::throwError(exec, KJS::GeneralError, i18n("Not enough arguments."));
@@ -59,7 +59,7 @@
{
START_QOBJECT_METHOD(createAction, QUiLoader)
{
- QObject *parent = KJSEmbed::extractObject<QObject>(exec, args, 0, 0);
+ QObject *parent = KJSEmbed::extractObject<QObject>(exec, args, 0, nullptr);
QString actionName = KJSEmbed::extractQString(exec, args, 1);
QAction *action = object->createAction(parent, actionName);
if (action) {
@@ -71,7 +71,7 @@
END_QOBJECT_METHOD
START_QOBJECT_METHOD(createActionGroup, QUiLoader)
-QObject *parent = KJSEmbed::extractObject<QObject>(exec, args, 0, 0);
+QObject *parent = KJSEmbed::extractObject<QObject>(exec, args, 0, nullptr);
QString actionName = KJSEmbed::extractQString(exec, args, 1);
QActionGroup *actionGroup = object->createActionGroup(parent, actionName);
if (actionGroup)
@@ -89,7 +89,7 @@
if (className.isEmpty()) {
return KJS::throwError(exec, KJS::SyntaxError, i18n("No classname specified"));
}
- QObject *parent = KJSEmbed::extractObject<QObject>(exec, args, 1, 0);
+ QObject *parent = KJSEmbed::extractObject<QObject>(exec, args, 1, nullptr);
QString name = KJSEmbed::extractQString(exec, args, 2);
QLayout *layout = object->createLayout(className, parent, name);
if (layout) {
@@ -106,7 +106,7 @@
if (className.isEmpty()) {
return KJS::throwError(exec, KJS::SyntaxError, i18n("No classname specified."));
}
- QWidget *parent = KJSEmbed::extractObject<QWidget>(exec, args, 1, 0);
+ QWidget *parent = KJSEmbed::extractObject<QWidget>(exec, args, 1, nullptr);
QString name = KJSEmbed::extractQString(exec, args, 2);
QWidget *widget = object->createWidget(className, parent, name);
if (widget) {
@@ -129,7 +129,7 @@
return KJS::throwError(exec, KJS::GeneralError, i18n("Could not open file '%1': %2", fileName, uiFile.errorString()));
}
- QWidget *parent = KJSEmbed::extractObject<QWidget>(exec, args, 1, 0);
+ QWidget *parent = KJSEmbed::extractObject<QWidget>(exec, args, 1, nullptr);
QWidget *widget = object->load(&uiFile, parent);
uiFile.close();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.30.0/src/kjsembed/qwidget_binding.cpp new/kjsembed-5.31.0/src/kjsembed/qwidget_binding.cpp
--- old/kjsembed-5.30.0/src/kjsembed/qwidget_binding.cpp 2017-01-08 21:56:54.000000000 +0100
+++ new/kjsembed-5.31.0/src/kjsembed/qwidget_binding.cpp 2017-02-05 12:04:51.000000000 +0100
@@ -36,11 +36,11 @@
namespace KJSEmbed
{
-static QUiLoader *gUiLoader = 0L;
+static QUiLoader *gUiLoader = nullptr;
QUiLoader *uiLoader()
{
- if (gUiLoader == 0) {
+ if (gUiLoader == nullptr) {
gUiLoader = new QUiLoader();
}
return gUiLoader;
@@ -70,7 +70,7 @@
START_QOBJECT_METHOD(childAt, QWidget)
QPoint pt = KJSEmbed::extractVariant<QPoint>(exec, args, 0);
int x, y;
-QWidget *child = 0;
+QWidget *child = nullptr;
if (pt.isNull())
{
x = KJSEmbed::extractVariant<int>(exec, args, 0);
@@ -91,7 +91,7 @@
result = KJS::jsNumber(object->heightForWidth(width));
END_QOBJECT_METHOD
START_QOBJECT_METHOD(mapFrom, QWidget)
-QWidget *w = KJSEmbed::extractObject<QWidget>(exec, args, 0, 0);
+QWidget *w = KJSEmbed::extractObject<QWidget>(exec, args, 0, nullptr);
QPoint pt = KJSEmbed::extractVariant<QPoint>(exec, args, 1);
result = KJSEmbed::createVariant(exec, "QPoint", object->mapFrom(w, pt));
END_QOBJECT_METHOD
@@ -104,7 +104,7 @@
result = KJSEmbed::createVariant(exec, "QPoint", object->mapFromParent(pt));
END_QOBJECT_METHOD
START_QOBJECT_METHOD(mapTo, QWidget)
-QWidget *w = KJSEmbed::extractObject<QWidget>(exec, args, 0, 0);
+QWidget *w = KJSEmbed::extractObject<QWidget>(exec, args, 0, nullptr);
QPoint pt = KJSEmbed::extractVariant<QPoint>(exec, args, 1);
result = KJSEmbed::createVariant(exec, "QPoint", object->mapTo(w, pt));
END_QOBJECT_METHOD
@@ -147,7 +147,7 @@
if (args.size() > 0)
{
QString widgetName = toQString(args[0]->toString(exec));
- QWidget *parentWidget = 0;
+ QWidget *parentWidget = nullptr;
KJSEmbed::QObjectBinding *parentImp = KJSEmbed::extractBindingImpKJSEmbed::QObjectBinding(exec, args[1]);
if (parentImp) {
parentWidget = parentImp->object<QWidget>();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.30.0/src/kjsembed/settings.cpp new/kjsembed-5.31.0/src/kjsembed/settings.cpp
--- old/kjsembed-5.30.0/src/kjsembed/settings.cpp 2017-01-08 21:56:54.000000000 +0100
+++ new/kjsembed-5.31.0/src/kjsembed/settings.cpp 2017-02-05 12:04:51.000000000 +0100
@@ -94,7 +94,7 @@
KJSO_QOBJECT_BIND(SettingsBinding, QSettings)
KJSO_START_CTOR(SettingsBinding, QSettings, 1)
-QSettings *settings = 0;
+QSettings *settings = nullptr;
if (args.size() == 1)
{
QObject *parent = KJSEmbed::extractObject<QObject>(exec, args, 0);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.30.0/src/kjsembed/size.cpp new/kjsembed-5.31.0/src/kjsembed/size.cpp
--- old/kjsembed-5.30.0/src/kjsembed/size.cpp 2017-01-08 21:56:54.000000000 +0100
+++ new/kjsembed-5.31.0/src/kjsembed/size.cpp 2017-02-05 12:04:51.000000000 +0100
@@ -26,7 +26,7 @@
using namespace KJSEmbed;
-const KJS::ClassInfo SizeBinding::info = { "QSize", &VariantBinding::info, 0, 0 };
+const KJS::ClassInfo SizeBinding::info = { "QSize", &VariantBinding::info, nullptr, nullptr };
SizeBinding::SizeBinding(KJS::ExecState *exec, const QSize &value)
: VariantBinding(exec, value)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.30.0/src/kjsembed/slotproxy.cpp new/kjsembed-5.31.0/src/kjsembed/slotproxy.cpp
--- old/kjsembed-5.30.0/src/kjsembed/slotproxy.cpp 2017-01-08 21:56:54.000000000 +0100
+++ new/kjsembed-5.31.0/src/kjsembed/slotproxy.cpp 2017-02-05 12:04:51.000000000 +0100
@@ -67,7 +67,7 @@
staticMetaObject.d.superdata = &QObject::staticMetaObject;
staticMetaObject.d.stringdata = m_stringData.data_ptr();
staticMetaObject.d.data = m_data;
- staticMetaObject.d.extradata = 0;
+ staticMetaObject.d.extradata = nullptr;
#ifdef DEBUG_SLOTPROXY
qDebug() << "SlotProxy() obj=" << this << " m_signature=" << m_signature;
#endif
@@ -88,7 +88,7 @@
void *SlotProxy::qt_metacast(const char *_clname)
{
if (!_clname) {
- return 0;
+ return nullptr;
}
if (!strcmp(_clname, m_stringData.constData())) {
return static_cast(const_cast(this));
@@ -205,7 +205,7 @@
if (parent->hasProperty(exec, KJS::Identifier(toUString(typeName)))) {
QObject *qObj;
if (isPtr &&
- ((qObj = *reinterpret_cast(_a[idx])) != 0)) {
+ ((qObj = *reinterpret_cast(_a[idx])) != nullptr)) {
#ifdef DEBUG_SLOTPROXY
qDebug() << "qObj=" << qObj;
#endif
@@ -226,7 +226,7 @@
#endif
objImp->setOwnership(KJSEmbed::ObjectBinding::JSOwned);
objImp->setObject(qObj);
- if (qObj->parent() != 0) {
+ if (qObj->parent() != nullptr) {
objImp->setOwnership(KJSEmbed::ObjectBinding::QObjOwned);
} else {
objImp->setOwnership(KJSEmbed::ObjectBinding::CPPOwned);
@@ -241,7 +241,7 @@
#ifdef DEBUG_SLOTPROXY
qDebug("\t\tNo binding registered");
#endif
- KJS::JSObject *returnValue = 0;
+ KJS::JSObject *returnValue = nullptr;
const int metaTypeId = QMetaType::type(param.constData());
if (QMetaType::typeFlags(metaTypeId) & QMetaType::PointerToQObject) {
QObject *obj = (*reinterpret_cast< QObject*(*)>(_a[idx]));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.30.0/src/kjsembed/static_binding.cpp new/kjsembed-5.31.0/src/kjsembed/static_binding.cpp
--- old/kjsembed-5.30.0/src/kjsembed/static_binding.cpp 2017-01-08 21:56:54.000000000 +0100
+++ new/kjsembed-5.31.0/src/kjsembed/static_binding.cpp 2017-02-05 12:04:51.000000000 +0100
@@ -41,7 +41,7 @@
KJS::JSValue *StaticBinding::callAsFunction(KJS::ExecState *exec, KJS::JSObject *self, const KJS::List &args)
{
- if (m_method->call == 0) {
+ if (m_method->call == nullptr) {
//throwError(exec, "Bad method id"); // NOTE: fix
KJS::throwError(exec, KJS::GeneralError, "Bad method id");
return KJS::jsNull();
@@ -59,7 +59,7 @@
void StaticBinding::publish(KJS::ExecState *exec, KJS::JSObject *object, const Method *methods)
{
int idx = 0;
- while (methods[idx].name != 0) {
+ while (methods[idx].name != nullptr) {
object->put(exec, methods[idx].name, new StaticBinding(exec, &methods[idx]), methods[idx].flags);
idx++;
}
@@ -101,7 +101,7 @@
/* crashes for some reason */
if (constructor->enumerators) {
int idx = 0;
- while (constructor->enumerators[idx].name != 0) {
+ while (constructor->enumerators[idx].name != nullptr) {
obj->put(exec, constructor->enumerators[idx].name,
KJS::jsNumber(constructor->enumerators[idx].value), KJS::DontDelete | KJS::ReadOnly);
idx++;
@@ -130,7 +130,7 @@
return (*mybind)(exec, objPtr);
}
- return 0;
+ return nullptr;
}
KJS::JSObject *StaticConstructor::construct(KJS::ExecState *exec, KJS::JSObject *parent, const KJS::UString &className, const KJS::List &args)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.30.0/src/kjsembed/svg_binding.cpp new/kjsembed-5.31.0/src/kjsembed/svg_binding.cpp
--- old/kjsembed-5.30.0/src/kjsembed/svg_binding.cpp 2017-01-08 21:56:54.000000000 +0100
+++ new/kjsembed-5.31.0/src/kjsembed/svg_binding.cpp 2017-02-05 12:04:51.000000000 +0100
@@ -65,15 +65,15 @@
KJSO_QOBJECT_BIND(SvgRenderer, QSvgRenderer)
KJSO_START_CTOR(SvgRenderer, QSvgRenderer, 0)
-QSvgRenderer *renderer = 0;
+QSvgRenderer *renderer = nullptr;
if (args.size() == 1)
{
- QObject *arg0 = KJSEmbed::extractObject<QObject>(exec, args, 0, 0);
+ QObject *arg0 = KJSEmbed::extractObject<QObject>(exec, args, 0, nullptr);
renderer = new QSvgRenderer(arg0);
} else if (args.size() == 2)
{
QString arg0 = KJSEmbed::extractVariant<QString>(exec, args, 0);
- QObject *arg1 = KJSEmbed::extractObject<QObject>(exec, args, 1, 0);
+ QObject *arg1 = KJSEmbed::extractObject<QObject>(exec, args, 1, nullptr);
renderer = new QSvgRenderer(arg0, arg1);
} else
{
@@ -103,15 +103,15 @@
KJSO_QOBJECT_BIND(SvgWidget, QSvgWidget)
KJSO_START_CTOR(SvgWidget, QSvgWidget, 0)
-QSvgWidget *widget = 0;
+QSvgWidget *widget = nullptr;
if (args.size() == 1)
{
- QWidget *arg0 = KJSEmbed::extractObject<QWidget>(exec, args, 0, 0);
+ QWidget *arg0 = KJSEmbed::extractObject<QWidget>(exec, args, 0, nullptr);
widget = new QSvgWidget(arg0);
} else if (args.size() == 2)
{
QString arg0 = KJSEmbed::extractVariant<QString>(exec, args, 0);
- QWidget *arg1 = KJSEmbed::extractObject<QWidget>(exec, args, 1, 0);
+ QWidget *arg1 = KJSEmbed::extractObject<QWidget>(exec, args, 1, nullptr);
widget = new QSvgWidget(arg0, arg1);
} else
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.30.0/src/kjsembed/url.cpp new/kjsembed-5.31.0/src/kjsembed/url.cpp
--- old/kjsembed-5.30.0/src/kjsembed/url.cpp 2017-01-08 21:56:54.000000000 +0100
+++ new/kjsembed-5.31.0/src/kjsembed/url.cpp 2017-02-05 12:04:51.000000000 +0100
@@ -26,7 +26,7 @@
using namespace KJSEmbed;
-const KJS::ClassInfo UrlBinding::info = { "QUrl", &VariantBinding::info, 0, 0 };
+const KJS::ClassInfo UrlBinding::info = { "QUrl", &VariantBinding::info, nullptr, nullptr };
UrlBinding::UrlBinding(KJS::ExecState *exec, const QUrl &value)
: VariantBinding(exec, value)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.30.0/src/kjsembed/value_binding.cpp new/kjsembed-5.31.0/src/kjsembed/value_binding.cpp
--- old/kjsembed-5.30.0/src/kjsembed/value_binding.cpp 2017-01-08 21:56:54.000000000 +0100
+++ new/kjsembed-5.31.0/src/kjsembed/value_binding.cpp 2017-02-05 12:04:51.000000000 +0100
@@ -24,7 +24,7 @@
using namespace KJSEmbed;
-const KJS::ClassInfo ValueBinding::info = { "ValueBinding", 0, 0, 0 };
+const KJS::ClassInfo ValueBinding::info = { "ValueBinding", nullptr, nullptr, nullptr };
KJS::JSValue *callValueType(KJS::ExecState *exec, KJS::JSObject *self, const KJS::List &args)
{
@@ -40,7 +40,7 @@
{"type", 0, KJS::DontDelete | KJS::ReadOnly, &callValueType },
//{"cast", 1, KJS::DontDelete|KJS::ReadOnly, &callPointerCast },
//{"toString", 0, KJS::DontDelete|KJS::ReadOnly, &callPointerToString },
- {0, 0, 0, 0 }
+ {nullptr, 0, 0, nullptr }
};
const Method *ValueFactory::methods()
@@ -50,7 +50,7 @@
ValueBinding::ValueBinding(KJS::ExecState *exec, const char *typeName)
: ProxyBinding(exec),
- m_value(0),
+ m_value(nullptr),
m_name(typeName)
{
StaticBinding::publish(exec, this, ValueFactory::methods());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-5.30.0/src/kjsembed/variant_binding.cpp new/kjsembed-5.31.0/src/kjsembed/variant_binding.cpp
--- old/kjsembed-5.30.0/src/kjsembed/variant_binding.cpp 2017-01-08 21:56:54.000000000 +0100
+++ new/kjsembed-5.31.0/src/kjsembed/variant_binding.cpp 2017-02-05 12:04:51.000000000 +0100
@@ -42,7 +42,7 @@
using namespace KJSEmbed;
-const KJS::ClassInfo VariantBinding::info = { "VariantBinding", 0, 0, 0 };
+const KJS::ClassInfo VariantBinding::info = { "VariantBinding", nullptr, nullptr, nullptr };
VariantBinding::VariantBinding(KJS::ExecState *exec, const QVariant &value)
: ProxyBinding(exec), m_value(value)
@@ -122,7 +122,7 @@
const Method VariantFactory::VariantMethods[] = {
{"cast", 1, KJS::DontDelete | KJS::ReadOnly | KJS::DontEnum, &callCast },
{"toString", 0, KJS::DontDelete | KJS::ReadOnly | KJS::DontEnum, &callToString },
- {0, 0, 0, 0 }
+ {nullptr, 0, 0, nullptr }
};
enum JavaScriptArrayType { None, List, Map };