ch0ic3/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter.git synced 2025-02-21 22:23:46 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Astyle pass (cleaning) (#739)

Browse Source
This commit is contained in:
xarkes 2018-09-30 22:00:53 +02:00 committed by GitHub
parent 0aace76065
commit ec815195cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
38 changed files with 208 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Cutter.cpp
View File

@ -1121,8 +1121,7 @@ QList<RVA> CutterCore::getBreakpointsAddresses()
QList<BreakpointDescription> bps = getBreakpoints();
BreakpointDescription bp;
QList<RVA> bpAddresses;
foreach (bp, bps)
{
foreach (bp, bps) {
bpAddresses << bp.addr;
}

6
src/dialogs/AttachProcDialog.cpp
View File

@ -95,8 +95,10 @@ bool ProcessProxyModel::filterAcceptsRow(int row, const QModelIndex &parent) con
bool ProcessProxyModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
{
ProcessDescription leftProc = left.data(ProcessModel::ProcDescriptionRole).value<ProcessDescription>();
ProcessDescription rightProc = right.data(ProcessModel::ProcDescriptionRole).value<ProcessDescription>();
ProcessDescription leftProc = left.data(
ProcessModel::ProcDescriptionRole).value<ProcessDescription>();
ProcessDescription rightProc = right.data(
ProcessModel::ProcDescriptionRole).value<ProcessDescription>();
switch (left.column()) {
case ProcessModel::PidColumn:

3
src/dialogs/EditInstructionDialog.cpp
View File

@ -10,7 +10,8 @@ EditInstructionDialog::EditInstructionDialog(QWidget *parent, bool isEditingByte
ui->setupUi(this);
setWindowFlags(windowFlags() & (~Qt::WindowContextHelpButtonHint));
connect(ui->lineEdit, SIGNAL(textEdited(const QString &)), this, SLOT(updatePreview(const QString &)));
connect(ui->lineEdit, SIGNAL(textEdited(const QString &)), this,
SLOT(updatePreview(const QString &)));
}
EditInstructionDialog::~EditInstructionDialog() {}

3
src/dialogs/InitialOptionsDialog.cpp
View File

@ -238,7 +238,8 @@ void InitialOptionsDialog::setupAndStartAnalysis(/*int level, QList<QString> adv
options.binLoadAddr = Core()->math(ui->entry_loadOffset->text());
}
options.mapAddr = Core()->math(ui->entry_mapOffset->text()); // Where to map the file once loaded (-m)
options.mapAddr = Core()->math(
ui->entry_mapOffset->text()); // Where to map the file once loaded (-m)
options.arch = getSelectedArch();
options.cpu = getSelectedCPU();
options.bits = getSelectedBits();

3
src/dialogs/InitialOptionsDialog.h
View File

@ -10,8 +10,7 @@
#include "AnalTask.h"
#include "utils/InitialOptions.h"
namespace Ui
{
namespace Ui {
class InitialOptionsDialog;
}

3
src/dialogs/NewFileDialog.cpp
View File

@ -337,7 +337,8 @@ void NewFileDialog::fillIOPluginsList()
void NewFileDialog::loadFile(const QString &filename)
{
if (ui->ioPlugin->currentIndex() == 0 && !Core()->tryFile(filename, false) && !ui->checkBox_FilelessOpen->isChecked()) {
if (ui->ioPlugin->currentIndex() == 0 && !Core()->tryFile(filename, false)
&& !ui->checkBox_FilelessOpen->isChecked()) {
QMessageBox msgBox(this);
msgBox.setText(tr("Select a new program or a previous one before continuing."));
msgBox.exec();

3
src/dialogs/VersionInfoDialog.cpp
View File

@ -23,7 +23,8 @@ VersionInfoDialog::VersionInfoDialog(QWidget *parent) :
VersionInfoDialog::~VersionInfoDialog() {}
void VersionInfoDialog::fillVersionInfo(){
void VersionInfoDialog::fillVersionInfo()
{
QJsonDocument doc = Core()->getFileVersionInfo();

12
src/widgets/BreakpointWidget.cpp
View File

@ -93,14 +93,17 @@ BreakpointProxyModel::BreakpointProxyModel(BreakpointModel *sourceModel, QObject
bool BreakpointProxyModel::filterAcceptsRow(int row, const QModelIndex &parent) const
{
QModelIndex index = sourceModel()->index(row, 0, parent);
BreakpointDescription item = index.data(BreakpointModel::BreakpointDescriptionRole).value<BreakpointDescription>();
BreakpointDescription item = index.data(
BreakpointModel::BreakpointDescriptionRole).value<BreakpointDescription>();
return item.permission.contains(filterRegExp());
}
bool BreakpointProxyModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
{
BreakpointDescription leftBreakpt = left.data(BreakpointModel::BreakpointDescriptionRole).value<BreakpointDescription>();
BreakpointDescription rightBreakpt = right.data(BreakpointModel::BreakpointDescriptionRole).value<BreakpointDescription>();
BreakpointDescription leftBreakpt = left.data(
BreakpointModel::BreakpointDescriptionRole).value<BreakpointDescription>();
BreakpointDescription rightBreakpt = right.data(
BreakpointModel::BreakpointDescriptionRole).value<BreakpointDescription>();
switch (left.column()) {
case BreakpointModel::AddrColumn:
@ -165,7 +168,8 @@ void BreakpointWidget::setScrollMode()
void BreakpointWidget::on_breakpointTreeView_doubleClicked(const QModelIndex &index)
{
BreakpointDescription item = index.data(BreakpointModel::BreakpointDescriptionRole).value<BreakpointDescription>();
BreakpointDescription item = index.data(
BreakpointModel::BreakpointDescriptionRole).value<BreakpointDescription>();
Core()->seek(item.addr);
}

3
src/widgets/BreakpointWidget.h
View File

@ -11,8 +11,7 @@
class MainWindow;
class QTreeWidget;
namespace Ui
{
namespace Ui {
class BreakpointWidget;
}

3
src/widgets/CommentsWidget.cpp
View File

@ -92,8 +92,7 @@ QVariant CommentsModel::data(const QModelIndex &index, int role) const
comment = comments->at(commentIndex);
}
switch (role)
{
switch (role) {
case Qt::DisplayRole:
if (isNested()) {
if (isSubnode) {

3
src/widgets/CommentsWidget.h
View File

@ -29,7 +29,8 @@ public:
enum NestedColumn { OffsetNestedColumn = 0, CommentNestedColumn, NestedColumnCount };
enum Role { CommentDescriptionRole = Qt::UserRole, FunctionRole };
CommentsModel(QList<CommentDescription> *comments, QMap<QString, QList<CommentDescription>> *nestedComments,
CommentsModel(QList<CommentDescription> *comments,
QMap<QString, QList<CommentDescription>> *nestedComments,
QObject *parent = nullptr);
QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const;

3
src/widgets/ConsoleWidget.cpp
View File

@ -179,7 +179,8 @@ void ConsoleWidget::executeCommand(const QString &command)
QString cmd_line = "[" + RAddressString(Core()->getOffset()) + "]> " + command + "\n";
commandTask = QSharedPointer<CommandTask>(new CommandTask(command));
connect(commandTask.data(), &CommandTask::finished, this, [this, cmd_line, command] (const QString &result) {
connect(commandTask.data(), &CommandTask::finished, this, [this, cmd_line,
command] (const QString & result) {
ui->outputTextEdit->appendPlainText(cmd_line + result);
scrollOutputToEnd();
historyAdd(command);

6
src/widgets/DebugToolbar.cpp
View File

@ -33,7 +33,8 @@ DebugToolbar::DebugToolbar(MainWindow *main, QWidget *parent) :
actionContinue->setShortcut(QKeySequence(Qt::Key_F5));
actionContinueUntilMain = new QAction(continueUntilMainIcon, tr("Continue until main"), parent);
actionContinueUntilCall = new QAction(continueUntilCallIcon, tr("Continue until call"), parent);
actionContinueUntilSyscall = new QAction(continueUntilSyscallIcon, tr("Continue until syscall"), parent);
actionContinueUntilSyscall = new QAction(continueUntilSyscallIcon, tr("Continue until syscall"),
parent);
actionStep = new QAction(stepIcon, tr("Step"), parent);
actionStep->setShortcut(QKeySequence(Qt::Key_F7));
actionStepOver = new QAction(stepOverIcon, tr("Step over"), parent);
@ -52,7 +53,8 @@ DebugToolbar::DebugToolbar(MainWindow *main, QWidget *parent) :
QToolButton *continueUntilButton = new QToolButton;
continueUntilButton->setPopupMode(QToolButton::MenuButtonPopup);
connect(continueUntilButton, &QToolButton::triggered, continueUntilButton, &QToolButton::setDefaultAction);
connect(continueUntilButton, &QToolButton::triggered, continueUntilButton,
&QToolButton::setDefaultAction);
QMenu *continueUntilMenu = new QMenu;
continueUntilMenu->addAction(actionContinueUntilMain);
continueUntilMenu->addAction(actionContinueUntilCall);

3
src/widgets/DisassemblerGraphView.cpp
View File

@ -116,7 +116,8 @@ DisassemblerGraphView::DisassemblerGraphView(QWidget *parent)
void DisassemblerGraphView::connectSeekChanged(bool disconn)
{
if (disconn) {
disconnect(seekable, &CutterSeekableWidget::seekChanged, this, &DisassemblerGraphView::onSeekChanged);
disconnect(seekable, &CutterSeekableWidget::seekChanged, this,
&DisassemblerGraphView::onSeekChanged);
} else {
connect(seekable, &CutterSeekableWidget::seekChanged, this, &DisassemblerGraphView::onSeekChanged);
}

9
src/widgets/DisassemblyWidget.cpp
View File

@ -125,7 +125,8 @@ DisassemblyWidget::DisassemblyWidget(MainWindow *main, QAction *action)
connect(Config(), SIGNAL(colorsUpdated()), this, SLOT(colorsUpdatedSlot()));
connect(this, &QDockWidget::visibilityChanged, this, [](bool visibility) {
bool emptyGraph = (Core()->getMemoryWidgetPriority() == CutterCore::MemoryWidgetType::Graph && Core()->isGraphEmpty());
bool emptyGraph = (Core()->getMemoryWidgetPriority() == CutterCore::MemoryWidgetType::Graph
&& Core()->isGraphEmpty());
if (visibility && !emptyGraph) {
Core()->setMemoryWidgetPriority(CutterCore::MemoryWidgetType::Disassembly);
}
@ -305,12 +306,14 @@ bool DisassemblyWidget::updateMaxLines()
return false;
}
void DisassemblyWidget::zoomIn() {
void DisassemblyWidget::zoomIn()
{
mDisasTextEdit->zoomIn();
updateMaxLines();
}
void DisassemblyWidget::zoomOut() {
void DisassemblyWidget::zoomOut()
{
mDisasTextEdit->zoomOut();
updateMaxLines();
}

3
src/widgets/FunctionsWidget.cpp
View File

@ -445,7 +445,8 @@ void FunctionsWidget::refreshTree()
}
task = QSharedPointer<FunctionsTask>(new FunctionsTask());
connect(task.data(), &FunctionsTask::fetchFinished, this, [this] (const QList<FunctionDescription> &functions) {
connect(task.data(), &FunctionsTask::fetchFinished,
this, [this] (const QList<FunctionDescription> &functions) {
functionModel->beginReloadFunctions();
this->functions = functions;

3
src/widgets/FunctionsWidget.h
View File

@ -43,7 +43,8 @@ public:
static const int IsImportRole = Qt::UserRole + 1;
enum Column { NameColumn = 0, SizeColumn, ImportColumn, OffsetColumn, NargsColumn, NbbsColumn,
NlocalsColumn, CcColumn, CalltypeColumn, ColumnCount };
NlocalsColumn, CcColumn, CalltypeColumn, ColumnCount
};
FunctionModel(QList<FunctionDescription> *functions, QSet<RVA> *importAddresses, ut64 *mainAdress,
bool nested, QFont defaultFont, QFont highlightFont, QObject *parent = nullptr);

6
src/widgets/HeadersWidget.cpp
View File

@ -89,8 +89,10 @@ bool HeadersProxyModel::filterAcceptsRow(int row, const QModelIndex &parent) con
bool HeadersProxyModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
{
HeaderDescription leftHeader = left.data(HeadersModel::HeaderDescriptionRole).value<HeaderDescription>();
HeaderDescription rightHeader = right.data(HeadersModel::HeaderDescriptionRole).value<HeaderDescription>();
HeaderDescription leftHeader = left.data(
HeadersModel::HeaderDescriptionRole).value<HeaderDescription>();
HeaderDescription rightHeader = right.data(
HeadersModel::HeaderDescriptionRole).value<HeaderDescription>();
switch (left.column()) {
case HeadersModel::OffsetColumn:

3
src/widgets/HeadersWidget.h
View File

@ -12,8 +12,7 @@
class MainWindow;
class QTreeWidget;
namespace Ui
{
namespace Ui {
class HeadersWidget;
}

12
src/widgets/ImportsWidget.cpp
View File

@ -26,8 +26,7 @@ int ImportsModel::columnCount(const QModelIndex&) const
QVariant ImportsModel::data(const QModelIndex &index, int role) const
{
const ImportDescription &import = imports->at(index.row());
switch (role)
{
switch (role) {
case Qt::ForegroundRole:
if (index.column() < ImportsModel::ColumnCount) {
if (banned.match(import.name).hasMatch())
@ -35,8 +34,7 @@ QVariant ImportsModel::data(const QModelIndex &index, int role) const
}
break;
case Qt::DisplayRole:
switch(index.column())
{
switch (index.column()) {
case ImportsModel::AddressColumn:
return RAddressString(import.plt);
case ImportsModel::TypeColumn:
@ -61,10 +59,8 @@ QVariant ImportsModel::data(const QModelIndex &index, int role) const
QVariant ImportsModel::headerData(int section, Qt::Orientation, int role) const
{
if(role == Qt::DisplayRole)
{
switch(section)
{
if (role == Qt::DisplayRole) {
switch (section) {
case ImportsModel::AddressColumn:
return tr("Address");
case ImportsModel::TypeColumn:

12
src/widgets/MemoryMapWidget.cpp
View File

@ -87,14 +87,17 @@ MemoryProxyModel::MemoryProxyModel(MemoryMapModel *sourceModel, QObject *parent)
bool MemoryProxyModel::filterAcceptsRow(int row, const QModelIndex &parent) const
{
QModelIndex index = sourceModel()->index(row, 0, parent);
MemoryMapDescription item = index.data(MemoryMapModel::MemoryDescriptionRole).value<MemoryMapDescription>();
MemoryMapDescription item = index.data(
MemoryMapModel::MemoryDescriptionRole).value<MemoryMapDescription>();
return item.name.contains(filterRegExp());
}
bool MemoryProxyModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
{
MemoryMapDescription leftMemMap = left.data(MemoryMapModel::MemoryDescriptionRole).value<MemoryMapDescription>();
MemoryMapDescription rightMemMap = right.data(MemoryMapModel::MemoryDescriptionRole).value<MemoryMapDescription>();
MemoryMapDescription leftMemMap = left.data(
MemoryMapModel::MemoryDescriptionRole).value<MemoryMapDescription>();
MemoryMapDescription rightMemMap = right.data(
MemoryMapModel::MemoryDescriptionRole).value<MemoryMapDescription>();
switch (left.column()) {
case MemoryMapModel::AddrStartColumn:
@ -149,6 +152,7 @@ void MemoryMapWidget::setScrollMode()
void MemoryMapWidget::on_memoryTreeView_doubleClicked(const QModelIndex &index)
{
MemoryMapDescription item = index.data(MemoryMapModel::MemoryDescriptionRole).value<MemoryMapDescription>();
MemoryMapDescription item = index.data(
MemoryMapModel::MemoryDescriptionRole).value<MemoryMapDescription>();
Core()->seek(item.addrStart);
}

3
src/widgets/MemoryMapWidget.h
View File

@ -11,8 +11,7 @@
class MainWindow;
class QTreeWidget;
namespace Ui
{
namespace Ui {
class MemoryMapWidget;
}

3
src/widgets/RegisterRefsWidget.cpp
View File

@ -186,7 +186,8 @@ void RegisterRefsWidget::showRegRefContextMenu(const QPoint &pt)
void RegisterRefsWidget::copyClip(int column)
{
int row = ui->registerRefTreeView->selectionModel()->currentIndex().row();
QString value = ui->registerRefTreeView->selectionModel()->currentIndex().sibling(row, column).data().toString();
QString value = ui->registerRefTreeView->selectionModel()->currentIndex().sibling(row,
column).data().toString();
QClipboard *clipboard = QApplication::clipboard();
clipboard->setText(value);
}

9
src/widgets/RelocsWidget.cpp
View File

@ -22,11 +22,9 @@ int RelocsModel::columnCount(const QModelIndex&) const
QVariant RelocsModel::data(const QModelIndex &index, int role) const
{
const RelocDescription &reloc = relocs->at(index.row());
switch (role)
{
switch (role) {
case Qt::DisplayRole:
switch (index.column())
{
switch (index.column()) {
case RelocsModel::VAddrColumn:
return RAddressString(reloc.vaddr);
case RelocsModel::TypeColumn:
@ -50,8 +48,7 @@ QVariant RelocsModel::data(const QModelIndex &index, int role) const
QVariant RelocsModel::headerData(int section, Qt::Orientation, int role) const
{
if (role == Qt::DisplayRole)
switch (section)
{
switch (section) {
case RelocsModel::VAddrColumn:
return tr("Address");
case RelocsModel::TypeColumn:

12
src/widgets/StackWidget.cpp
View File

@ -69,13 +69,17 @@ void StackWidget::setStackGrid()
QStandardItem *rowRef = new QStandardItem(ref);
modelStack->setItem(i, 2, rowRef);
if (refObject.toString().contains("ascii") && refObject.toString().count("-->") == 1) {
modelStack->setData(modelStack->index(i, 2, QModelIndex()), QVariant(QColor(243, 156, 17)), Qt::ForegroundRole); // orange
modelStack->setData(modelStack->index(i, 2, QModelIndex()), QVariant(QColor(243, 156, 17)),
Qt::ForegroundRole); // orange
} else if (ref.contains("program R X") && ref.count("-->") == 0) {
modelStack->setData(modelStack->index(i, 2, QModelIndex()), QVariant(QColor(Qt::red)), Qt::ForegroundRole);
modelStack->setData(modelStack->index(i, 2, QModelIndex()), QVariant(QColor(Qt::red)),
Qt::ForegroundRole);
} else if (ref.contains("stack") && ref.count("-->") == 0) {
modelStack->setData(modelStack->index(i, 2, QModelIndex()), QVariant(QColor(Qt::cyan)), Qt::ForegroundRole);
modelStack->setData(modelStack->index(i, 2, QModelIndex()), QVariant(QColor(Qt::cyan)),
Qt::ForegroundRole);
} else if (ref.contains("library") && ref.count("-->") == 0) {
modelStack->setData(modelStack->index(i, 2, QModelIndex()), QVariant(QColor(Qt::green)), Qt::ForegroundRole);
modelStack->setData(modelStack->index(i, 2, QModelIndex()), QVariant(QColor(Qt::green)),
Qt::ForegroundRole);
}
}
i++;

3
src/widgets/StringsWidget.cpp
View File

@ -178,7 +178,8 @@ void StringsWidget::refreshStrings()
}
task = QSharedPointer<StringsTask>(new StringsTask());
connect(task.data(), &StringsTask::stringSearchFinished, this, &StringsWidget::stringSearchFinished);
connect(task.data(), &StringsTask::stringSearchFinished, this,
&StringsWidget::stringSearchFinished);
Core()->getAsyncTaskManager()->start(task);
}

12
src/widgets/ZignaturesWidget.cpp
View File

@ -97,14 +97,17 @@ ZignaturesProxyModel::ZignaturesProxyModel(ZignaturesModel *sourceModel, QObject
bool ZignaturesProxyModel::filterAcceptsRow(int row, const QModelIndex &parent) const
{
QModelIndex index = sourceModel()->index(row, 0, parent);
ZignatureDescription item = index.data(ZignaturesModel::ZignatureDescriptionRole).value<ZignatureDescription>();
ZignatureDescription item = index.data(
ZignaturesModel::ZignatureDescriptionRole).value<ZignatureDescription>();
return item.name.contains(filterRegExp());
}
bool ZignaturesProxyModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
{
ZignatureDescription leftZignature = left.data(ZignaturesModel::ZignatureDescriptionRole).value<ZignatureDescription>();
ZignatureDescription rightZignature = right.data(ZignaturesModel::ZignatureDescriptionRole).value<ZignatureDescription>();
ZignatureDescription leftZignature = left.data(
ZignaturesModel::ZignatureDescriptionRole).value<ZignatureDescription>();
ZignatureDescription rightZignature = right.data(
ZignaturesModel::ZignatureDescriptionRole).value<ZignatureDescription>();
switch (left.column()) {
case ZignaturesModel::OffsetColumn:
@ -156,6 +159,7 @@ void ZignaturesWidget::setScrollMode()
void ZignaturesWidget::on_zignaturesTreeView_doubleClicked(const QModelIndex &index)
{
ZignatureDescription item = index.data(ZignaturesModel::ZignatureDescriptionRole).value<ZignatureDescription>();
ZignatureDescription item = index.data(
ZignaturesModel::ZignatureDescriptionRole).value<ZignatureDescription>();
Core()->seek(item.offset);
}

3
src/widgets/ZignaturesWidget.h
View File

@ -13,8 +13,7 @@ class MainWindow;
class QTreeWidget;
class QTreeWidgetItem;
namespace Ui
{
namespace Ui {
class ZignaturesWidget;
}