diff options
| author | Kevin Funk <kfunk@kde.org> | 2017-09-24 23:54:47 +0200 |
|---|---|---|
| committer | Kevin Funk <kevin.funk@kdab.com> | 2017-09-29 19:14:10 +0000 |
| commit | def6c3c3e263d06a39b2370a122f080f24df26f9 (patch) | |
| tree | 5799f6600b6f5751b4d97cb74b948f2cb7b10958 /tools | |
| parent | 7c9db49830de90879ecf7a217386cc860c9eb206 (diff) | |
Replace Q_NULLPTR with nullptr
Change-Id: I0df68cec43511537b61ddfe74bd677be7a598eae
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dumpcpp/main.cpp | 4 | ||||
| -rw-r--r-- | tools/testcon/mainwindow.cpp | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/tools/dumpcpp/main.cpp b/tools/dumpcpp/main.cpp index 1f0cca8..8a37f33 100644 --- a/tools/dumpcpp/main.cpp +++ b/tools/dumpcpp/main.cpp @@ -925,7 +925,7 @@ static QByteArrayList vTableOnlyStubsFromTypeLib(ITypeLib *typelib, const QStrin for (UINT i = 0, typeCount = typelib->GetTypeInfoCount(); i < typeCount; ++i) { TYPEKIND typekind; if (SUCCEEDED(typelib->GetTypeInfoType(i, &typekind)) && typekind == TKIND_INTERFACE) { - ITypeInfo *typeinfo = Q_NULLPTR; + ITypeInfo *typeinfo = nullptr; if (SUCCEEDED(typelib->GetTypeInfo(i, &typeinfo) && typeinfo)) { result.append(nameSpacePrefix + classNameFromTypeInfo(typeinfo)); typeinfo->Release(); @@ -949,7 +949,7 @@ bool generateTypeLibrary(QString typeLibFile, QString outname, QString libName = nameSpace; if (libName.isEmpty()) { - BSTR nameString = Q_NULLPTR; + BSTR nameString = nullptr; if (SUCCEEDED(typelib->GetDocumentation(-1, &nameString, 0, 0, 0))) { libName = QString::fromWCharArray(nameString); SysFreeString(nameString); diff --git a/tools/testcon/mainwindow.cpp b/tools/testcon/mainwindow.cpp index 682c8e5..3ff0016 100644 --- a/tools/testcon/mainwindow.cpp +++ b/tools/testcon/mainwindow.cpp @@ -65,14 +65,14 @@ static const ScriptLanguage scriptLanguages[] = { {"Python", ".py"} }; -MainWindow *MainWindow::m_instance = Q_NULLPTR; +MainWindow *MainWindow::m_instance = nullptr; MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) - , m_dlgInvoke(Q_NULLPTR) - , m_dlgProperties(Q_NULLPTR) - , m_dlgAmbient(Q_NULLPTR) - , m_scripts(Q_NULLPTR) + , m_dlgInvoke(nullptr) + , m_dlgProperties(nullptr) + , m_dlgAmbient(nullptr) + , m_scripts(nullptr) { setupUi(this); MainWindow::m_instance = this; // Logging handler needs the UI @@ -99,7 +99,7 @@ MainWindow::MainWindow(QWidget *parent) MainWindow::~MainWindow() { - MainWindow::m_instance = Q_NULLPTR; + MainWindow::m_instance = nullptr; } QAxWidget *MainWindow::activeAxWidget() const |