diff options
author | Alessandro Portale <alessandro.portale@qt.io> | 2018-07-23 22:28:49 +0200 |
---|---|---|
committer | Alessandro Portale <alessandro.portale@qt.io> | 2018-07-25 12:52:43 +0000 |
commit | 0558db7b54a60297444ff3a9a0d49651383bf825 (patch) | |
tree | dc7bc8757ebda56fc687b3605a3276f9449eff6d /src/shared | |
parent | babf038ce8f9174578545df843ff183a1583fd08 (diff) |
Debugger: Modernize
modernize-use-auto
modernize-use-nullptr
modernize-use-override
modernize-use-using
modernize-use-default-member-init
modernize-use-equals-default
Change-Id: I91a6874f0d7b94e9079ab4ef07c23c60c80be9c0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/shared')
-rw-r--r-- | src/shared/modeltest/modeltest.cpp | 2 | ||||
-rw-r--r-- | src/shared/modeltest/modeltest.h | 4 | ||||
-rw-r--r-- | src/shared/registryaccess/registryaccess.cpp | 8 | ||||
-rw-r--r-- | src/shared/registryaccess/registryaccess.h | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/shared/modeltest/modeltest.cpp b/src/shared/modeltest/modeltest.cpp index 4af993fd57d..2dfb296b460 100644 --- a/src/shared/modeltest/modeltest.cpp +++ b/src/shared/modeltest/modeltest.cpp @@ -33,7 +33,7 @@ Connect to all of the models signals. Whenever anything happens recheck everything. */ -ModelTest::ModelTest(QAbstractItemModel *_model, QObject *parent) : QObject(parent), model(_model), fetchingMore(false) +ModelTest::ModelTest(QAbstractItemModel *_model, QObject *parent) : QObject(parent), model(_model) { Q_ASSERT(model); diff --git a/src/shared/modeltest/modeltest.h b/src/shared/modeltest/modeltest.h index e3f3c8aa348..5bdc24f598e 100644 --- a/src/shared/modeltest/modeltest.h +++ b/src/shared/modeltest/modeltest.h @@ -34,7 +34,7 @@ class ModelTest : public QObject Q_OBJECT public: - ModelTest(QAbstractItemModel *model, QObject *parent = 0); + ModelTest(QAbstractItemModel *model, QObject *parent = nullptr); private Q_SLOTS: void nonDestructiveBasicTest(); @@ -69,7 +69,7 @@ private: QStack<Changing> insert; QStack<Changing> remove; - bool fetchingMore; + bool fetchingMore = false; QList<QPersistentModelIndex> changing; }; diff --git a/src/shared/registryaccess/registryaccess.cpp b/src/shared/registryaccess/registryaccess.cpp index e37185e507a..728aa41d7ec 100644 --- a/src/shared/registryaccess/registryaccess.cpp +++ b/src/shared/registryaccess/registryaccess.cpp @@ -39,7 +39,7 @@ static QString winErrorMessage(unsigned long error) const int len = FormatMessage( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, error, 0, (LPTSTR)&lpMsgBuf, 0, NULL); + nullptr, error, 0, (LPTSTR)&lpMsgBuf, 0, nullptr); if (len) { rc = QString::fromUtf16(lpMsgBuf, len); LocalFree(lpMsgBuf); @@ -63,14 +63,14 @@ static bool registryReadBinaryKey(HKEY handle, // HKEY_LOCAL_MACHINE, etc. DWORD type; DWORD size; // get size and retrieve - LONG rc = RegQueryValueEx(handle, valueName, 0, &type, 0, &size); + LONG rc = RegQueryValueEx(handle, valueName, nullptr, &type, nullptr, &size); if (rc != ERROR_SUCCESS) { *errorMessage = msgRegistryOperationFailed("read", valueName, msgFunctionFailed("RegQueryValueEx1", rc)); return false; } - BYTE *dataC = new BYTE[size + 1]; + auto dataC = new BYTE[size + 1]; // Will be Utf16 in case of a string - rc = RegQueryValueEx(handle, valueName, 0, &type, dataC, &size); + rc = RegQueryValueEx(handle, valueName, nullptr, &type, dataC, &size); if (rc != ERROR_SUCCESS) { *errorMessage = msgRegistryOperationFailed("read", valueName, msgFunctionFailed("RegQueryValueEx2", rc)); return false; diff --git a/src/shared/registryaccess/registryaccess.h b/src/shared/registryaccess/registryaccess.h index 26c50327678..2880aa66772 100644 --- a/src/shared/registryaccess/registryaccess.h +++ b/src/shared/registryaccess/registryaccess.h @@ -81,6 +81,6 @@ inline bool openRegistryKey(HKEY category, const WCHAR *key, bool readWrite, HKE QString debuggerCall(const QString &additionalOption = QString()); -bool isRegistered(HKEY handle, const QString &call, QString *errorMessage, QString *oldDebugger = 0); +bool isRegistered(HKEY handle, const QString &call, QString *errorMessage, QString *oldDebugger = nullptr); } // namespace RegistryAccess |