QuasarApp/qca
4
0
Fork 0
mirror of https://github.com/QuasarApp/qca.git synced 2025-04-26 11:34:32 +00:00
Code Issues Projects Releases Wiki Activity

Use nullptr

Browse Source
This commit is contained in:
Laurent Montel 2020-01-20 13:37:51 +01:00
parent 694abbcafa
commit acb45eeb84
32 changed files with 82 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/cmssigner/certitem.h
View File

@ -82,7 +82,7 @@ public:
IconPgpSec
};
CertItemStore(QObject *parent = 0);
CertItemStore(QObject *parent = nullptr);
~CertItemStore();
int idFromRow(int row) const;
@ -128,7 +128,7 @@ class CertItemPrivateLoader : public QObject
{
Q_OBJECT
public:
explicit CertItemPrivateLoader(CertItemStore *store, QObject *parent = 0);
explicit CertItemPrivateLoader(CertItemStore *store, QObject *parent = nullptr);
~CertItemPrivateLoader();
void start(int id);

2
examples/cmssigner/prompter.h
View File

@ -34,7 +34,7 @@ class Prompter : public QObject
{
Q_OBJECT
public:
Prompter(QObject *parent = 0);
Prompter(QObject *parent = nullptr);
~Prompter();
protected:

2
examples/eventhandlerdemo/eventhandlerdemo.cpp
View File

@ -37,7 +37,7 @@ class ClientPassphraseHandler: public QObject
{
Q_OBJECT
public:
ClientPassphraseHandler(QObject *parent = 0) : QObject( parent )
ClientPassphraseHandler(QObject *parent = nullptr) : QObject( parent )
{
// When the PasswordAsker or TokenAsker needs to interact
// with the user, it raises a signal. We connect that to a

2
examples/keyloader/keyloader.cpp
View File

@ -37,7 +37,7 @@ class PassphraseHandler: public QObject
public:
QCA::EventHandler handler;
PassphraseHandler(QObject *parent = 0) : QObject(parent)
PassphraseHandler(QObject *parent = nullptr) : QObject(parent)
{
connect(&handler, SIGNAL(eventReady(int, const QCA::Event &)),
SLOT(eh_eventReady(int, const QCA::Event &)));

2
examples/tlssocket/tlssocket.h
View File

@ -27,7 +27,7 @@
class TLSSocket : public QTcpSocket
{
public:
TLSSocket(QObject *parent = 0);
TLSSocket(QObject *parent = nullptr);
~TLSSocket();
void connectToHostEncrypted(const QString &host, quint16 port);

36
include/QtCrypto/qca_cert.h
View File

@ -1101,7 +1101,7 @@ CertificateInfoOrdered info = cert.subjectInfoOrdered();
\return the Certificate corresponding to the certificate in the
provided array
*/
static Certificate fromDER(const QByteArray &a, ConvertResult *result = 0, const QString &provider = QString());
static Certificate fromDER(const QByteArray &a, ConvertResult *result = nullptr, const QString &provider = QString());
/**
Import the certificate from PEM format
@ -1115,7 +1115,7 @@ CertificateInfoOrdered info = cert.subjectInfoOrdered();
\return the Certificate corresponding to the certificate in the
provided string
*/
static Certificate fromPEM(const QString &s, ConvertResult *result = 0, const QString &provider = QString());
static Certificate fromPEM(const QString &s, ConvertResult *result = nullptr, const QString &provider = QString());
/**
Import the certificate from a file
@ -1130,7 +1130,7 @@ CertificateInfoOrdered info = cert.subjectInfoOrdered();
\return the Certificate corresponding to the certificate in the
provided string
*/
static Certificate fromPEMFile(const QString &fileName, ConvertResult *result = 0, const QString &provider = QString());
static Certificate fromPEMFile(const QString &fileName, ConvertResult *result = nullptr, const QString &provider = QString());
/**
Test if the subject of the certificate matches a specified host
@ -1479,7 +1479,7 @@ public:
\note this only applies to PKCS#10 format certificate requests
*/
static CertificateRequest fromDER(const QByteArray &a, ConvertResult *result = 0, const QString &provider = QString());
static CertificateRequest fromDER(const QByteArray &a, ConvertResult *result = nullptr, const QString &provider = QString());
/**
Import the certificate request from PEM format
@ -1496,7 +1496,7 @@ public:
\note this only applies to PKCS#10 format certificate requests
*/
static CertificateRequest fromPEM(const QString &s, ConvertResult *result = 0, const QString &provider = QString());
static CertificateRequest fromPEM(const QString &s, ConvertResult *result = nullptr, const QString &provider = QString());
/**
Import the certificate request from a file
@ -1513,7 +1513,7 @@ public:
\note this only applies to PKCS#10 format certificate requests
*/
static CertificateRequest fromPEMFile(const QString &fileName, ConvertResult *result = 0, const QString &provider = QString());
static CertificateRequest fromPEMFile(const QString &fileName, ConvertResult *result = nullptr, const QString &provider = QString());
/**
Export the CertificateRequest to a string
@ -1538,7 +1538,7 @@ public:
\note this only applies to SPKAC format certificate requests
*/
static CertificateRequest fromString(const QString &s, ConvertResult *result = 0, const QString &provider = QString());
static CertificateRequest fromString(const QString &s, ConvertResult *result = nullptr, const QString &provider = QString());
/**
\internal
@ -1832,7 +1832,7 @@ public:
\return the CRL corresponding to the contents of the array
*/
static CRL fromDER(const QByteArray &a, ConvertResult *result = 0, const QString &provider = QString());
static CRL fromDER(const QByteArray &a, ConvertResult *result = nullptr, const QString &provider = QString());
/**
Import a PEM encoded %Certificate Revocation List (CRL)
@ -1845,7 +1845,7 @@ public:
\return the CRL corresponding to the contents of the string
*/
static CRL fromPEM(const QString &s, ConvertResult *result = 0, const QString &provider = QString());
static CRL fromPEM(const QString &s, ConvertResult *result = nullptr, const QString &provider = QString());
/**
Import a PEM encoded %Certificate Revocation List (CRL) from a file
@ -1859,7 +1859,7 @@ public:
\return the CRL in the file
*/
static CRL fromPEMFile(const QString &fileName, ConvertResult *result = 0, const QString &provider = QString());
static CRL fromPEMFile(const QString &fileName, ConvertResult *result = nullptr, const QString &provider = QString());
/**
\internal
@ -2004,7 +2004,7 @@ public:
\return the CertificateCollection corresponding to the contents of
the file specified in fileName
*/
static CertificateCollection fromFlatTextFile(const QString &fileName, ConvertResult *result = 0, const QString &provider = QString());
static CertificateCollection fromFlatTextFile(const QString &fileName, ConvertResult *result = nullptr, const QString &provider = QString());
/**
import a CertificateCollection from a PKCS#7 file
@ -2019,7 +2019,7 @@ public:
\return the CertificateCollection corresponding to the contents of
the file specified in fileName
*/
static CertificateCollection fromPKCS7File(const QString &fileName, ConvertResult *result = 0, const QString &provider = QString());
static CertificateCollection fromPKCS7File(const QString &fileName, ConvertResult *result = nullptr, const QString &provider = QString());
private:
class Private;
@ -2304,7 +2304,7 @@ else
\note This synchronous operation may require event handling, and so
it must not be called from the same thread as an EventHandler.
*/
static KeyBundle fromArray(const QByteArray &a, const SecureArray &passphrase = SecureArray(), ConvertResult *result = 0, const QString &provider = QString());
static KeyBundle fromArray(const QByteArray &a, const SecureArray &passphrase = SecureArray(), ConvertResult *result = nullptr, const QString &provider = QString());
/**
Import the key bundle from a file in PKCS12 (.p12) format
@ -2336,7 +2336,7 @@ else
\note This synchronous operation may require event handling, and so
it must not be called from the same thread as an EventHandler.
*/
static KeyBundle fromFile(const QString &fileName, const SecureArray &passphrase = SecureArray(), ConvertResult *result = 0, const QString &provider = QString());
static KeyBundle fromFile(const QString &fileName, const SecureArray &passphrase = SecureArray(), ConvertResult *result = nullptr, const QString &provider = QString());
private:
class Private;
@ -2493,7 +2493,7 @@ public:
\param provider the provider to use, if a particular provider is
required
*/
static PGPKey fromArray(const QByteArray &a, ConvertResult *result = 0, const QString &provider = QString());
static PGPKey fromArray(const QByteArray &a, ConvertResult *result = nullptr, const QString &provider = QString());
/**
Import the key from a string
@ -2504,7 +2504,7 @@ public:
\param provider the provider to use, if a particular provider is
required
*/
static PGPKey fromString(const QString &s, ConvertResult *result = 0, const QString &provider = QString());
static PGPKey fromString(const QString &s, ConvertResult *result = nullptr, const QString &provider = QString());
/**
Import the key from a file
@ -2516,7 +2516,7 @@ public:
\param provider the provider to use, if a particular provider is
required
*/
static PGPKey fromFile(const QString &fileName, ConvertResult *result = 0, const QString &provider = QString());
static PGPKey fromFile(const QString &fileName, ConvertResult *result = nullptr, const QString &provider = QString());
private:
class Private;
@ -2571,7 +2571,7 @@ public:
\param parent the parent object for this object
*/
KeyLoader(QObject *parent = 0);
KeyLoader(QObject *parent = nullptr);
~KeyLoader();
/**

6
include/QtCrypto/qca_core.h
View File

@ -1566,7 +1566,7 @@ public:
\param parent the parent object for this object
*/
EventHandler(QObject *parent = 0);
EventHandler(QObject *parent = nullptr);
~EventHandler();
/**
@ -1648,7 +1648,7 @@ public:
\param parent the parent object for this QObject
*/
PasswordAsker(QObject *parent = 0);
PasswordAsker(QObject *parent = nullptr);
~PasswordAsker();
/**
@ -1740,7 +1740,7 @@ public:
\param parent the parent object for this QObject
*/
TokenAsker(QObject *parent = 0);
TokenAsker(QObject *parent = nullptr);
~TokenAsker();
/**

4
include/QtCrypto/qca_keystore.h
View File

@ -361,7 +361,7 @@ public:
\param e the KeyStoreEntry to monitor
\param parent the parent object for this object
*/
explicit KeyStoreEntryWatcher(const KeyStoreEntry &e, QObject *parent = 0);
explicit KeyStoreEntryWatcher(const KeyStoreEntry &e, QObject *parent = nullptr);
~KeyStoreEntryWatcher();
@ -715,7 +715,7 @@ public:
\param parent the parent for this object
*/
KeyStoreManager(QObject *parent = 0);
KeyStoreManager(QObject *parent = nullptr);
~KeyStoreManager();
/**

14
include/QtCrypto/qca_publickey.h
View File

@ -743,7 +743,7 @@ if (! QCA::ConvertGood == conversionResult)
conversion succeeded (ConvertGood) or not
\param provider the name of the provider to use for the import.
*/
static PublicKey fromDER(const QByteArray &a, ConvertResult *result = 0, const QString &provider = QString());
static PublicKey fromDER(const QByteArray &a, ConvertResult *result = nullptr, const QString &provider = QString());
/**
Import a key in Privacy Enhanced Mail (PEM) format
@ -770,7 +770,7 @@ if (! QCA::ConvertGood == conversionResult)
\sa toPEM, which provides an inverse of fromPEM()
\sa fromPEMFile, which provides an import direct from a file.
*/
static PublicKey fromPEM(const QString &s, ConvertResult *result = 0, const QString &provider = QString());
static PublicKey fromPEM(const QString &s, ConvertResult *result = nullptr, const QString &provider = QString());
/**
Import a key in Privacy Enhanced Mail (PEM) format from a file
@ -799,7 +799,7 @@ if (! QCA::ConvertGood == conversionResult)
\note there is also a constructor form that can import from a file
*/
static PublicKey fromPEMFile(const QString &fileName, ConvertResult *result = 0, const QString &provider = QString());
static PublicKey fromPEMFile(const QString &fileName, ConvertResult *result = nullptr, const QString &provider = QString());
protected:
/**
@ -1045,7 +1045,7 @@ public:
\note This synchronous operation may require event handling, and so
it must not be called from the same thread as an EventHandler.
*/
static PrivateKey fromDER(const SecureArray &a, const SecureArray &passphrase = SecureArray(), ConvertResult *result = 0, const QString &provider = QString());
static PrivateKey fromDER(const SecureArray &a, const SecureArray &passphrase = SecureArray(), ConvertResult *result = nullptr, const QString &provider = QString());
/**
Import the key from Privacy Enhanced Mail (PEM) format
@ -1065,7 +1065,7 @@ public:
\note This synchronous operation may require event handling, and so
it must not be called from the same thread as an EventHandler.
*/
static PrivateKey fromPEM(const QString &s, const SecureArray &passphrase = SecureArray(), ConvertResult *result = 0, const QString &provider = QString());
static PrivateKey fromPEM(const QString &s, const SecureArray &passphrase = SecureArray(), ConvertResult *result = nullptr, const QString &provider = QString());
/**
Import the key in Privacy Enhanced Mail (PEM) format from a file
@ -1089,7 +1089,7 @@ public:
\note This synchronous operation may require event handling, and so
it must not be called from the same thread as an EventHandler.
*/
static PrivateKey fromPEMFile(const QString &fileName, const SecureArray &passphrase = SecureArray(), ConvertResult *result = 0, const QString &provider = QString());
static PrivateKey fromPEMFile(const QString &fileName, const SecureArray &passphrase = SecureArray(), ConvertResult *result = nullptr, const QString &provider = QString());
protected:
/**
@ -1126,7 +1126,7 @@ public:
\param parent the parent object, if applicable
*/
KeyGenerator(QObject *parent = 0);
KeyGenerator(QObject *parent = nullptr);
~KeyGenerator();

2
include/QtCrypto/qca_safetimer.h
View File

@ -34,7 +34,7 @@ class QCA_EXPORT SafeTimer : public QObject
{
Q_OBJECT
public:
SafeTimer(QObject *parent = 0);
SafeTimer(QObject *parent = nullptr);
~SafeTimer();
int interval() const;

8
include/QtCrypto/qca_securelayer.h
View File

@ -111,7 +111,7 @@ public:
\param parent the parent object for this object
*/
SecureLayer(QObject *parent = 0);
SecureLayer(QObject *parent = nullptr);
/**
Returns true if the layer has a meaningful "close".
@ -345,7 +345,7 @@ public:
\param provider the name of the provider, if a specific provider
is required
*/
explicit TLS(QObject *parent = 0, const QString &provider = QString());
explicit TLS(QObject *parent = nullptr, const QString &provider = QString());
/**
Constructor for Transport Layer Security connection.
@ -358,7 +358,7 @@ public:
\param provider the name of the provider, if a specific provider is
required
*/
explicit TLS(Mode mode, QObject *parent = 0, const QString &provider = QString());
explicit TLS(Mode mode, QObject *parent = nullptr, const QString &provider = QString());
/**
Destructor
@ -969,7 +969,7 @@ public:
specified, or specified as empty, then any provider is
acceptable.
*/
explicit SASL(QObject *parent = 0, const QString &provider = QString());
explicit SASL(QObject *parent = nullptr, const QString &provider = QString());
~SASL();

4
include/QtCrypto/qca_securemessage.h
View File

@ -848,7 +848,7 @@ public:
\param provider the provider to use, if a specific
provider is required
*/
explicit OpenPGP(QObject *parent = 0, const QString &provider = QString());
explicit OpenPGP(QObject *parent = nullptr, const QString &provider = QString());
~OpenPGP();
private:
@ -894,7 +894,7 @@ public:
\param provider the provider to use, if a specific
provider is required
*/
explicit CMS(QObject *parent = 0, const QString &provider = QString());
explicit CMS(QObject *parent = nullptr, const QString &provider = QString());
~CMS();
/**

14
include/QtCrypto/qca_support.h
View File

@ -278,7 +278,7 @@ public:
\param parent the parent object for this parent.
*/
SyncThread(QObject *parent = 0);
SyncThread(QObject *parent = nullptr);
/**
Calls stop() and then destructs
@ -409,7 +409,7 @@ public:
set in the constructor, you can set it using setDirName()
\param parent the parent object for this object
*/
explicit DirWatch(const QString &dir = QString(), QObject *parent = 0);
explicit DirWatch(const QString &dir = QString(), QObject *parent = nullptr);
~DirWatch();
/**
@ -467,7 +467,7 @@ public:
in this object, you can set it using setFileName()
\param parent the parent object for this object
*/
explicit FileWatch(const QString &file = QString(), QObject *parent = 0);
explicit FileWatch(const QString &file = QString(), QObject *parent = nullptr);
~FileWatch();
/**
@ -596,7 +596,7 @@ public:
you to test whether there is already a Console object of the
required Type, and if there is, obtain a reference to that object.
*/
Console(Type type, ChannelMode cmode, TerminalMode tmode, QObject *parent = 0);
Console(Type type, ChannelMode cmode, TerminalMode tmode, QObject *parent = nullptr);
~Console();
/**
@ -699,7 +699,7 @@ public:
\param parent the parent object for this object
*/
ConsoleReference(QObject *parent = 0);
ConsoleReference(QObject *parent = nullptr);
~ConsoleReference();
/**
@ -861,7 +861,7 @@ public:
\param parent the parent object for this object
*/
ConsolePrompt(QObject *parent = 0);
ConsolePrompt(QObject *parent = nullptr);
~ConsolePrompt();
/**
@ -1093,7 +1093,7 @@ protected:
\param name the name of this log device
\param parent the parent for this logger
*/
explicit AbstractLogDevice(const QString &name, QObject *parent = 0);
explicit AbstractLogDevice(const QString &name, QObject *parent = nullptr);
virtual ~AbstractLogDevice() = 0;

6
include/QtCrypto/qpipe.h
View File

@ -90,7 +90,7 @@ public:
\param parent the parent object to this object
*/
QPipeDevice(QObject *parent = 0);
QPipeDevice(QObject *parent = nullptr);
~QPipeDevice();
/**
@ -234,7 +234,7 @@ public:
\param parent the parent object for this object
*/
QPipeEnd(QObject *parent = 0);
QPipeEnd(QObject *parent = nullptr);
~QPipeEnd();
@ -487,7 +487,7 @@ public:
\param parent the parent object for this object
*/
QPipe(QObject *parent = 0);
QPipe(QObject *parent = nullptr);
~QPipe();

2
plugins/qca-gnupg/gpgaction.h
View File

@ -72,7 +72,7 @@ public:
Input input;
Output output;
GpgAction(QObject *parent = 0);
GpgAction(QObject *parent = nullptr);
~GpgAction();
void reset();
void start();

2
plugins/qca-gnupg/gpgop.h
View File

@ -134,7 +134,7 @@ public:
};
typedef QList<Key> KeyList;
explicit GpgOp(const QString &bin, QObject *parent = 0);
explicit GpgOp(const QString &bin, QObject *parent = nullptr);
~GpgOp();
void reset();

2
plugins/qca-gnupg/gpgproc/gpgproc.h
View File

@ -34,7 +34,7 @@ class GPGProc : public QObject
public:
enum Error { FailedToStart, UnexpectedExit, ErrorWrite };
enum Mode { NormalMode, ExtendedMode };
GPGProc(QObject *parent = 0);
GPGProc(QObject *parent = nullptr);
~GPGProc();
void reset();

2
plugins/qca-gnupg/gpgproc/gpgproc_p.h
View File

@ -32,7 +32,7 @@ class QProcessSignalRelay : public QObject
{
Q_OBJECT
public:
QProcessSignalRelay(QProcess *proc, QObject *parent = 0)
QProcessSignalRelay(QProcess *proc, QObject *parent = nullptr)
:QObject(parent)
{
qRegisterMetaType<QProcess::ProcessError>("QProcess::ProcessError");

2
plugins/qca-gnupg/gpgproc/sprocess.h
View File

@ -28,7 +28,7 @@ class SProcess : public QProcess
{
Q_OBJECT
public:
SProcess(QObject *parent = 0);
SProcess(QObject *parent = nullptr);
~SProcess();
#ifdef Q_OS_UNIX

2
plugins/qca-gnupg/ringwatch.h
View File

@ -57,7 +57,7 @@ public:
QList<DirItem> dirs;
QList<FileItem> files;
RingWatch(QObject *parent = 0);
RingWatch(QObject *parent = nullptr);
~RingWatch();
void add(const QString &filePath);

8
plugins/qca-ossl/qca-ossl.cpp
View File

@ -1897,7 +1897,7 @@ public:
RSA *result;
int bits, exp;
RSAKeyMaker(int _bits, int _exp, QObject *parent = 0) : QThread(parent), result(0), bits(_bits), exp(_exp)
RSAKeyMaker(int _bits, int _exp, QObject *parent = nullptr) : QThread(parent), result(0), bits(_bits), exp(_exp)
{
}
@ -2296,7 +2296,7 @@ public:
DLGroup domain;
DSA *result;
DSAKeyMaker(const DLGroup &_domain, QObject *parent = 0) : QThread(parent), domain(_domain), result(0)
DSAKeyMaker(const DLGroup &_domain, QObject *parent = nullptr) : QThread(parent), domain(_domain), result(0)
{
}
@ -2580,7 +2580,7 @@ public:
DLGroup domain;
DH *result;
DHKeyMaker(const DLGroup &_domain, QObject *parent = 0) : QThread(parent), domain(_domain), result(0)
DHKeyMaker(const DLGroup &_domain, QObject *parent = nullptr) : QThread(parent), domain(_domain), result(0)
{
}
@ -6417,7 +6417,7 @@ public:
bool ok;
QByteArray out, sig;
MyMessageContextThread(QObject *parent = 0) : QThread(parent), ok(false)
MyMessageContextThread(QObject *parent = nullptr) : QThread(parent), ok(false)
{
}

2
src/qca_cert.cpp
View File

@ -2832,7 +2832,7 @@ public:
In in;
Out out;
KeyLoaderThread(QObject *parent = 0) : QThread(parent)
KeyLoaderThread(QObject *parent = nullptr) : QThread(parent)
{
}

4
src/qca_core.cpp
View File

@ -1663,7 +1663,7 @@ class HandlerBase : public QObject
{
Q_OBJECT
public:
HandlerBase(QObject *parent = 0) : QObject(parent)
HandlerBase(QObject *parent = nullptr) : QObject(parent)
{
}
@ -1675,7 +1675,7 @@ class AskerBase : public QObject
{
Q_OBJECT
public:
AskerBase(QObject *parent = 0) : QObject(parent)
AskerBase(QObject *parent = nullptr) : QObject(parent)
{
}

4
src/qca_keystore.cpp
View File

@ -600,7 +600,7 @@ public:
KeyStoreTracker *tracker;
QMutex call_mutex;
KeyStoreThread(QObject *parent = 0) : SyncThread(parent)
KeyStoreThread(QObject *parent = nullptr) : SyncThread(parent)
{
}
@ -971,7 +971,7 @@ public:
QString entryId; // in: RemoveEntry, out: WriteEntry
bool success; // out: RemoveEntry
KeyStoreOperation(QObject *parent = 0)
KeyStoreOperation(QObject *parent = nullptr)
:QThread(parent)
{
}

2
src/qca_safeobj.h
View File

@ -34,7 +34,7 @@ class SafeSocketNotifier : public QObject
Q_OBJECT
public:
SafeSocketNotifier(int socket, QSocketNotifier::Type type,
QObject *parent = 0);
QObject *parent = nullptr);
~SafeSocketNotifier();

2
src/qca_safetimer.cpp
View File

@ -39,7 +39,7 @@ class SafeTimer::Private : public QObject
friend class SafeTimer;
public:
Private(QObject *parent = 0);
Private(QObject *parent = nullptr);
int timerId;
int fixerTimerId;

4
src/support/console.cpp
View File

@ -60,7 +60,7 @@ private:
QByteArray in_left, out_left;
public:
ConsoleWorker(QObject *parent = 0) : QObject(parent), in(this), out(this)
ConsoleWorker(QObject *parent = nullptr) : QObject(parent), in(this), out(this)
{
started = false;
}
@ -219,7 +219,7 @@ public:
QByteArray in_left, out_left;
QMutex call_mutex;
ConsoleThread(QObject *parent = 0) : SyncThread(parent)
ConsoleThread(QObject *parent = nullptr) : SyncThread(parent)
{
qRegisterMetaType<SecureArray>("QCA::SecureArray");
}

2
src/support/dirwatch.cpp
View File

@ -37,7 +37,7 @@ class QFileSystemWatcherRelay : public QObject
public:
QFileSystemWatcher *watcher;
QFileSystemWatcherRelay(QFileSystemWatcher *_watcher, QObject *parent = 0)
QFileSystemWatcherRelay(QFileSystemWatcher *_watcher, QObject *parent = nullptr)
:QObject(parent), watcher(_watcher)
{
connect(watcher, SIGNAL(directoryChanged(const QString &)), SIGNAL(directoryChanged(const QString &)), Qt::QueuedConnection);

12
src/support/qpipe.cpp
View File

@ -419,7 +419,7 @@ class QPipeWriter : public QThread
{
Q_OBJECT
public:
QPipeWriter(QObject *parent = 0) : QThread(parent)
QPipeWriter(QObject *parent = nullptr) : QThread(parent)
{
}
@ -456,7 +456,7 @@ class QPipeReader : public QThread
{
Q_OBJECT
public:
QPipeReader(QObject *parent = 0) : QThread(parent)
QPipeReader(QObject *parent = nullptr) : QThread(parent)
{
}
@ -499,7 +499,7 @@ public:
const char *data;
int size;
QPipeWriterThread(Q_PIPE_ID id, QObject *parent = 0) : QPipeWriter(parent)
QPipeWriterThread(Q_PIPE_ID id, QObject *parent = nullptr) : QPipeWriter(parent)
{
do_quit = false;
data = 0;
@ -634,7 +634,7 @@ public:
SafeTimer timer;
int total;
QPipeWriterPoll(Q_PIPE_ID id, QObject *parent = 0) : QPipeWriter(parent), timer(this)
QPipeWriterPoll(Q_PIPE_ID id, QObject *parent = nullptr) : QPipeWriter(parent), timer(this)
{
pipe = id;
data = 0;
@ -708,7 +708,7 @@ public:
QWaitCondition w;
bool do_quit, active;
QPipeReaderThread(Q_PIPE_ID id, QObject *parent = 0) : QPipeReader(parent)
QPipeReaderThread(Q_PIPE_ID id, QObject *parent = nullptr) : QPipeReader(parent)
{
do_quit = false;
active = true;
@ -807,7 +807,7 @@ public:
SafeTimer timer;
bool consoleMode;
QPipeReaderPoll(Q_PIPE_ID id, QObject *parent = 0) : QPipeReader(parent), timer(this)
QPipeReaderPoll(Q_PIPE_ID id, QObject *parent = nullptr) : QPipeReader(parent), timer(this)
{
pipe = id;
connect(&timer, SIGNAL(timeout()), SLOT(tryRead()));

2
src/support/synchronizer.cpp
View File

@ -317,7 +317,7 @@ class SynchronizerAgent : public QObject
{
Q_OBJECT
public:
SynchronizerAgent(QObject *parent = 0) : QObject(parent)
SynchronizerAgent(QObject *parent = nullptr) : QObject(parent)
{
QMetaObject::invokeMethod(this, "started", Qt::QueuedConnection);
}

2
src/support/syncthread.cpp
View File

@ -120,7 +120,7 @@ class SyncThreadAgent : public QObject
{
Q_OBJECT
public:
SyncThreadAgent(QObject *parent = 0) : QObject(parent)
SyncThreadAgent(QObject *parent = nullptr) : QObject(parent)
{
QMetaObject::invokeMethod(this, "started", Qt::QueuedConnection);
}

2
unittest/pgpunittest/pgpunittest.cpp
View File

@ -64,7 +64,7 @@ class PGPPassphraseProvider: public QObject
{
Q_OBJECT
public:
PGPPassphraseProvider(QObject *parent = 0) : QObject(parent)
PGPPassphraseProvider(QObject *parent = nullptr) : QObject(parent)
{
connect(&m_handler, SIGNAL(eventReady(int, const QCA::Event &)),
SLOT(eh_eventReady(int, const QCA::Event &)));