Commit 95eb3df7 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

GIT_SILENT: use nullptr now

parent 10a44f63
......@@ -595,7 +595,7 @@ QMenu *AddresseeLineEdit::createStandardContextMenu()
QMenu *menu = KLineEdit::createStandardContextMenu();
if (!menu) {
return Q_NULLPTR;
return nullptr;
}
if (d->useCompletion()) {
QAction *showOU = new QAction(i18n("Show Organization Unit for LDAP results"), menu);
......@@ -819,7 +819,7 @@ bool KPIM::AddresseeLineEdit::eventFilter(QObject *object, QEvent *event)
} else if (event->type() == QEvent::KeyRelease &&
(keyEvent->key() == Qt::Key_Tab || keyEvent->key() == Qt::Key_Backtab)) {
/// first, find the header of the current section
QListWidgetItem *myHeader = Q_NULLPTR;
QListWidgetItem *myHeader = nullptr;
int myHeaderIndex = -1;
const int iterationStep = keyEvent->key() == Qt::Key_Tab ? 1 : -1;
int index = qMin(qMax(currentIndex - iterationStep, 0), completionBox()->count() - 1);
......@@ -835,7 +835,7 @@ bool KPIM::AddresseeLineEdit::eventFilter(QObject *object, QEvent *event)
Q_ASSERT(myHeader); // we should always be able to find a header
// find the next header (searching backwards, for Qt::Key_Backtab)
QListWidgetItem *nextHeader = Q_NULLPTR;
QListWidgetItem *nextHeader = nullptr;
// when iterating forward, start at the currentindex, when backwards,
// one up from our header, or at the end
......
......@@ -43,7 +43,7 @@
#include <QNetworkConfigurationManager>
#include <addressline/blacklistbaloocompletion/blacklistbalooemailcompletiondialog.h>
static QNetworkConfigurationManager *s_networkConfigMgr = Q_NULLPTR;
static QNetworkConfigurationManager *s_networkConfigMgr = nullptr;
namespace KPIM
{
......@@ -51,7 +51,7 @@ Q_GLOBAL_STATIC(AddresseeLineEditStatic, s_static)
AddresseeLineEditPrivate::AddresseeLineEditPrivate(KPIM::AddresseeLineEdit *qq, bool enableCompletion)
: QObject(qq),
q(qq),
m_recentAddressConfig(Q_NULLPTR),
m_recentAddressConfig(nullptr),
m_useCompletion(enableCompletion),
m_completionInitialized(false),
m_smartPaste(false),
......@@ -229,7 +229,7 @@ void AddresseeLineEditPrivate::startLoadingLDAPEntries()
void AddresseeLineEditPrivate::stopLDAPLookup()
{
s_static->ldapSearch->cancelSearch();
s_static->ldapLineEdit = Q_NULLPTR;
s_static->ldapLineEdit = nullptr;
}
QStringList AddresseeLineEdit::cleanupEmailList(const QStringList &inputList)
......
......@@ -28,11 +28,11 @@ using namespace KPIM;
AddresseeLineEditStatic::AddresseeLineEditStatic()
: completion(new KMailCompletion),
ldapTimer(Q_NULLPTR),
ldapSearch(Q_NULLPTR),
ldapLineEdit(Q_NULLPTR),
ldapTimer(nullptr),
ldapSearch(nullptr),
ldapLineEdit(nullptr),
balooCompletionSource(0),
m_akonadiSession(Q_NULLPTR)
m_akonadiSession(nullptr)
{
}
......@@ -45,7 +45,7 @@ AddresseeLineEditStatic::~AddresseeLineEditStatic()
void AddresseeLineEditStatic::slotEditCompletionOrder()
{
QPointer<CompletionOrderEditor> dlg = new CompletionOrderEditor(ldapSearch, Q_NULLPTR);
QPointer<CompletionOrderEditor> dlg = new CompletionOrderEditor(ldapSearch, nullptr);
if (dlg->exec()) {
updateCompletionOrder();
}
......
......@@ -79,7 +79,7 @@ QString KMailCompletion::makeCompletion(const QString &string)
void KMailCompletion::addItemWithKeys(const QString &email, int weight,
const QStringList *keyWords)
{
Q_ASSERT(keyWords != Q_NULLPTR);
Q_ASSERT(keyWords != nullptr);
QStringList::ConstIterator end = keyWords->constEnd();
for (QStringList::ConstIterator it(keyWords->constBegin()); it != end; ++it) {
QStringList &emailList = m_keyMap[(*it) ]; //lookup email-list for given keyword
......@@ -92,7 +92,7 @@ void KMailCompletion::addItemWithKeys(const QString &email, int weight,
void KMailCompletion::postProcessMatches(QStringList *pMatches) const
{
Q_ASSERT(pMatches != Q_NULLPTR);
Q_ASSERT(pMatches != nullptr);
if (pMatches->isEmpty()) {
return;
}
......
......@@ -26,7 +26,7 @@ class AddresseeLineEditUtilTest : public QObject
{
Q_OBJECT
public:
explicit AddresseeLineEditUtilTest(QObject *parent = Q_NULLPTR);
explicit AddresseeLineEditUtilTest(QObject *parent = nullptr);
~AddresseeLineEditUtilTest();
private Q_SLOTS:
......
......@@ -27,7 +27,7 @@ class BalooCompletionEmailTest : public QObject
{
Q_OBJECT
public:
explicit BalooCompletionEmailTest(QObject *parent = Q_NULLPTR);
explicit BalooCompletionEmailTest(QObject *parent = nullptr);
~BalooCompletionEmailTest();
private Q_SLOTS:
......
......@@ -27,7 +27,7 @@ class CompletionConfigureDialogTest : public QObject
{
Q_OBJECT
public:
explicit CompletionConfigureDialogTest(QObject *parent = Q_NULLPTR);
explicit CompletionConfigureDialogTest(QObject *parent = nullptr);
~CompletionConfigureDialogTest();
private Q_SLOTS:
void shouldHaveDefaultValue();
......
......@@ -27,7 +27,7 @@ class CompletionOrderWidgetTest : public QObject
{
Q_OBJECT
public:
explicit CompletionOrderWidgetTest(QObject *parent = Q_NULLPTR);
explicit CompletionOrderWidgetTest(QObject *parent = nullptr);
~CompletionOrderWidgetTest();
private Q_SLOTS:
......
......@@ -27,7 +27,7 @@ class RecentAddressDialogTest : public QObject
{
Q_OBJECT
public:
explicit RecentAddressDialogTest(QObject *parent = Q_NULLPTR);
explicit RecentAddressDialogTest(QObject *parent = nullptr);
~RecentAddressDialogTest();
private Q_SLOTS:
......
......@@ -27,7 +27,7 @@ class RecentAddressWidgetTest : public QObject
{
Q_OBJECT
public:
explicit RecentAddressWidgetTest(QObject *parent = Q_NULLPTR);
explicit RecentAddressWidgetTest(QObject *parent = nullptr);
~RecentAddressWidgetTest();
private Q_SLOTS:
void shouldHaveDefaultValue();
......
......@@ -26,7 +26,7 @@ class BlackListBalooEmailCompletionDialogTest : public QObject
{
Q_OBJECT
public:
explicit BlackListBalooEmailCompletionDialogTest(QObject *parent = Q_NULLPTR);
explicit BlackListBalooEmailCompletionDialogTest(QObject *parent = nullptr);
~BlackListBalooEmailCompletionDialogTest();
private Q_SLOTS:
void shouldHaveDefaultValue();
......
......@@ -27,7 +27,7 @@ class BlackListBalooEmailCompletionWidgetTest : public QObject
{
Q_OBJECT
public:
explicit BlackListBalooEmailCompletionWidgetTest(QObject *parent = Q_NULLPTR);
explicit BlackListBalooEmailCompletionWidgetTest(QObject *parent = nullptr);
~BlackListBalooEmailCompletionWidgetTest();
private Q_SLOTS:
......
......@@ -27,7 +27,7 @@ class BlackListBalooEmailListTest : public QObject
{
Q_OBJECT
public:
explicit BlackListBalooEmailListTest(QObject *parent = Q_NULLPTR);
explicit BlackListBalooEmailListTest(QObject *parent = nullptr);
~BlackListBalooEmailListTest();
private Q_SLOTS:
void shouldHaveDefaultValue();
......
......@@ -27,7 +27,7 @@ class BlackListBalooEmailSearchJobTest : public QObject
{
Q_OBJECT
public:
explicit BlackListBalooEmailSearchJobTest(QObject *parent = Q_NULLPTR);
explicit BlackListBalooEmailSearchJobTest(QObject *parent = nullptr);
~BlackListBalooEmailSearchJobTest();
private Q_SLOTS:
......
......@@ -27,7 +27,7 @@ class BlackListBalooEmailUtilTest : public QObject
{
Q_OBJECT
public:
explicit BlackListBalooEmailUtilTest(QObject *parent = Q_NULLPTR);
explicit BlackListBalooEmailUtilTest(QObject *parent = nullptr);
~BlackListBalooEmailUtilTest();
private Q_SLOTS:
void shouldReturnEmptyResult();
......
......@@ -27,7 +27,7 @@ class BlackListBalooEmailWarningTest : public QObject
{
Q_OBJECT
public:
explicit BlackListBalooEmailWarningTest(QObject *parent = Q_NULLPTR);
explicit BlackListBalooEmailWarningTest(QObject *parent = nullptr);
~BlackListBalooEmailWarningTest();
private Q_SLOTS:
......
......@@ -32,7 +32,7 @@ class KPIM::BlackListBalooEmailCompletionDialogPrivate
{
public:
BlackListBalooEmailCompletionDialogPrivate()
: mBlackListWidget(Q_NULLPTR)
: mBlackListWidget(nullptr)
{
}
......
......@@ -36,10 +36,10 @@ class KPIM::CompletionConfigureDialogPrivate
{
public:
CompletionConfigureDialogPrivate()
: mTabWidget(Q_NULLPTR),
mCompletionOrderWidget(Q_NULLPTR),
mBlackListBalooWidget(Q_NULLPTR),
mRecentaddressWidget(Q_NULLPTR)
: mTabWidget(nullptr),
mCompletionOrderWidget(nullptr),
mBlackListBalooWidget(nullptr),
mRecentaddressWidget(nullptr)
{
}
......
......@@ -54,7 +54,7 @@ class KPIM::CompletionOrderEditorPrivate
{
public:
CompletionOrderEditorPrivate()
: mCompletionOrderWidget(Q_NULLPTR)
: mCompletionOrderWidget(nullptr)
{
}
......
......@@ -224,8 +224,8 @@ private:
CompletionOrderWidget::CompletionOrderWidget(QWidget *parent)
: QWidget(parent),
mConfig(QStringLiteral("kpimcompletionorder")),
mCollectionModel(Q_NULLPTR),
mLdapSearch(Q_NULLPTR),
mCollectionModel(nullptr),
mLdapSearch(nullptr),
mDirty(false)
{
new CompletionOrderEditorAdaptor(this);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment