diff options
Diffstat (limited to 'tests/baselineserver')
-rw-r--r-- | tests/baselineserver/shared/baselineprotocol.h | 6 | ||||
-rw-r--r-- | tests/baselineserver/shared/qbaselinetest.h | 2 | ||||
-rw-r--r-- | tests/baselineserver/src/baselineserver.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/tests/baselineserver/shared/baselineprotocol.h b/tests/baselineserver/shared/baselineprotocol.h index 4eda649c40..510762e304 100644 --- a/tests/baselineserver/shared/baselineprotocol.h +++ b/tests/baselineserver/shared/baselineprotocol.h @@ -128,7 +128,7 @@ public: BaselineProtocol(); ~BaselineProtocol(); - static BaselineProtocol *instance(QObject *parent = 0); + static BaselineProtocol *instance(QObject *parent = nullptr); // **************************************************** // Important constants here @@ -157,12 +157,12 @@ public: // For client: // For advanced client: - bool connect(const QString &testCase, bool *dryrun = 0, const PlatformInfo& clientInfo = PlatformInfo()); + bool connect(const QString &testCase, bool *dryrun = nullptr, const PlatformInfo& clientInfo = PlatformInfo()); bool disconnect(); bool requestBaselineChecksums(const QString &testFunction, ImageItemList *itemList); bool submitMatch(const ImageItem &item, QByteArray *serverMsg); bool submitNewBaseline(const ImageItem &item, QByteArray *serverMsg); - bool submitMismatch(const ImageItem &item, QByteArray *serverMsg, bool *fuzzyMatch = 0); + bool submitMismatch(const ImageItem &item, QByteArray *serverMsg, bool *fuzzyMatch = nullptr); // For server: bool acceptConnection(PlatformInfo *pi); diff --git a/tests/baselineserver/shared/qbaselinetest.h b/tests/baselineserver/shared/qbaselinetest.h index 60c50da9d9..ede0fe42e3 100644 --- a/tests/baselineserver/shared/qbaselinetest.h +++ b/tests/baselineserver/shared/qbaselinetest.h @@ -36,7 +36,7 @@ void setAutoMode(bool mode); void setSimFail(bool fail); void handleCmdLineArgs(int *argcp, char ***argvp); void addClientProperty(const QString& key, const QString& value); -bool connectToBaselineServer(QByteArray *msg = 0, const QString &testProject = QString(), const QString &testCase = QString()); +bool connectToBaselineServer(QByteArray *msg = nullptr, const QString &testProject = QString(), const QString &testCase = QString()); bool checkImage(const QImage& img, const char *name, quint16 checksum, QByteArray *msg, bool *error, int manualdatatag = 0); bool testImage(const QImage& img, QByteArray *msg, bool *error); QTestData &newRow(const char *dataTag, quint16 checksum = 0); diff --git a/tests/baselineserver/src/baselineserver.h b/tests/baselineserver/src/baselineserver.h index f2336497f6..25ef17f023 100644 --- a/tests/baselineserver/src/baselineserver.h +++ b/tests/baselineserver/src/baselineserver.h @@ -54,7 +54,7 @@ class BaselineServer : public QTcpServer Q_OBJECT public: - BaselineServer(QObject *parent = 0); + BaselineServer(QObject *parent = nullptr); static QString storagePath(); static QString baseUrl(); @@ -117,7 +117,7 @@ private slots: void idleClientTimeout(); private: - bool checkClient(QByteArray *errMsg, bool *dryRunMode = 0); + bool checkClient(QByteArray *errMsg, bool *dryRunMode = nullptr); bool establishConnection(); void provideBaselineChecksums(const QByteArray &itemListBlock); void recordMatch(const QByteArray &itemBlock); |