[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdeplasma-addons] /: Use nullptr
From: Friedrich W. H. Kossebau <null () kde ! org>
Date: 2018-01-27 3:27:50
Message-ID: E1efH9i-0003Da-6w () code ! kde ! org
[Download RAW message or body]
Git commit 6ae16cec142d57bec41a211dfa6e43b853568498 by Friedrich W. H. Kossebau.
Committed on 27/01/2018 at 03:18.
Pushed by kossebau into branch 'master'.
Use nullptr
M +1 -1 applets/comic/activecomicmodel.h
M +1 -1 applets/comic/checknewstrips.h
M +7 -7 applets/comic/comic.cpp
M +1 -1 applets/comic/comicarchivedialog.h
M +1 -1 applets/comic/comicarchivejob.cpp
M +1 -1 applets/comic/comicarchivejob.h
M +1 -1 applets/comic/comicmodel.h
M +1 -1 applets/comic/comicsaver.cpp
M +2 -2 applets/comic/comicupdater.cpp
M +1 -1 applets/comic/comicupdater.h
M +3 -3 applets/comic/stripselector.cpp
M +1 -1 applets/comic/stripselector.h
M +3 -3 applets/comic/stripselector_p.h
M +1 -1 applets/minimizeall/plugin/minimizeall.cpp
M +3 -3 applets/notes/plugin/documenthandler.cpp
M +1 -1 applets/notes/plugin/notemanager.h
M +1 -1 applets/quickshare/plugin/contenttracker.cpp
M +1 -1 applets/quickshare/plugin/contenttracker.h
M +1 -1 dataengines/comic/comic.cpp
M +1 -1 dataengines/comic/comic_package.h
M +1 -1 dataengines/comic/comicproviderkross.cpp
M +4 -4 dataengines/comic/comicproviderwrapper.cpp
M +3 -3 dataengines/comic/comicproviderwrapper.h
M +1 -1 runners/dictionary/dictionarymatchengine.h
M +1 -1 runners/dictionary/dictionaryrunner_config.h
M +1 -1 runners/spellchecker/spellcheck_config.h
https://commits.kde.org/kdeplasma-addons/6ae16cec142d57bec41a211dfa6e43b853568498
diff --git a/applets/comic/activecomicmodel.h b/applets/comic/activecomicmodel.h
index bb33d246f..98cc39654 100644
--- a/applets/comic/activecomicmodel.h
+++ b/applets/comic/activecomicmodel.h
@@ -34,7 +34,7 @@ public:
ComicHighlightRole = Qt::UserRole+4
};
- ActiveComicModel(QObject *parent = 0);
+ ActiveComicModel(QObject *parent = nullptr);
QHash<int, QByteArray> roleNames() const override;
diff --git a/applets/comic/checknewstrips.h b/applets/comic/checknewstrips.h
index 4b16affee..c1e408bdc 100644
--- a/applets/comic/checknewstrips.h
+++ b/applets/comic/checknewstrips.h
@@ -31,7 +31,7 @@ class CheckNewStrips : public QObject
Q_OBJECT
public:
- CheckNewStrips( const QStringList &identifiers, Plasma::DataEngine *engine, \
int minutes, QObject *parent = 0 ); + CheckNewStrips( const QStringList \
&identifiers, Plasma::DataEngine *engine, int minutes, QObject *parent = nullptr );
Q_SIGNALS:
/**
diff --git a/applets/comic/comic.cpp b/applets/comic/comic.cpp
index fb86bc3b3..8d011a9a3 100644
--- a/applets/comic/comic.cpp
+++ b/applets/comic/comic.cpp
@@ -55,7 +55,7 @@ const int ComicApplet::CACHE_LIMIT = 20;
ComicApplet::ComicApplet( QObject *parent, const QVariantList &args )
: Plasma::Applet( parent, args ),
- mProxy(0),
+ mProxy(nullptr),
mActiveComicModel(new ActiveComicModel(parent)),
mDifferentComic( true ),
mShowComicUrl( false ),
@@ -67,10 +67,10 @@ ComicApplet::ComicApplet( QObject *parent, const QVariantList \
&args ) mMiddleClick( true ),
mCheckNewComicStripsInterval(0),
mMaxComicLimit( CACHE_LIMIT ),
- mCheckNewStrips( 0 ),
- mActionShop( 0 ),
- mEngine( 0 ),
- mSavingDir(0)
+ mCheckNewStrips(nullptr),
+ mActionShop(nullptr),
+ mEngine(nullptr),
+ mSavingDir(nullptr)
{
setHasConfigurationInterface( true );
}
@@ -311,7 +311,7 @@ void ComicApplet::updateUsedComics()
mActionNextNewStripTab->setEnabled( isTabHighlighted(mCurrent.id()) );
delete mCheckNewStrips;
- mCheckNewStrips = 0;
+ mCheckNewStrips = nullptr;
if (mEngine && mCheckNewComicStripsInterval ) {
mCheckNewStrips = new CheckNewStrips( mTabIdentifier, mEngine, \
mCheckNewComicStripsInterval, this );
connect( mCheckNewStrips, &CheckNewStrips::lastStrip, this, \
&ComicApplet::slotFoundLastStrip ); @@ -428,7 +428,7 @@ void \
ComicApplet::slotStorePosition()
void ComicApplet::slotShop()
{
- KRun::runUrl(mCurrent.shopUrl(), "text/html", 0);
+ KRun::runUrl(mCurrent.shopUrl(), "text/html", nullptr);
}
void ComicApplet::createComicBook()
diff --git a/applets/comic/comicarchivedialog.h b/applets/comic/comicarchivedialog.h
index fc52aff23..70aa3bfaf 100644
--- a/applets/comic/comicarchivedialog.h
+++ b/applets/comic/comicarchivedialog.h
@@ -34,7 +34,7 @@ class ComicArchiveDialog : public QDialog
Q_OBJECT
public:
- ComicArchiveDialog( const QString &pluginName, const QString &comicName, \
IdentifierType identifierType, const QString ¤tIdentifierSuffix, const QString \
&firstIdentifierSuffix, const QString &savingDir = QString(), QWidget *parent = 0 ); \
+ ComicArchiveDialog( const QString &pluginName, const QString &comicName, \
IdentifierType identifierType, const QString ¤tIdentifierSuffix, const QString \
&firstIdentifierSuffix, const QString &savingDir = QString(), QWidget *parent = \
nullptr );
Q_SIGNALS:
void archive( int archiveType, const QUrl &dest, const QString \
&fromIdentifier, const QString &toIdentifier );
diff --git a/applets/comic/comicarchivejob.cpp b/applets/comic/comicarchivejob.cpp
index c3831ecc4..7a67b373c 100644
--- a/applets/comic/comicarchivejob.cpp
+++ b/applets/comic/comicarchivejob.cpp
@@ -41,7 +41,7 @@ ComicArchiveJob::ComicArchiveJob( const QUrl &dest, \
Plasma::DataEngine *engine, mTotalFiles( -1 ),
mEngine( engine ),
mZipFile( new QTemporaryFile ),
- mZip( 0 ),
+ mZip(nullptr),
mPluginName( pluginName ),
mDest( dest )
{
diff --git a/applets/comic/comicarchivejob.h b/applets/comic/comicarchivejob.h
index b0ad0fee0..150ac3988 100644
--- a/applets/comic/comicarchivejob.h
+++ b/applets/comic/comicarchivejob.h
@@ -51,7 +51,7 @@ class ComicArchiveJob : public KJob
* "garfield:2010-03-04", here "garfield" is the plugin name
* @see setToIdentifier, setFromIdentifier
*/
- ComicArchiveJob( const QUrl &dest, Plasma::DataEngine *engine, ArchiveType \
archiveType, IdentifierType identifierType, const QString &pluginName, QObject \
*parent = 0 ); + ComicArchiveJob( const QUrl &dest, Plasma::DataEngine \
*engine, ArchiveType archiveType, IdentifierType identifierType, const QString \
&pluginName, QObject *parent = nullptr ); ~ComicArchiveJob() override;
/**
diff --git a/applets/comic/comicmodel.h b/applets/comic/comicmodel.h
index 68c8e7f9d..74cef75e8 100644
--- a/applets/comic/comicmodel.h
+++ b/applets/comic/comicmodel.h
@@ -32,7 +32,7 @@ class ComicModel : public QAbstractTableModel, public \
Plasma::DataEngineConsumer Q_OBJECT
public:
- ComicModel( Plasma::DataEngine *engine, const QString &source, const \
QStringList &usedComics, QObject *parent = 0 ); + ComicModel( \
Plasma::DataEngine *engine, const QString &source, const QStringList &usedComics, \
QObject *parent = nullptr );
void setComics( const Plasma::DataEngine::Data &comics, const QStringList \
&usedComics );
diff --git a/applets/comic/comicsaver.cpp b/applets/comic/comicsaver.cpp
index ec8b79f69..27cdd7170 100644
--- a/applets/comic/comicsaver.cpp
+++ b/applets/comic/comicsaver.cpp
@@ -39,7 +39,7 @@ bool ComicSaver::save(const ComicData &comic)
const QString name = title + " - " + comic.current() + ".png";
QUrl destUrl = QUrl::fromLocalFile( mSavingDir->getDir() + '/'+ name );
- destUrl = QFileDialog::getSaveFileUrl(0, QString(), destUrl, "*.png" );
+ destUrl = QFileDialog::getSaveFileUrl(nullptr, QString(), destUrl, "*.png" );
if ( !destUrl.isValid() ) {
return false;
diff --git a/applets/comic/comicupdater.cpp b/applets/comic/comicupdater.cpp
index d953f1aa2..b50a2cb50 100644
--- a/applets/comic/comicupdater.cpp
+++ b/applets/comic/comicupdater.cpp
@@ -30,9 +30,9 @@
ComicUpdater::ComicUpdater( QObject *parent )
: QObject( parent ),
- mDownloadManager( 0 ),
+ mDownloadManager(nullptr),
mUpdateIntervall( 3 ),
- m_updateTimer( 0 )
+ m_updateTimer(nullptr)
{
}
diff --git a/applets/comic/comicupdater.h b/applets/comic/comicupdater.h
index afbfbaed1..a8cab37cf 100644
--- a/applets/comic/comicupdater.h
+++ b/applets/comic/comicupdater.h
@@ -46,7 +46,7 @@ class ComicUpdater : public QObject
Q_OBJECT
public:
- explicit ComicUpdater( QObject *parent = 0 );
+ explicit ComicUpdater( QObject *parent = nullptr );
~ComicUpdater() override;
void init( const KConfigGroup &group );
diff --git a/applets/comic/stripselector.cpp b/applets/comic/stripselector.cpp
index f613463ac..94af85c09 100644
--- a/applets/comic/stripselector.cpp
+++ b/applets/comic/stripselector.cpp
@@ -95,7 +95,7 @@ StripSelector *StripSelectorFactory::create(IdentifierType type)
return new StringStripSelector();
}
- return 0;
+ return nullptr;
}
@@ -111,7 +111,7 @@ StringStripSelector::~StringStripSelector()
void StringStripSelector::select(const ComicData ¤tStrip)
{
bool ok;
- const QString strip = QInputDialog::getText(0, i18n("Go to Strip"), i18n("Strip \
identifier:"), QLineEdit::Normal, + const QString strip = \
QInputDialog::getText(nullptr, i18n("Go to Strip"), i18n("Strip identifier:"), \
QLineEdit::Normal,
currentStrip.current(), &ok);
if (ok) {
emit stripChosen(strip);
@@ -130,7 +130,7 @@ NumberStripSelector::~NumberStripSelector()
void NumberStripSelector::select(const ComicData ¤tStrip)
{
- QScopedPointer<ChooseStripNumDialog> pageDialog(new ChooseStripNumDialog(0, \
currentStrip.current().toInt(), + QScopedPointer<ChooseStripNumDialog> \
pageDialog(new ChooseStripNumDialog(nullptr, \
currentStrip.current().toInt(),
currentStrip.firstStripNum(), \
currentStrip.maxStripNum())); if (pageDialog->exec() == QDialog::Accepted) {
emit stripChosen(QString::number(pageDialog->getStripNumber()));
diff --git a/applets/comic/stripselector.h b/applets/comic/stripselector.h
index 10594005f..2cbf9690d 100644
--- a/applets/comic/stripselector.h
+++ b/applets/comic/stripselector.h
@@ -56,7 +56,7 @@ class StripSelector : public QObject
void stripChosen(const QString &strip);
protected:
- explicit StripSelector(QObject *parent = 0);
+ explicit StripSelector(QObject *parent = nullptr);
};
/**
diff --git a/applets/comic/stripselector_p.h b/applets/comic/stripselector_p.h
index c28a475e7..fe26d1d9e 100644
--- a/applets/comic/stripselector_p.h
+++ b/applets/comic/stripselector_p.h
@@ -27,7 +27,7 @@
class StringStripSelector : public StripSelector
{
public:
- explicit StringStripSelector(QObject *parent = 0);
+ explicit StringStripSelector(QObject *parent = nullptr);
~StringStripSelector() override;
void select(const ComicData ¤tStrip) override;
@@ -36,7 +36,7 @@ class StringStripSelector : public StripSelector
class NumberStripSelector : public StripSelector
{
public:
- explicit NumberStripSelector(QObject *parent = 0);
+ explicit NumberStripSelector(QObject *parent = nullptr);
~NumberStripSelector() override;
void select(const ComicData ¤tStrip) override;
@@ -47,7 +47,7 @@ class DateStripSelector : public StripSelector
Q_OBJECT
public:
- explicit DateStripSelector(QObject *parent = 0);
+ explicit DateStripSelector(QObject *parent = nullptr);
~DateStripSelector() override;
void select(const ComicData ¤tStrip) override;
diff --git a/applets/minimizeall/plugin/minimizeall.cpp \
b/applets/minimizeall/plugin/minimizeall.cpp index 44eae3068..e40f422f6 100644
--- a/applets/minimizeall/plugin/minimizeall.cpp
+++ b/applets/minimizeall/plugin/minimizeall.cpp
@@ -92,7 +92,7 @@ bool MinimizeAll::match(const WId& wid, bool includehidden) const
void MinimizeAll::deactivate(bool unminimize)
{
if (m_active) {
- disconnect(KWindowSystem::self(), 0, this, 0);
+ disconnect(KWindowSystem::self(), nullptr, this, nullptr);
if (unminimize) {
Q_FOREACH (auto wid, m_minimizedWindows) {
diff --git a/applets/notes/plugin/documenthandler.cpp \
b/applets/notes/plugin/documenthandler.cpp index 79c276e3a..2c9d7232a 100644
--- a/applets/notes/plugin/documenthandler.cpp
+++ b/applets/notes/plugin/documenthandler.cpp
@@ -51,8 +51,8 @@
#include <QtGui/QFontDatabase>
DocumentHandler::DocumentHandler()
- : m_target(0)
- , m_doc(0)
+ : m_target(nullptr)
+ , m_doc(nullptr)
, m_cursorPosition(-1)
, m_selectionStart(0)
, m_selectionEnd(0)
@@ -61,7 +61,7 @@ DocumentHandler::DocumentHandler()
void DocumentHandler::setTarget(QQuickItem *target)
{
- m_doc = 0;
+ m_doc = nullptr;
m_target = target;
if (!m_target)
return;
diff --git a/applets/notes/plugin/notemanager.h b/applets/notes/plugin/notemanager.h
index 83d1cfc39..4a9c441bd 100644
--- a/applets/notes/plugin/notemanager.h
+++ b/applets/notes/plugin/notemanager.h
@@ -32,7 +32,7 @@ class NoteManager : public QObject
Q_OBJECT
public:
- explicit NoteManager(QObject* parent = 0);
+ explicit NoteManager(QObject* parent = nullptr);
/**
* Loads the note for the ID given
diff --git a/applets/quickshare/plugin/contenttracker.cpp \
b/applets/quickshare/plugin/contenttracker.cpp index 1cee4df11..70f165f36 100644
--- a/applets/quickshare/plugin/contenttracker.cpp
+++ b/applets/quickshare/plugin/contenttracker.cpp
@@ -85,7 +85,7 @@ void ContentTracker::connectToActivityManager()
this, &ContentTracker::focusChanged);
} else {
delete m_activityManagerIface;
- m_activityManagerIface = 0;
+ m_activityManagerIface = nullptr;
qWarning() << "activityManager not reachable";
}
}
diff --git a/applets/quickshare/plugin/contenttracker.h \
b/applets/quickshare/plugin/contenttracker.h index 09a5fc0a1..76dcaee49 100644
--- a/applets/quickshare/plugin/contenttracker.h
+++ b/applets/quickshare/plugin/contenttracker.h
@@ -34,7 +34,7 @@ class ContentTracker : public QObject
Q_PROPERTY(QString title READ title NOTIFY changed)
public:
- ContentTracker(QObject *parent = 0);
+ ContentTracker(QObject *parent = nullptr);
~ContentTracker() override;
QString uri() const;
diff --git a/dataengines/comic/comic.cpp b/dataengines/comic/comic.cpp
index 15ca20205..4ea931dda 100644
--- a/dataengines/comic/comic.cpp
+++ b/dataengines/comic/comic.cpp
@@ -145,7 +145,7 @@ bool ComicEngine::updateSourceEvent(const QString &identifier)
bool isCurrentComic = parts[1].isEmpty();
QVariantList args;
- ComicProvider *provider = 0;
+ ComicProvider *provider = nullptr;
//const QString type = \
service->property(QLatin1String("X-KDE-PlasmaComicProvider-SuffixType"), \
QVariant::String).toString();
const QString type = \
pkg.metadata().value("X-KDE-PlasmaComicProvider-SuffixType");
diff --git a/dataengines/comic/comic_package.h b/dataengines/comic/comic_package.h
index a77154cf3..c39454518 100644
--- a/dataengines/comic/comic_package.h
+++ b/dataengines/comic/comic_package.h
@@ -26,7 +26,7 @@ class ComicPackage : public KPackage::PackageStructure
Q_OBJECT
public:
- explicit ComicPackage(QObject *parent = 0, const QVariantList& args = \
QVariantList()); + explicit ComicPackage(QObject *parent = nullptr, const \
QVariantList& args = QVariantList()); void initPackage(KPackage::Package *package) \
override; };
diff --git a/dataengines/comic/comicproviderkross.cpp \
b/dataengines/comic/comicproviderkross.cpp index b27df4ee9..aec871116 100644
--- a/dataengines/comic/comicproviderkross.cpp
+++ b/dataengines/comic/comicproviderkross.cpp
@@ -21,7 +21,7 @@
#include <KPluginFactory>
#include <KPackage/PackageLoader>
-KPackage::PackageStructure *ComicProviderKross::m_packageStructure(0);
+KPackage::PackageStructure *ComicProviderKross::m_packageStructure(nullptr);
ComicProviderKross::ComicProviderKross(QObject *parent, const QVariantList &args)
: ComicProvider(parent, args), m_wrapper(this)
diff --git a/dataengines/comic/comicproviderwrapper.cpp \
b/dataengines/comic/comicproviderwrapper.cpp index 61b24a384..d197960ed 100644
--- a/dataengines/comic/comicproviderwrapper.cpp
+++ b/dataengines/comic/comicproviderwrapper.cpp
@@ -276,10 +276,10 @@ QString StaticDateWrapper::shortMonthName (int month)
ComicProviderWrapper::ComicProviderWrapper(ComicProviderKross *parent)
: QObject(parent),
- mAction(0),
+ mAction(nullptr),
mProvider(parent),
- mKrossImage(0),
- mPackage(0),
+ mKrossImage(nullptr),
+ mPackage(nullptr),
mRequests(0),
mIdentifierSpecified(false),
mIsLeftToRight(true),
@@ -723,7 +723,7 @@ void ComicProviderWrapper::pageRetrieved(int id, const QByteArray \
&data) finished();
}
} else {
- QTextCodec *codec = 0;
+ QTextCodec *codec = nullptr;
if (!mTextCodec.isEmpty()) {
codec = QTextCodec::codecForName(mTextCodec);
}
diff --git a/dataengines/comic/comicproviderwrapper.h \
b/dataengines/comic/comicproviderwrapper.h index 656036ea4..6da8cf859 100644
--- a/dataengines/comic/comicproviderwrapper.h
+++ b/dataengines/comic/comicproviderwrapper.h
@@ -41,7 +41,7 @@ class ImageWrapper : public QObject
Q_PROPERTY(QImage image READ image WRITE setImage)
Q_PROPERTY(QByteArray rawData READ rawData WRITE setRawData)
public:
- explicit ImageWrapper(QObject *parent = 0, const QByteArray &image = \
QByteArray()); + explicit ImageWrapper(QObject *parent = nullptr, const \
QByteArray &image = QByteArray());
QImage image() const;
/**
@@ -87,7 +87,7 @@ class DateWrapper : public QObject
Q_OBJECT
Q_PROPERTY(QDate date READ date WRITE setDate)
public:
- explicit DateWrapper(QObject *parent = 0, const QDate &date = QDate());
+ explicit DateWrapper(QObject *parent = nullptr, const QDate &date = \
QDate());
QDate date() const;
void setDate(const QDate &date);
@@ -131,7 +131,7 @@ class StaticDateWrapper : public QObject
DefaultLocaleLongDate = Qt::DefaultLocaleLongDate
};
- StaticDateWrapper(QObject *parent = 0);
+ StaticDateWrapper(QObject *parent = nullptr);
public Q_SLOTS:
QObject* currentDate();
diff --git a/runners/dictionary/dictionarymatchengine.h \
b/runners/dictionary/dictionarymatchengine.h index 25d8c73fe..d093804d0 100644
--- a/runners/dictionary/dictionarymatchengine.h
+++ b/runners/dictionary/dictionarymatchengine.h
@@ -21,7 +21,7 @@ class DictionaryMatchEngine : public QObject
Q_OBJECT
public:
- DictionaryMatchEngine(Plasma::DataEngine *dictionaryEngine, QObject *parent = \
0); + DictionaryMatchEngine(Plasma::DataEngine *dictionaryEngine, QObject *parent \
= nullptr); QString lookupWord(const QString &word);
private:
diff --git a/runners/dictionary/dictionaryrunner_config.h \
b/runners/dictionary/dictionaryrunner_config.h index bd18915b6..44846c92e 100644
--- a/runners/dictionary/dictionaryrunner_config.h
+++ b/runners/dictionary/dictionaryrunner_config.h
@@ -16,7 +16,7 @@ class DictionaryRunnerConfig : public KCModule
Q_OBJECT
public:
- DictionaryRunnerConfig(QWidget* parent = 0, const QVariantList& args = \
QVariantList()); + DictionaryRunnerConfig(QWidget* parent = nullptr, const \
QVariantList& args = QVariantList());
public Q_SLOTS:
void save() override;
diff --git a/runners/spellchecker/spellcheck_config.h \
b/runners/spellchecker/spellcheck_config.h index 1ce8f304c..e681c2d4a 100644
--- a/runners/spellchecker/spellcheck_config.h
+++ b/runners/spellchecker/spellcheck_config.h
@@ -34,7 +34,7 @@ class SpellCheckConfig : public KCModule
{
Q_OBJECT
public:
- explicit SpellCheckConfig(QWidget* parent = 0, const QVariantList& args = \
QVariantList()); + explicit SpellCheckConfig(QWidget* parent = nullptr, const \
QVariantList& args = QVariantList()); ~SpellCheckConfig() override;
public Q_SLOTS:
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic