summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <laurent.montel@kdab.com>2017-02-24 15:33:09 +0100
committerLaurent Montel <laurent.montel@kdab.com>2017-02-27 14:35:06 +0000
commit1da4966b26d1862d4efb56e2ebae5f4eb0039117 (patch)
tree21f204b73fd46a278dde44bc33f642e1534958d2
parent1704c484a83e845fc44ffe82d1af0bcdca028964 (diff)
downloadqt-creator-1da4966b26d1862d4efb56e2ebae5f4eb0039117.tar.gz
CPaster: Replace 0 by nullptr
Change-Id: Ic916a6b464951ea319345333c0c7188852f58d8c Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-rw-r--r--src/plugins/cpaster/cpasterplugin.cpp4
-rw-r--r--src/plugins/cpaster/fileshareprotocol.cpp2
-rw-r--r--src/plugins/cpaster/fileshareprotocolsettingspage.cpp2
-rw-r--r--src/plugins/cpaster/kdepasteprotocol.cpp2
-rw-r--r--src/plugins/cpaster/pastebindotcaprotocol.cpp2
-rw-r--r--src/plugins/cpaster/pastebindotcomprotocol.cpp4
-rw-r--r--src/plugins/cpaster/protocol.cpp2
-rw-r--r--src/plugins/cpaster/settingspage.cpp2
-rw-r--r--src/plugins/cpaster/urlopenprotocol.cpp2
9 files changed, 11 insertions, 11 deletions
diff --git a/src/plugins/cpaster/cpasterplugin.cpp b/src/plugins/cpaster/cpasterplugin.cpp
index a9d18b0c4f..8045826e29 100644
--- a/src/plugins/cpaster/cpasterplugin.cpp
+++ b/src/plugins/cpaster/cpasterplugin.cpp
@@ -94,7 +94,7 @@ void CodePasterServiceImpl::postClipboard()
}
// ---------- CodepasterPlugin
-CodepasterPlugin *CodepasterPlugin::m_instance = 0;
+CodepasterPlugin *CodepasterPlugin::m_instance = nullptr;
CodepasterPlugin::CodepasterPlugin() :
m_settings(new Settings)
@@ -106,7 +106,7 @@ CodepasterPlugin::~CodepasterPlugin()
{
delete m_urlOpen;
qDeleteAll(m_protocols);
- CodepasterPlugin::m_instance = 0;
+ CodepasterPlugin::m_instance = nullptr;
}
bool CodepasterPlugin::initialize(const QStringList &arguments, QString *errorMessage)
diff --git a/src/plugins/cpaster/fileshareprotocol.cpp b/src/plugins/cpaster/fileshareprotocol.cpp
index 687521cb64..a3be32d7ea 100644
--- a/src/plugins/cpaster/fileshareprotocol.cpp
+++ b/src/plugins/cpaster/fileshareprotocol.cpp
@@ -80,7 +80,7 @@ Core::IOptionsPage *FileShareProtocol::settingsPage() const
static bool parse(const QString &fileName,
QString *errorMessage,
- QString *user = 0, QString *description = 0, QString *text = 0)
+ QString *user = nullptr, QString *description = nullptr, QString *text = nullptr)
{
unsigned elementCount = 0;
diff --git a/src/plugins/cpaster/fileshareprotocolsettingspage.cpp b/src/plugins/cpaster/fileshareprotocolsettingspage.cpp
index c8e44d4492..2a4c14ae60 100644
--- a/src/plugins/cpaster/fileshareprotocolsettingspage.cpp
+++ b/src/plugins/cpaster/fileshareprotocolsettingspage.cpp
@@ -93,7 +93,7 @@ FileShareProtocolSettings FileShareProtocolSettingsWidget::settings() const
// ----------FileShareProtocolSettingsPage
FileShareProtocolSettingsPage::FileShareProtocolSettingsPage(const QSharedPointer<FileShareProtocolSettings> &s,
QObject *parent) :
- Core::IOptionsPage(parent), m_settings(s), m_widget(0)
+ Core::IOptionsPage(parent), m_settings(s), m_widget(nullptr)
{
setId("X.CodePaster.FileSharePaster");
setDisplayName(tr("Fileshare"));
diff --git a/src/plugins/cpaster/kdepasteprotocol.cpp b/src/plugins/cpaster/kdepasteprotocol.cpp
index fe61dd208e..d182005c1d 100644
--- a/src/plugins/cpaster/kdepasteprotocol.cpp
+++ b/src/plugins/cpaster/kdepasteprotocol.cpp
@@ -259,7 +259,7 @@ void StickyNotesPasteProtocol::listFinished()
emit listDone(name(), parseList(m_listReply));
}
m_listReply->deleteLater();
- m_listReply = 0;
+ m_listReply = nullptr;
}
QString KdePasteProtocol::protocolName()
diff --git a/src/plugins/cpaster/pastebindotcaprotocol.cpp b/src/plugins/cpaster/pastebindotcaprotocol.cpp
index 91f2878c2a..6d413a37b7 100644
--- a/src/plugins/cpaster/pastebindotcaprotocol.cpp
+++ b/src/plugins/cpaster/pastebindotcaprotocol.cpp
@@ -243,7 +243,7 @@ void PasteBinDotCaProtocol::listFinished()
else
emit listDone(name(), parseLists(m_listReply));
m_listReply->deleteLater();
- m_listReply = 0;
+ m_listReply = nullptr;
}
} // namespace CodePaster
diff --git a/src/plugins/cpaster/pastebindotcomprotocol.cpp b/src/plugins/cpaster/pastebindotcomprotocol.cpp
index 15c0d533e2..20e071d537 100644
--- a/src/plugins/cpaster/pastebindotcomprotocol.cpp
+++ b/src/plugins/cpaster/pastebindotcomprotocol.cpp
@@ -176,7 +176,7 @@ void PasteBinDotComProtocol::fetchFinished()
}
}
m_fetchReply->deleteLater();
- m_fetchReply = 0;
+ m_fetchReply = nullptr;
emit fetchDone(title, content, error);
}
@@ -410,7 +410,7 @@ void PasteBinDotComProtocol::listFinished()
qDebug() << list;
}
m_listReply->deleteLater();
- m_listReply = 0;
+ m_listReply = nullptr;
}
} // namespace CodePaster
diff --git a/src/plugins/cpaster/protocol.cpp b/src/plugins/cpaster/protocol.cpp
index 6280545118..f79bed2a46 100644
--- a/src/plugins/cpaster/protocol.cpp
+++ b/src/plugins/cpaster/protocol.cpp
@@ -161,7 +161,7 @@ bool Protocol::showConfigurationError(const Protocol *p,
parent = Core::ICore::mainWindow();
const QString title = tr("%1 - Configuration Error").arg(p->name());
QMessageBox mb(QMessageBox::Warning, title, message, QMessageBox::Cancel, parent);
- QPushButton *settingsButton = 0;
+ QPushButton *settingsButton = nullptr;
if (showConfig)
settingsButton = mb.addButton(Core::ICore::msgShowOptionsDialog(), QMessageBox::AcceptRole);
mb.exec();
diff --git a/src/plugins/cpaster/settingspage.cpp b/src/plugins/cpaster/settingspage.cpp
index 0926b49887..892b790fe5 100644
--- a/src/plugins/cpaster/settingspage.cpp
+++ b/src/plugins/cpaster/settingspage.cpp
@@ -63,7 +63,7 @@ Settings SettingsWidget::settings()
}
SettingsPage::SettingsPage(const QSharedPointer<Settings> &settings) :
- m_settings(settings), m_widget(0)
+ m_settings(settings), m_widget(nullptr)
{
setId("A.CodePaster.General");
setDisplayName(tr("General"));
diff --git a/src/plugins/cpaster/urlopenprotocol.cpp b/src/plugins/cpaster/urlopenprotocol.cpp
index 01f2a5c0c0..64f416b19e 100644
--- a/src/plugins/cpaster/urlopenprotocol.cpp
+++ b/src/plugins/cpaster/urlopenprotocol.cpp
@@ -59,7 +59,7 @@ void UrlOpenProtocol::fetchFinished()
else
content = QString::fromUtf8(m_fetchReply->readAll());
m_fetchReply->deleteLater();
- m_fetchReply = 0;
+ m_fetchReply = nullptr;
emit fetchDone(title, content, error);
}