Commit 40812377 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

GIT_SILENT: use nullptr now

parent 63e19806
......@@ -42,10 +42,10 @@ class AclEntryDialog::Private
public:
Private(AclEntryDialog *qq)
: q(qq),
mButtonGroup(Q_NULLPTR),
mUserIdLineEdit(Q_NULLPTR),
mButtonLayout(Q_NULLPTR),
mOkButton(Q_NULLPTR)
mButtonGroup(nullptr),
mUserIdLineEdit(nullptr),
mButtonLayout(nullptr),
mOkButton(nullptr)
{
}
......@@ -62,7 +62,7 @@ public:
void AclEntryDialog::Private::slotChanged()
{
mOkButton->setEnabled(!mUserIdLineEdit->text().trimmed().isEmpty() && mButtonGroup->checkedButton() != Q_NULLPTR);
mOkButton->setEnabled(!mUserIdLineEdit->text().trimmed().isEmpty() && mButtonGroup->checkedButton() != nullptr);
}
void AclEntryDialog::Private::slotSelectAddresses()
......
......@@ -50,7 +50,7 @@ public:
PermissionsTextRole
};
AclModel(QObject *parent = Q_NULLPTR)
AclModel(QObject *parent = nullptr)
: QAbstractListModel(parent)
{
}
......@@ -272,7 +272,7 @@ public:
if (mImapUserName == userId) {
if (KMessageBox::Cancel == KMessageBox::warningContinueCancel(
Q_NULLPTR,
nullptr,
i18n("Do you really want to remove your own permissions for this folder? "
"You will not be able to access it afterwards."),
i18n("Remove"))) {
......@@ -280,7 +280,7 @@ public:
}
} else {
if (KMessageBox::Cancel == KMessageBox::warningContinueCancel(
Q_NULLPTR,
nullptr,
i18n("Do you really want to remove these permissions for this folder?"),
i18n("Remove"))) {
return;
......
......@@ -24,7 +24,7 @@ class CollectionAclWidgetTest : public QObject
{
Q_OBJECT
public:
explicit CollectionAclWidgetTest(QObject *parent = Q_NULLPTR);
explicit CollectionAclWidgetTest(QObject *parent = nullptr);
~CollectionAclWidgetTest();
private Q_SLOTS:
void shouldHaveDefaultValue();
......
......@@ -23,7 +23,7 @@ class ImapAclAttributeTest : public QObject
{
Q_OBJECT
public:
explicit ImapAclAttributeTest(QObject *parent = Q_NULLPTR);
explicit ImapAclAttributeTest(QObject *parent = nullptr);
~ImapAclAttributeTest();
private Q_SLOTS:
void shouldHaveDefaultValue();
......
......@@ -42,7 +42,7 @@ class PimCommon::CollectionAclPagePrivate
{
public:
CollectionAclPagePrivate()
: mCollectionAclWidget(Q_NULLPTR)
: mCollectionAclWidget(nullptr)
{
}
......
......@@ -35,9 +35,9 @@ using namespace PimCommon;
class ActionButton : public QPushButton
{
public:
ActionButton(QWidget *parent = Q_NULLPTR)
ActionButton(QWidget *parent = nullptr)
: QPushButton(parent),
mDefaultAction(Q_NULLPTR)
mDefaultAction(nullptr)
{
}
......
......@@ -42,7 +42,7 @@ class PimCommon::AutoCorrectionWidgetPrivate
public:
AutoCorrectionWidgetPrivate()
: ui(new Ui::AutoCorrectionWidget),
mAutoCorrection(Q_NULLPTR),
mAutoCorrection(nullptr),
mWasChanged(false)
{
......@@ -202,7 +202,7 @@ void AutoCorrectionWidget::addAutoCorrectEntries()
{
d->ui->treeWidget->clear();
QHash<QString, QString>::const_iterator i = d->m_autocorrectEntries.constBegin();
QTreeWidgetItem *item = Q_NULLPTR;
QTreeWidgetItem *item = nullptr;
while (i != d->m_autocorrectEntries.constEnd()) {
item = new QTreeWidgetItem(d->ui->treeWidget, item);
item->setText(0, i.key());
......@@ -408,11 +408,11 @@ void AutoCorrectionWidget::removeAutocorrectEntry()
//qCDebug(PIMCOMMON_LOG) << "below";
findStr = item->text(0);
delete item;
item = Q_NULLPTR;
item = nullptr;
} else if (d->ui->treeWidget->topLevelItemCount() > 0) {
findStr = item->text(0);
delete item;
item = Q_NULLPTR;
item = nullptr;
}
if (!findStr.isEmpty()) {
d->m_autocorrectEntries.remove(findStr);
......@@ -434,7 +434,7 @@ void AutoCorrectionWidget::enableAddRemoveButton()
const QString find = d->ui->find->text();
const QString replace = d->ui->replace->text();
QTreeWidgetItem *item = Q_NULLPTR;
QTreeWidgetItem *item = nullptr;
if (d->m_autocorrectEntries.contains(find)) {
item = d->ui->treeWidget->findItems(find, Qt::MatchCaseSensitive).at(0);
}
......@@ -568,7 +568,7 @@ void AutoCorrectionWidget::slotImportAutoCorrection(QAction *act)
}
const QString fileName = QFileDialog::getOpenFileName(this, title, QString(), filter);
if (!fileName.isEmpty()) {
PimCommon::ImportAbstractAutocorrection *importAutoCorrection = Q_NULLPTR;
PimCommon::ImportAbstractAutocorrection *importAutoCorrection = nullptr;
switch (type) {
case AutoCorrectionWidget::LibreOffice:
importAutoCorrection = new PimCommon::ImportLibreOfficeAutocorrection(this);
......
......@@ -27,7 +27,7 @@ LineEditWithAutocorrectionTest::LineEditWithAutocorrectionTest()
void LineEditWithAutocorrectionTest::shouldNotAutocorrectWhenDisabled()
{
PimCommon::LineEditWithAutoCorrection lineedit(Q_NULLPTR, QStringLiteral("lineeditwithautocorrecttestrc"));
PimCommon::LineEditWithAutoCorrection lineedit(nullptr, QStringLiteral("lineeditwithautocorrecttestrc"));
QHash<QString, QString> entries;
const QString originalWord = QStringLiteral("FOOFOO");
const QString replaceWord = QStringLiteral("BLABLA");
......@@ -42,7 +42,7 @@ void LineEditWithAutocorrectionTest::shouldNotAutocorrectWhenDisabled()
void LineEditWithAutocorrectionTest::shouldReplaceWordWhenExactText()
{
PimCommon::LineEditWithAutoCorrection lineedit(Q_NULLPTR, QStringLiteral("lineeditwithautocorrecttestrc"));
PimCommon::LineEditWithAutoCorrection lineedit(nullptr, QStringLiteral("lineeditwithautocorrecttestrc"));
const QString originalWord = QStringLiteral("FOOFOO");
const QString replaceWord = QStringLiteral("BLABLA");
QHash<QString, QString> entries;
......@@ -60,7 +60,7 @@ void LineEditWithAutocorrectionTest::shouldReplaceWordWhenExactText()
void LineEditWithAutocorrectionTest::shouldNotReplaceWordWhenInexactText()
{
PimCommon::LineEditWithAutoCorrection lineedit(Q_NULLPTR, QStringLiteral("lineeditwithautocorrecttestrc"));
PimCommon::LineEditWithAutoCorrection lineedit(nullptr, QStringLiteral("lineeditwithautocorrecttestrc"));
const QString originalWord = QStringLiteral("FOOFOO");
const QString replaceWord = QStringLiteral("BLABLA");
QHash<QString, QString> entries;
......@@ -78,7 +78,7 @@ void LineEditWithAutocorrectionTest::shouldNotReplaceWordWhenInexactText()
void LineEditWithAutocorrectionTest::shouldNotAddTwoSpace()
{
PimCommon::LineEditWithAutoCorrection lineedit(Q_NULLPTR, QStringLiteral("lineeditwithautocorrecttestrc"));
PimCommon::LineEditWithAutoCorrection lineedit(nullptr, QStringLiteral("lineeditwithautocorrecttestrc"));
const QString originalWord = QStringLiteral("FOOFOO ");
lineedit.autocorrection()->setSingleSpaces(true);
lineedit.autocorrection()->setEnabledAutoCorrection(true);
......
......@@ -27,7 +27,7 @@ RichTextEditWithAutoCorrectionTest::RichTextEditWithAutoCorrectionTest()
void RichTextEditWithAutoCorrectionTest::shouldNotAutocorrectWhenDisabled()
{
PimCommon::RichTextEditWithAutoCorrection richtext(Q_NULLPTR);
PimCommon::RichTextEditWithAutoCorrection richtext(nullptr);
QHash<QString, QString> entries;
const QString originalWord = QStringLiteral("FOOFOO");
const QString replaceWord = QStringLiteral("BLABLA");
......@@ -42,7 +42,7 @@ void RichTextEditWithAutoCorrectionTest::shouldNotAutocorrectWhenDisabled()
void RichTextEditWithAutoCorrectionTest::shouldReplaceWordWhenExactText()
{
PimCommon::RichTextEditWithAutoCorrection richtext(Q_NULLPTR);
PimCommon::RichTextEditWithAutoCorrection richtext(nullptr);
const QString originalWord = QStringLiteral("FOOFOO");
const QString replaceWord = QStringLiteral("BLABLA");
QHash<QString, QString> entries;
......@@ -59,7 +59,7 @@ void RichTextEditWithAutoCorrectionTest::shouldReplaceWordWhenExactText()
void RichTextEditWithAutoCorrectionTest::shouldNotReplaceWordWhenInexactText()
{
PimCommon::RichTextEditWithAutoCorrection richtext(Q_NULLPTR);
PimCommon::RichTextEditWithAutoCorrection richtext(nullptr);
const QString originalWord = QStringLiteral("FOOFOO");
const QString replaceWord = QStringLiteral("BLABLA");
QHash<QString, QString> entries;
......@@ -77,7 +77,7 @@ void RichTextEditWithAutoCorrectionTest::shouldNotReplaceWordWhenInexactText()
void RichTextEditWithAutoCorrectionTest::shouldReplaceWhenPressEnter()
{
PimCommon::RichTextEditWithAutoCorrection richtext(Q_NULLPTR);
PimCommon::RichTextEditWithAutoCorrection richtext(nullptr);
const QString originalWord = QStringLiteral("FOOFOO");
const QString replaceWord = QStringLiteral("BLABLA");
QHash<QString, QString> entries;
......@@ -94,7 +94,7 @@ void RichTextEditWithAutoCorrectionTest::shouldReplaceWhenPressEnter()
void RichTextEditWithAutoCorrectionTest::shouldReplaceWhenPressReturn()
{
PimCommon::RichTextEditWithAutoCorrection richtext(Q_NULLPTR);
PimCommon::RichTextEditWithAutoCorrection richtext(nullptr);
const QString originalWord = QStringLiteral("FOOFOO");
const QString replaceWord = QStringLiteral("BLABLA");
QHash<QString, QString> entries;
......
......@@ -28,7 +28,7 @@
using namespace PimCommon;
ImportLibreOfficeAutocorrection::ImportLibreOfficeAutocorrection(QWidget *parent)
: ImportAbstractAutocorrection(parent), mArchive(Q_NULLPTR), mTempDir(Q_NULLPTR)
: ImportAbstractAutocorrection(parent), mArchive(nullptr), mTempDir(nullptr)
{
}
......@@ -44,11 +44,11 @@ void ImportLibreOfficeAutocorrection::closeArchive()
mArchive->close();
}
delete mArchive;
mArchive = Q_NULLPTR;
mArchive = nullptr;
}
delete mTempDir;
mTempDir = Q_NULLPTR;
mTempDir = nullptr;
}
bool ImportLibreOfficeAutocorrection::import(const QString &fileName, LoadAttribute loadAttribute)
......@@ -85,7 +85,7 @@ void ImportLibreOfficeAutocorrection::importAutoCorrectionFile()
bool ImportLibreOfficeAutocorrection::importFile(Type type, const KArchiveDirectory *archiveDirectory)
{
const KArchiveEntry *documentList = Q_NULLPTR;
const KArchiveEntry *documentList = nullptr;
QString archiveFileName;
switch (type) {
......
......@@ -35,7 +35,7 @@ class ConfigureTestDialog : public QDialog
{
Q_OBJECT
public:
explicit ConfigureTestDialog(PimCommon::AutoCorrection *autoCorrection, QWidget *parent = Q_NULLPTR);
explicit ConfigureTestDialog(PimCommon::AutoCorrection *autoCorrection, QWidget *parent = nullptr);
~ConfigureTestDialog();
private Q_SLOTS:
......@@ -49,7 +49,7 @@ class TextEditAutoCorrectionWidget : public QTextEdit
{
Q_OBJECT
public:
explicit TextEditAutoCorrectionWidget(PimCommon::AutoCorrection *autoCorrection, QWidget *parent = Q_NULLPTR);
explicit TextEditAutoCorrectionWidget(PimCommon::AutoCorrection *autoCorrection, QWidget *parent = nullptr);
~TextEditAutoCorrectionWidget();
protected:
......@@ -63,7 +63,7 @@ class AutocorrectionTestWidget : public QWidget
{
Q_OBJECT
public:
explicit AutocorrectionTestWidget(QWidget *parent = Q_NULLPTR);
explicit AutocorrectionTestWidget(QWidget *parent = nullptr);
~AutocorrectionTestWidget();
private Q_SLOTS:
......
......@@ -24,7 +24,7 @@ class RegularExpressionTests : public QObject
{
Q_OBJECT
public:
explicit RegularExpressionTests(QObject *parent = Q_NULLPTR);
explicit RegularExpressionTests(QObject *parent = nullptr);
~RegularExpressionTests();
private Q_SLOTS:
void shouldVerifyQStringListFilterConversion_data();
......
......@@ -24,7 +24,7 @@ class ConfigurePluginsListWidgetTest : public QObject
{
Q_OBJECT
public:
explicit ConfigurePluginsListWidgetTest(QObject *parent = Q_NULLPTR);
explicit ConfigurePluginsListWidgetTest(QObject *parent = nullptr);
~ConfigurePluginsListWidgetTest();
private Q_SLOTS:
void shouldHaveDefaultValue();
......
......@@ -24,7 +24,7 @@ class ConfigurePluginsWidgetTest : public QObject
{
Q_OBJECT
public:
explicit ConfigurePluginsWidgetTest(QObject *parent = Q_NULLPTR);
explicit ConfigurePluginsWidgetTest(QObject *parent = nullptr);
~ConfigurePluginsWidgetTest();
private Q_SLOTS:
void shouldHaveDefaultValue();
......
......@@ -28,7 +28,7 @@ using namespace PimCommon;
ConfigurePluginDialog::ConfigurePluginDialog(QWidget *parent)
: QDialog(parent),
mButtonBox(Q_NULLPTR)
mButtonBox(nullptr)
{
}
......
......@@ -24,7 +24,7 @@ class CustomToolsWidgetNgTest : public QObject
{
Q_OBJECT
public:
explicit CustomToolsWidgetNgTest(QObject *parent = Q_NULLPTR);
explicit CustomToolsWidgetNgTest(QObject *parent = nullptr);
~CustomToolsWidgetNgTest();
private Q_SLOTS:
......
......@@ -48,7 +48,7 @@ class CustomToolsPluginInfo
{
public:
CustomToolsPluginInfo()
: plugin(Q_NULLPTR)
: plugin(nullptr)
{
}
......@@ -103,7 +103,7 @@ void CustomToolsPluginManagerPrivate::initializePluginList()
if (unique.contains(info.saveName())) {
continue;
}
info.plugin = Q_NULLPTR;
info.plugin = nullptr;
mPluginList.push_back(info);
unique.insert(info.saveName());
} else {
......
......@@ -34,6 +34,6 @@ void CustomToolsViewInterface::setText(const QString &)
KToggleAction *CustomToolsViewInterface::action() const
{
return Q_NULLPTR;
return nullptr;
}
......@@ -30,7 +30,7 @@ class PimCommon::CustomToolsWidgetNgPrivate
{
public:
CustomToolsWidgetNgPrivate()
: mStackedWidget(Q_NULLPTR)
: mStackedWidget(nullptr)
{
}
......
......@@ -37,11 +37,11 @@ class PimCommon::CheckedCollectionWidgetPrivate
{
public:
CheckedCollectionWidgetPrivate()
: mFolderView(Q_NULLPTR),
mSelectionModel(Q_NULLPTR),
mCheckProxy(Q_NULLPTR),
mCollectionFilter(Q_NULLPTR),
mEntityTreeModel(Q_NULLPTR)
: mFolderView(nullptr),
mSelectionModel(nullptr),
mCheckProxy(nullptr),
mCollectionFilter(nullptr),
mEntityTreeModel(nullptr)
{
}
......
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