Commit 50b99fa3 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

GIT_SILENT: use nullptr now

parent fcc07268
......@@ -43,7 +43,7 @@ class TestObject : public QObject
Q_OBJECT
public:
TestObject(KUniqueService *service)
: m_proc(Q_NULLPTR), m_callCount(0),
: m_proc(nullptr), m_callCount(0),
m_service(service)
{}
......
......@@ -277,16 +277,16 @@ QVector <Command *> Command::commandsForFiles(const QStringList &files)
}
}
if (!importFiles.isEmpty()) {
cmds << new ImportCertificateFromFileCommand(importFiles, Q_NULLPTR);
cmds << new ImportCertificateFromFileCommand(importFiles, nullptr);
}
if (!decryptFiles.isEmpty()) {
cmds << new DecryptVerifyFilesCommand(decryptFiles, Q_NULLPTR);
cmds << new DecryptVerifyFilesCommand(decryptFiles, nullptr);
}
if (!encryptFiles.isEmpty()) {
cmds << new SignEncryptFilesCommand(encryptFiles, Q_NULLPTR);
cmds << new SignEncryptFilesCommand(encryptFiles, nullptr);
}
if (!checksumFiles.isEmpty()) {
cmds << new ChecksumVerifyFilesCommand(checksumFiles, Q_NULLPTR);
cmds << new ChecksumVerifyFilesCommand(checksumFiles, nullptr);
}
return cmds;
}
......
......@@ -63,7 +63,7 @@ class DumpCertificateDialog : public QDialog
{
Q_OBJECT
public:
explicit DumpCertificateDialog(QWidget *parent = Q_NULLPTR)
explicit DumpCertificateDialog(QWidget *parent = nullptr)
: QDialog(parent), ui(this)
{
......
......@@ -62,7 +62,7 @@ class DumpCrlCacheDialog : public QDialog
{
Q_OBJECT
public:
explicit DumpCrlCacheDialog(QWidget *parent = Q_NULLPTR)
explicit DumpCrlCacheDialog(QWidget *parent = nullptr)
: QDialog(parent), ui(this)
{
readConfig();
......@@ -200,7 +200,7 @@ private:
void slotDialogDestroyed()
{
dialog = Q_NULLPTR;
dialog = nullptr;
if (process.state() != QProcess::NotRunning) {
q->cancel();
} else {
......@@ -229,7 +229,7 @@ const DumpCrlCacheCommand::Private *DumpCrlCacheCommand::d_func() const
DumpCrlCacheCommand::Private::Private(DumpCrlCacheCommand *qq, KeyListController *c)
: Command::Private(qq, c),
dialog(Q_NULLPTR),
dialog(nullptr),
process(),
errorBuffer(),
canceled(false)
......@@ -313,7 +313,7 @@ void DumpCrlCacheCommand::doCancel()
if (d->dialog) {
d->dialog->close();
}
d->dialog = Q_NULLPTR;
d->dialog = nullptr;
}
void DumpCrlCacheCommand::Private::slotProcessFinished(int code, QProcess::ExitStatus status)
......
......@@ -65,7 +65,7 @@ class OutputDialog : public QDialog
{
Q_OBJECT
public:
explicit OutputDialog(QWidget *parent = Q_NULLPTR)
explicit OutputDialog(QWidget *parent = nullptr)
: QDialog(parent),
vlay(this),
logTextWidget(this),
......
......@@ -79,7 +79,7 @@ class ImportResultProxyModel : public AbstractKeyListSortFilterProxyModel
{
Q_OBJECT
public:
ImportResultProxyModel(const std::vector<ImportResult> &results, const QStringList &ids, QObject *parent = Q_NULLPTR)
ImportResultProxyModel(const std::vector<ImportResult> &results, const QStringList &ids, QObject *parent = nullptr)
: AbstractKeyListSortFilterProxyModel(parent)
{
updateFindCache(results, ids);
......@@ -457,7 +457,7 @@ void ImportCertificatesCommand::Private::tryToFinish()
QString::fromUtf8(fingerPr),
uids.join(QStringLiteral("</item><item>")));
int k = KMessageBox::questionYesNo(Q_NULLPTR, str, i18nc("@title:window",
int k = KMessageBox::questionYesNo(nullptr, str, i18nc("@title:window",
"Secret key imported"));
if (k == KMessageBox::Yes) {
......
......@@ -62,7 +62,7 @@ using namespace Kleo::Commands;
using namespace Kleo::Dialogs;
static const char *const components[] = {
Q_NULLPTR, // gpgconf
nullptr, // gpgconf
"gpg",
"gpg-agent",
"scdaemon",
......
......@@ -50,7 +50,7 @@ SignEncryptFolderCommand::SignEncryptFolderCommand(QAbstractItemView *v, KeyList
}
SignEncryptFolderCommand::SignEncryptFolderCommand(KeyListController *c)
: SignEncryptFolderCommand(Q_NULLPTR, c)
: SignEncryptFolderCommand(nullptr, c)
{
}
......
......@@ -72,7 +72,7 @@ void AppearanceConfigurationPage::defaults()
extern "C"
{
Q_DECL_EXPORT KCModule *create_kleopatra_config_appear(QWidget *parent = Q_NULLPTR, const QVariantList &args = QVariantList())
Q_DECL_EXPORT KCModule *create_kleopatra_config_appear(QWidget *parent = nullptr, const QVariantList &args = QVariantList())
{
AppearanceConfigurationPage *page =
new AppearanceConfigurationPage(parent, args);
......
......@@ -48,7 +48,7 @@ class AppearanceConfigurationPage : public KCModule
{
Q_OBJECT
public:
explicit AppearanceConfigurationPage(QWidget *parent = Q_NULLPTR, const QVariantList &args = QVariantList());
explicit AppearanceConfigurationPage(QWidget *parent = nullptr, const QVariantList &args = QVariantList());
void load() Q_DECL_OVERRIDE;
void save() Q_DECL_OVERRIDE;
......
......@@ -47,7 +47,7 @@ class AppearanceConfigWidget : public QWidget
{
Q_OBJECT
public:
explicit AppearanceConfigWidget(QWidget *parent = Q_NULLPTR, Qt::WindowFlags f = 0);
explicit AppearanceConfigWidget(QWidget *parent = nullptr, Qt::WindowFlags f = 0);
~AppearanceConfigWidget();
public Q_SLOTS:
......
......@@ -53,7 +53,7 @@ class ConfigureDialog : public KleoPageConfigDialog
{
Q_OBJECT
public:
explicit ConfigureDialog(QWidget *parent = Q_NULLPTR);
explicit ConfigureDialog(QWidget *parent = nullptr);
~ConfigureDialog();
protected:
......
......@@ -71,7 +71,7 @@ void CryptoOperationsConfigurationPage::defaults()
extern "C"
{
Q_DECL_EXPORT KCModule *create_kleopatra_config_cryptooperations(QWidget *parent = Q_NULLPTR, const QVariantList &args = QVariantList())
Q_DECL_EXPORT KCModule *create_kleopatra_config_cryptooperations(QWidget *parent = nullptr, const QVariantList &args = QVariantList())
{
CryptoOperationsConfigurationPage *page =
new CryptoOperationsConfigurationPage(parent, args);
......
......@@ -48,7 +48,7 @@ class CryptoOperationsConfigurationPage : public KCModule
{
Q_OBJECT
public:
explicit CryptoOperationsConfigurationPage(QWidget *parent = Q_NULLPTR, const QVariantList &args = QVariantList());
explicit CryptoOperationsConfigurationPage(QWidget *parent = nullptr, const QVariantList &args = QVariantList());
void load() Q_DECL_OVERRIDE;
void save() Q_DECL_OVERRIDE;
......
......@@ -49,7 +49,7 @@ class CryptoOperationsConfigWidget : public QWidget
{
Q_OBJECT
public:
explicit CryptoOperationsConfigWidget(QWidget *parent = Q_NULLPTR, Qt::WindowFlags f = 0);
explicit CryptoOperationsConfigWidget(QWidget *parent = nullptr, Qt::WindowFlags f = 0);
~CryptoOperationsConfigWidget();
public Q_SLOTS:
......
......@@ -358,7 +358,7 @@ void DirectoryServicesConfigurationPage::defaults()
extern "C"
{
Q_DECL_EXPORT KCModule *create_kleopatra_config_dirserv(QWidget *parent = Q_NULLPTR, const QVariantList &args = QVariantList())
Q_DECL_EXPORT KCModule *create_kleopatra_config_dirserv(QWidget *parent = nullptr, const QVariantList &args = QVariantList())
{
DirectoryServicesConfigurationPage *page =
new DirectoryServicesConfigurationPage(parent, args);
......
......@@ -55,7 +55,7 @@ class DirectoryServicesConfigurationPage : public KCModule
{
Q_OBJECT
public:
explicit DirectoryServicesConfigurationPage(QWidget *parent = Q_NULLPTR, const QVariantList &args = QVariantList());
explicit DirectoryServicesConfigurationPage(QWidget *parent = nullptr, const QVariantList &args = QVariantList());
void load() Q_DECL_OVERRIDE;
void save() Q_DECL_OVERRIDE;
......
......@@ -47,7 +47,7 @@ class GnuPGSystemConfigurationPage : public KCModule
{
Q_OBJECT
public:
explicit GnuPGSystemConfigurationPage(QWidget *parent = Q_NULLPTR, const QVariantList &args = QVariantList());
explicit GnuPGSystemConfigurationPage(QWidget *parent = nullptr, const QVariantList &args = QVariantList());
~GnuPGSystemConfigurationPage();
void load() Q_DECL_OVERRIDE;
......
......@@ -45,7 +45,7 @@ class KleoPageConfigDialog : public KPageDialog
{
Q_OBJECT
public:
explicit KleoPageConfigDialog(QWidget *parent = Q_NULLPTR);
explicit KleoPageConfigDialog(QWidget *parent = nullptr);
void addModule(const QString &module);
......
......@@ -44,7 +44,7 @@ class SMimeValidationConfigurationPage : public KCModule
{
Q_OBJECT
public:
explicit SMimeValidationConfigurationPage(QWidget *parent = Q_NULLPTR, const QVariantList &args = QVariantList());
explicit SMimeValidationConfigurationPage(QWidget *parent = nullptr, const QVariantList &args = QVariantList());
void load() Q_DECL_OVERRIDE;
void save() Q_DECL_OVERRIDE;
......
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