diff --git a/src/main.cpp b/src/main.cpp index de2701ce..01924ac6 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -30,8 +30,8 @@ int main(int argc, char *argv[]) cmd_parser.addPositionalArgument("filename", QObject::tr("Filename to open.")); QCommandLineOption anal_option({"A", "anal"}, - QObject::tr("Automatically start analysis. Needs filename to be specified. May be a value between 0 and 4."), - QObject::tr("level")); + QObject::tr("Automatically start analysis. Needs filename to be specified. May be a value between 0 and 4."), + QObject::tr("level")); cmd_parser.addOption(anal_option); cmd_parser.process(a); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 042c9606..f999f682 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -284,7 +284,7 @@ void MainWindow::openFile(const QString &fn, int anal_level) { QString project_name = qhelpers::uniqueProjectName(fn); - if(core->getProjectNames().contains(project_name)) + if (core->getProjectNames().contains(project_name)) openProject(project_name); else openNewFile(fn, anal_level); @@ -298,7 +298,7 @@ void MainWindow::openNewFile(const QString &fn, int anal_level) o->setAttribute(Qt::WA_DeleteOnClose); o->show(); - if(anal_level >= 0) + if (anal_level >= 0) o->setupAndStartAnalysis(anal_level); } @@ -344,7 +344,7 @@ void MainWindow::finalizeOpen() addOutput(" > Adding binary information to notepad"); notepadDock->setText("# Binary information\n\n" + core->cmd("i") + - "\n" + core->cmd("ie") + "\n" + core->cmd("iM") + "\n"); + "\n" + core->cmd("ie") + "\n" + core->cmd("iM") + "\n"); } //Get binary beginning/end addresses @@ -1040,9 +1040,9 @@ void MainWindow::on_actionTabs_on_Top_triggered() void MainWindow::on_actionReset_settings_triggered() { QMessageBox::StandardButton ret = - (QMessageBox::StandardButton)QMessageBox::question(this, "Iaito", - "Do you really want to clear all settings?", - QMessageBox::Ok | QMessageBox::Cancel); + (QMessageBox::StandardButton)QMessageBox::question(this, "Iaito", + "Do you really want to clear all settings?", + QMessageBox::Ok | QMessageBox::Cancel); if (ret == QMessageBox::Ok) { // Save options in settings diff --git a/src/qrcore.cpp b/src/qrcore.cpp index ff927435..4bb0f988 100644 --- a/src/qrcore.cpp +++ b/src/qrcore.cpp @@ -855,7 +855,7 @@ QStringList QRCore::getProjectNames() QStringList ret; QJsonArray jsonArray = cmdj("Plj").array(); - for(QJsonValue value : jsonArray) + for (QJsonValue value : jsonArray) ret.append(value.toString()); return ret; diff --git a/src/widgets/consolewidget.cpp b/src/widgets/consolewidget.cpp index 84bafc08..7a08c3b5 100644 --- a/src/widgets/consolewidget.cpp +++ b/src/widgets/consolewidget.cpp @@ -234,7 +234,7 @@ void ConsoleWidget::historyNext() { if (lastHistoryPosition >= history.size()) { - lastHistoryPosition = history.size() -1 ; + lastHistoryPosition = history.size() - 1 ; } --lastHistoryPosition; @@ -257,7 +257,7 @@ void ConsoleWidget::historyPrev() { if (!history.isEmpty()) { - if (lastHistoryPosition >= history.size() -1) + if (lastHistoryPosition >= history.size() - 1) { lastHistoryPosition = history.size() - 2; } diff --git a/src/widgets/exportswidget.cpp b/src/widgets/exportswidget.cpp index a3d21948..2ae43763 100644 --- a/src/widgets/exportswidget.cpp +++ b/src/widgets/exportswidget.cpp @@ -7,8 +7,8 @@ ExportsModel::ExportsModel(QList *exports, QObject *parent) - : QAbstractListModel(parent), - exports(exports) + : QAbstractListModel(parent), + exports(exports) { } @@ -24,54 +24,54 @@ int ExportsModel::columnCount(const QModelIndex &) const QVariant ExportsModel::data(const QModelIndex &index, int role) const { - if(index.row() >= exports->count()) + if (index.row() >= exports->count()) return QVariant(); const ExportDescription &exp = exports->at(index.row()); - switch(role) + switch (role) { - case Qt::DisplayRole: - switch(index.column()) - { - case OFFSET: - return RAddressString(exp.vaddr); - case SIZE: - return RSizeString(exp.size); - case TYPE: - return exp.type; - case NAME: - return exp.name; - default: - return QVariant(); - } - case ExportDescriptionRole: - return QVariant::fromValue(exp); + case Qt::DisplayRole: + switch (index.column()) + { + case OFFSET: + return RAddressString(exp.vaddr); + case SIZE: + return RSizeString(exp.size); + case TYPE: + return exp.type; + case NAME: + return exp.name; default: return QVariant(); + } + case ExportDescriptionRole: + return QVariant::fromValue(exp); + default: + return QVariant(); } } QVariant ExportsModel::headerData(int section, Qt::Orientation, int role) const { - switch(role) + switch (role) { - case Qt::DisplayRole: - switch(section) - { - case OFFSET: - return tr("Address"); - case SIZE: - return tr("Size"); - case TYPE: - return tr("Type"); - case NAME: - return tr("Name"); - default: - return QVariant(); - } + case Qt::DisplayRole: + switch (section) + { + case OFFSET: + return tr("Address"); + case SIZE: + return tr("Size"); + case TYPE: + return tr("Type"); + case NAME: + return tr("Name"); default: return QVariant(); + } + default: + return QVariant(); } } @@ -90,7 +90,7 @@ void ExportsModel::endReloadExports() ExportsSortFilterProxyModel::ExportsSortFilterProxyModel(ExportsModel *source_model, QObject *parent) - : QSortFilterProxyModel(parent) + : QSortFilterProxyModel(parent) { setSourceModel(source_model); } @@ -107,23 +107,23 @@ bool ExportsSortFilterProxyModel::lessThan(const QModelIndex &left, const QModel ExportDescription left_exp = left.data(ExportsModel::ExportDescriptionRole).value(); ExportDescription right_exp = right.data(ExportsModel::ExportDescriptionRole).value(); - switch(left.column()) + switch (left.column()) { - case ExportsModel::SIZE: - if(left_exp.size != right_exp.size) - return left_exp.size < right_exp.size; - // fallthrough - case ExportsModel::OFFSET: - if(left_exp.vaddr != right_exp.vaddr) - return left_exp.vaddr < right_exp.vaddr; - // fallthrough - case ExportsModel::NAME: - return left_exp.name < right_exp.name; - case ExportsModel::TYPE: - if(left_exp.type != right_exp.type) - return left_exp.type < right_exp.type; - default: - break; + case ExportsModel::SIZE: + if (left_exp.size != right_exp.size) + return left_exp.size < right_exp.size; + // fallthrough + case ExportsModel::OFFSET: + if (left_exp.vaddr != right_exp.vaddr) + return left_exp.vaddr < right_exp.vaddr; + // fallthrough + case ExportsModel::NAME: + return left_exp.name < right_exp.name; + case ExportsModel::TYPE: + if (left_exp.type != right_exp.type) + return left_exp.type < right_exp.type; + default: + break; } // fallback diff --git a/src/widgets/flagswidget.cpp b/src/widgets/flagswidget.cpp index 9409ae32..3e294b60 100644 --- a/src/widgets/flagswidget.cpp +++ b/src/widgets/flagswidget.cpp @@ -28,50 +28,50 @@ int FlagsModel::columnCount(const QModelIndex &) const QVariant FlagsModel::data(const QModelIndex &index, int role) const { - if(index.row() >= flags->count()) + if (index.row() >= flags->count()) return QVariant(); const FlagDescription &flag = flags->at(index.row()); - switch(role) + switch (role) { - case Qt::DisplayRole: - switch(index.column()) - { - case SIZE: - return RSizeString(flag.size); - case OFFSET: - return RAddressString(flag.offset); - case NAME: - return flag.name; - default: - return QVariant(); - } - case FlagDescriptionRole: - return QVariant::fromValue(flag); + case Qt::DisplayRole: + switch (index.column()) + { + case SIZE: + return RSizeString(flag.size); + case OFFSET: + return RAddressString(flag.offset); + case NAME: + return flag.name; default: return QVariant(); + } + case FlagDescriptionRole: + return QVariant::fromValue(flag); + default: + return QVariant(); } } QVariant FlagsModel::headerData(int section, Qt::Orientation, int role) const { - switch(role) + switch (role) { - case Qt::DisplayRole: - switch(section) - { - case SIZE: - return tr("Size"); - case OFFSET: - return tr("Offset"); - case NAME: - return tr("Name"); - default: - return QVariant(); - } + case Qt::DisplayRole: + switch (section) + { + case SIZE: + return tr("Size"); + case OFFSET: + return tr("Offset"); + case NAME: + return tr("Name"); default: return QVariant(); + } + default: + return QVariant(); } } @@ -107,20 +107,20 @@ bool FlagsSortFilterProxyModel::lessThan(const QModelIndex &left, const QModelIn FlagDescription left_flag = left.data(FlagsModel::FlagDescriptionRole).value(); FlagDescription right_flag = right.data(FlagsModel::FlagDescriptionRole).value(); - switch(left.column()) + switch (left.column()) { - case FlagsModel::SIZE: - if(left_flag.size != right_flag.size) - return left_flag.size < right_flag.size; - // fallthrough - case FlagsModel::OFFSET: - if(left_flag.offset != right_flag.offset) - return left_flag.offset < right_flag.offset; - // fallthrough - case FlagsModel::NAME: - return left_flag.name < right_flag.name; - default: - break; + case FlagsModel::SIZE: + if (left_flag.size != right_flag.size) + return left_flag.size < right_flag.size; + // fallthrough + case FlagsModel::OFFSET: + if (left_flag.offset != right_flag.offset) + return left_flag.offset < right_flag.offset; + // fallthrough + case FlagsModel::NAME: + return left_flag.name < right_flag.name; + default: + break; } // fallback @@ -197,7 +197,7 @@ void FlagsWidget::refreshFlags() QString flagspace; QVariant flagspace_data = ui->flagspaceCombo->currentData(); - if(flagspace_data.isValid()) + if (flagspace_data.isValid()) flagspace = flagspace_data.value().name; diff --git a/src/widgets/functionswidget.cpp b/src/widgets/functionswidget.cpp index 2d718e6d..6f16cf4a 100644 --- a/src/widgets/functionswidget.cpp +++ b/src/widgets/functionswidget.cpp @@ -617,18 +617,23 @@ void FunctionsWidget::setScrollMode() qhelpers::setVerticalScrollMode(ui->functionsTreeView); } -void FunctionsWidget::show_filter() { +void FunctionsWidget::show_filter() +{ ui->filterLineEdit->setVisible(true); ui->closeFilterButton->setVisible(true); ui->filterLineEdit->setFocus(); } -void FunctionsWidget::clear_filter() { - if (ui->filterLineEdit->text() == "") { +void FunctionsWidget::clear_filter() +{ + if (ui->filterLineEdit->text() == "") + { ui->filterLineEdit->setVisible(false); ui->closeFilterButton->setVisible(false); ui->functionsTreeView->setFocus(); - } else { + } + else + { ui->filterLineEdit->setText(""); } } diff --git a/src/widgets/memorywidget.cpp b/src/widgets/memorywidget.cpp index b35b0b53..773f4251 100644 --- a/src/widgets/memorywidget.cpp +++ b/src/widgets/memorywidget.cpp @@ -754,7 +754,7 @@ void MemoryWidget::hexScrolled() // To prevent recursive calls to hexScrolled (this function) blocks the // scroll bar signals - auto appendTextWithoutSignals = [](QTextEdit *edit, const QString &text) + auto appendTextWithoutSignals = [](QTextEdit * edit, const QString & text) { edit->verticalScrollBar()->blockSignals(true); edit->append(text); @@ -1573,7 +1573,9 @@ void MemoryWidget::create_graph(QString off) if (settings.value("dark").toBool()) { ui->graphWebView->page()->runJavaScript(QString("init_panel('dark');")); - } else { + } + else + { ui->graphWebView->page()->runJavaScript(QString("init_panel('light');")); } } @@ -1622,7 +1624,8 @@ void MemoryWidget::on_disasTextEdit_2_cursorPositionChanged() tc.select(QTextCursor::LineUnderCursor); QString lastline = tc.selectedText().trimmed(); QList words = lastline.split(" ", QString::SkipEmptyParts); - if (words.length() == 0) { + if (words.length() == 0) + { return; } QString ele = words[0]; diff --git a/src/widgets/omnibar.cpp b/src/widgets/omnibar.cpp index ad5e188a..521bbdc8 100644 --- a/src/widgets/omnibar.cpp +++ b/src/widgets/omnibar.cpp @@ -10,23 +10,26 @@ Omnibar::Omnibar(MainWindow *main, QWidget *parent) : QLineEdit(parent), main(main), - commands({": Comments toggle", - ": Dashboard toggle", - ": Exports toggle", - ": Flags toggle", - ": Functions toggle", - ": Imports toggle", - ": Lock/Unlock interface", - ": Notepad toggle", - ": Refresh contents", - ": Relocs toggle", - ": Run Script", - ": Sections toggle", - ": Strings toggle", - ": Symbols toggle", - ": Tabs up/down", - ": Theme switch", - ": Web server start/stop"}) + commands( +{ + ": Comments toggle", + ": Dashboard toggle", + ": Exports toggle", + ": Flags toggle", + ": Functions toggle", + ": Imports toggle", + ": Lock/Unlock interface", + ": Notepad toggle", + ": Refresh contents", + ": Relocs toggle", + ": Run Script", + ": Sections toggle", + ": Strings toggle", + ": Symbols toggle", + ": Tabs up/down", + ": Theme switch", + ": Web server start/stop" +}) { // QLineEdit basic features this->setMinimumHeight(16); diff --git a/src/widgets/sectionswidget.cpp b/src/widgets/sectionswidget.cpp index 35c45367..b7472f2d 100644 --- a/src/widgets/sectionswidget.cpp +++ b/src/widgets/sectionswidget.cpp @@ -26,7 +26,7 @@ void SectionsWidget::setup() int row = 0; for (auto section : main->core->getAllSections()) { - if(!section.name.contains(".")) + if (!section.name.contains(".")) continue; fillSections(row++, section); diff --git a/src/widgets/symbolswidget.cpp b/src/widgets/symbolswidget.cpp index 4ce919b6..accf2b6d 100644 --- a/src/widgets/symbolswidget.cpp +++ b/src/widgets/symbolswidget.cpp @@ -49,9 +49,9 @@ void SymbolsWidget::fillSymbols() for (auto symbol : this->main->core->getAllSymbols()) { QTreeWidgetItem *item = qhelpers::appendRow(ui->symbolsTreeWidget, - RAddressString(symbol.vaddr), - QString("%1 %2").arg(symbol.bind, symbol.type).trimmed(), - symbol.name); + RAddressString(symbol.vaddr), + QString("%1 %2").arg(symbol.bind, symbol.type).trimmed(), + symbol.name); item->setData(0, Qt::UserRole, QVariant::fromValue(symbol)); }