Hello community,
here is the log from the commit of package ktextwidgets for openSUSE:Factory checked in at 2017-03-03 17:19:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ktextwidgets (Old)
and /work/SRC/openSUSE:Factory/.ktextwidgets.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ktextwidgets"
Fri Mar 3 17:19:58 2017 rev:38 rq:461463 version:5.31.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/ktextwidgets/ktextwidgets.changes 2017-02-03 17:46:27.862279174 +0100
+++ /work/SRC/openSUSE:Factory/.ktextwidgets.new/ktextwidgets.changes 2017-03-03 17:19:59.317321473 +0100
@@ -1,0 +2,7 @@
+Thu Feb 9 09:33: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:
----
ktextwidgets-5.30.0.tar.xz
New:
----
ktextwidgets-5.31.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ktextwidgets.spec ++++++
--- /var/tmp/diff_new_pack.sNUvty/_old 2017-03-03 17:19:59.893240012 +0100
+++ /var/tmp/diff_new_pack.sNUvty/_new 2017-03-03 17:19:59.893240012 +0100
@@ -18,9 +18,9 @@
%bcond_without lang
%define lname libKF5TextWidgets5
-%define _tar_path 5.30
+%define _tar_path 5.31
Name: ktextwidgets
-Version: 5.30.0
+Version: 5.31.0
Release: 0
%define kf5_version %{version}
BuildRequires: cmake >= 3.0
@@ -36,9 +36,9 @@
BuildRequires: kwidgetsaddons-devel >= %{_tar_path}
BuildRequires: kwindowsystem-devel >= %{_tar_path}
BuildRequires: sonnet-devel >= %{_tar_path}
-BuildRequires: cmake(Qt5Core) >= 5.5.0
-BuildRequires: cmake(Qt5Test) >= 5.5.0
-BuildRequires: cmake(Qt5Widgets) >= 5.5.0
+BuildRequires: cmake(Qt5Core) >= 5.6.0
+BuildRequires: cmake(Qt5Test) >= 5.6.0
+BuildRequires: cmake(Qt5Widgets) >= 5.6.0
Summary: KDE Text editing widgets
License: LGPL-2.1+
Group: System/GUI/KDE
@@ -70,7 +70,7 @@
Requires: extra-cmake-modules
Requires: ki18n-devel >= %{_tar_path}
Requires: sonnet-devel >= %{_tar_path}
-Requires: cmake(Qt5Widgets) >= 5.5.0
+Requires: cmake(Qt5Widgets) >= 5.6.0
%description devel
KTextWidgets provides widgets for displaying and editing text. It supports
++++++ ktextwidgets-5.30.0.tar.xz -> ktextwidgets-5.31.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktextwidgets-5.30.0/CMakeLists.txt new/ktextwidgets-5.31.0/CMakeLists.txt
--- old/ktextwidgets-5.30.0/CMakeLists.txt 2017-01-08 22:02:24.000000000 +0100
+++ new/ktextwidgets-5.31.0/CMakeLists.txt 2017-02-05 12:13:38.000000000 +0100
@@ -1,12 +1,12 @@
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(KTextWidgets VERSION ${KF5_VERSION})
# ECM setup
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)
@@ -28,7 +28,7 @@
SOVERSION 5)
# Dependencies
-set(REQUIRED_QT_VERSION 5.5.0)
+set(REQUIRED_QT_VERSION 5.6.0)
find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktextwidgets-5.30.0/autotests/kfindtest.cpp new/ktextwidgets-5.31.0/autotests/kfindtest.cpp
--- old/ktextwidgets-5.30.0/autotests/kfindtest.cpp 2017-01-08 22:02:24.000000000 +0100
+++ new/ktextwidgets-5.31.0/autotests/kfindtest.cpp 2017-02-05 12:13:38.000000000 +0100
@@ -29,7 +29,7 @@
void KFindRecorder::changeText(int line, const QString &text)
{
Q_ASSERT(line < m_text.count());
- Q_ASSERT(m_find != 0);
+ Q_ASSERT(m_find != nullptr);
m_line = line;
m_text[line] = text;
@@ -39,7 +39,7 @@
void KFindRecorder::find(const QString &pattern, long options)
{
delete m_find;
- m_find = new KFind(pattern, options, 0);
+ m_find = new KFind(pattern, options, nullptr);
// Prevent dialogs from popping up
m_find->closeFindNextDialog();
@@ -65,7 +65,7 @@
bool KFindRecorder::findNext(const QString &pattern)
{
- Q_ASSERT(m_find != 0);
+ Q_ASSERT(m_find != nullptr);
if (!pattern.isNull()) {
m_find->setPattern(pattern);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktextwidgets-5.30.0/autotests/kfindtest.h new/ktextwidgets-5.31.0/autotests/kfindtest.h
--- old/ktextwidgets-5.30.0/autotests/kfindtest.h 2017-01-08 22:02:24.000000000 +0100
+++ new/ktextwidgets-5.31.0/autotests/kfindtest.h 2017-02-05 12:13:38.000000000 +0100
@@ -33,8 +33,8 @@
public:
KFindRecorder(const QStringList &text) :
- QObject(0),
- m_find(0),
+ QObject(nullptr),
+ m_find(nullptr),
m_text(text),
m_line(0)
{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktextwidgets-5.30.0/autotests/kreplacetest.cpp new/ktextwidgets-5.31.0/autotests/kreplacetest.cpp
--- old/ktextwidgets-5.30.0/autotests/kreplacetest.cpp 2017-01-08 22:02:24.000000000 +0100
+++ new/ktextwidgets-5.31.0/autotests/kreplacetest.cpp 2017-02-05 12:13:38.000000000 +0100
@@ -87,7 +87,7 @@
// so slotReplaceNext never returns)
if (m_replace->options() & KReplaceDialog::PromptOnReplace) {
QDialog *dlg = m_replace->replaceNextDialog(false);
- disconnect(dlg, SIGNAL(finished(int)), m_replace, 0); // hack to avoid _k_slotDialogClosed being called
+ disconnect(dlg, SIGNAL(finished(int)), m_replace, nullptr); // hack to avoid _k_slotDialogClosed being called
dlg->hide();
QPushButton *button = dlg->findChild(m_buttonName);
@@ -273,7 +273,7 @@
static void testReplacementHistory(const QStringList &findHistory, const QStringList &replaceHistory)
{
- KReplaceDialog dlg(0, 0, findHistory, replaceHistory);
+ KReplaceDialog dlg(nullptr, 0, findHistory, replaceHistory);
dlg.show();
qDebug() << "testReplacementHistory:" << dlg.replacementHistory();
assert(dlg.replacementHistory() == replaceHistory);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktextwidgets-5.30.0/autotests/kreplacetest.h new/ktextwidgets-5.31.0/autotests/kreplacetest.h
--- old/ktextwidgets-5.30.0/autotests/kreplacetest.h 2017-01-08 22:02:24.000000000 +0100
+++ new/ktextwidgets-5.31.0/autotests/kreplacetest.h 2017-02-05 12:13:38.000000000 +0100
@@ -30,7 +30,7 @@
Q_OBJECT
public:
KReplaceTest(const QStringList &text, const QString &buttonName)
- : QObject(0L), m_text(text), m_replace(0), m_buttonName(buttonName) {}
+ : QObject(nullptr), m_text(text), m_replace(nullptr), m_buttonName(buttonName) {}
void replace(const QString &pattern, const QString &replacement, long options);
void print();
Binary files old/ktextwidgets-5.30.0/docs/pics/kfinddialog.png and new/ktextwidgets-5.31.0/docs/pics/kfinddialog.png differ
Binary files old/ktextwidgets-5.30.0/docs/pics/kreplacedialog.png and new/ktextwidgets-5.31.0/docs/pics/kreplacedialog.png differ
Binary files old/ktextwidgets-5.30.0/docs/pics/krichtextedit.png and new/ktextwidgets-5.31.0/docs/pics/krichtextedit.png differ
Binary files old/ktextwidgets-5.30.0/docs/pics/ktextedit.png and new/ktextwidgets-5.31.0/docs/pics/ktextedit.png differ
Binary files old/ktextwidgets-5.30.0/dox/kfinddialog.png and new/ktextwidgets-5.31.0/dox/kfinddialog.png differ
Binary files old/ktextwidgets-5.30.0/dox/kreplacedialog.png and new/ktextwidgets-5.31.0/dox/kreplacedialog.png differ
Binary files old/ktextwidgets-5.30.0/dox/krichtextedit.png and new/ktextwidgets-5.31.0/dox/krichtextedit.png differ
Binary files old/ktextwidgets-5.30.0/dox/ktextedit.png and new/ktextwidgets-5.31.0/dox/ktextedit.png differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktextwidgets-5.30.0/po/gl/ktextwidgets5.po new/ktextwidgets-5.31.0/po/gl/ktextwidgets5.po
--- old/ktextwidgets-5.30.0/po/gl/ktextwidgets5.po 2017-01-08 22:02:24.000000000 +0100
+++ new/ktextwidgets-5.31.0/po/gl/ktextwidgets5.po 2017-02-05 12:13:38.000000000 +0100
@@ -9,13 +9,13 @@
# Marce Villarino , 2009, 2010, 2011, 2012.
# Xosé , 2010.
# Marce Villarino , 2011, 2012, 2013, 2014.
-# Adrián Chaves Fernández (Gallaecio) , 2015.
+# Adrián Chaves Fernández (Gallaecio) , 2015, 2017.
msgid ""
msgstr ""
"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: 2015-11-07 11:12+0100\n"
+"PO-Revision-Date: 2017-01-29 12:37+0100\n"
"Last-Translator: Adrián Chaves Fernández (Gallaecio) \n"
"Language-Team: Galician \n"
@@ -115,7 +115,7 @@
#: findreplace/kfinddialog.cpp:92
#, kde-format
msgid "&Edit..."
-msgstr "&Editar..."
+msgstr "&Editar…"
#: findreplace/kfinddialog.cpp:101
#, kde-format
@@ -278,8 +278,8 @@
"Perform a case sensitive search: entering the pattern 'Joe' will not match "
"'joe' or 'JOE', only 'Joe'."
msgstr ""
-"Fai unha busca sensíbel ás maiúsculas: o padrón «Mónica» non casará con "
-"«mónica» nin «MóNiCa», só con «Mónica»."
+"Fai unha busca que distingue maiúsculas de minúsculas: o padrón «Mónica» non "
+"casará con «mónica» nin «MóNiCa», só con «Mónica»."
#: findreplace/kfinddialog.cpp:240
#, kde-format
@@ -412,12 +412,12 @@
#: findreplace/kreplace.cpp:397
#, kde-format
msgid "Do you want to restart search from the end?"
-msgstr "Desexa continuar a busca polo final?"
+msgstr "Quere continuar a busca polo final?"
#: findreplace/kreplace.cpp:398
#, kde-format
msgid "Do you want to restart search at the beginning?"
-msgstr "Desexa continuar a busca polo comezo?"
+msgstr "Quere continuar a busca polo comezo?"
#: findreplace/kreplace.cpp:401
#, kde-format
@@ -461,7 +461,7 @@
#, kde-format
msgctxt "@action"
msgid "Text &Color..."
-msgstr "&Cor do texto..."
+msgstr "&Cor do texto…"
#: widgets/krichtextwidget.cpp:231
#, kde-format
@@ -473,7 +473,7 @@
#, kde-format
msgctxt "@action"
msgid "Text &Highlight..."
-msgstr "&Realce do texto..."
+msgstr "&Realce do texto…"
#: widgets/krichtextwidget.cpp:252
#, kde-format
@@ -699,7 +699,7 @@
#: widgets/ktextedit.cpp:566
#, kde-format
msgid "Check Spelling..."
-msgstr "Corrixir a ortografía..."
+msgstr "Corrixir a ortografía…"
#: widgets/ktextedit.cpp:571
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktextwidgets-5.30.0/src/dialogs/klinkdialog_p.h new/ktextwidgets-5.31.0/src/dialogs/klinkdialog_p.h
--- old/ktextwidgets-5.30.0/src/dialogs/klinkdialog_p.h 2017-01-08 22:02:24.000000000 +0100
+++ new/ktextwidgets-5.31.0/src/dialogs/klinkdialog_p.h 2017-02-05 12:13:38.000000000 +0100
@@ -49,7 +49,7 @@
* Create a link dialog.
* @param parent Parent widget.
*/
- KLinkDialog(QWidget *parent = 0);
+ KLinkDialog(QWidget *parent = nullptr);
/**
* Destructor
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktextwidgets-5.30.0/src/findreplace/kfind.cpp new/ktextwidgets-5.31.0/src/findreplace/kfind.cpp
--- old/ktextwidgets-5.30.0/src/findreplace/kfind.cpp 2017-01-08 22:02:24.000000000 +0100
+++ new/ktextwidgets-5.31.0/src/findreplace/kfind.cpp 2017-02-05 12:13:38.000000000 +0100
@@ -54,7 +54,7 @@
// Create the dialog.
KFindNextDialog::KFindNextDialog(const QString &pattern, QWidget *parent)
: QDialog(parent),
- m_findButton(0)
+ m_findButton(nullptr)
{
setModal(false);
setWindowTitle(i18n("Find Next"));
@@ -105,11 +105,11 @@
{
matches = 0;
pattern = _pattern;
- dialog = 0;
+ dialog = nullptr;
dialogClosed = false;
index = INDEX_NOMATCH;
lastResult = NoMatch;
- regExp = 0;
+ regExp = nullptr;
q->setOptions(options); // create d->regExp with the right options
}
@@ -391,7 +391,7 @@
void KFind::Private::startNewIncrementalSearch()
{
Private::Match *match = emptyMatch;
- if (match == 0) {
+ if (match == nullptr) {
text.clear();
index = 0;
currentId = 0;
@@ -402,7 +402,7 @@
}
matchedLength = 0;
incrementalPath.clear();
- delete emptyMatch; emptyMatch = 0;
+ delete emptyMatch; emptyMatch = nullptr;
matchedPattern = pattern;
pattern.clear();
}
@@ -682,7 +682,7 @@
Qt::CaseSensitivity caseSensitive = (d->options & KFind::CaseSensitive) ? Qt::CaseSensitive : Qt::CaseInsensitive;
d->regExp = new QRegExp(d->pattern, caseSensitive);
} else {
- d->regExp = 0;
+ d->regExp = nullptr;
}
}
@@ -690,7 +690,7 @@
{
if (d->dialog) {
d->dialog->deleteLater();
- d->dialog = 0;
+ d->dialog = nullptr;
}
d->dialogClosed = true;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktextwidgets-5.30.0/src/findreplace/kfind_p.h new/ktextwidgets-5.31.0/src/findreplace/kfind_p.h
--- old/ktextwidgets-5.30.0/src/findreplace/kfind_p.h 2017-01-08 22:02:24.000000000 +0100
+++ new/ktextwidgets-5.31.0/src/findreplace/kfind_p.h 2017-02-05 12:13:38.000000000 +0100
@@ -33,12 +33,12 @@
struct KFind::Private {
Private(KFind *q)
: q(q)
- , findDialog(0)
+ , findDialog(nullptr)
, currentId(0)
, customIds(false)
, patternChanged(false)
, matchedPattern(QLatin1String(""))
- , emptyMatch(0)
+ , emptyMatch(nullptr)
{
}
@@ -47,10 +47,10 @@
if (dialog) {
dialog->deleteLater();
}
- dialog = 0;
+ dialog = nullptr;
data.clear();
delete emptyMatch;
- emptyMatch = 0;
+ emptyMatch = nullptr;
}
struct Match {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktextwidgets-5.30.0/src/findreplace/kfinddialog.cpp new/ktextwidgets-5.31.0/src/findreplace/kfinddialog.cpp
--- old/ktextwidgets-5.30.0/src/findreplace/kfinddialog.cpp 2017-01-08 22:02:24.000000000 +0100
+++ new/ktextwidgets-5.31.0/src/findreplace/kfinddialog.cpp 2017-02-05 12:13:38.000000000 +0100
@@ -147,8 +147,8 @@
topLayout->addWidget(buttonBox);
// We delay creation of these until needed.
- patterns = 0;
- placeholders = 0;
+ patterns = nullptr;
+ placeholders = nullptr;
// signals and slots connections
q->connect(selectedText, SIGNAL(toggled(bool)), q, SLOT(_k_slotSelectedTextToggled(bool)));
@@ -431,7 +431,7 @@
regexpDialog = KPluginTrader::createInstanceFromQuery<QDialog>(QStringLiteral("kregexpeditor"),
QStringLiteral("KRegExpEditor/KRegExpEditor"),
QString(),
- 0,
+ nullptr,
q);
regexpDialogQueryDone = true;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktextwidgets-5.30.0/src/findreplace/kfinddialog.h new/ktextwidgets-5.31.0/src/findreplace/kfinddialog.h
--- old/ktextwidgets-5.30.0/src/findreplace/kfinddialog.h 2017-01-08 22:02:24.000000000 +0100
+++ new/ktextwidgets-5.31.0/src/findreplace/kfinddialog.h 2017-02-05 12:13:38.000000000 +0100
@@ -79,7 +79,7 @@
* @param findStrings The find history, see findHistory()
* @param hasSelection Whether a selection exists
*/
- explicit KFindDialog(QWidget *parent = 0, long options = 0,
+ explicit KFindDialog(QWidget *parent = nullptr, long options = 0,
const QStringList &findStrings = QStringList(), bool hasSelection = false, bool replaceDialog = false);
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktextwidgets-5.30.0/src/findreplace/kfinddialog_p.h new/ktextwidgets-5.31.0/src/findreplace/kfinddialog_p.h
--- old/ktextwidgets-5.30.0/src/findreplace/kfinddialog_p.h 2017-01-08 22:02:24.000000000 +0100
+++ new/ktextwidgets-5.31.0/src/findreplace/kfinddialog_p.h 2017-02-05 12:13:38.000000000 +0100
@@ -40,12 +40,12 @@
public:
KFindDialogPrivate(KFindDialog *q)
: q(q),
- regexpDialog(0),
+ regexpDialog(nullptr),
regexpDialogQueryDone(false),
initialShowDone(false),
enabled(KFind::WholeWordsOnly | KFind::FromCursor | KFind::SelectedText | KFind::CaseSensitive | KFind::FindBackwards | KFind::RegularExpression),
- findExtension(0),
- buttonBox(0)
+ findExtension(nullptr),
+ buttonBox(nullptr)
{}
void init(bool forReplace, const QStringList &findStrings, bool hasSelection);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktextwidgets-5.30.0/src/findreplace/kreplace.cpp new/ktextwidgets-5.31.0/src/findreplace/kreplace.cpp
--- old/ktextwidgets-5.30.0/src/findreplace/kreplace.cpp 2017-01-08 22:02:24.000000000 +0100
+++ new/ktextwidgets-5.31.0/src/findreplace/kreplace.cpp 2017-02-05 12:13:38.000000000 +0100
@@ -155,7 +155,7 @@
if (KFind::d->dialog || create) {
return d->dialog();
}
- return 0L;
+ return nullptr;
}
KReplaceNextDialog *KReplacePrivate::dialog()
@@ -272,7 +272,7 @@
index = KFind::find(text, pattern, index, options, &matchedLength);
if (index != -1) {
- *replacedLength = replaceHelper(text, replacement, index, options, matchedLength, NULL);
+ *replacedLength = replaceHelper(text, replacement, index, options, matchedLength, nullptr);
if (options & KFind::FindBackwards) {
index--;
} else {
@@ -314,7 +314,7 @@
q->KFind::d->index++;
}
if (q->KFind::d->dialogClosed) {
- q->KFind::d->dialog->deleteLater(); q->KFind::d->dialog = 0L; // hide it again
+ q->KFind::d->dialog->deleteLater(); q->KFind::d->dialog = nullptr; // hide it again
} else {
emit q->findNext();
}
@@ -324,7 +324,7 @@
{
doReplace();
if (q->KFind::d->dialogClosed) {
- q->KFind::d->dialog->deleteLater(); q->KFind::d->dialog = 0L; // hide it again
+ q->KFind::d->dialog->deleteLater(); q->KFind::d->dialog = nullptr; // hide it again
} else {
emit q->findNext();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktextwidgets-5.30.0/src/findreplace/kreplace.h new/ktextwidgets-5.31.0/src/findreplace/kreplace.h
--- old/ktextwidgets-5.30.0/src/findreplace/kreplace.h 2017-01-08 22:02:24.000000000 +0100
+++ new/ktextwidgets-5.31.0/src/findreplace/kreplace.h 2017-02-05 12:13:38.000000000 +0100
@@ -105,7 +105,7 @@
* Only use this constructor if you don't use KFindDialog, or if
* you use it as a modal dialog.
*/
- KReplace(const QString &pattern, const QString &replacement, long options, QWidget *parent = 0);
+ KReplace(const QString &pattern, const QString &replacement, long options, QWidget *parent = nullptr);
/**
* This is the recommended constructor if you also use KReplaceDialog (non-modal).
* You should pass the pointer to it here, so that when a message box
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktextwidgets-5.30.0/src/findreplace/kreplacedialog.cpp new/ktextwidgets-5.31.0/src/findreplace/kreplacedialog.cpp
--- old/ktextwidgets-5.30.0/src/findreplace/kreplacedialog.cpp 2017-01-08 22:02:24.000000000 +0100
+++ new/ktextwidgets-5.31.0/src/findreplace/kreplacedialog.cpp 2017-02-05 12:13:38.000000000 +0100
@@ -42,7 +42,7 @@
KReplaceDialogPrivate(KReplaceDialog *q)
: q(q)
, initialShowDone(false)
- , replaceExtension(0)
+ , replaceExtension(nullptr)
{
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktextwidgets-5.30.0/src/findreplace/kreplacedialog.h new/ktextwidgets-5.31.0/src/findreplace/kreplacedialog.h
--- old/ktextwidgets-5.30.0/src/findreplace/kreplacedialog.h 2017-01-08 22:02:24.000000000 +0100
+++ new/ktextwidgets-5.31.0/src/findreplace/kreplacedialog.h 2017-02-05 12:13:38.000000000 +0100
@@ -78,7 +78,7 @@
* replace with
* @param hasSelection Whether a selection exists
*/
- explicit KReplaceDialog(QWidget *parent = 0, long options = 0,
+ explicit KReplaceDialog(QWidget *parent = nullptr, long options = 0,
const QStringList &findStrings = QStringList(),
const QStringList &replaceStrings = QStringList(),
bool hasSelection = true);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktextwidgets-5.30.0/src/widgets/kpluralhandlingspinbox.h new/ktextwidgets-5.31.0/src/widgets/kpluralhandlingspinbox.h
--- old/ktextwidgets-5.30.0/src/widgets/kpluralhandlingspinbox.h 2017-01-08 22:02:24.000000000 +0100
+++ new/ktextwidgets-5.31.0/src/widgets/kpluralhandlingspinbox.h 2017-02-05 12:13:38.000000000 +0100
@@ -40,7 +40,7 @@
* Default constructor
*/
- explicit KPluralHandlingSpinBox(QWidget *parent = 0);
+ explicit KPluralHandlingSpinBox(QWidget *parent = nullptr);
~KPluralHandlingSpinBox();
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktextwidgets-5.30.0/src/widgets/krichtextedit.h new/ktextwidgets-5.31.0/src/widgets/krichtextedit.h
--- old/ktextwidgets-5.30.0/src/widgets/krichtextedit.h 2017-01-08 22:02:24.000000000 +0100
+++ new/ktextwidgets-5.31.0/src/widgets/krichtextedit.h 2017-02-05 12:13:38.000000000 +0100
@@ -79,14 +79,14 @@
* HTML.
* @param parent The parent widget
*/
- explicit KRichTextEdit(const QString &text, QWidget *parent = 0);
+ explicit KRichTextEdit(const QString &text, QWidget *parent = nullptr);
/**
* Constructs a KRichTextEdit object.
*
* @param parent The parent widget
*/
- explicit KRichTextEdit(QWidget *parent = 0);
+ explicit KRichTextEdit(QWidget *parent = nullptr);
/**
* Destructor.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktextwidgets-5.30.0/src/widgets/krichtextwidget.cpp new/ktextwidgets-5.31.0/src/widgets/krichtextwidget.cpp
--- old/ktextwidgets-5.30.0/src/widgets/krichtextwidget.cpp 2017-01-08 22:02:24.000000000 +0100
+++ new/ktextwidgets-5.31.0/src/widgets/krichtextwidget.cpp 2017-02-05 12:13:38.000000000 +0100
@@ -48,30 +48,30 @@
: q(parent),
painterActive(false),
richTextEnabled(false), // It's only enabled when an action makes text rich.
- enableRichText(0),
- action_text_foreground_color(0),
- action_text_background_color(0),
- action_text_bold(0),
- action_text_italic(0),
- action_text_underline(0),
- action_text_strikeout(0),
- action_font_family(0),
- action_font_size(0),
- action_list_style(0),
- action_list_indent(0),
- action_list_dedent(0),
- action_manage_link(0),
- action_insert_horizontal_rule(0),
- action_format_painter(0),
- action_to_plain_text(0),
- action_align_left(0),
- action_align_right(0),
- action_align_center(0),
- action_align_justify(0),
- action_direction_ltr(0),
- action_direction_rtl(0),
- action_text_superscript(0),
- action_text_subscript(0)
+ enableRichText(nullptr),
+ action_text_foreground_color(nullptr),
+ action_text_background_color(nullptr),
+ action_text_bold(nullptr),
+ action_text_italic(nullptr),
+ action_text_underline(nullptr),
+ action_text_strikeout(nullptr),
+ action_font_family(nullptr),
+ action_font_size(nullptr),
+ action_list_style(nullptr),
+ action_list_indent(nullptr),
+ action_list_dedent(nullptr),
+ action_manage_link(nullptr),
+ action_insert_horizontal_rule(nullptr),
+ action_format_painter(nullptr),
+ action_to_plain_text(nullptr),
+ action_align_left(nullptr),
+ action_align_right(nullptr),
+ action_align_center(nullptr),
+ action_align_justify(nullptr),
+ action_direction_ltr(nullptr),
+ action_direction_rtl(nullptr),
+ action_text_superscript(nullptr),
+ action_text_subscript(nullptr)
{
}
@@ -233,7 +233,7 @@
d->action_text_foreground_color->setObjectName(QStringLiteral("format_text_foreground_color"));
connect(d->action_text_foreground_color, SIGNAL(triggered()), this, SLOT(_k_setTextForegroundColor()));
} else {
- d->action_text_foreground_color = 0;
+ d->action_text_foreground_color = nullptr;
}
if (d->richTextSupport & SupportTextBackgroundColor) {
@@ -244,7 +244,7 @@
d->action_text_background_color->setObjectName(QStringLiteral("format_text_background_color"));
connect(d->action_text_background_color, SIGNAL(triggered()), this, SLOT(_k_setTextBackgroundColor()));
} else {
- d->action_text_background_color = 0;
+ d->action_text_background_color = nullptr;
}
if (d->richTextSupport & SupportFontFamily) {
@@ -254,7 +254,7 @@
d->action_font_family->setObjectName(QStringLiteral("format_font_family"));
connect(d->action_font_family, SIGNAL(triggered(QString)), this, SLOT(setFontFamily(QString)));
} else {
- d->action_font_family = 0;
+ d->action_font_family = nullptr;
}
if (d->richTextSupport & SupportFontSize) {
@@ -264,7 +264,7 @@
d->action_font_size->setObjectName(QStringLiteral("format_font_size"));
connect(d->action_font_size, &KFontSizeAction::fontSizeChanged, this, &KRichTextEdit::setFontSize);
} else {
- d->action_font_size = 0;
+ d->action_font_size = nullptr;
}
if (d->richTextSupport & SupportBold) {
@@ -278,7 +278,7 @@
d->action_text_bold->setShortcut(Qt::CTRL + Qt::Key_B);
connect(d->action_text_bold, &QAction::triggered, this, &KRichTextEdit::setTextBold);
} else {
- d->action_text_bold = 0;
+ d->action_text_bold = nullptr;
}
if (d->richTextSupport & SupportItalic) {
@@ -293,7 +293,7 @@
connect(d->action_text_italic, &QAction::triggered,
this, &KRichTextEdit::setTextItalic);
} else {
- d->action_text_italic = 0;
+ d->action_text_italic = nullptr;
}
if (d->richTextSupport & SupportUnderline) {
@@ -308,7 +308,7 @@
connect(d->action_text_underline, &QAction::triggered,
this, &KRichTextEdit::setTextUnderline);
} else {
- d->action_text_underline = 0;
+ d->action_text_underline = nullptr;
}
if (d->richTextSupport & SupportStrikeOut) {
@@ -323,7 +323,7 @@
connect(d->action_text_strikeout, &QAction::triggered,
this, &KRichTextEdit::setTextStrikeOut);
} else {
- d->action_text_strikeout = 0;
+ d->action_text_strikeout = nullptr;
}
if (d->richTextSupport & SupportAlignment) {
@@ -366,10 +366,10 @@
alignmentGroup->addAction(d->action_align_right);
alignmentGroup->addAction(d->action_align_justify);
} else {
- d->action_align_left = 0;
- d->action_align_center = 0;
- d->action_align_right = 0;
- d->action_align_justify = 0;
+ d->action_align_left = nullptr;
+ d->action_align_center = nullptr;
+ d->action_align_right = nullptr;
+ d->action_align_justify = nullptr;
}
if (d->richTextSupport & SupportDirection) {
@@ -393,8 +393,8 @@
directionGroup->addAction(d->action_direction_ltr);
directionGroup->addAction(d->action_direction_rtl);
} else {
- d->action_direction_ltr = 0;
- d->action_direction_rtl = 0;
+ d->action_direction_ltr = nullptr;
+ d->action_direction_rtl = nullptr;
}
if (d->richTextSupport & SupportChangeListStyle) {
@@ -420,7 +420,7 @@
connect(d->action_list_style, SIGNAL(triggered()),
this, SLOT(_k_updateMiscActions()));
} else {
- d->action_list_style = 0;
+ d->action_list_style = nullptr;
}
if (d->richTextSupport & SupportIndentLists) {
@@ -433,7 +433,7 @@
connect(d->action_list_indent, SIGNAL(triggered()),
this, SLOT(_k_updateMiscActions()));
} else {
- d->action_list_indent = 0;
+ d->action_list_indent = nullptr;
}
if (d->richTextSupport & SupportDedentLists) {
@@ -446,7 +446,7 @@
connect(d->action_list_dedent, SIGNAL(triggered()),
this, SLOT(_k_updateMiscActions()));
} else {
- d->action_list_dedent = 0;
+ d->action_list_dedent = nullptr;
}
if (d->richTextSupport & SupportRuleLine) {
@@ -457,7 +457,7 @@
connect(d->action_insert_horizontal_rule, &QAction::triggered,
this, &KRichTextEdit::insertHorizontalRule);
} else {
- d->action_insert_horizontal_rule = 0;
+ d->action_insert_horizontal_rule = nullptr;
}
if (d->richTextSupport & SupportHyperlinks) {
@@ -468,7 +468,7 @@
connect(d->action_manage_link, SIGNAL(triggered()),
this, SLOT(_k_manageLink()));
} else {
- d->action_manage_link = 0;
+ d->action_manage_link = nullptr;
}
if (d->richTextSupport & SupportFormatPainting) {
@@ -479,7 +479,7 @@
connect(d->action_format_painter, SIGNAL(toggled(bool)),
this, SLOT(_k_formatPainter(bool)));
} else {
- d->action_format_painter = 0;
+ d->action_format_painter = nullptr;
}
if (d->richTextSupport & SupportToPlainText) {
@@ -489,7 +489,7 @@
connect(d->action_to_plain_text, &QAction::triggered,
this, &KRichTextEdit::switchToPlainText);
} else {
- d->action_to_plain_text = 0;
+ d->action_to_plain_text = nullptr;
}
if (d->richTextSupport & SupportSuperScriptAndSubScript) {
@@ -507,9 +507,9 @@
connect(d->action_text_superscript, &QAction::triggered,
this, &KRichTextEdit::setTextSuperScript);
} else {
- d->action_text_subscript = 0;
+ d->action_text_subscript = nullptr;
- d->action_text_superscript = 0;
+ d->action_text_superscript = nullptr;
}
disconnect(this, SIGNAL(currentCharFormatChanged(QTextCharFormat)),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktextwidgets-5.30.0/src/widgets/krichtextwidget.h new/ktextwidgets-5.31.0/src/widgets/krichtextwidget.h
--- old/ktextwidgets-5.30.0/src/widgets/krichtextwidget.h 2017-01-08 22:02:24.000000000 +0100
+++ new/ktextwidgets-5.31.0/src/widgets/krichtextwidget.h 2017-02-05 12:13:38.000000000 +0100
@@ -47,7 +47,6 @@
class KTEXTWIDGETS_EXPORT KRichTextWidget : public KRichTextEdit
{
Q_OBJECT
- Q_FLAGS(RichTextSupport)
Q_PROPERTY(RichTextSupport richTextSupport READ richTextSupport WRITE setRichTextSupport)
public:
@@ -228,6 +227,7 @@
FullSupport = 0xffffffff
};
Q_DECLARE_FLAGS(RichTextSupport, RichTextSupportValues)
+ Q_FLAG(RichTextSupport)
/**
* @brief Constructor
@@ -242,7 +242,7 @@
* HTML.
* @param parent The parent widget
*/
- explicit KRichTextWidget(const QString &text, QWidget *parent = 0);
+ explicit KRichTextWidget(const QString &text, QWidget *parent = nullptr);
/**
* @brief Destructor
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktextwidgets-5.30.0/src/widgets/ktextedit.cpp new/ktextwidgets-5.31.0/src/widgets/ktextedit.cpp
--- old/ktextwidgets-5.30.0/src/widgets/ktextedit.cpp 2017-01-08 22:02:24.000000000 +0100
+++ new/ktextwidgets-5.31.0/src/widgets/ktextedit.cpp 2017-02-05 12:13:38.000000000 +0100
@@ -66,15 +66,15 @@
public:
Private(KTextEdit *_parent)
: parent(_parent),
- languagesMenu(Q_NULLPTR),
+ languagesMenu(nullptr),
customPalette(false),
spellCheckingEnabled(false),
findReplaceEnabled(true),
showTabAction(true),
showAutoCorrectionButton(false),
- decorator(0), speller(0), findDlg(0), find(0), repDlg(0), replace(0),
+ decorator(nullptr), speller(nullptr), findDlg(nullptr), find(nullptr), repDlg(nullptr), replace(nullptr),
#ifdef HAVE_SPEECH
- textToSpeech(Q_NULLPTR),
+ textToSpeech(nullptr),
#endif
findIndex(0), repIndex(0),
lastReplacedPosition(-1)
@@ -174,7 +174,7 @@
backgroundSpellCheck->changeLanguage(spellCheckingLanguage);
}
Sonnet::Dialog *spellDialog = new Sonnet::Dialog(
- backgroundSpellCheck, force ? parent : 0);
+ backgroundSpellCheck, force ? parent : nullptr);
backgroundSpellCheck->setParent(spellDialog);
spellDialog->setAttribute(Qt::WA_DeleteOnClose, true);
spellDialog->activeAutoCorrect(showAutoCorrectionButton);
@@ -529,7 +529,7 @@
{
QMenu *popup = createStandardContextMenu();
if (!popup) {
- return 0;
+ return nullptr;
}
connect(popup, SIGNAL(triggered(QAction*)),
this, SLOT(menuActivated(QAction*)));
@@ -538,7 +538,7 @@
if (!isReadOnly()) {
QList actionList = popup->actions();
enum { UndoAct, RedoAct, CutAct, CopyAct, PasteAct, ClearAct, SelectAllAct, NCountActs };
- QAction *separatorAction = 0L;
+ QAction *separatorAction = nullptr;
int idx = actionList.indexOf(actionList[SelectAllAct]) + 1;
if (idx < actionList.count()) {
separatorAction = actionList.at(idx);
@@ -612,8 +612,8 @@
findNextAction->setEnabled(false);
findPrevAction->setEnabled(false);
} else {
- findNextAction->setEnabled(d->find != 0);
- findPrevAction->setEnabled(d->find != 0);
+ findNextAction->setEnabled(d->find != nullptr);
+ findPrevAction->setEnabled(d->find != nullptr);
}
popup->addSeparator();
popup->addAction(findAction);
@@ -671,14 +671,14 @@
if (d->decorator) {
return d->decorator->highlighter();
} else {
- return 0;
+ return nullptr;
}
}
void KTextEdit::clearDecorator()
{
delete d->decorator;
- d->decorator = 0;
+ d->decorator = nullptr;
}
void KTextEdit::addTextDecorator(Sonnet::SpellCheckDecorator *decorator)
@@ -754,7 +754,7 @@
if (readOnly) {
delete d->decorator;
- d->decorator = 0;
+ d->decorator = nullptr;
d->customPalette = testAttribute(Qt::WA_SetPalette);
QPalette p = palette();
@@ -821,7 +821,7 @@
if (d->repDlg->pattern().isEmpty()) {
delete d->replace;
- d->replace = 0;
+ d->replace = nullptr;
ensureCursorVisible();
return;
}
@@ -880,7 +880,7 @@
d->replace->displayFinalDialog();
d->replace->disconnect(this);
d->replace->deleteLater(); // we are in a slot connected to m_replace, don't delete it right away
- d->replace = 0;
+ d->replace = nullptr;
ensureCursorVisible();
//or if ( m_replace->shouldRestart() ) { reinit (w/o FromCursor) and call slotReplaceNext(); }
} else {
@@ -896,7 +896,7 @@
}
if (d->findDlg->pattern().isEmpty()) {
delete d->find;
- d->find = 0;
+ d->find = nullptr;
return;
}
delete d->find;
@@ -925,7 +925,7 @@
if (document()->isEmpty()) {
d->find->disconnect(this);
d->find->deleteLater(); // we are in a slot connected to m_find, don't delete right away
- d->find = 0;
+ d->find = nullptr;
return;
}
@@ -939,7 +939,7 @@
d->find->displayFinalDialog();
d->find->disconnect(this);
d->find->deleteLater(); // we are in a slot connected to m_find, don't delete right away
- d->find = 0;
+ d->find = nullptr;
//or if ( m_find->shouldRestart() ) { reinit (w/o FromCursor) and call slotFindNext(); }
} else {
//m_find->closeFindNextDialog();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktextwidgets-5.30.0/src/widgets/ktextedit.h new/ktextwidgets-5.31.0/src/widgets/ktextedit.h
--- old/ktextwidgets-5.30.0/src/widgets/ktextedit.h 2017-01-08 22:02:24.000000000 +0100
+++ new/ktextwidgets-5.31.0/src/widgets/ktextedit.h 2017-02-05 12:13:38.000000000 +0100
@@ -60,13 +60,13 @@
* Constructs a KTextEdit object. See QTextEdit::QTextEdit
* for details.
*/
- explicit KTextEdit(const QString &text, QWidget *parent = 0);
+ explicit KTextEdit(const QString &text, QWidget *parent = nullptr);
/**
* Constructs a KTextEdit object. See QTextEdit::QTextEdit
* for details.
*/
- explicit KTextEdit(QWidget *parent = 0);
+ explicit KTextEdit(QWidget *parent = nullptr);
/**
* Destroys the KTextEdit object.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktextwidgets-5.30.0/src/widgets/nestedlisthelper.cpp new/ktextwidgets-5.31.0/src/widgets/nestedlisthelper.cpp
--- old/ktextwidgets-5.30.0/src/widgets/nestedlisthelper.cpp 2017-01-08 22:02:24.000000000 +0100
+++ new/ktextwidgets-5.31.0/src/widgets/nestedlisthelper.cpp 2017-02-05 12:13:38.000000000 +0100
@@ -176,7 +176,7 @@
QTextCursor cursor = QTextCursor(block);
list = cursor.createList(list->format());
bool processingSubList = false;
- while (block.next().textList() != 0) {
+ while (block.next().textList() != nullptr) {
block = block.next();
QTextList *nextList = block.textList();
@@ -204,7 +204,7 @@
int minimumIndent = block.textList()->format().indent();
// Start at the top of the list
- while (block.previous().textList() != 0) {
+ while (block.previous().textList() != nullptr) {
if (block.previous().textList()->format().indent() < minimumIndent) {
break;
}