From bebc2ec36def37d7f18f96ac1fdd153eb13fc09c Mon Sep 17 00:00:00 2001 From: Paul I Date: Fri, 4 May 2018 10:58:32 +0300 Subject: [PATCH] More c++11 (#478) * Replace 0 and Q_NULLPTR with nullptr * Use c++11 foreach --- src/AnalThread.h | 2 +- src/Cutter.cpp | 18 +++++++++--------- src/Cutter.h | 2 +- src/MainWindow.cpp | 12 ++++++------ src/MainWindow.h | 2 +- src/dialogs/AboutDialog.h | 2 +- src/dialogs/CommentsDialog.h | 2 +- src/dialogs/EditInstructionDialog.h | 2 +- src/dialogs/FlagDialog.h | 2 +- src/dialogs/NewFileDialog.h | 2 +- src/dialogs/R2PluginsDialog.h | 2 +- src/dialogs/RenameDialog.h | 2 +- src/dialogs/SaveProjectDialog.h | 2 +- src/dialogs/VersionInfoDialog.cpp | 10 +++++----- src/dialogs/VersionInfoDialog.h | 2 +- src/dialogs/XrefsDialog.h | 2 +- src/utils/HexAsciiHighlighter.cpp | 2 +- src/utils/HexAsciiHighlighter.h | 2 +- src/utils/HexHighlighter.cpp | 4 ++-- src/utils/HexHighlighter.h | 2 +- src/utils/Highlighter.cpp | 6 +++--- src/utils/Highlighter.h | 2 +- src/utils/JsonModel.h | 2 +- src/utils/JsonTreeItem.h | 4 ++-- src/utils/MdHighlighter.cpp | 4 ++-- src/utils/MdHighlighter.h | 2 +- src/widgets/ClassesWidget.h | 4 ++-- src/widgets/CommentsWidget.h | 4 ++-- src/widgets/ExportsWidget.h | 4 ++-- src/widgets/FlagsWidget.h | 4 ++-- src/widgets/FunctionsWidget.cpp | 2 +- src/widgets/FunctionsWidget.h | 4 ++-- src/widgets/ImportsWidget.h | 2 +- src/widgets/Omnibar.h | 2 +- src/widgets/PieView.h | 2 +- src/widgets/RelocsWidget.h | 4 ++-- src/widgets/SdbDock.cpp | 4 ++-- src/widgets/SearchWidget.h | 4 ++-- src/widgets/SectionsWidget.h | 6 +++--- src/widgets/SidebarWidget.cpp | 6 +++--- src/widgets/StringsWidget.h | 4 ++-- src/widgets/SymbolsWidget.h | 4 ++-- src/widgets/TypesWidget.h | 4 ++-- src/widgets/VisualNavbar.h | 2 +- 44 files changed, 81 insertions(+), 81 deletions(-) diff --git a/src/AnalThread.h b/src/AnalThread.h index bcbf3614..6218ae70 100644 --- a/src/AnalThread.h +++ b/src/AnalThread.h @@ -11,7 +11,7 @@ class AnalThread : public QThread { Q_OBJECT public: - explicit AnalThread(OptionsDialog *parent = 0); + explicit AnalThread(OptionsDialog *parent = nullptr); ~AnalThread(); void start(MainWindow *main, int level, QList advanced); diff --git a/src/Cutter.cpp b/src/Cutter.cpp index 8f61b0e6..9b2c45af 100644 --- a/src/Cutter.cpp +++ b/src/Cutter.cpp @@ -288,7 +288,7 @@ void CutterCore::analyze(int level, QList advanced) } else if (level == 2) { r_core_cmd0(core_, "aaaa"); } else if (level == 3) { - foreach (QString option, advanced) { + for (QString option : advanced) { r_core_cmd0(core_, option.toStdString().c_str()); } } @@ -802,7 +802,7 @@ QList CutterCore::getSeekHistory() QList ret; QJsonArray jsonArray = cmdj("sj").array(); - foreach (QJsonValue value, jsonArray) + for (QJsonValue value : jsonArray) ret << value.toVariant().toULongLong(); return ret; @@ -942,7 +942,7 @@ QList CutterCore::getAllFunctions() QJsonArray jsonArray = cmdj("aflj").array(); - foreach (QJsonValue value, jsonArray) { + for (QJsonValue value : jsonArray) { QJsonObject jsonObject = value.toObject(); FunctionDescription function; @@ -969,7 +969,7 @@ QList CutterCore::getAllImports() QJsonArray importsArray = cmdj("iij").array(); - foreach (QJsonValue value, importsArray) { + for (QJsonValue value : importsArray) { QJsonObject importObject = value.toObject(); ImportDescription import; @@ -993,7 +993,7 @@ QList CutterCore::getAllExports() QJsonArray importsArray = cmdj("iEj").array(); - foreach (QJsonValue value, importsArray) { + for (QJsonValue value : importsArray) { QJsonObject importObject = value.toObject(); ExportDescription exp; @@ -1364,7 +1364,7 @@ QList CutterCore::getAllTypes() QJsonArray typesArray = cmdj("tj").array(); - foreach (QJsonValue value, typesArray) { + for (QJsonValue value : typesArray) { QJsonObject typeObject = value.toObject(); TypeDescription exp; @@ -1387,11 +1387,11 @@ QList CutterCore::getAllSearch(QString search_for, QString sp QJsonArray searchArray = cmdj(space + QString(" ") + search_for).array(); if (space == "/Rj") { - foreach (QJsonValue value, searchArray) { + for (QJsonValue value : searchArray) { QJsonObject searchObject = value.toObject(); SearchDescription exp; exp.code = QString(""); - foreach (QJsonValue value2, searchObject["opcodes"].toArray()) { + for (QJsonValue value2 : searchObject["opcodes"].toArray()) { QJsonObject gadget = value2.toObject(); exp.code += gadget["opcode"].toString() + "; "; } @@ -1403,7 +1403,7 @@ QList CutterCore::getAllSearch(QString search_for, QString sp ret << exp; } } else { - foreach (QJsonValue value, searchArray) { + for (QJsonValue value : searchArray) { QJsonObject searchObject = value.toObject(); SearchDescription exp; diff --git a/src/Cutter.h b/src/Cutter.h index 37f3a432..edd877d7 100644 --- a/src/Cutter.h +++ b/src/Cutter.h @@ -283,7 +283,7 @@ class CutterCore: public QObject friend class ccClass; public: - explicit CutterCore(QObject *parent = 0); + explicit CutterCore(QObject *parent = nullptr); ~CutterCore(); static CutterCore *getInstance(); diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 3e413ee1..133850c1 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -376,13 +376,13 @@ void MainWindow::saveSettings() void MainWindow::setPanelLock() { if (panelLock) { - foreach (QDockWidget *dockWidget, findChildren()) { + for (QDockWidget *dockWidget : findChildren()) { dockWidget->setFeatures(QDockWidget::NoDockWidgetFeatures); } ui->actionLock->setChecked(false); } else { - foreach (QDockWidget *dockWidget, findChildren()) { + for (QDockWidget *dockWidget : findChildren()) { dockWidget->setFeatures(QDockWidget::AllDockWidgetFeatures); } @@ -411,11 +411,11 @@ void MainWindow::refreshAll() void MainWindow::lockUnlock_Docks(bool what) { if (what) { - foreach (QDockWidget *dockWidget, findChildren()) { + for (QDockWidget *dockWidget : findChildren()) { dockWidget->setFeatures(QDockWidget::NoDockWidgetFeatures); } } else { - foreach (QDockWidget *dockWidget, findChildren()) { + for (QDockWidget *dockWidget : findChildren()) { dockWidget->setFeatures(QDockWidget::AllDockWidgetFeatures); } } @@ -549,12 +549,12 @@ void MainWindow::on_actionLock_triggered() void MainWindow::on_actionLockUnlock_triggered() { if (ui->actionLockUnlock->isChecked()) { - foreach (QDockWidget *dockWidget, findChildren()) { + for (QDockWidget *dockWidget : findChildren()) { dockWidget->setFeatures(QDockWidget::NoDockWidgetFeatures); } ui->actionLockUnlock->setIcon(QIcon(":/lock")); } else { - foreach (QDockWidget *dockWidget, findChildren()) { + for (QDockWidget *dockWidget : findChildren()) { dockWidget->setFeatures(QDockWidget::AllDockWidgetFeatures); } ui->actionLockUnlock->setIcon(QIcon(":/unlock")); diff --git a/src/MainWindow.h b/src/MainWindow.h index 9ea9930e..bdb11146 100644 --- a/src/MainWindow.h +++ b/src/MainWindow.h @@ -58,7 +58,7 @@ class MainWindow : public QMainWindow public: bool responsive; - explicit MainWindow(QWidget *parent = 0); + explicit MainWindow(QWidget *parent = nullptr); ~MainWindow(); void openNewFile(const QString &fn, int analLevel = -1, diff --git a/src/dialogs/AboutDialog.h b/src/dialogs/AboutDialog.h index 46ef4bb4..b2e7a171 100644 --- a/src/dialogs/AboutDialog.h +++ b/src/dialogs/AboutDialog.h @@ -13,7 +13,7 @@ class AboutDialog : public QDialog Q_OBJECT public: - explicit AboutDialog(QWidget *parent = 0); + explicit AboutDialog(QWidget *parent = nullptr); ~AboutDialog(); private slots: diff --git a/src/dialogs/CommentsDialog.h b/src/dialogs/CommentsDialog.h index d836d5bc..6e5c83e2 100644 --- a/src/dialogs/CommentsDialog.h +++ b/src/dialogs/CommentsDialog.h @@ -13,7 +13,7 @@ class CommentsDialog : public QDialog Q_OBJECT public: - explicit CommentsDialog(QWidget *parent = 0); + explicit CommentsDialog(QWidget *parent = nullptr); ~CommentsDialog(); QString getComment(); diff --git a/src/dialogs/EditInstructionDialog.h b/src/dialogs/EditInstructionDialog.h index daa1a275..1c84967f 100644 --- a/src/dialogs/EditInstructionDialog.h +++ b/src/dialogs/EditInstructionDialog.h @@ -14,7 +14,7 @@ class EditInstructionDialog : public QDialog Q_OBJECT public: - explicit EditInstructionDialog(QWidget *parent = 0); + explicit EditInstructionDialog(QWidget *parent = nullptr); ~EditInstructionDialog(); QString getInstruction(); diff --git a/src/dialogs/FlagDialog.h b/src/dialogs/FlagDialog.h index a5399de5..86c7e812 100644 --- a/src/dialogs/FlagDialog.h +++ b/src/dialogs/FlagDialog.h @@ -15,7 +15,7 @@ class FlagDialog : public QDialog Q_OBJECT public: - explicit FlagDialog(RVA offset, QWidget *parent = 0); + explicit FlagDialog(RVA offset, QWidget *parent = nullptr); ~FlagDialog(); private slots: diff --git a/src/dialogs/NewFileDialog.h b/src/dialogs/NewFileDialog.h index 2bcf625c..0f78f07b 100644 --- a/src/dialogs/NewFileDialog.h +++ b/src/dialogs/NewFileDialog.h @@ -14,7 +14,7 @@ class NewFileDialog : public QDialog Q_OBJECT public: - explicit NewFileDialog(QWidget *parent = 0); + explicit NewFileDialog(QWidget *parent = nullptr); ~NewFileDialog(); private slots: diff --git a/src/dialogs/R2PluginsDialog.h b/src/dialogs/R2PluginsDialog.h index a1a38b88..06e58f9b 100644 --- a/src/dialogs/R2PluginsDialog.h +++ b/src/dialogs/R2PluginsDialog.h @@ -15,7 +15,7 @@ class R2PluginsDialog : public QDialog Q_OBJECT public: - explicit R2PluginsDialog(QWidget *parent = 0); + explicit R2PluginsDialog(QWidget *parent = nullptr); ~R2PluginsDialog(); private: diff --git a/src/dialogs/RenameDialog.h b/src/dialogs/RenameDialog.h index 1f3fbd8b..dc787a1c 100644 --- a/src/dialogs/RenameDialog.h +++ b/src/dialogs/RenameDialog.h @@ -13,7 +13,7 @@ class RenameDialog : public QDialog Q_OBJECT public: - explicit RenameDialog(QWidget *parent = 0); + explicit RenameDialog(QWidget *parent = nullptr); ~RenameDialog(); void setName(QString fcnName); diff --git a/src/dialogs/SaveProjectDialog.h b/src/dialogs/SaveProjectDialog.h index f4762be6..52bce7b6 100644 --- a/src/dialogs/SaveProjectDialog.h +++ b/src/dialogs/SaveProjectDialog.h @@ -17,7 +17,7 @@ class SaveProjectDialog : public QDialog public: enum Result { Saved, Rejected, Destructive }; - explicit SaveProjectDialog(bool quit, QWidget *parent = 0); + explicit SaveProjectDialog(bool quit, QWidget *parent = nullptr); ~SaveProjectDialog(); virtual void accept() override; diff --git a/src/dialogs/VersionInfoDialog.cpp b/src/dialogs/VersionInfoDialog.cpp index 5da548a1..0cd0a6db 100644 --- a/src/dialogs/VersionInfoDialog.cpp +++ b/src/dialogs/VersionInfoDialog.cpp @@ -64,7 +64,7 @@ void VersionInfoDialog::fillVersionInfo(){ QTreeWidgetItem *entriesItemL = new QTreeWidgetItem(); entriesItemL->setText(0, "Entries:"); - foreach (QJsonValue val, versym["entries"].toArray()) { + for (QJsonValue val : versym["entries"].toArray()) { QJsonObject obj = val.toObject(); QTreeWidgetItem *tempItem = new QTreeWidgetItem(); tempItem->setText(0, RAddressString(obj["idx"].toDouble())); @@ -104,7 +104,7 @@ void VersionInfoDialog::fillVersionInfo(){ QTreeWidgetItem *entriesItemR = new QTreeWidgetItem(); entriesItemR->setText(0, "Entries:"); - foreach (QJsonValue parentVal, verneed["entries"].toArray()) { + for (QJsonValue parentVal : verneed["entries"].toArray()) { QJsonObject parentObj = parentVal.toObject(); QTreeWidgetItem *parentItem = new QTreeWidgetItem(); QString parentString; @@ -113,7 +113,7 @@ void VersionInfoDialog::fillVersionInfo(){ parentString.append("File: " + parentObj["file_name"].toString()); parentItem->setText(1, parentString); - foreach (QJsonValue childVal, parentObj["vernaux"].toArray()) { + for (QJsonValue childVal : parentObj["vernaux"].toArray()) { QJsonObject childObj = childVal.toObject(); QTreeWidgetItem *childItem = new QTreeWidgetItem(); QString childString; @@ -143,7 +143,7 @@ void VersionInfoDialog::fillVersionInfo(){ ui->rightLabel->setText("String table"); // Left tree - foreach (QString key, vs.keys()){ + for (QString key : vs.keys()){ QTreeWidgetItem *tempItem = new QTreeWidgetItem(); tempItem->setText(0, key); if (vs[key].isDouble()) @@ -157,7 +157,7 @@ void VersionInfoDialog::fillVersionInfo(){ } // Right tree - foreach (QString key, strings.keys()){ + for (QString key : strings.keys()){ QTreeWidgetItem *tempItem = new QTreeWidgetItem(); tempItem->setText(0, key); tempItem->setText(1, strings[key].toString()); diff --git a/src/dialogs/VersionInfoDialog.h b/src/dialogs/VersionInfoDialog.h index b6f1aa95..3c410204 100644 --- a/src/dialogs/VersionInfoDialog.h +++ b/src/dialogs/VersionInfoDialog.h @@ -15,7 +15,7 @@ class VersionInfoDialog : public QDialog Q_OBJECT public: - explicit VersionInfoDialog(QWidget *parent = 0); + explicit VersionInfoDialog(QWidget *parent = nullptr); ~VersionInfoDialog(); private: diff --git a/src/dialogs/XrefsDialog.h b/src/dialogs/XrefsDialog.h index 7201d44c..080e420f 100644 --- a/src/dialogs/XrefsDialog.h +++ b/src/dialogs/XrefsDialog.h @@ -18,7 +18,7 @@ class XrefsDialog : public QDialog Q_OBJECT public: - explicit XrefsDialog(QWidget *parent = 0); + explicit XrefsDialog(QWidget *parent = nullptr); ~XrefsDialog(); void fillRefsForAddress(RVA addr, QString name, bool whole_function); diff --git a/src/utils/HexAsciiHighlighter.cpp b/src/utils/HexAsciiHighlighter.cpp index 11266862..4b552b08 100644 --- a/src/utils/HexAsciiHighlighter.cpp +++ b/src/utils/HexAsciiHighlighter.cpp @@ -18,7 +18,7 @@ AsciiHighlighter::AsciiHighlighter(QTextDocument *parent) void AsciiHighlighter::highlightBlock(const QString &text) { - foreach (const HighlightingRule &rule, highlightingRules) { + for (const HighlightingRule &rule : highlightingRules) { QRegExp expression(rule.pattern); int index = expression.indexIn(text); while (index >= 0) { diff --git a/src/utils/HexAsciiHighlighter.h b/src/utils/HexAsciiHighlighter.h index 64a526e9..407980ca 100644 --- a/src/utils/HexAsciiHighlighter.h +++ b/src/utils/HexAsciiHighlighter.h @@ -13,7 +13,7 @@ class AsciiHighlighter : public QSyntaxHighlighter Q_OBJECT public: - explicit AsciiHighlighter(QTextDocument *parent = 0); + explicit AsciiHighlighter(QTextDocument *parent = nullptr); protected: void highlightBlock(const QString &text); diff --git a/src/utils/HexHighlighter.cpp b/src/utils/HexHighlighter.cpp index d90e77bf..667b0c92 100644 --- a/src/utils/HexHighlighter.cpp +++ b/src/utils/HexHighlighter.cpp @@ -26,7 +26,7 @@ HexHighlighter::HexHighlighter(QTextDocument *parent) << "\\b6e\\b" << "\\b6f\\b" << "\\b70\\b" << "\\b71\\b" << "\\b72\\b" << "\\b73\\b" << "\\b74\\b" << "\\b75\\b" << "\\b76\\b" << "\\b77\\b" << "\\b78\\b" << "\\b79\\b" << "\\b7a\\b" << "\\b7b\\b" << "\\b7c\\b" << "\\b7d\\b" << "\\b7e\\b" << "\\b7f\\b"; - foreach (const QString &pattern, keywordPatterns) { + for (const QString &pattern : keywordPatterns) { rule.pattern = QRegExp(pattern); rule.pattern.setCaseSensitivity(Qt::CaseInsensitive); rule.format = keywordFormat; @@ -45,7 +45,7 @@ HexHighlighter::HexHighlighter(QTextDocument *parent) void HexHighlighter::highlightBlock(const QString &text) { - foreach (const HighlightingRule &rule, highlightingRules) { + for (const HighlightingRule &rule : highlightingRules) { QRegExp expression(rule.pattern); int index = expression.indexIn(text); while (index >= 0) { diff --git a/src/utils/HexHighlighter.h b/src/utils/HexHighlighter.h index 9915d634..1de74666 100644 --- a/src/utils/HexHighlighter.h +++ b/src/utils/HexHighlighter.h @@ -13,7 +13,7 @@ class HexHighlighter : public QSyntaxHighlighter Q_OBJECT public: - explicit HexHighlighter(QTextDocument *parent = 0); + explicit HexHighlighter(QTextDocument *parent = nullptr); protected: void highlightBlock(const QString &text); diff --git a/src/utils/Highlighter.cpp b/src/utils/Highlighter.cpp index 981ea612..691999c5 100644 --- a/src/utils/Highlighter.cpp +++ b/src/utils/Highlighter.cpp @@ -13,7 +13,7 @@ Highlighter::Highlighter(QTextDocument *parent) : keywordFormat.setForeground(QColor(65, 131, 215)); keywordFormat.setFontWeight(QFont::Bold); - foreach (const QString &pattern, this->core->opcodes) { + for (const QString &pattern : this->core->opcodes) { rule.pattern = QRegExp("\\b" + pattern + "\\b"); rule.pattern.setCaseSensitivity(Qt::CaseInsensitive); rule.format = keywordFormat; @@ -23,7 +23,7 @@ Highlighter::Highlighter(QTextDocument *parent) : regFormat.setForeground(QColor(236, 100, 75)); regFormat.setFontWeight(QFont::Bold); - foreach (const QString &pattern, this->core->regs) { + for (const QString &pattern : this->core->regs) { rule.pattern = QRegExp("\\b" + pattern + "\\b"); rule.pattern.setCaseSensitivity(Qt::CaseInsensitive); rule.format = regFormat; @@ -43,7 +43,7 @@ Highlighter::Highlighter(QTextDocument *parent) : void Highlighter::highlightBlock(const QString &text) { - foreach (const HighlightingRule &rule, highlightingRules) { + for (const HighlightingRule &rule : highlightingRules) { QRegExp expression(rule.pattern); int index = expression.indexIn(text); while (index >= 0) { diff --git a/src/utils/Highlighter.h b/src/utils/Highlighter.h index e4a44e31..79d360e3 100644 --- a/src/utils/Highlighter.h +++ b/src/utils/Highlighter.h @@ -15,7 +15,7 @@ class Highlighter : public QSyntaxHighlighter Q_OBJECT public: - Highlighter(QTextDocument *parent = 0); + Highlighter(QTextDocument *parent = nullptr); protected: void highlightBlock(const QString &text); diff --git a/src/utils/JsonModel.h b/src/utils/JsonModel.h index 93d3c12c..4c950a40 100644 --- a/src/utils/JsonModel.h +++ b/src/utils/JsonModel.h @@ -17,7 +17,7 @@ class JsonModel : public QAbstractItemModel { public: - explicit JsonModel(QObject *parent = 0); + explicit JsonModel(QObject *parent = nullptr); bool load(QIODevice *device); bool loadJson(const QByteArray &json); QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE; diff --git a/src/utils/JsonTreeItem.h b/src/utils/JsonTreeItem.h index bd51a9b0..780a3799 100644 --- a/src/utils/JsonTreeItem.h +++ b/src/utils/JsonTreeItem.h @@ -13,7 +13,7 @@ class JsonTreeItem { public: - JsonTreeItem(JsonTreeItem *parent = 0); + JsonTreeItem(JsonTreeItem *parent = nullptr); ~JsonTreeItem(); void appendChild(JsonTreeItem *item); JsonTreeItem *child(int row); @@ -26,7 +26,7 @@ public: QString key() const; QString value() const; QJsonValue::Type type() const; - static JsonTreeItem *load(const QJsonValue &value, JsonTreeItem *parent = 0); + static JsonTreeItem *load(const QJsonValue &value, JsonTreeItem *parent = nullptr); private: QString mKey; diff --git a/src/utils/MdHighlighter.cpp b/src/utils/MdHighlighter.cpp index 79cf7369..940c8ac1 100644 --- a/src/utils/MdHighlighter.cpp +++ b/src/utils/MdHighlighter.cpp @@ -15,7 +15,7 @@ MdHighlighter::MdHighlighter(QTextDocument *parent) << "\\*([^\\\\]+)\\*" << "\\_([^\\\\]+)\\_" << "\\_\\_([^\\\\]+)\\_\\_"; - foreach (const QString &pattern, keywordPatterns) { + for (const QString &pattern : keywordPatterns) { rule.pattern = QRegExp(pattern); rule.format = keywordFormat; highlightingRules.append(rule); @@ -30,7 +30,7 @@ MdHighlighter::MdHighlighter(QTextDocument *parent) void MdHighlighter::highlightBlock(const QString &text) { - foreach (const HighlightingRule &rule, highlightingRules) { + for (const HighlightingRule &rule : highlightingRules) { QRegExp expression(rule.pattern); int index = expression.indexIn(text); while (index >= 0) { diff --git a/src/utils/MdHighlighter.h b/src/utils/MdHighlighter.h index e542a389..57817191 100644 --- a/src/utils/MdHighlighter.h +++ b/src/utils/MdHighlighter.h @@ -13,7 +13,7 @@ class MdHighlighter : public QSyntaxHighlighter Q_OBJECT public: - explicit MdHighlighter(QTextDocument *parent = 0); + explicit MdHighlighter(QTextDocument *parent = nullptr); protected: void highlightBlock(const QString &text); diff --git a/src/widgets/ClassesWidget.h b/src/widgets/ClassesWidget.h index de44de08..7a3fe774 100644 --- a/src/widgets/ClassesWidget.h +++ b/src/widgets/ClassesWidget.h @@ -33,7 +33,7 @@ public: static const int NameRole = Qt::UserRole + 1; static const int TypeRole = Qt::UserRole + 2; - explicit ClassesModel(QList *classes, QObject *parent = 0); + explicit ClassesModel(QList *classes, QObject *parent = nullptr); QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; QModelIndex parent(const QModelIndex &index) const override; @@ -57,7 +57,7 @@ class ClassesSortFilterProxyModel : public QSortFilterProxyModel Q_OBJECT public: - explicit ClassesSortFilterProxyModel(ClassesModel *source_model, QObject *parent = 0); + explicit ClassesSortFilterProxyModel(ClassesModel *source_model, QObject *parent = nullptr); protected: bool filterAcceptsRow(int row, const QModelIndex &parent) const override; diff --git a/src/widgets/CommentsWidget.h b/src/widgets/CommentsWidget.h index a83a69f2..ac30fe75 100644 --- a/src/widgets/CommentsWidget.h +++ b/src/widgets/CommentsWidget.h @@ -30,7 +30,7 @@ public: enum Role { CommentDescriptionRole = Qt::UserRole, FunctionRole }; CommentsModel(QList *comments, QMap> *nestedComments, - QObject *parent = Q_NULLPTR); + QObject *parent = nullptr); QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const; QModelIndex parent(const QModelIndex &index) const; @@ -53,7 +53,7 @@ class CommentsProxyModel : public QSortFilterProxyModel Q_OBJECT public: - CommentsProxyModel(CommentsModel *sourceModel, QObject *parent = Q_NULLPTR); + CommentsProxyModel(CommentsModel *sourceModel, QObject *parent = nullptr); protected: bool filterAcceptsRow(int row, const QModelIndex &parent) const override; diff --git a/src/widgets/ExportsWidget.h b/src/widgets/ExportsWidget.h index a317d5eb..603d0466 100644 --- a/src/widgets/ExportsWidget.h +++ b/src/widgets/ExportsWidget.h @@ -27,7 +27,7 @@ public: enum Column { OffsetColumn = 0, SizeColumn, TypeColumn, NameColumn, ColumnCount }; enum Role { ExportDescriptionRole = Qt::UserRole }; - ExportsModel(QList *exports, QObject *parent = Q_NULLPTR); + ExportsModel(QList *exports, QObject *parent = nullptr); int rowCount(const QModelIndex &parent = QModelIndex()) const; int columnCount(const QModelIndex &parent = QModelIndex()) const; @@ -44,7 +44,7 @@ class ExportsProxyModel : public QSortFilterProxyModel Q_OBJECT public: - ExportsProxyModel(ExportsModel *source_model, QObject *parent = Q_NULLPTR); + ExportsProxyModel(ExportsModel *source_model, QObject *parent = nullptr); protected: bool filterAcceptsRow(int row, const QModelIndex &parent) const override; diff --git a/src/widgets/FlagsWidget.h b/src/widgets/FlagsWidget.h index 2e2780cc..25d24096 100644 --- a/src/widgets/FlagsWidget.h +++ b/src/widgets/FlagsWidget.h @@ -24,7 +24,7 @@ public: enum Columns { OFFSET = 0, SIZE, NAME, COUNT }; static const int FlagDescriptionRole = Qt::UserRole; - FlagsModel(QList *flags, QObject *parent = 0); + FlagsModel(QList *flags, QObject *parent = nullptr); int rowCount(const QModelIndex &parent = QModelIndex()) const; int columnCount(const QModelIndex &parent = QModelIndex()) const; @@ -43,7 +43,7 @@ class FlagsSortFilterProxyModel : public QSortFilterProxyModel Q_OBJECT public: - FlagsSortFilterProxyModel(FlagsModel *source_model, QObject *parent = 0); + FlagsSortFilterProxyModel(FlagsModel *source_model, QObject *parent = nullptr); protected: bool filterAcceptsRow(int row, const QModelIndex &parent) const override; diff --git a/src/widgets/FunctionsWidget.cpp b/src/widgets/FunctionsWidget.cpp index d329351b..fcb01817 100644 --- a/src/widgets/FunctionsWidget.cpp +++ b/src/widgets/FunctionsWidget.cpp @@ -438,7 +438,7 @@ void FunctionsWidget::refreshTree() functions = Core()->getAllFunctions(); importAddresses.clear(); - foreach (ImportDescription import, Core()->getAllImports()) + for (ImportDescription import : Core()->getAllImports()) importAddresses.insert(import.plt); mainAdress = (ut64)Core()->cmdj("iMj").object()["vaddr"].toInt(); diff --git a/src/widgets/FunctionsWidget.h b/src/widgets/FunctionsWidget.h index 91e0f91d..8c10b81c 100644 --- a/src/widgets/FunctionsWidget.h +++ b/src/widgets/FunctionsWidget.h @@ -45,7 +45,7 @@ public: NlocalsColumn, CcColumn, CalltypeColumn, ColumnCount }; FunctionModel(QList *functions, QSet *importAddresses, ut64 *mainAdress, - bool nested, QFont defaultFont, QFont highlightFont, QObject *parent = 0); + bool nested, QFont defaultFont, QFont highlightFont, QObject *parent = nullptr); QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const; QModelIndex parent(const QModelIndex &index) const; @@ -81,7 +81,7 @@ class FunctionSortFilterProxyModel : public QSortFilterProxyModel Q_OBJECT public: - FunctionSortFilterProxyModel(FunctionModel *source_model, QObject *parent = 0); + FunctionSortFilterProxyModel(FunctionModel *source_model, QObject *parent = nullptr); protected: bool filterAcceptsRow(int row, const QModelIndex &parent) const override; diff --git a/src/widgets/ImportsWidget.h b/src/widgets/ImportsWidget.h index 1270a354..8bdb5ba8 100644 --- a/src/widgets/ImportsWidget.h +++ b/src/widgets/ImportsWidget.h @@ -62,7 +62,7 @@ class ImportsProxyModel : public QSortFilterProxyModel Q_OBJECT public: - ImportsProxyModel(ImportsModel *sourceModel, QObject *parent = Q_NULLPTR); + ImportsProxyModel(ImportsModel *sourceModel, QObject *parent = nullptr); protected: bool filterAcceptsRow(int row, const QModelIndex &parent) const override; diff --git a/src/widgets/Omnibar.h b/src/widgets/Omnibar.h index 34aff83c..0cc51be0 100644 --- a/src/widgets/Omnibar.h +++ b/src/widgets/Omnibar.h @@ -9,7 +9,7 @@ class Omnibar : public QLineEdit { Q_OBJECT public: - explicit Omnibar(MainWindow *main, QWidget *parent = 0); + explicit Omnibar(MainWindow *main, QWidget *parent = nullptr); void refresh(const QStringList &flagList); diff --git a/src/widgets/PieView.h b/src/widgets/PieView.h index d8991aca..b0563726 100644 --- a/src/widgets/PieView.h +++ b/src/widgets/PieView.h @@ -49,7 +49,7 @@ class PieView : public QAbstractItemView Q_OBJECT public: - explicit PieView(QWidget *parent = 0); + explicit PieView(QWidget *parent = nullptr); QRect visualRect(const QModelIndex &index) const override; void scrollTo(const QModelIndex &index, ScrollHint hint = EnsureVisible) override; diff --git a/src/widgets/RelocsWidget.h b/src/widgets/RelocsWidget.h index f9531a33..7dfc5c49 100644 --- a/src/widgets/RelocsWidget.h +++ b/src/widgets/RelocsWidget.h @@ -25,7 +25,7 @@ public: enum Column { VAddrColumn = 0, TypeColumn, NameColumn, ColumnCount }; enum Role { RelocDescriptionRole = Qt::UserRole, AddressRole }; - RelocsModel(QList *relocs, QObject* parent = Q_NULLPTR); + RelocsModel(QList *relocs, QObject* parent = nullptr); int rowCount(const QModelIndex &parent) const; int columnCount(const QModelIndex &parent) const; @@ -42,7 +42,7 @@ class RelocsProxyModel : public QSortFilterProxyModel Q_OBJECT public: - RelocsProxyModel(RelocsModel *sourceModel, QObject *parent = Q_NULLPTR); + RelocsProxyModel(RelocsModel *sourceModel, QObject *parent = nullptr); protected: bool filterAcceptsRow(int row, const QModelIndex &parent) const override; diff --git a/src/widgets/SdbDock.cpp b/src/widgets/SdbDock.cpp index e69f0a5f..92d84f64 100644 --- a/src/widgets/SdbDock.cpp +++ b/src/widgets/SdbDock.cpp @@ -33,7 +33,7 @@ void SdbDock::reload(QString _path) QList keys; /* key-values */ keys = Core()->sdbListKeys(path); - foreach (QString key, keys) { + for (QString key : keys) { QTreeWidgetItem *tempItem = new QTreeWidgetItem(); tempItem->setText(0, key); tempItem->setText(1, Core()->sdbGet(path, key)); @@ -45,7 +45,7 @@ void SdbDock::reload(QString _path) /* namespaces */ keys = Core()->sdbList(path); keys.append(".."); - foreach (QString key, keys) { + for (QString key : keys) { QTreeWidgetItem *tempItem = new QTreeWidgetItem(); tempItem->setText(0, key + "/"); tempItem->setText(1, ""); diff --git a/src/widgets/SearchWidget.h b/src/widgets/SearchWidget.h index 0f6b56fc..3ded5edb 100644 --- a/src/widgets/SearchWidget.h +++ b/src/widgets/SearchWidget.h @@ -24,7 +24,7 @@ public: enum Columns { OFFSET = 0, SIZE, CODE, DATA, COUNT }; static const int SearchDescriptionRole = Qt::UserRole; - SearchModel(QList *search, QObject *parent = 0); + SearchModel(QList *search, QObject *parent = nullptr); int rowCount(const QModelIndex &parent = QModelIndex()) const; int columnCount(const QModelIndex &parent = QModelIndex()) const; @@ -43,7 +43,7 @@ class SearchSortFilterProxyModel : public QSortFilterProxyModel Q_OBJECT public: - SearchSortFilterProxyModel(SearchModel *source_model, QObject *parent = 0); + SearchSortFilterProxyModel(SearchModel *source_model, QObject *parent = nullptr); protected: bool filterAcceptsRow(int row, const QModelIndex &parent) const override; diff --git a/src/widgets/SectionsWidget.h b/src/widgets/SectionsWidget.h index 9823a0bd..6c75d671 100644 --- a/src/widgets/SectionsWidget.h +++ b/src/widgets/SectionsWidget.h @@ -30,7 +30,7 @@ public: enum Column { NameColumn = 0, SizeColumn, AddressColumn, EndAddressColumn, ColumnCount }; enum Role { SectionDescriptionRole = Qt::UserRole }; - SectionsModel(QList *sections, QObject *parent = Q_NULLPTR); + SectionsModel(QList *sections, QObject *parent = nullptr); int rowCount(const QModelIndex &parent = QModelIndex()) const; int columnCount(const QModelIndex &parent = QModelIndex()) const; @@ -47,7 +47,7 @@ class SectionsProxyModel : public QSortFilterProxyModel Q_OBJECT public: - SectionsProxyModel(SectionsModel *sourceModel, QObject *parent = Q_NULLPTR); + SectionsProxyModel(SectionsModel *sourceModel, QObject *parent = nullptr); private slots: void onSourceModelDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight, @@ -62,7 +62,7 @@ class SectionsWidget : public CutterDockWidget Q_OBJECT public: - explicit SectionsWidget(MainWindow *main, QAction *action = Q_NULLPTR); + explicit SectionsWidget(MainWindow *main, QAction *action = nullptr); ~SectionsWidget(); protected: diff --git a/src/widgets/SidebarWidget.cpp b/src/widgets/SidebarWidget.cpp index 64df79bb..02476da6 100644 --- a/src/widgets/SidebarWidget.cpp +++ b/src/widgets/SidebarWidget.cpp @@ -190,7 +190,7 @@ void SidebarWidget::fillOffsetInfo(QString off) ui->offsetTreeWidget->clear(); QString raw = Core()->getOffsetInfo(off); QList lines = raw.split("\n", QString::SkipEmptyParts); - foreach (QString line, lines) { + for (QString line : lines) { QList eles = line.split(":", QString::SkipEmptyParts); QTreeWidgetItem *tempItem = new QTreeWidgetItem(); tempItem->setText(0, eles.at(0).toUpper()); @@ -239,11 +239,11 @@ void SidebarWidget::fillRegistersInfo() ui->regInfoTreeWidget->clear(); QJsonObject jsonRoot = Core()->getRegistersInfo().object(); - foreach (QString key, jsonRoot.keys()) { + for (QString key : jsonRoot.keys()) { QTreeWidgetItem *tempItem = new QTreeWidgetItem(); QString tempString; tempItem->setText(0, key.toUpper()); - foreach (QJsonValue value, jsonRoot[key].toArray()) { + for (QJsonValue value : jsonRoot[key].toArray()) { tempString.append(value.toString() + " "); } tempItem->setText(1, tempString); diff --git a/src/widgets/StringsWidget.h b/src/widgets/StringsWidget.h index 79d22b5a..90d1c99a 100644 --- a/src/widgets/StringsWidget.h +++ b/src/widgets/StringsWidget.h @@ -27,7 +27,7 @@ public: enum Columns { OFFSET = 0, STRING, TYPE, LENGTH, SIZE, COUNT }; static const int StringDescriptionRole = Qt::UserRole; - StringsModel(QList *strings, QObject *parent = 0); + StringsModel(QList *strings, QObject *parent = nullptr); int rowCount(const QModelIndex &parent = QModelIndex()) const; int columnCount(const QModelIndex &parent = QModelIndex()) const; @@ -46,7 +46,7 @@ class StringsSortFilterProxyModel : public QSortFilterProxyModel Q_OBJECT public: - StringsSortFilterProxyModel(StringsModel *source_model, QObject *parent = 0); + StringsSortFilterProxyModel(StringsModel *source_model, QObject *parent = nullptr); protected: bool filterAcceptsRow(int row, const QModelIndex &parent) const override; diff --git a/src/widgets/SymbolsWidget.h b/src/widgets/SymbolsWidget.h index 845774a6..cdd8a20a 100644 --- a/src/widgets/SymbolsWidget.h +++ b/src/widgets/SymbolsWidget.h @@ -26,7 +26,7 @@ public: enum Column { AddressColumn = 0, TypeColumn, NameColumn, ColumnCount }; enum Role { SymbolDescriptionRole = Qt::UserRole }; - SymbolsModel(QList *exports, QObject *parent = Q_NULLPTR); + SymbolsModel(QList *exports, QObject *parent = nullptr); int rowCount(const QModelIndex &parent = QModelIndex()) const; int columnCount(const QModelIndex &parent = QModelIndex()) const; @@ -43,7 +43,7 @@ class SymbolsProxyModel : public QSortFilterProxyModel Q_OBJECT public: - SymbolsProxyModel(SymbolsModel *sourceModel, QObject *parent = Q_NULLPTR); + SymbolsProxyModel(SymbolsModel *sourceModel, QObject *parent = nullptr); protected: bool filterAcceptsRow(int row, const QModelIndex &parent) const override; diff --git a/src/widgets/TypesWidget.h b/src/widgets/TypesWidget.h index f6f47e09..2ddce1e6 100644 --- a/src/widgets/TypesWidget.h +++ b/src/widgets/TypesWidget.h @@ -32,7 +32,7 @@ public: enum Columns { TYPE = 0, SIZE, FORMAT, COUNT }; static const int TypeDescriptionRole = Qt::UserRole; - TypesModel(QList *types, QObject *parent = 0); + TypesModel(QList *types, QObject *parent = nullptr); int rowCount(const QModelIndex &parent = QModelIndex()) const; int columnCount(const QModelIndex &parent = QModelIndex()) const; @@ -51,7 +51,7 @@ class TypesSortFilterProxyModel : public QSortFilterProxyModel Q_OBJECT public: - TypesSortFilterProxyModel(TypesModel *source_model, QObject *parent = 0); + TypesSortFilterProxyModel(TypesModel *source_model, QObject *parent = nullptr); protected: bool filterAcceptsRow(int row, const QModelIndex &parent) const override; diff --git a/src/widgets/VisualNavbar.h b/src/widgets/VisualNavbar.h index 4b68ed08..eb92a20d 100644 --- a/src/widgets/VisualNavbar.h +++ b/src/widgets/VisualNavbar.h @@ -35,7 +35,7 @@ class VisualNavbar : public QToolBar }; public: - explicit VisualNavbar(MainWindow *main, QWidget *parent = 0); + explicit VisualNavbar(MainWindow *main, QWidget *parent = nullptr); public slots: void paintEvent(QPaintEvent *event) override;