Hello community,
here is the log from the commit of package kdeclarative for openSUSE:Factory checked in at 2017-03-03 15:22:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdeclarative (Old)
and /work/SRC/openSUSE:Factory/.kdeclarative.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdeclarative"
Fri Mar 3 15:22:40 2017 rev:39 rq:461410 version:5.31.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdeclarative/kdeclarative.changes 2017-02-03 17:44:19.672423645 +0100
+++ /work/SRC/openSUSE:Factory/.kdeclarative.new/kdeclarative.changes 2017-03-03 15:22:40.469552914 +0100
@@ -1,0 +2,7 @@
+Thu Feb 9 09:25:41 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:
----
kdeclarative-5.30.0.tar.xz
New:
----
kdeclarative-5.31.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdeclarative.spec ++++++
--- /var/tmp/diff_new_pack.WyqnhS/_old 2017-03-03 15:22:41.009476471 +0100
+++ /var/tmp/diff_new_pack.WyqnhS/_new 2017-03-03 15:22:41.013475904 +0100
@@ -18,9 +18,9 @@
%bcond_without lang
%define lname libKF5Declarative5
-%define _tar_path 5.30
+%define _tar_path 5.31
Name: kdeclarative
-Version: 5.30.0
+Version: 5.31.0
Release: 0
%define kf5_version %{version}
BuildRequires: cmake >= 3.0
@@ -38,11 +38,11 @@
BuildRequires: kwidgetsaddons-devel >= %{_tar_path}
BuildRequires: kwindowsystem-devel >= %{_tar_path}
BuildRequires: libepoxy-devel
-BuildRequires: cmake(Qt5Core) >= 5.5.0
-BuildRequires: cmake(Qt5Gui) >= 5.5.0
-BuildRequires: cmake(Qt5Qml) >= 5.5.0
-BuildRequires: cmake(Qt5Quick) >= 5.5.0
-BuildRequires: cmake(Qt5Test) >= 5.5.0
+BuildRequires: cmake(Qt5Core) >= 5.6.0
+BuildRequires: cmake(Qt5Gui) >= 5.6.0
+BuildRequires: cmake(Qt5Qml) >= 5.6.0
+BuildRequires: cmake(Qt5Quick) >= 5.6.0
+BuildRequires: cmake(Qt5Test) >= 5.6.0
Summary: Integration of QML and KDE workspaces
License: LGPL-2.1+
Group: System/GUI/KDE
@@ -106,7 +106,7 @@
Requires: kpackage-devel >= %{_tar_path}
Requires: libKF5CalendarEvents5 = %{version}
Requires: libKF5QuickAddons5 = %{version}
-Requires: cmake(Qt5Qml) >= 5.5.0
+Requires: cmake(Qt5Qml) >= 5.6.0
%description devel
KDeclarative provides integration of QML and KDE workspaces.
++++++ kdeclarative-5.30.0.tar.xz -> kdeclarative-5.31.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.30.0/CMakeLists.txt new/kdeclarative-5.31.0/CMakeLists.txt
--- old/kdeclarative-5.30.0/CMakeLists.txt 2017-01-08 21:48:46.000000000 +0100
+++ new/kdeclarative-5.31.0/CMakeLists.txt 2017-02-05 11:52:50.000000000 +0100
@@ -1,18 +1,18 @@
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(KDeclarative VERSION ${KF5_VERSION})
# Dependencies
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 ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${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} NO_MODULE REQUIRED Qml Quick Gui)
include(KDEInstallDirs)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.30.0/autotests/modeltest.h new/kdeclarative-5.31.0/autotests/modeltest.h
--- old/kdeclarative-5.30.0/autotests/modeltest.h 2017-01-08 21:48:46.000000000 +0100
+++ new/kdeclarative-5.31.0/autotests/modeltest.h 2017-02-05 11:52:50.000000000 +0100
@@ -52,7 +52,7 @@
Q_OBJECT
public:
- explicit ModelTest( QAbstractItemModel *model, QObject *parent = 0 );
+ explicit ModelTest( QAbstractItemModel *model, QObject *parent = nullptr );
private Q_SLOTS:
void nonDestructiveBasicTest();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.30.0/autotests/util.cpp new/kdeclarative-5.31.0/autotests/util.cpp
--- old/kdeclarative-5.30.0/autotests/util.cpp 2017-01-08 21:48:46.000000000 +0100
+++ new/kdeclarative-5.31.0/autotests/util.cpp 2017-02-05 11:52:50.000000000 +0100
@@ -41,7 +41,7 @@
#include
#include
-QQmlDataTest *QQmlDataTest::m_instance = 0;
+QQmlDataTest *QQmlDataTest::m_instance = nullptr;
QQmlDataTest::QQmlDataTest() :
m_dataDirectory(QFINDTESTDATA("data")),
@@ -53,7 +53,7 @@
QQmlDataTest::~QQmlDataTest()
{
- m_instance = 0;
+ m_instance = nullptr;
}
void QQmlDataTest::initTestCase()
@@ -100,7 +100,7 @@
Q_GLOBAL_STATIC(QMutex, qQmlTestMessageHandlerMutex)
-QQmlTestMessageHandler *QQmlTestMessageHandler::m_instance = 0;
+QQmlTestMessageHandler *QQmlTestMessageHandler::m_instance = nullptr;
void QQmlTestMessageHandler::messageHandler(QtMsgType, const QMessageLogContext &, const QString &message)
{
@@ -122,5 +122,5 @@
QMutexLocker locker(qQmlTestMessageHandlerMutex());
Q_ASSERT(QQmlTestMessageHandler::m_instance);
qInstallMessageHandler(m_oldHandler);
- QQmlTestMessageHandler::m_instance = 0;
+ QQmlTestMessageHandler::m_instance = nullptr;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.30.0/autotests/util.h new/kdeclarative-5.31.0/autotests/util.h
--- old/kdeclarative-5.30.0/autotests/util.h 2017-01-08 21:48:46.000000000 +0100
+++ new/kdeclarative-5.31.0/autotests/util.h 2017-02-05 11:52:50.000000000 +0100
@@ -67,7 +67,7 @@
static inline QQmlDataTest *instance() { return m_instance; }
static QByteArray msgComponentError(const QQmlComponent &,
- const QQmlEngine *engine = 0);
+ const QQmlEngine *engine = nullptr);
public Q_SLOTS:
virtual void initTestCase();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.30.0/po/gl/kdeclarative5.po new/kdeclarative-5.31.0/po/gl/kdeclarative5.po
--- old/kdeclarative-5.30.0/po/gl/kdeclarative5.po 2017-01-08 21:48:46.000000000 +0100
+++ new/kdeclarative-5.31.0/po/gl/kdeclarative5.po 2017-02-05 11:52:50.000000000 +0100
@@ -41,12 +41,12 @@
#: kpackagelauncherqml/main.cpp:43
#, kde-format
msgid "KPackage QML application shell"
-msgstr "Shell de programas en QML de KPackage"
+msgstr "Shell de aplicativos en QML de KPackage"
#: kpackagelauncherqml/main.cpp:51
#, kde-format
msgid "The unique name of the application (mandatory)"
-msgstr "Nome único para o programa (obrigatorio)"
+msgstr "Nome único para o aplicativo (obrigatorio)"
#: qmlcontrols/kquickcontrols/KeySequenceItem.qml:38
#, kde-format
@@ -54,7 +54,7 @@
"Click on the button, then enter the shortcut like you would in the program.\n"
"Example for Ctrl+A: hold the Ctrl key and press A."
msgstr ""
-"Prema no botón, logo indique o atallo que desexe ter no programa.\n"
+"Prema o botón, logo indique o atallo que desexe ter no programa.\n"
"Exemplo para Ctrl+A: manteña premida a tecla Ctrl e prema A."
#: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:276
@@ -77,7 +77,7 @@
#: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:333
#, kde-format
msgid "Conflict with Standard Application Shortcut"
-msgstr "Conflito cun atallo estándar de programa"
+msgstr "Conflito cun atallo estándar de aplicativo"
#: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:334
#, kde-format
@@ -87,8 +87,8 @@
"Do you really want to use it as a global shortcut as well?"
msgstr ""
"A combinación de teclas «%1» tamén está asignada á acción estándar «%2», que "
-"é usada por algúns programas.\n"
-"Desexa realmente empregala tamén como atallo global?"
+"é usada por algúns aplicativos.\n"
+"Está seguro de que quere empregala tamén como atallo global?"
#: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:339
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.30.0/po/ia/kdeclarative5.po new/kdeclarative-5.31.0/po/ia/kdeclarative5.po
--- old/kdeclarative-5.30.0/po/ia/kdeclarative5.po 2017-01-08 21:48:46.000000000 +0100
+++ new/kdeclarative-5.31.0/po/ia/kdeclarative5.po 2017-02-05 11:52:50.000000000 +0100
@@ -1,21 +1,21 @@
# Copyright (C) YEAR This_file_is_part_of_KDE
# This file is distributed under the same license as the PACKAGE package.
#
-# g.sora , 2010, 2011, 2012, 2013, 2014.
+# g.sora , 2010, 2011, 2012, 2013, 2014, 2017.
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2016-11-19 20:11+0100\n"
-"PO-Revision-Date: 2014-04-04 15:51+0200\n"
-"Last-Translator: G.Sora \n"
-"Language-Team: Interlingua \n"
+"PO-Revision-Date: 2017-01-15 19:41+0100\n"
+"Last-Translator: giovanni \n"
+"Language-Team: Interlingua \n"
"Language: ia\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 2.0\n"
#, kde-format
msgctxt "NAME OF TRANSLATORS"
@@ -30,13 +30,12 @@
#: kpackagelauncherqml/main.cpp:43
#, kde-format
msgid "KPackage QML application shell"
-msgstr ""
+msgstr "Shell de application QML de KPackage"
#: kpackagelauncherqml/main.cpp:51
-#, fuzzy, kde-format
-#| msgid "defines the application font"
+#, kde-format
msgid "The unique name of the application (mandatory)"
-msgstr "Il define le font de application"
+msgstr "Il define le nomine unic del application (obligatori)"
#: qmlcontrols/kquickcontrols/KeySequenceItem.qml:38
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.30.0/src/calendarevents/calendareventsplugin.h new/kdeclarative-5.31.0/src/calendarevents/calendareventsplugin.h
--- old/kdeclarative-5.30.0/src/calendarevents/calendareventsplugin.h 2017-01-08 21:48:46.000000000 +0100
+++ new/kdeclarative-5.31.0/src/calendarevents/calendareventsplugin.h 2017-02-05 11:52:50.000000000 +0100
@@ -182,7 +182,7 @@
Q_OBJECT
public:
- explicit CalendarEventsPlugin(QObject *parent = Q_NULLPTR);
+ explicit CalendarEventsPlugin(QObject *parent = nullptr);
virtual ~CalendarEventsPlugin();
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.30.0/src/kdeclarative/configpropertymap.h new/kdeclarative-5.31.0/src/kdeclarative/configpropertymap.h
--- old/kdeclarative-5.30.0/src/kdeclarative/configpropertymap.h 2017-01-08 21:48:46.000000000 +0100
+++ new/kdeclarative-5.31.0/src/kdeclarative/configpropertymap.h 2017-02-05 11:52:50.000000000 +0100
@@ -36,7 +36,7 @@
Q_OBJECT
public:
- ConfigPropertyMap(KCoreConfigSkeleton *config, QObject *parent = 0);
+ ConfigPropertyMap(KCoreConfigSkeleton *config, QObject *parent = nullptr);
~ConfigPropertyMap();
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.30.0/src/kdeclarative/kdeclarative.cpp new/kdeclarative-5.31.0/src/kdeclarative/kdeclarative.cpp
--- old/kdeclarative-5.30.0/src/kdeclarative/kdeclarative.cpp 2017-01-08 21:48:46.000000000 +0100
+++ new/kdeclarative-5.31.0/src/kdeclarative/kdeclarative.cpp 2017-02-05 11:52:50.000000000 +0100
@@ -39,7 +39,7 @@
QStringList KDeclarativePrivate::s_runtimePlatform;
KDeclarativePrivate::KDeclarativePrivate()
- : contextObj(0)
+ : contextObj(nullptr)
{
}
@@ -76,7 +76,7 @@
{
//get rid of stock network access manager factory
QQmlNetworkAccessManagerFactory *factory = d->declarativeEngine.data()->networkAccessManagerFactory();
- d->declarativeEngine.data()->setNetworkAccessManagerFactory(0);
+ d->declarativeEngine.data()->setNetworkAccessManagerFactory(nullptr);
delete factory;
d->declarativeEngine.data()->setNetworkAccessManagerFactory(new KIOAccessManagerFactory());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.30.0/src/kdeclarative/qmlobject.cpp new/kdeclarative-5.31.0/src/kdeclarative/qmlobject.cpp
--- old/kdeclarative-5.30.0/src/kdeclarative/qmlobject.cpp 2017-01-08 21:48:46.000000000 +0100
+++ new/kdeclarative-5.31.0/src/kdeclarative/qmlobject.cpp 2017-02-05 11:52:50.000000000 +0100
@@ -58,8 +58,8 @@
public:
QmlObjectPrivate(QmlObject *parent)
: q(parent),
- engine(0),
- component(0),
+ engine(nullptr),
+ component(nullptr),
delay(false)
{
executionEndTimer = new QTimer(q);
@@ -368,7 +368,7 @@
} else {
d->errorPrint(component);
delete object;
- return 0;
+ return nullptr;
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.30.0/src/kdeclarative/qmlobject.h new/kdeclarative-5.31.0/src/kdeclarative/qmlobject.h
--- old/kdeclarative-5.30.0/src/kdeclarative/qmlobject.h 2017-01-08 21:48:46.000000000 +0100
+++ new/kdeclarative-5.31.0/src/kdeclarative/qmlobject.h 2017-02-05 11:52:50.000000000 +0100
@@ -69,7 +69,7 @@
*
* @param parent the parent of this object
*/
- explicit QmlObject(QObject *parent = 0);
+ explicit QmlObject(QObject *parent = nullptr);
/**
* Constructs a new QmlObject
@@ -77,7 +77,7 @@
* @param engine a QQmlEngine we want to use
* @param parent the parent of this object
*/
- explicit QmlObject(QQmlEngine *engine, QObject *parent = 0);
+ explicit QmlObject(QQmlEngine *engine, QObject *parent = nullptr);
/**
* Constructs a new QmlObject
@@ -86,7 +86,7 @@
* @param rootContext the root context we want to use for objects creation
* @param parent the parent of this object
*/
- explicit QmlObject(QQmlEngine *engine, QQmlContext *rootContext, QObject *parent = 0);
+ explicit QmlObject(QQmlEngine *engine, QQmlContext *rootContext, QObject *parent = nullptr);
~QmlObject();
/**
@@ -204,7 +204,7 @@
* the object when created (and before Component.onCompleted
* gets emitted
*/
- QObject *createObjectFromSource(const QUrl &source, QQmlContext *context = 0, const QVariantHash &initialProperties = QVariantHash());
+ QObject *createObjectFromSource(const QUrl &source, QQmlContext *context = nullptr, const QVariantHash &initialProperties = QVariantHash());
/**
* Creates and returns an object based on the provided QQmlComponent
@@ -217,7 +217,7 @@
* the object when created (and before Component.onCompleted
* gets emitted
*/
- QObject *createObjectFromComponent(QQmlComponent *component, QQmlContext *context = 0, const QVariantHash &initialProperties = QVariantHash());
+ QObject *createObjectFromComponent(QQmlComponent *component, QQmlContext *context = nullptr, const QVariantHash &initialProperties = QVariantHash());
public Q_SLOTS:
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.30.0/src/kdeclarative/qmlobjectsharedengine.h new/kdeclarative-5.31.0/src/kdeclarative/qmlobjectsharedengine.h
--- old/kdeclarative-5.30.0/src/kdeclarative/qmlobjectsharedengine.h 2017-01-08 21:48:46.000000000 +0100
+++ new/kdeclarative-5.31.0/src/kdeclarative/qmlobjectsharedengine.h 2017-02-05 11:52:50.000000000 +0100
@@ -50,7 +50,7 @@
*
* @param parent the parent of this object
*/
- explicit QmlObjectSharedEngine(QObject *parent = 0);
+ explicit QmlObjectSharedEngine(QObject *parent = nullptr);
~QmlObjectSharedEngine();
private:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.30.0/src/qmlcontrols/draganddrop/DeclarativeDragArea.cpp new/kdeclarative-5.31.0/src/qmlcontrols/draganddrop/DeclarativeDragArea.cpp
--- old/kdeclarative-5.30.0/src/qmlcontrols/draganddrop/DeclarativeDragArea.cpp 2017-01-08 21:48:46.000000000 +0100
+++ new/kdeclarative-5.31.0/src/qmlcontrols/draganddrop/DeclarativeDragArea.cpp 2017-02-05 11:52:50.000000000 +0100
@@ -43,9 +43,9 @@
DeclarativeDragArea::DeclarativeDragArea(QQuickItem *parent)
: QQuickItem(parent),
- m_delegate(0),
+ m_delegate(nullptr),
m_source(parent),
- m_target(0),
+ m_target(nullptr),
m_enabled(true),
m_draggingJustStarted(false),
m_dragActive(false),
@@ -87,7 +87,7 @@
}
void DeclarativeDragArea::resetDelegate()
{
- setDelegate(0);
+ setDelegate(nullptr);
}
/*!
@@ -109,7 +109,7 @@
void DeclarativeDragArea::resetSource()
{
- setSource(0);
+ setSource(nullptr);
}
bool DeclarativeDragArea::dragActive() const
@@ -121,7 +121,7 @@
QQuickItem* DeclarativeDragArea::target() const
{
//TODO: implement me
- return 0;
+ return nullptr;
}
// data
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.30.0/src/qmlcontrols/draganddrop/DeclarativeDragArea.h new/kdeclarative-5.31.0/src/qmlcontrols/draganddrop/DeclarativeDragArea.h
--- old/kdeclarative-5.30.0/src/qmlcontrols/draganddrop/DeclarativeDragArea.h 2017-01-08 21:48:46.000000000 +0100
+++ new/kdeclarative-5.31.0/src/qmlcontrols/draganddrop/DeclarativeDragArea.h 2017-02-05 11:52:50.000000000 +0100
@@ -96,7 +96,7 @@
Q_PROPERTY(bool dragActive READ dragActive NOTIFY dragActiveChanged)
public:
- DeclarativeDragArea(QQuickItem *parent=0);
+ DeclarativeDragArea(QQuickItem *parent=nullptr);
~DeclarativeDragArea();
QQuickItem *delegate() const;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.30.0/src/qmlcontrols/draganddrop/DeclarativeDragDropEvent.cpp new/kdeclarative-5.31.0/src/qmlcontrols/draganddrop/DeclarativeDragDropEvent.cpp
--- old/kdeclarative-5.30.0/src/qmlcontrols/draganddrop/DeclarativeDragDropEvent.cpp 2017-01-08 21:48:46.000000000 +0100
+++ new/kdeclarative-5.31.0/src/qmlcontrols/draganddrop/DeclarativeDragDropEvent.cpp 2017-02-05 11:52:50.000000000 +0100
@@ -31,7 +31,7 @@
m_y(e->pos().y()),
m_buttons(e->mouseButtons()),
m_modifiers(e->keyboardModifiers()),
- m_data(Q_NULLPTR),
+ m_data(nullptr),
m_event(e)
{
}
@@ -42,8 +42,8 @@
m_y(0),
m_buttons(Qt::NoButton),
m_modifiers(Qt::NoModifier),
- m_data(Q_NULLPTR),
- m_event(0)
+ m_data(nullptr),
+ m_event(nullptr)
{
Q_UNUSED(e);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.30.0/src/qmlcontrols/draganddrop/DeclarativeDragDropEvent.h new/kdeclarative-5.31.0/src/qmlcontrols/draganddrop/DeclarativeDragDropEvent.h
--- old/kdeclarative-5.30.0/src/qmlcontrols/draganddrop/DeclarativeDragDropEvent.h 2017-01-08 21:48:46.000000000 +0100
+++ new/kdeclarative-5.31.0/src/qmlcontrols/draganddrop/DeclarativeDragDropEvent.h 2017-02-05 11:52:50.000000000 +0100
@@ -95,8 +95,8 @@
public:
- DeclarativeDragDropEvent(QDropEvent* e, DeclarativeDropArea* parent = 0);
- DeclarativeDragDropEvent(QDragLeaveEvent* e, DeclarativeDropArea* parent = 0);
+ DeclarativeDragDropEvent(QDropEvent* e, DeclarativeDropArea* parent = nullptr);
+ DeclarativeDragDropEvent(QDragLeaveEvent* e, DeclarativeDropArea* parent = nullptr);
int x() const { return m_x; }
int y() const { return m_y; }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.30.0/src/qmlcontrols/draganddrop/DeclarativeDropArea.cpp new/kdeclarative-5.31.0/src/qmlcontrols/draganddrop/DeclarativeDropArea.cpp
--- old/kdeclarative-5.30.0/src/qmlcontrols/draganddrop/DeclarativeDropArea.cpp 2017-01-08 21:48:46.000000000 +0100
+++ new/kdeclarative-5.31.0/src/qmlcontrols/draganddrop/DeclarativeDropArea.cpp 2017-02-05 11:52:50.000000000 +0100
@@ -47,7 +47,7 @@
if (DeclarativeDropArea *da = qobject_cast(candidate)) {
da->m_temporaryInhibition = inhibit;
if (inhibit) {
- emit da->dragLeaveEvent(0);
+ emit da->dragLeaveEvent(nullptr);
}
}
candidate = candidate->parentItem();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.30.0/src/qmlcontrols/draganddrop/DeclarativeDropArea.h new/kdeclarative-5.31.0/src/qmlcontrols/draganddrop/DeclarativeDropArea.h
--- old/kdeclarative-5.30.0/src/qmlcontrols/draganddrop/DeclarativeDropArea.h 2017-01-08 21:48:46.000000000 +0100
+++ new/kdeclarative-5.31.0/src/qmlcontrols/draganddrop/DeclarativeDropArea.h 2017-02-05 11:52:50.000000000 +0100
@@ -45,7 +45,7 @@
Q_PROPERTY(bool containsDrag READ containsDrag NOTIFY containsDragChanged )
public:
- DeclarativeDropArea(QQuickItem *parent=0);
+ DeclarativeDropArea(QQuickItem *parent=nullptr);
bool isEnabled() const;
void setEnabled(bool enabled);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.30.0/src/qmlcontrols/draganddrop/DeclarativeMimeData.cpp new/kdeclarative-5.31.0/src/qmlcontrols/draganddrop/DeclarativeMimeData.cpp
--- old/kdeclarative-5.30.0/src/qmlcontrols/draganddrop/DeclarativeMimeData.cpp 2017-01-08 21:48:46.000000000 +0100
+++ new/kdeclarative-5.31.0/src/qmlcontrols/draganddrop/DeclarativeMimeData.cpp 2017-02-05 11:52:50.000000000 +0100
@@ -31,7 +31,7 @@
DeclarativeMimeData::DeclarativeMimeData()
: QMimeData(),
- m_source(0)
+ m_source(nullptr)
{}
/*!
@@ -49,7 +49,7 @@
*/
DeclarativeMimeData::DeclarativeMimeData(const QMimeData* copy)
: QMimeData(),
- m_source(0)
+ m_source(nullptr)
{
// Copy the standard MIME data
foreach(QString format, copy->formats()) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.30.0/src/qmlcontrols/kcoreaddons/formats.h new/kdeclarative-5.31.0/src/qmlcontrols/kcoreaddons/formats.h
--- old/kdeclarative-5.30.0/src/qmlcontrols/kcoreaddons/formats.h 2017-01-08 21:48:46.000000000 +0100
+++ new/kdeclarative-5.31.0/src/qmlcontrols/kcoreaddons/formats.h 2017-02-05 11:52:50.000000000 +0100
@@ -29,7 +29,7 @@
public:
- explicit Formats (QObject* parent = 0);
+ explicit Formats (QObject* parent = nullptr);
/**
* Converts size from bytes to the appropriate string representation
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.30.0/src/qmlcontrols/kcoreaddons/kuserproxy.h new/kdeclarative-5.31.0/src/qmlcontrols/kcoreaddons/kuserproxy.h
--- old/kdeclarative-5.30.0/src/qmlcontrols/kcoreaddons/kuserproxy.h 2017-01-08 21:48:46.000000000 +0100
+++ new/kdeclarative-5.31.0/src/qmlcontrols/kcoreaddons/kuserproxy.h 2017-02-05 11:52:50.000000000 +0100
@@ -70,7 +70,7 @@
Q_PROPERTY(QString host READ host CONSTANT)
public:
- KUserProxy(QObject *parent = 0);
+ KUserProxy(QObject *parent = nullptr);
~KUserProxy();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.30.0/src/qmlcontrols/kioplugin/krunproxy.cpp new/kdeclarative-5.31.0/src/qmlcontrols/kioplugin/krunproxy.cpp
--- old/kdeclarative-5.30.0/src/qmlcontrols/kioplugin/krunproxy.cpp 2017-01-08 21:48:46.000000000 +0100
+++ new/kdeclarative-5.31.0/src/qmlcontrols/kioplugin/krunproxy.cpp 2017-02-05 11:52:50.000000000 +0100
@@ -45,8 +45,8 @@
// the desktop file itself but the application in which it is associated
// with.
KService::Ptr service = KService::serviceByDesktopPath(filePath);
- return KRun::runService(*service, QList<QUrl>(), 0) != 0;
+ return KRun::runService(*service, QList<QUrl>(), nullptr) != 0;
} else {
- return KRun::runUrl(QUrl(filePath), fileMymeType, 0);
+ return KRun::runUrl(QUrl(filePath), fileMymeType, nullptr);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.30.0/src/qmlcontrols/kioplugin/krunproxy.h new/kdeclarative-5.31.0/src/qmlcontrols/kioplugin/krunproxy.h
--- old/kdeclarative-5.30.0/src/qmlcontrols/kioplugin/krunproxy.h 2017-01-08 21:48:46.000000000 +0100
+++ new/kdeclarative-5.31.0/src/qmlcontrols/kioplugin/krunproxy.h 2017-02-05 11:52:50.000000000 +0100
@@ -27,7 +27,7 @@
public:
- explicit KRunProxy (QObject* parent = 0);
+ explicit KRunProxy (QObject* parent = nullptr);
/**
* opens the url from the existing file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.30.0/src/qmlcontrols/kquickcontrols/private/keysequencehelper.cpp new/kdeclarative-5.31.0/src/qmlcontrols/kquickcontrols/private/keysequencehelper.cpp
--- old/kdeclarative-5.30.0/src/qmlcontrols/kquickcontrols/private/keysequencehelper.cpp 2017-01-08 21:48:46.000000000 +0100
+++ new/kdeclarative-5.31.0/src/qmlcontrols/kquickcontrols/private/keysequencehelper.cpp 2017-02-05 11:52:50.000000000 +0100
@@ -298,7 +298,7 @@
}
if (!others.isEmpty()
- && !KGlobalAccel::promptStealShortcutSystemwide(0, others, keySequence)) {
+ && !KGlobalAccel::promptStealShortcutSystemwide(nullptr, others, keySequence)) {
return true;
}
@@ -336,7 +336,7 @@
"Do you really want to use it as a global shortcut as well?",
seq.toString(QKeySequence::NativeText), KStandardShortcut::label(std));
- if (KMessageBox::warningContinueCancel(0, message, title, KGuiItem(i18n("Reassign"))) != KMessageBox::Continue) {
+ if (KMessageBox::warningContinueCancel(nullptr, message, title, KGuiItem(i18n("Reassign"))) != KMessageBox::Continue) {
return false;
}
return true;
@@ -403,7 +403,7 @@
// Qt sometimes returns garbage keycodes, I observed -1, if it doesn't know a key.
// We cannot do anything useful with those (several keys have -1, indistinguishable)
// and QKeySequence.toString() will also yield a garbage string.
- KMessageBox::sorry(0,
+ KMessageBox::sorry(nullptr,
i18n("The key you just pressed is not supported by Qt."),
i18n("Unsupported Key"));
return d->cancelRecording();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.30.0/src/qmlcontrols/kquickcontrols/private/keysequencehelper.h new/kdeclarative-5.31.0/src/qmlcontrols/kquickcontrols/private/keysequencehelper.h
--- old/kdeclarative-5.30.0/src/qmlcontrols/kquickcontrols/private/keysequencehelper.h 2017-01-08 21:48:46.000000000 +0100
+++ new/kdeclarative-5.31.0/src/qmlcontrols/kquickcontrols/private/keysequencehelper.h 2017-02-05 11:52:50.000000000 +0100
@@ -37,8 +37,6 @@
{
Q_OBJECT
- Q_FLAGS(ShortcutTypes)
-
Q_PROPERTY(
QKeySequence keySequence
READ keySequence
@@ -68,11 +66,12 @@
GlobalShortcuts = 0x02 //!< Check against global shortcuts. @see KGlobalAccel
};
Q_DECLARE_FLAGS(ShortcutTypes, ShortcutType)
+ Q_FLAG(ShortcutTypes)
/**
* Constructor.
*/
- explicit KeySequenceHelper(QObject* parent = 0);
+ explicit KeySequenceHelper(QObject* parent = nullptr);
/**
* Destructs the widget.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.30.0/src/qmlcontrols/kquickcontrols/private/translationcontext.h new/kdeclarative-5.31.0/src/qmlcontrols/kquickcontrols/private/translationcontext.h
--- old/kdeclarative-5.30.0/src/qmlcontrols/kquickcontrols/private/translationcontext.h 2017-01-08 21:48:46.000000000 +0100
+++ new/kdeclarative-5.31.0/src/qmlcontrols/kquickcontrols/private/translationcontext.h 2017-02-05 11:52:50.000000000 +0100
@@ -28,7 +28,7 @@
Q_PROPERTY(QString domain READ domain WRITE setDomain NOTIFY domainChanged)
public:
- explicit TranslationContext(QObject* parent = 0);
+ explicit TranslationContext(QObject* parent = nullptr);
virtual ~TranslationContext();
QString domain() const;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.30.0/src/qmlcontrols/kquickcontrolsaddons/clipboard.h new/kdeclarative-5.31.0/src/qmlcontrols/kquickcontrolsaddons/clipboard.h
--- old/kdeclarative-5.30.0/src/qmlcontrols/kquickcontrolsaddons/clipboard.h 2017-01-08 21:48:46.000000000 +0100
+++ new/kdeclarative-5.31.0/src/qmlcontrols/kquickcontrolsaddons/clipboard.h 2017-02-05 11:52:50.000000000 +0100
@@ -45,7 +45,7 @@
Q_PROPERTY(QStringList formats READ formats NOTIFY contentChanged)
public:
- explicit Clipboard(QObject* parent = 0);
+ explicit Clipboard(QObject* parent = nullptr);
QClipboard::Mode mode() const;
void setMode(QClipboard::Mode mode);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.30.0/src/qmlcontrols/kquickcontrolsaddons/columnproxymodel.cpp new/kdeclarative-5.31.0/src/qmlcontrols/kquickcontrolsaddons/columnproxymodel.cpp
--- old/kdeclarative-5.30.0/src/qmlcontrols/kquickcontrolsaddons/columnproxymodel.cpp 2017-01-08 21:48:46.000000000 +0100
+++ new/kdeclarative-5.31.0/src/qmlcontrols/kquickcontrolsaddons/columnproxymodel.cpp 2017-02-05 11:52:50.000000000 +0100
@@ -22,7 +22,7 @@
ColumnProxyModel::ColumnProxyModel(QObject* parent)
: QAbstractListModel(parent)
, m_column(0)
- , m_sourceModel(0)
+ , m_sourceModel(nullptr)
{}
void ColumnProxyModel::setSourceModel(QAbstractItemModel* sourceModel)
@@ -167,7 +167,7 @@
Q_ASSERT(source==m_sourceModel);
beginResetModel();
- m_sourceModel = 0;
+ m_sourceModel = nullptr;
endResetModel();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.30.0/src/qmlcontrols/kquickcontrolsaddons/columnproxymodel.h new/kdeclarative-5.31.0/src/qmlcontrols/kquickcontrolsaddons/columnproxymodel.h
--- old/kdeclarative-5.30.0/src/qmlcontrols/kquickcontrolsaddons/columnproxymodel.h 2017-01-08 21:48:46.000000000 +0100
+++ new/kdeclarative-5.31.0/src/qmlcontrols/kquickcontrolsaddons/columnproxymodel.h 2017-02-05 11:52:50.000000000 +0100
@@ -29,7 +29,7 @@
// Q_PROPERTY(QAbstractItemModel* sourceModel READ sourceModel WRITE setSourceModel) //rootIndex sets the model
Q_PROPERTY(int column READ column WRITE setColumn)
public:
- ColumnProxyModel(QObject* parent = 0);
+ ColumnProxyModel(QObject* parent = nullptr);
void setRootIndex(const QModelIndex& idx);
QModelIndex rootIndex() const;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.30.0/src/qmlcontrols/kquickcontrolsaddons/eventgenerator.h new/kdeclarative-5.31.0/src/qmlcontrols/kquickcontrolsaddons/eventgenerator.h
--- old/kdeclarative-5.30.0/src/qmlcontrols/kquickcontrolsaddons/eventgenerator.h 2017-01-08 21:48:46.000000000 +0100
+++ new/kdeclarative-5.31.0/src/qmlcontrols/kquickcontrolsaddons/eventgenerator.h 2017-02-05 11:52:50.000000000 +0100
@@ -36,15 +36,15 @@
MouseButtonRelease,
MouseMove
};
- Q_ENUMS(MouseEvent)
+ Q_ENUM(MouseEvent)
enum GrabEvent {
GrabMouse,
UngrabMouse
};
- Q_ENUMS(GrabEvent)
+ Q_ENUM(GrabEvent)
- EventGenerator(QObject *parent = 0);
+ EventGenerator(QObject *parent = nullptr);
~EventGenerator();
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.30.0/src/qmlcontrols/kquickcontrolsaddons/icondialog.cpp new/kdeclarative-5.31.0/src/qmlcontrols/kquickcontrolsaddons/icondialog.cpp
--- old/kdeclarative-5.30.0/src/qmlcontrols/kquickcontrolsaddons/icondialog.cpp 2017-01-08 21:48:46.000000000 +0100
+++ new/kdeclarative-5.31.0/src/qmlcontrols/kquickcontrolsaddons/icondialog.cpp 2017-02-05 11:52:50.000000000 +0100
@@ -28,7 +28,7 @@
IconDialog::IconDialog(QObject *parent)
: QObject(parent)
- , m_dialog(Q_NULLPTR)
+ , m_dialog(nullptr)
, m_iconSize(0)
, m_user(false)
, m_modality(Qt::WindowModal)
@@ -161,7 +161,7 @@
m_dialog->setWindowModality(m_modality);
- m_dialog->setup(KIconLoader::NoGroup, KIconLoader::Application, false, m_iconSize, m_user);
+ m_dialog->setup(KIconLoader::Desktop, KIconLoader::Application, false, m_iconSize, m_user);
m_dialog->show();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.30.0/src/qmlcontrols/kquickcontrolsaddons/icondialog.h new/kdeclarative-5.31.0/src/qmlcontrols/kquickcontrolsaddons/icondialog.h
--- old/kdeclarative-5.30.0/src/qmlcontrols/kquickcontrolsaddons/icondialog.h 2017-01-08 21:48:46.000000000 +0100
+++ new/kdeclarative-5.31.0/src/qmlcontrols/kquickcontrolsaddons/icondialog.h 2017-02-05 11:52:50.000000000 +0100
@@ -61,7 +61,7 @@
Q_PROPERTY(bool visible READ visible WRITE setVisible NOTIFY visibleChanged)
public:
- explicit IconDialog(QObject *parent = Q_NULLPTR);
+ explicit IconDialog(QObject *parent = nullptr);
virtual ~IconDialog();
QString iconName() const;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.30.0/src/qmlcontrols/kquickcontrolsaddons/kcmshell.h new/kdeclarative-5.31.0/src/qmlcontrols/kquickcontrolsaddons/kcmshell.h
--- old/kdeclarative-5.30.0/src/qmlcontrols/kquickcontrolsaddons/kcmshell.h 2017-01-08 21:48:46.000000000 +0100
+++ new/kdeclarative-5.31.0/src/qmlcontrols/kquickcontrolsaddons/kcmshell.h 2017-02-05 11:52:50.000000000 +0100
@@ -27,7 +27,7 @@
Q_OBJECT
public:
- explicit KCMShell(QObject *parent = Q_NULLPTR);
+ explicit KCMShell(QObject *parent = nullptr);
virtual ~KCMShell();
public Q_SLOTS:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.30.0/src/qmlcontrols/kquickcontrolsaddons/mimedatabase.h new/kdeclarative-5.31.0/src/qmlcontrols/kquickcontrolsaddons/mimedatabase.h
--- old/kdeclarative-5.30.0/src/qmlcontrols/kquickcontrolsaddons/mimedatabase.h 2017-01-08 21:48:46.000000000 +0100
+++ new/kdeclarative-5.31.0/src/qmlcontrols/kquickcontrolsaddons/mimedatabase.h 2017-02-05 11:52:50.000000000 +0100
@@ -27,7 +27,7 @@
{
Q_OBJECT
public:
- MimeDatabase(QObject* parent = 0);
+ MimeDatabase(QObject* parent = nullptr);
Q_SCRIPTABLE QJsonObject mimeTypeForUrl(const QUrl & url) const;
Q_SCRIPTABLE QJsonObject mimeTypeForName(const QString & name) const;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.30.0/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.cpp new/kdeclarative-5.31.0/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.cpp
--- old/kdeclarative-5.30.0/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.cpp 2017-01-08 21:48:46.000000000 +0100
+++ new/kdeclarative-5.31.0/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.cpp 2017-02-05 11:52:50.000000000 +0100
@@ -32,8 +32,8 @@
MouseEventListener::MouseEventListener(QQuickItem *parent)
: QQuickItem(parent),
m_pressed(false),
- m_pressAndHoldEvent(0),
- m_lastEvent(0),
+ m_pressAndHoldEvent(nullptr),
+ m_lastEvent(nullptr),
m_containsMouse(false),
m_acceptedButtons(Qt::LeftButton)
{
@@ -132,7 +132,7 @@
screenPos = w->mapToGlobal(event->pos());
}
- KDeclarativeMouseEvent dme(event->pos().x(), event->pos().y(), screenPos.x(), screenPos.y(), Qt::NoButton, Qt::NoButton, event->modifiers(), 0);
+ KDeclarativeMouseEvent dme(event->pos().x(), event->pos().y(), screenPos.x(), screenPos.y(), Qt::NoButton, Qt::NoButton, event->modifiers(), nullptr);
emit positionChanged(&dme);
}
@@ -223,7 +223,7 @@
emit pressAndHold(m_pressAndHoldEvent);
delete m_pressAndHoldEvent;
- m_pressAndHoldEvent = 0;
+ m_pressAndHoldEvent = nullptr;
}
}
@@ -277,7 +277,7 @@
screenPos = w->mapToGlobal(myPos.toPoint());
}
- KDeclarativeMouseEvent dme(myPos.x(), myPos.y(), screenPos.x(), screenPos.y(), Qt::NoButton, Qt::NoButton, he->modifiers(), 0);
+ KDeclarativeMouseEvent dme(myPos.x(), myPos.y(), screenPos.x(), screenPos.y(), Qt::NoButton, Qt::NoButton, he->modifiers(), nullptr);
//qDebug() << "positionChanged..." << dme.x() << dme.y();
emit positionChanged(&dme);
break;
@@ -349,7 +349,7 @@
return screen;
}
}
- return 0;
+ return nullptr;
}
void MouseEventListener::mouseUngrabEvent()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.30.0/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.h new/kdeclarative-5.31.0/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.h
--- old/kdeclarative-5.30.0/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.h 2017-01-08 21:48:46.000000000 +0100
+++ new/kdeclarative-5.31.0/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.h 2017-02-05 11:52:50.000000000 +0100
@@ -163,7 +163,7 @@
Q_PROPERTY(bool pressed READ isPressed NOTIFY pressedChanged)
public:
- MouseEventListener(QQuickItem *parent=0);
+ MouseEventListener(QQuickItem *parent=nullptr);
~MouseEventListener();
bool containsMouse() const;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.30.0/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp new/kdeclarative-5.31.0/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp
--- old/kdeclarative-5.30.0/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp 2017-01-08 21:48:46.000000000 +0100
+++ new/kdeclarative-5.31.0/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp 2017-02-05 11:52:50.000000000 +0100
@@ -501,7 +501,7 @@
QQmlListProperty<PlotData> Plotter::dataSets()
{
- return QQmlListProperty<PlotData>(this, 0, Plotter::dataSet_append, Plotter::dataSet_count, Plotter::dataSet_at, Plotter::dataSet_clear);
+ return QQmlListProperty<PlotData>(this, nullptr, Plotter::dataSet_append, Plotter::dataSet_count, Plotter::dataSet_at, Plotter::dataSet_clear);
}
@@ -712,14 +712,14 @@
Q_UNUSED(updatePaintNodeData)
if (!window()->openglContext()) {
delete oldNode;
- return Q_NULLPTR;
+ return nullptr;
}
QSGSimpleTextureNode *n = static_cast(oldNode);
if (width() == 0 && height() == 0) {
delete oldNode;
- return Q_NULLPTR;
+ return nullptr;
}
if (!n) {
@@ -822,7 +822,7 @@
qreal adjustedMin = m_min;
m_mutex.lock();
if (m_stacked) {
- PlotData *previousData = 0;
+ PlotData *previousData = nullptr;
auto i = m_plotData.constEnd();
do {
--i;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.30.0/src/qmlcontrols/kquickcontrolsaddons/plotter.h new/kdeclarative-5.31.0/src/qmlcontrols/kquickcontrolsaddons/plotter.h
--- old/kdeclarative-5.30.0/src/qmlcontrols/kquickcontrolsaddons/plotter.h 2017-01-08 21:48:46.000000000 +0100
+++ new/kdeclarative-5.31.0/src/qmlcontrols/kquickcontrolsaddons/plotter.h 2017-02-05 11:52:50.000000000 +0100
@@ -69,7 +69,7 @@
Q_PROPERTY(qreal min READ min NOTIFY minChanged)
public:
- PlotData(QObject *parent = 0);
+ PlotData(QObject *parent = nullptr);
void setColor(const QColor &color);
QColor color() const;
@@ -165,7 +165,7 @@
//Q_CLASSINFO("DefaultProperty", "dataSets")
public:
- Plotter(QQuickItem *parent = 0);
+ Plotter(QQuickItem *parent = nullptr);
~Plotter();
qreal max() const;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.30.0/src/qmlcontrols/kquickcontrolsaddons/qiconitem.cpp new/kdeclarative-5.31.0/src/qmlcontrols/kquickcontrolsaddons/qiconitem.cpp
--- old/kdeclarative-5.30.0/src/qmlcontrols/kquickcontrolsaddons/qiconitem.cpp 2017-01-08 21:48:46.000000000 +0100
+++ new/kdeclarative-5.31.0/src/qmlcontrols/kquickcontrolsaddons/qiconitem.cpp 2017-02-05 11:52:50.000000000 +0100
@@ -122,10 +122,10 @@
{
if (m_icon.isNull()) {
delete node;
- return Q_NULLPTR;
+ return nullptr;
}
- if (m_changed || node == 0) {
+ if (m_changed || node == nullptr) {
m_changed = false;
ManagedTextureNode* mNode = dynamic_cast(node);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.30.0/src/qmlcontrols/kquickcontrolsaddons/qiconitem.h new/kdeclarative-5.31.0/src/qmlcontrols/kquickcontrolsaddons/qiconitem.h
--- old/kdeclarative-5.30.0/src/qmlcontrols/kquickcontrolsaddons/qiconitem.h 2017-01-08 21:48:46.000000000 +0100
+++ new/kdeclarative-5.31.0/src/qmlcontrols/kquickcontrolsaddons/qiconitem.h 2017-02-05 11:52:50.000000000 +0100
@@ -34,8 +34,6 @@
Q_PROPERTY(State state READ state WRITE setState NOTIFY stateChanged)
Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY stateChanged)
- Q_ENUMS(State)
-
public:
enum State {
@@ -44,8 +42,9 @@
DisabledState, ///Icon is disabled.
SelectedState ///Icon is selected
};
+ Q_ENUM(State)
- QIconItem(QQuickItem *parent=0);
+ QIconItem(QQuickItem *parent=nullptr);
~QIconItem();
void setIcon(const QVariant &icon);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.30.0/src/qmlcontrols/kquickcontrolsaddons/qimageitem.h new/kdeclarative-5.31.0/src/qmlcontrols/kquickcontrolsaddons/qimageitem.h
--- old/kdeclarative-5.30.0/src/qmlcontrols/kquickcontrolsaddons/qimageitem.h 2017-01-08 21:48:46.000000000 +0100
+++ new/kdeclarative-5.31.0/src/qmlcontrols/kquickcontrolsaddons/qimageitem.h 2017-02-05 11:52:50.000000000 +0100
@@ -35,7 +35,6 @@
Q_PROPERTY(int paintedHeight READ paintedHeight NOTIFY paintedHeightChanged)
Q_PROPERTY(FillMode fillMode READ fillMode WRITE setFillMode NOTIFY fillModeChanged)
Q_PROPERTY(bool null READ isNull NOTIFY nullChanged)
- Q_ENUMS(FillMode)
public:
enum FillMode {
@@ -46,8 +45,9 @@
TileVertically, // the image is stretched horizontally and tiled vertically
TileHorizontally //the image is stretched vertically and tiled horizontally
};
+ Q_ENUM(FillMode)
- QImageItem(QQuickItem *parent=0);
+ QImageItem(QQuickItem *parent=nullptr);
~QImageItem();
void setImage(const QImage &image);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.30.0/src/qmlcontrols/kquickcontrolsaddons/qpixmapitem.h new/kdeclarative-5.31.0/src/qmlcontrols/kquickcontrolsaddons/qpixmapitem.h
--- old/kdeclarative-5.30.0/src/qmlcontrols/kquickcontrolsaddons/qpixmapitem.h 2017-01-08 21:48:46.000000000 +0100
+++ new/kdeclarative-5.31.0/src/qmlcontrols/kquickcontrolsaddons/qpixmapitem.h 2017-02-05 11:52:50.000000000 +0100
@@ -35,7 +35,6 @@
Q_PROPERTY(int paintedHeight READ paintedHeight NOTIFY paintedHeightChanged)
Q_PROPERTY(FillMode fillMode READ fillMode WRITE setFillMode NOTIFY fillModeChanged)
Q_PROPERTY(bool null READ isNull NOTIFY nullChanged)
- Q_ENUMS(FillMode)
public:
enum FillMode {
@@ -46,8 +45,9 @@
TileVertically, // the image is stretched horizontally and tiled vertically
TileHorizontally //the image is stretched vertically and tiled horizontally
};
+ Q_ENUM(FillMode)
- QPixmapItem(QQuickItem *parent=0);
+ QPixmapItem(QQuickItem *parent=nullptr);
~QPixmapItem();
void setPixmap(const QPixmap &pixmap);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.30.0/src/qmlcontrols/kwindowsystemplugin/kwindowsystemproxy.h new/kdeclarative-5.31.0/src/qmlcontrols/kwindowsystemplugin/kwindowsystemproxy.h
--- old/kdeclarative-5.30.0/src/qmlcontrols/kwindowsystemplugin/kwindowsystemproxy.h 2017-01-08 21:48:46.000000000 +0100
+++ new/kdeclarative-5.31.0/src/qmlcontrols/kwindowsystemplugin/kwindowsystemproxy.h 2017-02-05 11:52:50.000000000 +0100
@@ -79,7 +79,7 @@
Q_PROPERTY(bool compositingActive READ compositingActive NOTIFY compositingActiveChanged)
public:
- explicit KWindowSystemProxy(QObject *parent = Q_NULLPTR);
+ explicit KWindowSystemProxy(QObject *parent = nullptr);
virtual ~KWindowSystemProxy();
int currentDesktop() const;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.30.0/src/quickaddons/configmodule.cpp new/kdeclarative-5.31.0/src/quickaddons/configmodule.cpp
--- old/kdeclarative-5.30.0/src/quickaddons/configmodule.cpp 2017-01-08 21:48:46.000000000 +0100
+++ new/kdeclarative-5.31.0/src/quickaddons/configmodule.cpp 2017-02-05 11:52:50.000000000 +0100
@@ -48,9 +48,9 @@
public:
ConfigModulePrivate(ConfigModule *module):
_q(module),
- _qmlObject(Q_NULLPTR),
+ _qmlObject(nullptr),
_buttons(ConfigModule::Help | ConfigModule::Default | ConfigModule::Apply),
- _about(0),
+ _about(nullptr),
_useRootOnlyMessage(false),
_needsAuthorization(false),
_needsSave(false)
@@ -119,7 +119,7 @@
if (!object->parent() && ConfigModulePrivate::s_rootObjects.contains(QtQml::qmlEngine(object))) {
return ConfigModulePrivate::s_rootObjects.value(QtQml::qmlEngine(object));
} else {
- return 0;
+ return nullptr;
}
}
@@ -145,7 +145,7 @@
return qobject_cast(d->_qmlObject->rootObject());
} else {
qWarning() << "Error loading the module" << aboutData()->componentName() << ": no QML file provided";
- return 0;
+ return nullptr;
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.30.0/src/quickaddons/configmodule.h new/kdeclarative-5.31.0/src/quickaddons/configmodule.h
--- old/kdeclarative-5.30.0/src/quickaddons/configmodule.h 2017-01-08 21:48:46.000000000 +0100
+++ new/kdeclarative-5.31.0/src/quickaddons/configmodule.h 2017-02-05 11:52:50.000000000 +0100
@@ -136,7 +136,6 @@
{
Q_OBJECT
- Q_FLAGS(Buttons)
Q_PROPERTY(QQuickItem *mainUi READ mainUi CONSTANT)
Q_PROPERTY(KQuickAddons::ConfigModule::Buttons buttons READ buttons WRITE setButtons NOTIFY buttonsChanged)
Q_PROPERTY(bool needsSave READ needsSave WRITE setNeedsSave NOTIFY needsSaveChanged)
@@ -160,8 +159,9 @@
Default = 2,
Apply = 4
};
- Q_ENUMS(Button)
+ Q_ENUM(Button)
Q_DECLARE_FLAGS(Buttons, Button)
+ Q_FLAG(Buttons)
/**
* Base class for all KControlModules.
@@ -170,7 +170,7 @@
* to any slot.
* @param aboutData becomes owned by the ConfigModule
*/
- explicit ConfigModule(const KAboutData *aboutData, QObject *parent = 0, const QVariantList &args = QVariantList());
+ explicit ConfigModule(const KAboutData *aboutData, QObject *parent = nullptr, const QVariantList &args = QVariantList());
/**
* @note do not emit changed signals here, since they are not yet connected
@@ -178,7 +178,7 @@
* @param metaData description for the plugin: it will generate a KAboutData from that
* @since 5.11
*/
- explicit ConfigModule(const KPluginMetaData &metaData, QObject *parent = 0, const QVariantList &args = QVariantList());
+ explicit ConfigModule(const KPluginMetaData &metaData, QObject *parent = nullptr, const QVariantList &args = QVariantList());
/**
* Base class for all KControlModules.
@@ -186,7 +186,7 @@
* @note do not emit changed signals here, since they are not yet connected
* to any slot.
*/
- explicit ConfigModule(QObject *parent = 0, const QVariantList &args = QVariantList());
+ explicit ConfigModule(QObject *parent = nullptr, const QVariantList &args = QVariantList());
/**
* Destroys the module.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.30.0/src/quickaddons/imagetexturescache.cpp new/kdeclarative-5.31.0/src/quickaddons/imagetexturescache.cpp
--- old/kdeclarative-5.30.0/src/quickaddons/imagetexturescache.cpp 2017-01-08 21:48:46.000000000 +0100
+++ new/kdeclarative-5.31.0/src/quickaddons/imagetexturescache.cpp 2017-02-05 11:52:50.000000000 +0100
@@ -66,5 +66,5 @@
QSharedPointer<QSGTexture> ImageTexturesCache::loadTexture(QQuickWindow *window, const QImage &image)
{
- return loadTexture(window, image, 0);
+ return loadTexture(window, image, nullptr);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.30.0/src/quickaddons/quickviewsharedengine.cpp new/kdeclarative-5.31.0/src/quickaddons/quickviewsharedengine.cpp
--- old/kdeclarative-5.30.0/src/quickaddons/quickviewsharedengine.cpp 2017-01-08 21:48:46.000000000 +0100
+++ new/kdeclarative-5.31.0/src/quickaddons/quickviewsharedengine.cpp 2017-02-05 11:52:50.000000000 +0100
@@ -85,8 +85,7 @@
if(q->size().isEmpty()) {
q->resize(initialSize);
- q->contentItem()->setWidth(item->width());
- q->contentItem()->setHeight(item->height());
+ q->contentItem()->setSize(initialSize);
}
syncResizeMode();
@@ -101,8 +100,7 @@
}
if (resizeMode == QuickViewSharedEngine::SizeRootObjectToView) {
- item->setWidth(q->width());
- item->setHeight(q->height());
+ item->setSize(QSize(q->width(), q->height()));
QObject::disconnect(item, SIGNAL(widthChanged()),
q, SLOT(syncWidth()));
@@ -268,8 +266,7 @@
{
QQuickItem *item = qobject_cast(d->qmlObject->rootObject());
if (item && d->resizeMode == SizeRootObjectToView) {
- item->setWidth(e->size().width());
- item->setHeight(e->size().height());
+ item->setSize(e->size());
}
QQuickWindow::resizeEvent(e);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.30.0/src/quickaddons/quickviewsharedengine.h new/kdeclarative-5.31.0/src/quickaddons/quickviewsharedengine.h
--- old/kdeclarative-5.30.0/src/quickaddons/quickviewsharedengine.h 2017-01-08 21:48:46.000000000 +0100
+++ new/kdeclarative-5.31.0/src/quickaddons/quickviewsharedengine.h 2017-02-05 11:52:50.000000000 +0100
@@ -45,15 +45,15 @@
Q_PROPERTY(ResizeMode resizeMode READ resizeMode WRITE setResizeMode NOTIFY resizeModeChanged)
Q_PROPERTY(QQmlComponent::Status status READ status NOTIFY statusChanged)
Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
- Q_ENUMS(ResizeMode)
public:
enum ResizeMode {
SizeViewToRootObject,
SizeRootObjectToView
};
+ Q_ENUM(ResizeMode)
- explicit QuickViewSharedEngine(QWindow *parent = 0);
+ explicit QuickViewSharedEngine(QWindow *parent = nullptr);
~QuickViewSharedEngine();
/**