Hello community, here is the log from the commit of package kross for openSUSE:Factory checked in at 2017-03-03 17:17:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kross (Old) and /work/SRC/openSUSE:Factory/.kross.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kross" Fri Mar 3 17:17:54 2017 rev:38 rq:461455 version:5.31.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kross/kross.changes 2017-02-03 17:46:14.228208998 +0100 +++ /work/SRC/openSUSE:Factory/.kross.new/kross.changes 2017-03-03 17:17:54.986907407 +0100 @@ -1,0 +2,7 @@ +Thu Feb 9 09:32:34 UTC 2017 - [email protected] + +- Update to 5.31.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.31.0.php + +------------------------------------------------------------------- Old: ---- kross-5.30.0.tar.xz New: ---- kross-5.31.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kross.spec ++++++ --- /var/tmp/diff_new_pack.fcv2cZ/_old 2017-03-03 17:17:55.562825948 +0100 +++ /var/tmp/diff_new_pack.fcv2cZ/_new 2017-03-03 17:17:55.566825381 +0100 @@ -17,9 +17,9 @@ %bcond_without lang -%define _tar_path 5.30 +%define _tar_path 5.31 Name: kross -Version: 5.30.0 +Version: 5.31.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 3.0 @@ -34,11 +34,11 @@ BuildRequires: kparts-devel >= %{_tar_path} BuildRequires: kwidgetsaddons-devel >= %{_tar_path} BuildRequires: kxmlgui-devel >= %{_tar_path} -BuildRequires: cmake(Qt5Core) >= 5.5.0 -BuildRequires: cmake(Qt5Script) >= 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(Qt5Script) >= 5.6.0 +BuildRequires: cmake(Qt5UiTools) >= 5.6.0 +BuildRequires: cmake(Qt5Widgets) >= 5.6.0 +BuildRequires: cmake(Qt5Xml) >= 5.6.0 %if %{with lang} Recommends: %{name}-lang = %{version} %endif @@ -66,10 +66,10 @@ Requires: kio-devel >= %{_tar_path} Requires: kparts-devel >= %{_tar_path} Requires: kwidgetsaddons-devel >= %{_tar_path} -Requires: cmake(Qt5Core) >= 5.5.0 -Requires: cmake(Qt5Script) >= 5.5.0 -Requires: cmake(Qt5Widgets) >= 5.5.0 -Requires: cmake(Qt5Xml) >= 5.5.0 +Requires: cmake(Qt5Core) >= 5.6.0 +Requires: cmake(Qt5Script) >= 5.6.0 +Requires: cmake(Qt5Widgets) >= 5.6.0 +Requires: cmake(Qt5Xml) >= 5.6.0 %description devel Kross is a scripting bridge to embed scripting functionality ++++++ kross-5.30.0.tar.xz -> kross-5.31.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kross-5.30.0/CMakeLists.txt new/kross-5.31.0/CMakeLists.txt --- old/kross-5.30.0/CMakeLists.txt 2017-01-08 22:00:56.000000000 +0100 +++ new/kross-5.31.0/CMakeLists.txt 2017-02-05 12:10:47.000000000 +0100 @@ -1,11 +1,11 @@ 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(Kross 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) @@ -29,7 +29,7 @@ PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5KrossConfigVersion.cmake" SOVERSION 5) -set(REQUIRED_QT_VERSION 5.5.0) +set(REQUIRED_QT_VERSION 5.6.0) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core Script Xml Widgets UiTools) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kross-5.30.0/po/gl/kross5.po new/kross-5.31.0/po/gl/kross5.po --- old/kross-5.30.0/po/gl/kross5.po 2017-01-08 22:00:56.000000000 +0100 +++ new/kross-5.31.0/po/gl/kross5.po 2017-02-05 12:10:47.000000000 +0100 @@ -171,7 +171,7 @@ #: ui/actioncollectionview.cpp:341 #, kde-format msgid "Edit..." -msgstr "Editar..." +msgstr "Editar…" #: ui/actioncollectionview.cpp:343 #, kde-format @@ -181,7 +181,7 @@ #: ui/actioncollectionview.cpp:348 #, kde-format msgid "Add..." -msgstr "Engadir..." +msgstr "Engadir…" #: ui/actioncollectionview.cpp:350 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kross-5.30.0/src/console/main.cpp new/kross-5.31.0/src/console/main.cpp --- old/kross-5.30.0/src/console/main.cpp 2017-01-08 22:00:56.000000000 +0100 +++ new/kross-5.31.0/src/console/main.cpp 2017-02-05 12:10:47.000000000 +0100 @@ -44,7 +44,7 @@ #define ERROR_NOINTERPRETER -4 #define ERROR_EXCEPTION -6 -QApplication *app = 0; +QApplication *app = nullptr; int runScriptFile(const QString &scriptfile) { @@ -69,7 +69,7 @@ } // First we need a Action and fill it. - Kross::Action *action = new Kross::Action(0 /*no parent*/, QUrl::fromUserInput(scriptfile)); + Kross::Action *action = new Kross::Action(nullptr /*no parent*/, QUrl::fromUserInput(scriptfile)); action->setInterpreter(interpreterinfo->interpreterName()); action->setCode(scriptcode); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kross-5.30.0/src/core/action.cpp new/kross-5.31.0/src/core/action.cpp --- old/kross-5.30.0/src/core/action.cpp 2017-01-08 22:00:56.000000000 +0100 +++ new/kross-5.31.0/src/core/action.cpp 2017-02-05 12:10:47.000000000 +0100 @@ -97,7 +97,7 @@ */ QMap< QString, QVariant > options; - Private() : script(0), version(0) {} + Private() : script(nullptr), version(0) {} }; } @@ -523,12 +523,12 @@ emit finalized(this); } delete d->script; - d->script = 0; + d->script = nullptr; } bool Action::isFinalized() const { - return d->script == 0; + return d->script == nullptr; } void Action::slotTriggered() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kross-5.30.0/src/core/actioncollection.cpp new/kross-5.31.0/src/core/actioncollection.cpp --- old/kross-5.30.0/src/core/actioncollection.cpp 2017-01-08 22:00:56.000000000 +0100 +++ new/kross-5.31.0/src/core/actioncollection.cpp 2017-02-05 12:10:47.000000000 +0100 @@ -60,8 +60,8 @@ } ActionCollection::ActionCollection(const QString &name, ActionCollection *parent) - : QObject(0) - , d(new Private(0)) + : QObject(nullptr) + , d(new Private(nullptr)) { setObjectName(name); d->text = name; @@ -143,11 +143,11 @@ if (d->parent) { emit d->parent->collectionToBeRemoved(this, d->parent); d->parent->unregisterCollection(objectName()); - setParent(0); + setParent(nullptr); emit d->parent->collectionRemoved(this, d->parent); - d->parent = 0; + d->parent = nullptr; } - setParent(0); + setParent(nullptr); if (parent) { emit parent->collectionToBeInserted(this, parent); setParent(parent); @@ -165,7 +165,7 @@ ActionCollection *ActionCollection::collection(const QString &name) const { - return d->collections.contains(name) ? d->collections[name] : QPointer<ActionCollection>(0); + return d->collections.contains(name) ? d->collections[name] : QPointer<ActionCollection>(nullptr); } QStringList ActionCollection::collections() const @@ -205,7 +205,7 @@ Action *ActionCollection::action(const QString &name) const { - return d->actionMap.contains(name) ? d->actionMap[name] : 0; + return d->actionMap.contains(name) ? d->actionMap[name] : nullptr; } void ActionCollection::addAction(Action *action) @@ -240,7 +240,7 @@ d->actionList.removeAll(action); d->actionMap.remove(name); //krossdebug( QString("ActionCollection::removeAction: %1 %2").arg(action->name()).arg(action->parent()->objectName()) ); - action->setParent(0); + action->setParent(nullptr); emit actionRemoved(action, this); emitUpdated(); } @@ -342,7 +342,7 @@ const QByteArray description = elem.attribute("comment").toUtf8(); const QString iconname = elem.attribute("icon"); bool enabled = QVariant(elem.attribute("enabled", "true")).toBool(); - ActionCollection *c = d->collections.contains(name) ? d->collections[name] : QPointer<ActionCollection>(0); + ActionCollection *c = d->collections.contains(name) ? d->collections[name] : QPointer<ActionCollection>(nullptr); if (! c) { c = new ActionCollection(name, this); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kross-5.30.0/src/core/actioncollection.h new/kross-5.31.0/src/core/actioncollection.h --- old/kross-5.30.0/src/core/actioncollection.h 2017-01-08 22:00:56.000000000 +0100 +++ new/kross-5.31.0/src/core/actioncollection.h 2017-02-05 12:10:47.000000000 +0100 @@ -59,7 +59,7 @@ * itself as child of the parent \p parent by using the * \a setParentCollection method. */ - explicit ActionCollection(const QString &name, ActionCollection *parent = 0); + explicit ActionCollection(const QString &name, ActionCollection *parent = nullptr); /** * Destructor. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kross-5.30.0/src/core/childreninterface.h new/kross-5.31.0/src/core/childreninterface.h --- old/kross-5.30.0/src/core/childreninterface.h 2017-01-08 22:00:56.000000000 +0100 +++ new/kross-5.31.0/src/core/childreninterface.h 2017-02-05 12:10:47.000000000 +0100 @@ -99,7 +99,7 @@ */ QObject *object(const QString &name) const { - return m_objects.contains(name) ? m_objects.value(name) : 0; + return m_objects.contains(name) ? m_objects.value(name) : nullptr; } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kross-5.30.0/src/core/interpreter.cpp new/kross-5.31.0/src/core/interpreter.cpp --- old/kross-5.30.0/src/core/interpreter.cpp 2017-01-08 22:00:56.000000000 +0100 +++ new/kross-5.31.0/src/core/interpreter.cpp 2017-02-05 12:10:47.000000000 +0100 @@ -65,13 +65,13 @@ d->wildcard = wildcard; d->mimetypes = mimetypes; d->options = options; - d->interpreter = 0; + d->interpreter = nullptr; } InterpreterInfo::~InterpreterInfo() { delete d->interpreter; - d->interpreter = 0; + d->interpreter = nullptr; delete d; } @@ -97,7 +97,7 @@ InterpreterInfo::Option *InterpreterInfo::option(const QString &name) const { - return d->options.contains(name) ? d->options[name] : 0; + return d->options.contains(name) ? d->options[name] : nullptr; } InterpreterInfo::Option::Map &InterpreterInfo::options() @@ -126,7 +126,7 @@ // and execute the extern krosspython_instance function. d->interpreter = interpreter_func ? (Interpreter *)(interpreter_func)(KROSS_VERSION, this) - : 0; + : nullptr; if (! d->interpreter) { //#ifdef KROSS_INTERPRETER_DEBUG diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kross-5.30.0/src/core/manager.cpp new/kross-5.31.0/src/core/manager.cpp --- old/kross-5.30.0/src/core/manager.cpp 2017-01-08 22:00:56.000000000 +0100 +++ new/kross-5.31.0/src/core/manager.cpp 2017-02-05 12:10:47.000000000 +0100 @@ -103,7 +103,7 @@ libname << "' library: " << lib.errorString(); } #endif - return 0; + return nullptr; } QFunctionPointer funcPtr = lib.resolve(functionname); @@ -236,7 +236,7 @@ InterpreterInfo *Manager::interpreterInfo(const QString &interpretername) const { - return hasInterpreterInfo(interpretername) ? d->interpreterinfos[interpretername] : 0; + return hasInterpreterInfo(interpretername) ? d->interpreterinfos[interpretername] : nullptr; } const QString Manager::interpreternameForFile(const QString &file) @@ -261,7 +261,7 @@ { if (! hasInterpreterInfo(interpretername)) { qCWarning(KROSS_LOG) << "No such interpreter " << interpretername; - return 0; + return nullptr; } return d->interpreterinfos[interpretername]->interpreter(); } @@ -278,7 +278,7 @@ bool Manager::hasAction(const QString &name) { - return findChild< Action * >(name) != 0L; + return findChild< Action * >(name) != nullptr; } QObject *Manager::action(const QString &name) @@ -304,7 +304,7 @@ if (modulename.isEmpty() || modulename.contains(QRegExp("[^a-zA-Z0-9]"))) { qCWarning(KROSS_LOG) << "Invalid module name " << modulename; - return 0; + return nullptr; } QByteArray libraryname = QString("krossmodule%1").arg(modulename).toLower().toLatin1(); @@ -320,7 +320,7 @@ } else { qCWarning(KROSS_LOG) << "Failed to load module " << modulename; } - return 0; + return nullptr; } void Manager::deleteModules() @@ -332,7 +332,7 @@ bool Manager::executeScriptFile(const QUrl &file) { qCDebug(KROSS_LOG) << "Manager::executeScriptFile() file=" << file.toString(); - Action *action = new Action(0 /*no parent*/, file); + Action *action = new Action(nullptr /*no parent*/, file); action->trigger(); bool ok = ! action->hadError(); delete action; //action->delayedDestruct(); @@ -356,7 +356,7 @@ MetaTypeHandler *Manager::metaTypeHandler(const QByteArray &typeName) const { - return d->wrappers.contains(typeName) ? d->wrappers[typeName] : 0; + return d->wrappers.contains(typeName) ? d->wrappers[typeName] : nullptr; } void Manager::registerMetaTypeHandler(const QByteArray &typeName, MetaTypeHandler::FunctionPtr *handler) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kross-5.30.0/src/core/metafunction.cpp new/kross-5.31.0/src/core/metafunction.cpp --- old/kross-5.30.0/src/core/metafunction.cpp 2017-01-08 22:00:56.000000000 +0100 +++ new/kross-5.31.0/src/core/metafunction.cpp 2017-02-05 12:10:47.000000000 +0100 @@ -104,9 +104,9 @@ staticMetaObject.d.superdata = &QObject::staticMetaObject; staticMetaObject.d.stringdata = reinterpret_cast<const QByteArrayData *>(d->stringData); staticMetaObject.d.data = dataRef.data(); - staticMetaObject.d.relatedMetaObjects = 0; - staticMetaObject.d.extradata = 0; - staticMetaObject.d.static_metacall = 0; + staticMetaObject.d.relatedMetaObjects = nullptr; + staticMetaObject.d.extradata = nullptr; + staticMetaObject.d.static_metacall = nullptr; } MetaFunction::~MetaFunction() { @@ -122,7 +122,7 @@ void *MetaFunction::qt_metacast(const char *_clname) { if (! _clname) { - return 0; + return nullptr; } if (! qstrcmp(_clname, s_fakeClassName)) { return static_cast<void *>(const_cast< MetaFunction * >(this)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kross-5.30.0/src/core/metatype.h new/kross-5.31.0/src/core/metatype.h --- old/kross-5.30.0/src/core/metatype.h 2017-01-08 22:00:56.000000000 +0100 +++ new/kross-5.31.0/src/core/metatype.h 2017-02-05 12:10:47.000000000 +0100 @@ -198,9 +198,9 @@ typedef QVariant(FunctionPtr)(void *); typedef QVariant(FunctionPtr2)(MetaTypeHandler *handler, void *); - explicit MetaTypeHandler() : m_func1(0), m_func2(0) {} - explicit MetaTypeHandler(FunctionPtr *func) : m_func1(func), m_func2(0) {} - explicit MetaTypeHandler(FunctionPtr2 *func) : m_func1(0), m_func2(func) {} + explicit MetaTypeHandler() : m_func1(nullptr), m_func2(nullptr) {} + explicit MetaTypeHandler(FunctionPtr *func) : m_func1(func), m_func2(nullptr) {} + explicit MetaTypeHandler(FunctionPtr2 *func) : m_func1(nullptr), m_func2(func) {} virtual ~MetaTypeHandler() {} /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kross-5.30.0/src/modules/form.cpp new/kross-5.31.0/src/modules/form.cpp --- old/kross-5.30.0/src/modules/form.cpp 2017-01-08 22:00:56.000000000 +0100 +++ new/kross-5.31.0/src/modules/form.cpp 2017-02-05 12:10:47.000000000 +0100 @@ -446,7 +446,7 @@ QWidget *FormDialog::page(const QString &name) const { - return d->items.contains(name) ? d->items[name]->widget() : 0; + return d->items.contains(name) ? d->items[name]->widget() : nullptr; } //shared by FormDialog and FormAssistant @@ -563,7 +563,7 @@ QWidget *FormAssistant::page(const QString &name) const { - return d->items.contains(name) ? d->items[name]->widget() : 0; + return d->items.contains(name) ? d->items[name]->widget() : nullptr; } QWidget *FormAssistant::addPage(const QString &name, const QString &header, const QString &iconname) @@ -686,13 +686,13 @@ KMessageBox::DialogType type; if (dialogtype == "Error") { if (! details.isNull()) { - KMessageBox::detailedError(0, message, details, caption); + KMessageBox::detailedError(nullptr, message, details, caption); return QString(); } type = KMessageBox::Error; } else if (dialogtype == "Sorry") { if (! details.isNull()) { - KMessageBox::detailedSorry(0, message, details, caption); + KMessageBox::detailedSorry(nullptr, message, details, caption); return QString(); } type = KMessageBox::Sorry; @@ -709,7 +709,7 @@ } else { /*if(dialogtype == "Information")*/ type = KMessageBox::Information; } - switch (KMessageBox::messageBox(0, type, message, caption)) { + switch (KMessageBox::messageBox(nullptr, type, message, caption)) { case KMessageBox::Ok: return "Ok"; case KMessageBox::Cancel: return "Cancel"; case KMessageBox::Yes: return "Yes"; @@ -737,7 +737,7 @@ QObject *FormModule::createLayout(QWidget *parent, const QString &layout) { - QLayout *l = 0; + QLayout *l = nullptr; if (layout == "QVBoxLayout") { l = new QVBoxLayout(); } else if (layout == "QHBoxLayout") { @@ -819,11 +819,11 @@ QFile file(filename); if (! file.exists()) { // qDebug() << QString("Kross::FormModule::createWidgetFromUIFile: There exists no such file \"%1\"").arg(filename); - return 0; + return nullptr; } if (! file.open(QFile::ReadOnly)) { // qDebug() << QString("Kross::FormModule::createWidgetFromUIFile: Failed to open the file \"%1\"").arg(filename); - return 0; + return nullptr; } const QString xml = file.readAll(); file.close(); @@ -859,12 +859,12 @@ KPluginFactory *factory = KPluginLoader(name.toLatin1()).factory(); if (! factory) { qWarning() << QString("Kross::FormModule::loadPart: No such library \"%1\"").arg(name); - return 0; + return nullptr; } KParts::ReadOnlyPart *part = factory->create< KParts::ReadOnlyPart >(parent); if (! part) { qWarning() << QString("Kross::FormModule::loadPart: Library \"%1\" is not a KPart").arg(name); - return 0; + return nullptr; } if (url.isValid()) { part->openUrl(url); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kross-5.30.0/src/qts/plugin.h new/kross-5.31.0/src/qts/plugin.h --- old/kross-5.30.0/src/qts/plugin.h 2017-01-08 22:00:56.000000000 +0100 +++ new/kross-5.31.0/src/qts/plugin.h 2017-02-05 12:10:47.000000000 +0100 @@ -53,7 +53,7 @@ * * \param parent Optional QObject parent of this QObject. */ - EcmaPlugin(QObject *parent = 0); + EcmaPlugin(QObject *parent = nullptr); /** * Destructor. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kross-5.30.0/src/qts-interpreter/script.cpp new/kross-5.31.0/src/qts-interpreter/script.cpp --- old/kross-5.30.0/src/qts-interpreter/script.cpp 2017-01-08 22:00:56.000000000 +0100 +++ new/kross-5.31.0/src/qts-interpreter/script.cpp 2017-02-05 12:10:47.000000000 +0100 @@ -39,7 +39,7 @@ QScriptValue m_kross; QScriptValue m_self; - explicit Private(EcmaScript *script) : m_script(script), m_engine(0) {} + explicit Private(EcmaScript *script) : m_script(script), m_engine(nullptr) {} ~Private() { delete m_engine; @@ -61,7 +61,7 @@ if (m_engine->hasUncaughtException()) { handleException(); delete m_engine; - m_engine = 0; + m_engine = nullptr; return false; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kross-5.30.0/src/ui/actioncollectionmodel.cpp new/kross-5.31.0/src/ui/actioncollectionmodel.cpp --- old/kross-5.30.0/src/ui/actioncollectionmodel.cpp 2017-01-08 22:00:56.000000000 +0100 +++ new/kross-5.31.0/src/ui/actioncollectionmodel.cpp 2017-02-05 12:10:47.000000000 +0100 @@ -86,9 +86,9 @@ int ActionCollectionModel::rowNumber(ActionCollection *collection) const { - Q_ASSERT(collection != 0); + Q_ASSERT(collection != nullptr); ActionCollection *par = collection->parentCollection(); - Q_ASSERT(par != 0); + Q_ASSERT(par != nullptr); int row = par->collections().indexOf(collection->objectName()) + par->actions().count(); return row; } @@ -192,8 +192,8 @@ Action *ActionCollectionModel::action(const QModelIndex &index) { ActionCollection *par = static_cast<ActionCollection *>(index.internalPointer()); - if (par == 0 || index.row() >= par->actions().count()) { - return 0; + if (par == nullptr || index.row() >= par->actions().count()) { + return nullptr; } return par->actions().value(index.row()); } @@ -201,12 +201,12 @@ ActionCollection *ActionCollectionModel::collection(const QModelIndex &index) { ActionCollection *par = static_cast<ActionCollection *>(index.internalPointer()); - if (par == 0) { - return 0; + if (par == nullptr) { + return nullptr; } int row = index.row() - par->actions().count(); if (row < 0) { - return 0; // this is probably an action + return nullptr; // this is probably an action } return par->collection(par->collections().value(row)); } @@ -237,7 +237,7 @@ return QModelIndex(); } ActionCollection *par = parent.isValid() ? collection(parent) : d->collection.data(); - if (par == 0) { + if (par == nullptr) { // safety: may happen if parent index is an action (ModelTest tests this) return QModelIndex(); } @@ -250,7 +250,7 @@ return QModelIndex(); } ActionCollection *par = static_cast<ActionCollection *>(index.internalPointer()); - Q_ASSERT(par != 0); + Q_ASSERT(par != nullptr); if (par == d->collection) { return QModelIndex(); } @@ -428,7 +428,7 @@ } } ActionCollection *par = static_cast<ActionCollection *>(index.internalPointer()); - for (ActionCollection *p = par; p != 0; p = par->parentCollection()) { + for (ActionCollection *p = par; p != nullptr; p = par->parentCollection()) { QString s = p->name(); if (! s.endsWith('/')) { s += '/'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kross-5.30.0/src/ui/actioncollectionmodel.h new/kross-5.31.0/src/ui/actioncollectionmodel.h --- old/kross-5.30.0/src/ui/actioncollectionmodel.h 2017-01-08 22:00:56.000000000 +0100 +++ new/kross-5.31.0/src/ui/actioncollectionmodel.h 2017-02-05 12:10:47.000000000 +0100 @@ -56,7 +56,7 @@ //Editable = 8 }; - explicit ActionCollectionModel(QObject *parent, ActionCollection *collection = 0, Mode mode = Mode(Icons | ToolTips)); + explicit ActionCollectionModel(QObject *parent, ActionCollection *collection = nullptr, Mode mode = Mode(Icons | ToolTips)); virtual ~ActionCollectionModel(); int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; @@ -129,7 +129,7 @@ class KROSSUI_EXPORT ActionCollectionProxyModel : public QSortFilterProxyModel { public: - explicit ActionCollectionProxyModel(QObject *parent, ActionCollectionModel *model = 0); + explicit ActionCollectionProxyModel(QObject *parent, ActionCollectionModel *model = nullptr); virtual ~ActionCollectionProxyModel(); private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kross-5.30.0/src/ui/actioncollectionview.cpp new/kross-5.31.0/src/ui/actioncollectionview.cpp --- old/kross-5.30.0/src/ui/actioncollectionview.cpp 2017-01-08 22:00:56.000000000 +0100 +++ new/kross-5.31.0/src/ui/actioncollectionview.cpp 2017-02-05 12:10:47.000000000 +0100 @@ -127,12 +127,12 @@ Action *ActionCollectionEditor::action() const { - return d->type == Private::ActionType ? d->action : 0; + return d->type == Private::ActionType ? d->action : nullptr; } ActionCollection *ActionCollectionEditor::collection() const { - return d->type == Private::CollectionType ? d->collection : 0; + return d->type == Private::CollectionType ? d->collection : nullptr; } QLineEdit *ActionCollectionEditor::nameEdit() const @@ -249,8 +249,8 @@ d->fileedit->setUrl(QUrl::fromLocalFile(d->action->file())); gridlayout->addWidget(d->fileedit, 5, 1); } else { - d->interpreteredit = 0; - d->fileedit = 0; + d->interpreteredit = nullptr; + d->fileedit = nullptr; } //d->enabledcheckbox = new QCheckBox(this); @@ -399,7 +399,7 @@ QPushButton *ActionCollectionView::button(const QString &actionname) const { - return d->buttons.contains(actionname) ? d->buttons[actionname] : 0; + return d->buttons.contains(actionname) ? d->buttons[actionname] : nullptr; } QItemSelection ActionCollectionView::itemSelection() const @@ -413,7 +413,7 @@ { QAction *action = d->collection->action(actionname); if (! action) { - return 0; + return nullptr; } //if( d->buttons.contains(actionname) ) delete d->buttons[]; QPushButton *btn = new QPushButton(parentWidget); @@ -528,8 +528,8 @@ if (! selectionModel()) { return; } - Action *action = 0; - ActionCollection *collection = 0; + Action *action = nullptr; + ActionCollection *collection = nullptr; foreach (const QModelIndex &index, itemSelection().indexes()) { if (! index.isValid()) { continue; @@ -566,7 +566,7 @@ { //TODO - KMessageBox::sorry(0, "TODO"); + KMessageBox::sorry(nullptr, "TODO"); //ScriptManagerAddWizard wizard(this, collection); //int result = wizard.exec(); @@ -606,6 +606,6 @@ if (! selectionModel()) { return; } - KMessageBox::sorry(0, "TODO"); + KMessageBox::sorry(nullptr, "TODO"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kross-5.30.0/src/ui/actioncollectionview.h new/kross-5.31.0/src/ui/actioncollectionview.h --- old/kross-5.30.0/src/ui/actioncollectionview.h 2017-01-08 22:00:56.000000000 +0100 +++ new/kross-5.31.0/src/ui/actioncollectionview.h 2017-02-05 12:10:47.000000000 +0100 @@ -72,7 +72,7 @@ * operate on. * \param parent The optional parent widget this widget is child of. */ - explicit ActionCollectionEditor(Action *action, QWidget *parent = 0); + explicit ActionCollectionEditor(Action *action, QWidget *parent = nullptr); /** * Constructor. @@ -80,7 +80,7 @@ * editor should operate on. * \param parent The optional parent widget this widget is child of. */ - explicit ActionCollectionEditor(ActionCollection *collection, QWidget *parent = 0); + explicit ActionCollectionEditor(ActionCollection *collection, QWidget *parent = nullptr); /** * Destructor. @@ -169,7 +169,7 @@ * Constructor. * \param parent The optional parent widget this widget is child of. */ - explicit ActionCollectionView(QWidget *parent = 0); + explicit ActionCollectionView(QWidget *parent = nullptr); /** * Destructor. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kross-5.30.0/src/ui/scriptingplugin.cpp new/kross-5.31.0/src/ui/scriptingplugin.cpp --- old/kross-5.30.0/src/ui/scriptingplugin.cpp 2017-01-08 22:00:56.000000000 +0100 +++ new/kross-5.31.0/src/ui/scriptingplugin.cpp 2017-02-05 12:10:47.000000000 +0100 @@ -87,7 +87,7 @@ Kross::ActionCollection *collection = Kross::Manager::self().actionCollection()->collection(d->collectionName); if (collection) { - collection->setParentCollection(0); + collection->setParentCollection(nullptr); collection->deleteLater(); } @@ -265,7 +265,7 @@ } //TODO very funny! this should use ui/view.h instead --Nick - KRun::runUrl(QUrl::fromLocalFile(d->userActionsFile), QString("text/plain"), 0, false); + KRun::runUrl(QUrl::fromLocalFile(d->userActionsFile), QString("text/plain"), nullptr, false); } void ScriptingPlugin::slotResetScriptActions() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kross-5.30.0/src/ui/scriptingplugin.h new/kross-5.31.0/src/ui/scriptingplugin.h --- old/kross-5.30.0/src/ui/scriptingplugin.h 2017-01-08 22:00:56.000000000 +0100 +++ new/kross-5.31.0/src/ui/scriptingplugin.h 2017-02-05 12:10:47.000000000 +0100 @@ -68,7 +68,7 @@ * * \param parent The parent QObject this QObject is child of. */ - explicit ScriptingPlugin(QObject *parent = 0); + explicit ScriptingPlugin(QObject *parent = nullptr); /** * Allows having actions defined in a custom location, eg for project-specific actions @@ -76,7 +76,7 @@ * \param userActionsFile scripts.rc filepath -- file may be modified by user * \param referenceActionsDir dir -- %APPDATA%/scripts/%referenceActionsDir% contains standard actions for this plugin instance; has a lower priority than \a userActionsFile. */ - ScriptingPlugin(const QString &collectionName, const QString &userActionsFile, const QString &referenceActionsDir = QString(), QObject *parent = 0); + ScriptingPlugin(const QString &collectionName, const QString &userActionsFile, const QString &referenceActionsDir = QString(), QObject *parent = nullptr); /** * Destructor.
