Hello community,
here is the log from the commit of package kparts for openSUSE:Factory checked in at 2017-03-03 19:48:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kparts (Old)
and /work/SRC/openSUSE:Factory/.kparts.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kparts"
Fri Mar 3 19:48:37 2017 rev:37 rq:461451 version:5.31.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kparts/kparts.changes 2017-02-03 17:45:56.530713975 +0100
+++ /work/SRC/openSUSE:Factory/.kparts.new/kparts.changes 2017-03-03 19:48:38.249892002 +0100
@@ -1,0 +2,7 @@
+Thu Feb 9 09:32:04 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:
----
kparts-5.30.0.tar.xz
New:
----
kparts-5.31.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kparts.spec ++++++
--- /var/tmp/diff_new_pack.eQ0NHw/_old 2017-03-03 19:48:38.769818607 +0100
+++ /var/tmp/diff_new_pack.eQ0NHw/_new 2017-03-03 19:48:38.773818043 +0100
@@ -18,9 +18,9 @@
%bcond_without lang
%define lname libKF5Parts5
-%define _tar_path 5.30
+%define _tar_path 5.31
Name: kparts
-Version: 5.30.0
+Version: 5.31.0
Release: 0
%define kf5_version %{version}
BuildRequires: cmake >= 3.0
@@ -42,11 +42,11 @@
BuildRequires: kwindowsystem-devel >= %{_tar_path}
BuildRequires: kxmlgui-devel >= %{_tar_path}
BuildRequires: solid-devel >= %{_tar_path}
-BuildRequires: cmake(Qt5Core) >= 5.5.0
-BuildRequires: cmake(Qt5Network) >= 5.5.0
-BuildRequires: cmake(Qt5Test) >= 5.5.0
-BuildRequires: cmake(Qt5Widgets) >= 5.5.0
-BuildRequires: cmake(Qt5Xml) >= 5.5.0
+BuildRequires: cmake(Qt5Core) >= 5.6.0
+BuildRequires: cmake(Qt5Network) >= 5.6.0
+BuildRequires: cmake(Qt5Test) >= 5.6.0
+BuildRequires: cmake(Qt5Widgets) >= 5.6.0
+BuildRequires: cmake(Qt5Xml) >= 5.6.0
Summary: Plugin framework for user interface components
License: LGPL-2.1+
Group: System/GUI/KDE
++++++ kparts-5.30.0.tar.xz -> kparts-5.31.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/CMakeLists.txt new/kparts-5.31.0/CMakeLists.txt
--- old/kparts-5.30.0/CMakeLists.txt 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/CMakeLists.txt 2017-02-05 12:08:30.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(KParts 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 Core Widgets Xml)
include(KDEInstallDirs)
include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/autotests/openorsavequestion_unittest.cpp new/kparts-5.31.0/autotests/openorsavequestion_unittest.cpp
--- old/kparts-5.30.0/autotests/openorsavequestion_unittest.cpp 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/autotests/openorsavequestion_unittest.cpp 2017-02-05 12:08:30.000000000 +0100
@@ -53,7 +53,7 @@
void testAutoEmbed()
{
// This one should get the fast path, no dialog should show up.
- BrowserOpenOrSaveQuestion questionEmbedHtml(0, QUrl(QStringLiteral("http://www.example.com/")),
+ BrowserOpenOrSaveQuestion questionEmbedHtml(nullptr, QUrl(QStringLiteral("http://www.example.com/")),
QString::fromLatin1("text/html"));
QCOMPARE(questionEmbedHtml.askEmbedOrSave(), BrowserOpenOrSaveQuestion::Embed);
@@ -62,7 +62,7 @@
{
KSharedConfig::Ptr cfg = KSharedConfig::openConfig(QStringLiteral("filetypesrc"), KConfig::NoGlobals);
cfg->group("Notification Messages").writeEntry("askSave" "text/plain", "false");
- BrowserOpenOrSaveQuestion question(0, QUrl(QStringLiteral("http://www.example.com/")),
+ BrowserOpenOrSaveQuestion question(nullptr, QUrl(QStringLiteral("http://www.example.com/")),
QString::fromLatin1("text/plain"));
QCOMPARE((int)question.askOpenOrSave(), (int)BrowserOpenOrSaveQuestion::Open);
cfg->group("Notification Messages").writeEntry("askSave" "text/plain", "true");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/autotests/parttest.cpp new/kparts-5.31.0/autotests/parttest.cpp
--- old/kparts-5.30.0/autotests/parttest.cpp 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/autotests/parttest.cpp 2017-02-05 12:08:30.000000000 +0100
@@ -53,37 +53,37 @@
void PartTest::testAutoDeletePart()
{
- KParts::Part *part = new TestPart(0, 0);
+ KParts::Part *part = new TestPart(nullptr, nullptr);
QPointerKParts::Part partPointer(part);
delete part->widget();
- QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
+ QCoreApplication::sendPostedEvents(nullptr, QEvent::DeferredDelete);
QVERIFY(partPointer.isNull());
}
void PartTest::testAutoDeleteWidget()
{
- KParts::Part *part = new TestPart(0, 0);
+ KParts::Part *part = new TestPart(nullptr, nullptr);
QPointerKParts::Part partPointer(part);
QPointer<QWidget> widgetPointer(part->widget());
delete part;
- QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
+ QCoreApplication::sendPostedEvents(nullptr, QEvent::DeferredDelete);
QVERIFY(widgetPointer.isNull());
}
void PartTest::testNoAutoDeletePart()
{
- KParts::Part *part = new TestPart(0, 0);
+ KParts::Part *part = new TestPart(nullptr, nullptr);
part->setAutoDeletePart(false);
QPointerKParts::Part partPointer(part);
delete part->widget();
- QVERIFY(part->widget() == 0);
+ QVERIFY(part->widget() == nullptr);
QCOMPARE(static_cast(partPointer), part);
delete part;
}
void PartTest::testNoAutoDeleteWidget()
{
- KParts::Part *part = new TestPart(0, 0);
+ KParts::Part *part = new TestPart(nullptr, nullptr);
part->setAutoDeleteWidget(false);
QWidget *widget = part->widget();
QVERIFY(widget);
@@ -105,7 +105,7 @@
void PartTest::testOpenUrlArguments()
{
- TestPart *part = new TestPart(0, 0);
+ TestPart *part = new TestPart(nullptr, nullptr);
QVERIFY(part->closeUrl()); // nothing to do, no error
QVERIFY(part->arguments().mimeType().isEmpty());
KParts::OpenUrlArguments args;
@@ -133,7 +133,7 @@
void PartTest::testAutomaticMimeType()
{
- TestPart *part = new TestPart(0, 0);
+ TestPart *part = new TestPart(nullptr, nullptr);
QVERIFY(part->closeUrl()); // nothing to do, no error
QVERIFY(part->arguments().mimeType().isEmpty());
// open a file, and test the detected mimetype
@@ -188,7 +188,7 @@
{
QVERIFY(tb->isVisible());
- TestPart *part = new TestPart(0, 0);
+ TestPart *part = new TestPart(nullptr, nullptr);
// TODO define xml with a toolbar for the part
// and put some saved settings into qttestrc in order to test
// r347935+r348051, i.e. the fact that KParts::MainWindow::createGUI
@@ -200,14 +200,14 @@
this->saveAutoSaveSettings();
// Hide the toolbar using the action (so that setSettingsDirty is called, too)
- KToggleToolBarAction action(tb, QString(), 0);
+ KToggleToolBarAction action(tb, QString(), nullptr);
action.trigger();
QVERIFY(!tb->isVisible());
// Switch the active part, and check that
// the toolbar doesn't magically reappear,
// as it did when createGUI was calling applyMainWindowSettings
- this->createGUI(0);
+ this->createGUI(nullptr);
QVERIFY(!tb->isVisible());
this->createGUI(part);
QVERIFY(!tb->isVisible());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/po/de/kparts5.po new/kparts-5.31.0/po/de/kparts5.po
--- old/kparts-5.30.0/po/de/kparts5.po 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/po/de/kparts5.po 2017-02-05 12:08:30.000000000 +0100
@@ -4,7 +4,7 @@
# Stephan Johach , 2004, 2005, 2006, 2007.
# Georg Schuster , 2005.
# Thomas Reitelbach , 2005, 2006, 2007, 2008, 2009.
-# Burkhard Lück , 2006, 2007, 2009, 2010, 2011, 2012, 2013, 2014.
+# Burkhard Lück , 2006, 2007, 2009, 2010, 2011, 2012, 2013, 2014, 2017.
# Frederik Schwarzer , 2007, 2008, 2009, 2010, 2011, 2012, 2013.
# Johannes Obermayr , 2010.
# Panagiotis Papadopoulos , 2010.
@@ -14,14 +14,14 @@
"Project-Id-Version: kdelibs4\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2016-11-19 20:12+0100\n"
-"PO-Revision-Date: 2014-02-27 08:40+0100\n"
+"PO-Revision-Date: 2017-01-21 15:10+0100\n"
"Last-Translator: Burkhard Lück \n"
"Language-Team: German \n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 2.0\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
#, kde-format
@@ -127,7 +127,7 @@
#: browserrun.cpp:405
#, kde-format
msgid "The Download Manager (%1) could not be found in your $PATH "
-msgstr "Der Downloadmanager %1 ist über Ihren PATH nicht auffindbar "
+msgstr "Die Download-Verwaltung %1 wurde in Ihrem $PATH nicht gefunden "
#: browserrun.cpp:406
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/po/gl/kparts5.po new/kparts-5.31.0/po/gl/kparts5.po
--- old/kparts-5.30.0/po/gl/kparts5.po 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/po/gl/kparts5.po 2017-02-05 12:08:30.000000000 +0100
@@ -40,7 +40,7 @@
#: browserextension.cpp:241
#, kde-format
msgid "<qt>Do you want to search the Internet for <b>%1</b>?</qt>"
-msgstr "<qt>Desexa buscar <b>%1</b> en internet?</qt>"
+msgstr "<qt>Quere buscar <b>%1</b> en internet?</qt>"
#: browserextension.cpp:242
#, kde-format
@@ -86,7 +86,7 @@
#, kde-format
msgctxt "@label:button"
msgid "&Open with..."
-msgstr "&Abrir con..."
+msgstr "&Abrir con…"
#: browseropenorsavequestion.cpp:266
#, kde-format
@@ -115,7 +115,7 @@
#: browserrun.cpp:346
#, kde-format
msgid "Do you really want to execute '%1'?"
-msgstr "Desexa realmente executar «%1»?"
+msgstr "Está seguro de que quere executar «%1»?"
#: browserrun.cpp:347
#, kde-format
@@ -139,7 +139,7 @@
"\n"
"The integration with Konqueror will be disabled."
msgstr ""
-"Tente instalalo de novo\n"
+"Intente instalalo de novo\n"
"\n"
"Desactivarase a integración con Konqueror."
@@ -170,7 +170,7 @@
"Do you want to save your changes or discard them?"
msgstr ""
"O documento «%1» foi modificado.\n"
-"Desexa gardar os cambios ou descartalos?"
+"Quere gardar os cambios ou descartalos?"
#: readwritepart.cpp:104
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/src/browserarguments.cpp new/kparts-5.31.0/src/browserarguments.cpp
--- old/kparts-5.30.0/src/browserarguments.cpp 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/src/browserarguments.cpp 2017-02-05 12:08:30.000000000 +0100
@@ -48,12 +48,12 @@
{
softReload = false;
trustedSource = false;
- d = 0; // Let's build it on demand for now
+ d = nullptr; // Let's build it on demand for now
}
BrowserArguments::BrowserArguments(const BrowserArguments &args)
{
- d = 0;
+ d = nullptr;
(*this) = args;
}
@@ -63,7 +63,7 @@
return *this;
}
- delete d; d = 0;
+ delete d; d = nullptr;
softReload = args.softReload;
postData = args.postData;
@@ -81,7 +81,7 @@
BrowserArguments::~BrowserArguments()
{
delete d;
- d = 0;
+ d = nullptr;
}
void BrowserArguments::setContentType(const QString &contentType)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/src/browserextension.cpp new/kparts-5.31.0/src/browserextension.cpp
--- old/kparts-5.30.0/src/browserextension.cpp 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/src/browserextension.cpp 2017-02-05 12:08:30.000000000 +0100
@@ -66,7 +66,7 @@
public:
BrowserExtensionPrivate(KParts::ReadOnlyPart *parent)
: m_urlDropHandlingEnabled(false),
- m_browserInterface(0),
+ m_browserInterface(nullptr),
m_part(parent)
{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/src/browserextension.h new/kparts-5.31.0/src/browserextension.h
--- old/kparts-5.30.0/src/browserextension.h 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/src/browserextension.h 2017-02-05 12:08:30.000000000 +0100
@@ -354,7 +354,7 @@
const KParts::OpenUrlArguments &arguments = KParts::OpenUrlArguments(),
const KParts::BrowserArguments &browserArguments = KParts::BrowserArguments(),
const KParts::WindowArgs &windowArgs = KParts::WindowArgs(),
- KParts::ReadOnlyPart **part = 0); // TODO consider moving to BrowserHostExtension?
+ KParts::ReadOnlyPart **part = nullptr); // TODO consider moving to BrowserHostExtension?
/**
* Since the part emits the jobid in the started() signal,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/src/browserhostextension.cpp new/kparts-5.31.0/src/browserhostextension.cpp
--- old/kparts-5.30.0/src/browserhostextension.cpp 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/src/browserhostextension.cpp 2017-02-05 12:08:30.000000000 +0100
@@ -81,5 +81,5 @@
{
Q_UNUSED(callingPart);
Q_UNUSED(frame);
- return 0;
+ return nullptr;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/src/browseropenorsavequestion.cpp new/kparts-5.31.0/src/browseropenorsavequestion.cpp
--- old/kparts-5.30.0/src/browseropenorsavequestion.cpp 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/src/browseropenorsavequestion.cpp 2017-02-05 12:08:30.000000000 +0100
@@ -60,7 +60,7 @@
BrowserOpenOrSaveQuestionPrivate(QWidget *parent, const QUrl &url, const QString &mimeType)
: QDialog(parent), url(url), mimeType(mimeType),
- features(0)
+ features(nullptr)
{
const int spacingHint = style()->pixelMetric(QStyle::PM_DefaultLayoutSpacing);
@@ -184,13 +184,13 @@
public Q_SLOTS:
void reject() Q_DECL_OVERRIDE
{
- selectedService = 0;
+ selectedService = nullptr;
QDialog::reject();
}
void slotYesClicked()
{
- selectedService = 0;
+ selectedService = nullptr;
done(Save);
}
@@ -202,7 +202,7 @@
void slotOpenWithClicked()
{
if (!openWithButton->menu()) {
- selectedService = 0;
+ selectedService = nullptr;
done(OpenWith);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/src/browserrun.cpp new/kparts-5.31.0/src/browserrun.cpp
--- old/kparts-5.30.0/src/browserrun.cpp 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/src/browserrun.cpp 2017-02-05 12:08:30.000000000 +0100
@@ -189,7 +189,7 @@
// qDebug() << "It is in fact a directory!";
// Update our URL in case of a redirection
KRun::setUrl(static_cast(job)->url());
- setJob(0);
+ setJob(nullptr);
mimeTypeDetermined(QStringLiteral("inode/directory"));
} else {
KRun::slotScanFinished(job);
@@ -218,7 +218,7 @@
if (job->isErrorPage()) {
d->m_mimeType = type;
handleError(job);
- setJob(0);
+ setJob(nullptr);
} else {
// qDebug() << "found" << type << "for" << KRun::url();
@@ -245,7 +245,7 @@
// Make a copy to avoid a dead reference
QString _type = type;
job->putOnHold();
- setJob(0);
+ setJob(nullptr);
// If the current mime-type is the default mime-type, then attempt to
// determine the "real" mimetype from the file name.
@@ -260,7 +260,7 @@
BrowserRun::NonEmbeddableResult BrowserRun::handleNonEmbeddable(const QString &mimeType)
{
- return handleNonEmbeddable(mimeType, NULL);
+ return handleNonEmbeddable(mimeType, nullptr);
}
BrowserRun::NonEmbeddableResult BrowserRun::handleNonEmbeddable(const QString &_mimeType, KService::Ptr *selectedService)
@@ -342,7 +342,7 @@
return false;
}
- return (KMessageBox::warningContinueCancel(0,
+ return (KMessageBox::warningContinueCancel(nullptr,
i18n("Do you really want to execute '%1'?", url.toDisplayString()),
i18n("Execute File?"), KGuiItem(i18n("Execute"))) == KMessageBox::Continue);
}
@@ -352,7 +352,7 @@
BrowserRun::AskSaveResult BrowserRun::askSave(const QUrl &url, KService::Ptr offer, const QString &mimeType, const QString &suggestedFileName)
{
Q_UNUSED(offer);
- BrowserOpenOrSaveQuestion question(0, url, mimeType);
+ BrowserOpenOrSaveQuestion question(nullptr, url, mimeType);
question.setSuggestedFileName(suggestedFileName);
const BrowserOpenOrSaveQuestion::Result result = question.askOpenOrSave();
return result == BrowserOpenOrSaveQuestion::Save ? Save
@@ -365,7 +365,7 @@
#ifndef KPARTS_NO_DEPRECATED
BrowserRun::AskSaveResult BrowserRun::askEmbedOrSave(const QUrl &url, const QString &mimeType, const QString &suggestedFileName, int flags)
{
- BrowserOpenOrSaveQuestion question(0, url, mimeType);
+ BrowserOpenOrSaveQuestion question(nullptr, url, mimeType);
question.setSuggestedFileName(suggestedFileName);
const BrowserOpenOrSaveQuestion::Result result = question.askEmbedOrSave(flags);
return result == BrowserOpenOrSaveQuestion::Save ? Save
@@ -404,7 +404,7 @@
if (cmd.isEmpty()) {
QString errMsg = i18n("The Download Manager (%1) could not be found in your $PATH ", downloadManger);
QString errMsgEx = i18n("Try to reinstall it \n\nThe integration with Konqueror will be disabled.");
- KMessageBox::detailedSorry(0, errMsg, errMsgEx);
+ KMessageBox::detailedSorry(nullptr, errMsg, errMsgEx);
cfg.writePathEntry("DownloadManager", QString());
cfg.sync();
} else {
@@ -478,7 +478,7 @@
// The default handling of error pages is to show them like normal pages
// But this is done here in handleError so that KHTMLRun can reimplement it
tjob->putOnHold();
- setJob(0);
+ setJob(nullptr);
if (!d->m_mimeType.isEmpty()) {
mimeTypeDetermined(d->m_mimeType);
}
@@ -526,7 +526,7 @@
* an error:/ URL that sends the info to khtml.
*/
KRun::setUrl(makeErrorUrl(error, errorText, url()));
- setJob(0);
+ setJob(nullptr);
mimeTypeDetermined(QStringLiteral("text/html"));
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/src/browserrun.h new/kparts-5.31.0/src/browserrun.h
--- old/kparts-5.30.0/src/browserrun.h 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/src/browserrun.h 2017-02-05 12:08:30.000000000 +0100
@@ -122,7 +122,7 @@
// static so that it can be called from other classes
static void simpleSave(const QUrl &url, const QString &suggestedFileName,
- QWidget *window = 0); // KDE5: remove
+ QWidget *window = nullptr); // KDE5: remove
/**
* If kget integration is enabled, passes the url to kget.
* Otherwise, asks the user for a destination url, and calls saveUrlUsingKIO.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/src/browserview.desktop new/kparts-5.31.0/src/browserview.desktop
--- old/kparts-5.30.0/src/browserview.desktop 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/src/browserview.desktop 2017-02-05 12:08:30.000000000 +0100
@@ -4,7 +4,7 @@
X-KDE-Derived=KParts/ReadOnlyPart
Name=Browser View
Name[af]=Blaaier-aansig
-Name[ar]=عرض تصفحي
+Name[ar]=منظور متصفّح
Name[as]=চৰকৰ প্ৰদৰ্শন
Name[ast]=Vista de restolador
Name[be]=Выгляд аглядальніка
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/src/fileinfoextension.cpp new/kparts-5.31.0/src/fileinfoextension.cpp
--- old/kparts-5.30.0/src/fileinfoextension.cpp 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/src/fileinfoextension.cpp 2017-02-05 12:08:30.000000000 +0100
@@ -23,7 +23,7 @@
KParts::FileInfoExtension::FileInfoExtension(KParts::ReadOnlyPart *parent)
: QObject(parent),
- d(0)
+ d(nullptr)
{
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/src/historyprovider.cpp new/kparts-5.31.0/src/historyprovider.cpp
--- old/kparts-5.30.0/src/historyprovider.cpp 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/src/historyprovider.cpp 2017-02-05 12:08:30.000000000 +0100
@@ -27,7 +27,7 @@
{
public:
HistoryProviderPrivate()
- : q(0)
+ : q(nullptr)
{
}
@@ -68,7 +68,7 @@
{
if (!historyProviderPrivate.isDestroyed() &&
historyProviderPrivate()->q == this) {
- historyProviderPrivate()->q = 0;
+ historyProviderPrivate()->q = nullptr;
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/src/historyprovider.h new/kparts-5.31.0/src/historyprovider.h
--- old/kparts-5.30.0/src/historyprovider.h 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/src/historyprovider.h 2017-02-05 12:08:30.000000000 +0100
@@ -97,7 +97,7 @@
/**
* Creates a KHistoryProvider with an optional parent and name
*/
- HistoryProvider(QObject *parent = 0);
+ HistoryProvider(QObject *parent = nullptr);
/**
* Destroys the provider.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/src/htmlextension.cpp new/kparts-5.31.0/src/htmlextension.cpp
--- old/kparts-5.30.0/src/htmlextension.cpp 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/src/htmlextension.cpp 2017-02-05 12:08:30.000000000 +0100
@@ -25,7 +25,7 @@
using namespace KParts;
KParts::HtmlExtension::HtmlExtension(KParts::ReadOnlyPart *parent)
- : QObject(parent), d(0)
+ : QObject(parent), d(nullptr)
{
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/src/htmlsettingsinterface.cpp new/kparts-5.31.0/src/htmlsettingsinterface.cpp
--- old/kparts-5.30.0/src/htmlsettingsinterface.cpp 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/src/htmlsettingsinterface.cpp 2017-02-05 12:08:30.000000000 +0100
@@ -38,7 +38,7 @@
break;
}
- return 0;
+ return nullptr;
}
HtmlSettingsInterface::JavaScriptAdvice HtmlSettingsInterface::textToJavascriptAdvice(const QString &text)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/src/kpart.desktop new/kparts-5.31.0/src/kpart.desktop
--- old/kparts-5.30.0/src/kpart.desktop 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/src/kpart.desktop 2017-02-05 12:08:30.000000000 +0100
@@ -3,7 +3,7 @@
X-KDE-ServiceType=KPart
Comment=KDE Component
Comment[af]=KDE Komponent
-Comment[ar]=مكون كدي
+Comment[ar]=مكوّن «كدي»
Comment[as]=KDE অংশ
Comment[ast]=Componente de KDE
Comment[be]=Кампанент KDE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/src/krop.desktop new/kparts-5.31.0/src/krop.desktop
--- old/kparts-5.30.0/src/krop.desktop 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/src/krop.desktop 2017-02-05 12:08:30.000000000 +0100
@@ -4,7 +4,7 @@
X-KDE-Derived=KPart
Comment=KDE Component
Comment[af]=KDE Komponent
-Comment[ar]=مكون كدي
+Comment[ar]=مكوّن «كدي»
Comment[as]=KDE অংশ
Comment[ast]=Componente de KDE
Comment[be]=Кампанент KDE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/src/krwp.desktop new/kparts-5.31.0/src/krwp.desktop
--- old/kparts-5.30.0/src/krwp.desktop 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/src/krwp.desktop 2017-02-05 12:08:30.000000000 +0100
@@ -4,7 +4,7 @@
X-KDE-Derived=KParts/ReadOnlyPart
Comment=KDE Component
Comment[af]=KDE Komponent
-Comment[ar]=مكون كدي
+Comment[ar]=مكوّن «كدي»
Comment[as]=KDE অংশ
Comment[ast]=Componente de KDE
Comment[be]=Кампанент KDE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/src/listingfilterextension.cpp new/kparts-5.31.0/src/listingfilterextension.cpp
--- old/kparts-5.30.0/src/listingfilterextension.cpp 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/src/listingfilterextension.cpp 2017-02-05 12:08:30.000000000 +0100
@@ -23,7 +23,7 @@
KParts::ListingFilterExtension::ListingFilterExtension(KParts::ReadOnlyPart *parent)
: QObject(parent),
- d(0)
+ d(nullptr)
{
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/src/listingnotificationextension.cpp new/kparts-5.31.0/src/listingnotificationextension.cpp
--- old/kparts-5.30.0/src/listingnotificationextension.cpp 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/src/listingnotificationextension.cpp 2017-02-05 12:08:30.000000000 +0100
@@ -24,7 +24,7 @@
KParts::ListingNotificationExtension::ListingNotificationExtension(KParts::ReadOnlyPart *parent)
: QObject(parent),
- d(0)
+ d(nullptr)
{
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/src/liveconnectextension.cpp new/kparts-5.31.0/src/liveconnectextension.cpp
--- old/kparts-5.30.0/src/liveconnectextension.cpp 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/src/liveconnectextension.cpp 2017-02-05 12:08:30.000000000 +0100
@@ -26,7 +26,7 @@
LiveConnectExtension::LiveConnectExtension(KParts::ReadOnlyPart *parent)
- : QObject(parent), d(0) {}
+ : QObject(parent), d(nullptr) {}
LiveConnectExtension::~LiveConnectExtension() {}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/src/mainwindow.cpp new/kparts-5.31.0/src/mainwindow.cpp
--- old/kparts-5.30.0/src/mainwindow.cpp 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/src/mainwindow.cpp 2017-02-05 12:08:30.000000000 +0100
@@ -47,9 +47,9 @@
{
public:
MainWindowPrivate()
- : m_activePart(0),
+ : m_activePart(nullptr),
m_bShellGUIActivated(false),
- m_helpMenu(0),
+ m_helpMenu(nullptr),
m_manageWindowTitle(true)
{
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/src/mainwindow.h new/kparts-5.31.0/src/mainwindow.h
--- old/kparts-5.30.0/src/mainwindow.h 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/src/mainwindow.h 2017-02-05 12:08:30.000000000 +0100
@@ -60,7 +60,7 @@
/**
* Constructor, same signature as KMainWindow.
*/
- explicit MainWindow(QWidget *parent = 0, Qt::WindowFlags f = KDE_DEFAULT_WINDOWFLAGS);
+ explicit MainWindow(QWidget *parent = nullptr, Qt::WindowFlags f = KDE_DEFAULT_WINDOWFLAGS);
/**
* Destructor.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/src/part.cpp new/kparts-5.31.0/src/part.cpp
--- old/kparts-5.30.0/src/part.cpp 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/src/part.cpp 2017-02-05 12:08:30.000000000 +0100
@@ -71,7 +71,7 @@
void Part::embed(QWidget *parentWidget)
{
if (widget()) {
- widget()->setParent(parentWidget, 0);
+ widget()->setParent(parentWidget, nullptr);
widget()->setGeometry(0, 0, widget()->width(), widget()->height());
widget()->show();
}
@@ -125,7 +125,7 @@
Q_D(Part);
if ((QWidget *)d->m_widget != widget) {
- return 0;
+ return nullptr;
}
return this;
@@ -188,7 +188,7 @@
QWidget *Part::hostContainer(const QString &containerName)
{
if (!factory()) {
- return 0;
+ return nullptr;
}
return factory()->container(containerName, this);
@@ -198,7 +198,7 @@
{
Q_D(Part);
- d->m_widget = 0;
+ d->m_widget = nullptr;
if (d->m_autoDeletePart) {
// qDebug() << "deleting part" << objectName();
this->deleteLater();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/src/part.h new/kparts-5.31.0/src/part.h
--- old/kparts-5.30.0/src/part.h 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/src/part.h 2017-02-05 12:08:30.000000000 +0100
@@ -76,7 +76,7 @@
*
* @param parent Parent object of the part.
*/
- explicit Part(QObject *parent = 0);
+ explicit Part(QObject *parent = nullptr);
/**
* Destructor.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/src/part_p.h new/kparts-5.31.0/src/part_p.h
--- old/kparts-5.30.0/src/part_p.h 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/src/part_p.h 2017-02-05 12:08:30.000000000 +0100
@@ -38,11 +38,11 @@
PartPrivate(Part *q)
: PartBasePrivate(q),
- m_iconLoader(0),
+ m_iconLoader(nullptr),
m_bSelectable(true),
m_autoDeleteWidget(true),
m_autoDeletePart(true),
- m_manager(0)
+ m_manager(nullptr)
{
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/src/partbase_p.h new/kparts-5.31.0/src/partbase_p.h
--- old/kparts-5.30.0/src/partbase_p.h 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/src/partbase_p.h 2017-02-05 12:08:30.000000000 +0100
@@ -36,7 +36,7 @@
PartBasePrivate(PartBase *q): q_ptr(q),
m_pluginLoadingMode(PartBase::LoadPlugins),
m_pluginInterfaceVersion(0),
- m_obj(0),
+ m_obj(nullptr),
m_componentData(KAboutData::applicationData())
{
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/src/partmanager.cpp new/kparts-5.31.0/src/partmanager.cpp
--- old/kparts-5.30.0/src/partmanager.cpp 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/src/partmanager.cpp 2017-02-05 12:08:30.000000000 +0100
@@ -43,10 +43,10 @@
public:
PartManagerPrivate()
{
- m_activeWidget = 0;
- m_activePart = 0;
- m_selectedPart = 0;
- m_selectedWidget = 0;
+ m_activeWidget = nullptr;
+ m_activePart = nullptr;
+ m_selectedPart = nullptr;
+ m_selectedWidget = nullptr;
m_bAllowNestedParts = false;
m_bIgnoreScrollBars = false;
m_activationButtonMask = Qt::LeftButton | Qt::MidButton | Qt::RightButton;
@@ -137,7 +137,7 @@
}
foreach (Part *it, d->m_parts) {
- it->setManager(0);
+ it->setManager(nullptr);
}
// core dumps ... setActivePart( 0 );
@@ -205,7 +205,7 @@
return false;
}
- QMouseEvent *mev = 0;
+ QMouseEvent *mev = nullptr;
if (ev->type() == QEvent::MouseButtonPress || ev->type() == QEvent::MouseButtonDblClick) {
mev = static_cast(ev);
#ifdef DEBUG_PARTMANAGER
@@ -278,7 +278,7 @@
d->m_reason = NoReason;
return true;
} else if (d->m_activeWidget == w && d->m_activePart == part) {
- setSelectedPart(0);
+ setSelectedPart(nullptr);
return false;
}
@@ -321,7 +321,7 @@
return part;
}
}
- return 0;
+ return nullptr;
}
Part *PartManager::findPartFromWidget(QWidget *widget)
@@ -331,7 +331,7 @@
return (*it);
}
}
- return 0;
+ return nullptr;
}
void PartManager::addPart(Part *part, bool setActive)
@@ -381,15 +381,15 @@
const int nb = d->m_parts.removeAll(part);
Q_ASSERT(nb == 1);
Q_UNUSED(nb); // no warning in release mode
- part->setManager(0);
+ part->setManager(nullptr);
emit partRemoved(part);
if (part == d->m_activePart) {
- setActivePart(0);
+ setActivePart(nullptr);
}
if (part == d->m_selectedPart) {
- setSelectedPart(0);
+ setSelectedPart(nullptr);
}
}
@@ -403,7 +403,7 @@
}
d->m_parts.removeAll(oldPart);
- oldPart->setManager(0);
+ oldPart->setManager(nullptr);
emit partRemoved(oldPart);
@@ -442,7 +442,7 @@
KParts::Part *oldActivePart = d->m_activePart;
QWidget *oldActiveWidget = d->m_activeWidget;
- setSelectedPart(0);
+ setSelectedPart(nullptr);
d->m_activePart = part;
d->m_activeWidget = widget;
@@ -544,7 +544,7 @@
{
// qDebug();
if (static_cast(sender()) == d->m_activeWidget) {
- setActivePart(0); //do not remove the part because if the part's widget dies, then the
+ setActivePart(nullptr); //do not remove the part because if the part's widget dies, then the
}
//part will delete itself anyway, invoking removePart() in its destructor
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/src/partmanager.h new/kparts-5.31.0/src/partmanager.h
--- old/kparts-5.30.0/src/partmanager.h 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/src/partmanager.h 2017-02-05 12:08:30.000000000 +0100
@@ -45,13 +45,13 @@
class KPARTS_EXPORT PartManager : public QObject
{
Q_OBJECT
- Q_ENUMS(SelectionPolicy)
Q_PROPERTY(SelectionPolicy selectionPolicy READ selectionPolicy WRITE setSelectionPolicy)
Q_PROPERTY(bool allowNestedParts READ allowNestedParts WRITE setAllowNestedParts)
Q_PROPERTY(bool ignoreScrollBars READ ignoreScrollBars WRITE setIgnoreScrollBars)
public:
/// Selection policy. The default policy of a PartManager is Direct.
enum SelectionPolicy { Direct, TriState };
+ Q_ENUM(SelectionPolicy)
/**
* This extends QFocusEvent::Reason with the non-focus-event reasons for partmanager to activate a part.
@@ -165,7 +165,7 @@
* @p widget can be used to specify which widget was responsible for the activation.
* This is important if you have multiple views for a document/part , like in KOffice .
*/
- virtual void setActivePart(Part *part, QWidget *widget = 0);
+ virtual void setActivePart(Part *part, QWidget *widget = nullptr);
/**
* Returns the active part.
@@ -185,7 +185,7 @@
* @p widget can be used to specify which widget was responsible for the selection.
* This is important if you have multiple views for a document/part , like in KOffice .
*/
- virtual void setSelectedPart(Part *part, QWidget *widget = 0);
+ virtual void setSelectedPart(Part *part, QWidget *widget = nullptr);
/**
* Returns the current selected part.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/src/plugin.cpp new/kparts-5.31.0/src/plugin.cpp
--- old/kparts-5.30.0/src/plugin.cpp 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/src/plugin.cpp 2017-02-05 12:08:30.000000000 +0100
@@ -167,12 +167,12 @@
KPluginFactory *factory = loader.factory();
if (!factory) {
- return 0;
+ return nullptr;
}
Plugin *plugin = factory->create<Plugin>(keyword, parent);
if (!plugin) {
- return 0;
+ return nullptr;
}
plugin->d->m_library = libname;
return plugin;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/src/plugin.h new/kparts-5.31.0/src/plugin.h
--- old/kparts-5.30.0/src/plugin.h 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/src/plugin.h 2017-02-05 12:08:30.000000000 +0100
@@ -64,7 +64,7 @@
/**
* Construct a new KParts plugin.
*/
- Plugin(QObject *parent = 0);
+ Plugin(QObject *parent = nullptr);
/**
* Destructor.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/src/readonlypart.cpp new/kparts-5.31.0/src/readonlypart.cpp
--- old/kparts-5.30.0/src/readonlypart.cpp 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/src/readonlypart.cpp 2017-02-05 12:08:30.000000000 +0100
@@ -171,7 +171,7 @@
bool ReadOnlyPartPrivate::openLocalFile()
{
Q_Q(ReadOnlyPart);
- emit q->started(0);
+ emit q->started(nullptr);
m_bTemp = false;
// set the mimetype only if it was not already set (for example, by the host application)
if (m_arguments.mimeType().isEmpty()) {
@@ -229,12 +229,12 @@
if (d->m_statJob) {
//qDebug() << "Aborting job" << d->m_statJob;
d->m_statJob->kill();
- d->m_statJob = 0;
+ d->m_statJob = nullptr;
}
if (d->m_job) {
//qDebug() << "Aborting job" << d->m_job;
d->m_job->kill();
- d->m_job = 0;
+ d->m_job = nullptr;
}
}
@@ -259,7 +259,7 @@
void ReadOnlyPartPrivate::_k_slotStatJobFinished(KJob *job)
{
Q_ASSERT(job == m_statJob);
- m_statJob = 0;
+ m_statJob = nullptr;
// We could emit canceled on error, but we haven't even emitted started yet,
// this could maybe confuse some apps? So for now we'll just fallback to KIO::get
@@ -280,7 +280,7 @@
Q_Q(ReadOnlyPart);
Q_ASSERT(job == m_job);
- m_job = 0;
+ m_job = nullptr;
if (job->error()) {
emit q->canceled(job->errorString());
} else {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/src/readonlypart.h new/kparts-5.31.0/src/readonlypart.h
--- old/kparts-5.30.0/src/readonlypart.h 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/src/readonlypart.h 2017-02-05 12:08:30.000000000 +0100
@@ -72,7 +72,7 @@
* Constructor
* See also Part for the setXXX methods to call.
*/
- explicit ReadOnlyPart(QObject *parent = 0);
+ explicit ReadOnlyPart(QObject *parent = nullptr);
/**
* Destructor
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/src/readonlypart_p.h new/kparts-5.31.0/src/readonlypart_p.h
--- old/kparts-5.30.0/src/readonlypart_p.h 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/src/readonlypart_p.h 2017-02-05 12:08:30.000000000 +0100
@@ -41,9 +41,9 @@
ReadOnlyPartPrivate(ReadOnlyPart *q): PartPrivate(q)
{
- m_job = 0;
- m_statJob = 0;
- m_uploadJob = 0;
+ m_job = nullptr;
+ m_statJob = nullptr;
+ m_uploadJob = nullptr;
m_showProgressInfo = true;
m_saveOk = false;
m_waitForSave = false;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/src/readwritepart.cpp new/kparts-5.31.0/src/readwritepart.cpp
--- old/kparts-5.30.0/src/readwritepart.cpp 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/src/readwritepart.cpp 2017-02-05 12:08:30.000000000 +0100
@@ -247,7 +247,7 @@
if (d->m_uploadJob) {
QFile::remove(d->m_uploadJob->srcUrl().toLocalFile());
d->m_uploadJob->kill();
- d->m_uploadJob = 0;
+ d->m_uploadJob = nullptr;
}
QTemporaryFile *tempFile = new QTemporaryFile();
tempFile->open();
@@ -273,7 +273,7 @@
if (m_uploadJob->error()) {
QFile::remove(m_uploadJob->srcUrl().toLocalFile());
QString error = m_uploadJob->errorString();
- m_uploadJob = 0;
+ m_uploadJob = nullptr;
if (m_duringSaveAs) {
q->setUrl(m_originalURL);
m_file = m_originalFilePath;
@@ -282,7 +282,7 @@
} else {
::org::kde::KDirNotify::emitFilesAdded(m_url.adjusted(QUrl::RemoveFilename));
- m_uploadJob = 0;
+ m_uploadJob = nullptr;
q->setModified(false);
emit q->completed();
m_saveOk = true;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/src/readwritepart.h new/kparts-5.31.0/src/readwritepart.h
--- old/kparts-5.30.0/src/readwritepart.h 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/src/readwritepart.h 2017-02-05 12:08:30.000000000 +0100
@@ -55,7 +55,7 @@
* Constructor
* See parent constructor for instructions.
*/
- explicit ReadWritePart(QObject *parent = 0);
+ explicit ReadWritePart(QObject *parent = nullptr);
/**
* Destructor
* Applications using a ReadWritePart should make sure, before
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/src/scriptableextension.cpp new/kparts-5.31.0/src/scriptableextension.cpp
--- old/kparts-5.30.0/src/scriptableextension.cpp 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/src/scriptableextension.cpp 2017-02-05 12:08:30.000000000 +0100
@@ -28,7 +28,7 @@
struct ScriptableExtensionPrivate {
ScriptableExtension *hostContext;
- ScriptableExtensionPrivate(): hostContext(0)
+ ScriptableExtensionPrivate(): hostContext(nullptr)
{}
};
@@ -243,7 +243,7 @@
bool ScriptableLiveConnectExtension::hasProperty(ScriptableExtension *, quint64 objId, const QString &propName)
{
- QVariant val = get(0, objId, propName);
+ QVariant val = get(nullptr, objId, propName);
bool ok = !val.canConvertScriptableExtension::Exception();
releaseValue(val);
return ok;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/src/scriptableextension.h new/kparts-5.31.0/src/scriptableextension.h
--- old/kparts-5.30.0/src/scriptableextension.h 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/src/scriptableextension.h 2017-02-05 12:08:30.000000000 +0100
@@ -94,7 +94,7 @@
ScriptableExtension *owner;
quint64 objId;
- Object(): owner(0), objId(0) {}
+ Object(): owner(nullptr), objId(0) {}
Object(ScriptableExtension *o, quint64 id): owner(o), objId(id) {}
bool operator==(const Object &other) const
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/src/statusbarextension.cpp new/kparts-5.31.0/src/statusbarextension.cpp
--- old/kparts-5.30.0/src/statusbarextension.cpp 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/src/statusbarextension.cpp 2017-02-05 12:08:30.000000000 +0100
@@ -41,7 +41,7 @@
{
public:
StatusBarItem() // for QValueList
- : m_widget(0), m_visible(false)
+ : m_widget(nullptr), m_visible(false)
{}
StatusBarItem(QWidget *widget, int stretch, bool permanent)
: m_widget(widget), m_stretch(stretch), m_permanent(permanent), m_visible(false)
@@ -83,7 +83,7 @@
{
public:
StatusBarExtensionPrivate(StatusBarExtension *q): q(q),
- m_statusBar(0),
+ m_statusBar(nullptr),
m_activated(true) {}
StatusBarExtension *q;
@@ -155,8 +155,8 @@
{
if (!d->m_statusBar) {
KParts::ReadOnlyPart *part = qobject_cast(parent());
- QWidget *w = part ? part->widget() : 0;
- KMainWindow *mw = w ? qobject_cast(w->topLevelWidget()) : 0;
+ QWidget *w = part ? part->widget() : nullptr;
+ KMainWindow *mw = w ? qobject_cast(w->topLevelWidget()) : nullptr;
if (mw) {
d->m_statusBar = mw->statusBar();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/src/textextension.cpp new/kparts-5.31.0/src/textextension.cpp
--- old/kparts-5.30.0/src/textextension.cpp 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/src/textextension.cpp 2017-02-05 12:08:30.000000000 +0100
@@ -22,7 +22,7 @@
#include "readonlypart.h"
KParts::TextExtension::TextExtension(KParts::ReadOnlyPart *parent)
- : QObject(parent), d(0)
+ : QObject(parent), d(nullptr)
{
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/tests/normalktm.cpp new/kparts-5.31.0/tests/normalktm.cpp
--- old/kparts-5.30.0/tests/normalktm.cpp 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/tests/normalktm.cpp 2017-02-05 12:08:30.000000000 +0100
@@ -83,7 +83,7 @@
m_splitter->show();
- m_editorpart = 0;
+ m_editorpart = nullptr;
}
TestMainWindow::~TestMainWindow()
@@ -110,7 +110,7 @@
{
// replace part2 with the editor part
delete m_part2;
- m_part2 = 0;
+ m_part2 = nullptr;
m_editorpart = new NotepadPart(m_splitter, this);
m_editorpart->setReadWrite(); // read-write mode
////// m_manager->addPart( m_editorpart );
@@ -122,7 +122,7 @@
void TestMainWindow::slotFileCloseEditor()
{
delete m_editorpart;
- m_editorpart = 0;
+ m_editorpart = nullptr;
m_part2 = new Part2(this, m_splitter);
////// m_manager->addPart( m_part2 );
m_part2->widget()->show(); //// we need to do this in a normal KTM....
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/tests/openorsavequestion.cpp new/kparts-5.31.0/tests/openorsavequestion.cpp
--- old/kparts-5.30.0/tests/openorsavequestion.cpp 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/tests/openorsavequestion.cpp 2017-02-05 12:08:30.000000000 +0100
@@ -31,7 +31,7 @@
// A test for both 1) "unknown mimetype" 2) no associated app
{
- BrowserOpenOrSaveQuestion questionOpenUnknownMimeType(0, QUrl(QStringLiteral("http://www.example.com/foo.foo")),
+ BrowserOpenOrSaveQuestion questionOpenUnknownMimeType(nullptr, QUrl(QStringLiteral("http://www.example.com/foo.foo")),
QString::fromLatin1("application/foo"));
BrowserOpenOrSaveQuestion::Result res = questionOpenUnknownMimeType.askOpenOrSave();
qDebug() << res;
@@ -39,7 +39,7 @@
// The normal case
{
- BrowserOpenOrSaveQuestion questionOpen(0, QUrl(QStringLiteral("http://www.example.com/foo.pdf")),
+ BrowserOpenOrSaveQuestion questionOpen(nullptr, QUrl(QStringLiteral("http://www.example.com/foo.pdf")),
QString::fromLatin1("application/pdf"));
questionOpen.setSuggestedFileName(QString::fromLatin1("file.pdf"));
questionOpen.setFeatures(BrowserOpenOrSaveQuestion::ServiceSelection);
@@ -52,7 +52,7 @@
// Trying a case with only one app associated
{
- BrowserOpenOrSaveQuestion questionOpen(0, QUrl(QStringLiteral("http://www.example.com/foo.zip")),
+ BrowserOpenOrSaveQuestion questionOpen(nullptr, QUrl(QStringLiteral("http://www.example.com/foo.zip")),
QString::fromLatin1("application/zip"));
questionOpen.setFeatures(BrowserOpenOrSaveQuestion::ServiceSelection);
BrowserOpenOrSaveQuestion::Result res = questionOpen.askOpenOrSave();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/tests/partviewer.cpp new/kparts-5.31.0/tests/partviewer.cpp
--- old/kparts-5.30.0/tests/partviewer.cpp 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/tests/partviewer.cpp 2017-02-05 12:08:30.000000000 +0100
@@ -46,7 +46,7 @@
actionCollection()->addAction(QStringLiteral("file_quit"), paQuit);
connect(paQuit, SIGNAL(triggered()), this, SLOT(close()));
- m_part = 0;
+ m_part = nullptr;
// Set a reasonable size
resize(600, 350);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/tests/plugin_spellcheck.cpp new/kparts-5.31.0/tests/plugin_spellcheck.cpp
--- old/kparts-5.30.0/tests/plugin_spellcheck.cpp 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/tests/plugin_spellcheck.cpp 2017-02-05 12:08:30.000000000 +0100
@@ -47,7 +47,7 @@
// The parent is assumed to be a NotepadPart
// Can't use qobject_cast here, we would need NotepadPart to be in a shared library.
if (!parent()->inherits("NotepadPart")) {
- KMessageBox::error(0, QStringLiteral("You just called the spell-check action on a wrong part (not NotepadPart)"));
+ KMessageBox::error(nullptr, QStringLiteral("You just called the spell-check action on a wrong part (not NotepadPart)"));
} else {
NotepadPart *part = (NotepadPart *) parent();
QTextEdit *widget = qobject_cast(part->widget());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/tests/plugin_spellcheck.h new/kparts-5.31.0/tests/plugin_spellcheck.h
--- old/kparts-5.30.0/tests/plugin_spellcheck.h 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/tests/plugin_spellcheck.h 2017-02-05 12:08:30.000000000 +0100
@@ -27,7 +27,7 @@
{
Q_OBJECT
public:
- PluginSpellCheck(QObject *parent = 0,
+ PluginSpellCheck(QObject *parent = nullptr,
const QVariantList & = QVariantList());
virtual ~PluginSpellCheck();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.30.0/tests/testmainwindow.cpp new/kparts-5.31.0/tests/testmainwindow.cpp
--- old/kparts-5.30.0/tests/testmainwindow.cpp 2017-01-08 21:59:22.000000000 +0100
+++ new/kparts-5.31.0/tests/testmainwindow.cpp 2017-02-05 12:08:30.000000000 +0100
@@ -90,12 +90,12 @@
m_manager->addPart(m_part1, true); // sets part 1 as the active part
m_manager->addPart(m_part2, false);
- m_editorpart = 0;
+ m_editorpart = nullptr;
}
TestMainWindow::~TestMainWindow()
{
- disconnect(m_manager, 0, this, 0);
+ disconnect(m_manager, nullptr, this, nullptr);
}
void TestMainWindow::slotFileOpen()
@@ -117,12 +117,12 @@
void TestMainWindow::embedEditor()
{
if (m_manager->activePart() == m_part2) {
- createGUI(0);
+ createGUI(nullptr);
}
// replace part2 with the editor part
delete m_part2;
- m_part2 = 0;
+ m_part2 = nullptr;
m_editorpart = new NotepadPart(m_splitter, this);
m_editorpart->setReadWrite(); // read-write mode
m_manager->addPart(m_editorpart);
@@ -141,11 +141,11 @@
// Is this necessary ? (David)
if (m_manager->activePart() == m_editorpart) {
- createGUI(0);
+ createGUI(nullptr);
}
delete m_editorpart;
- m_editorpart = 0;
+ m_editorpart = nullptr;
m_part2 = new Part2(this, m_splitter);
m_manager->addPart(m_part2);
m_paEditFile->setEnabled(true);