ch0ic3/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter.git synced 2024-12-18 10:56:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ProcessesWidget: make ColumnIndex a class member

Browse Source 
The same name with a differing definition clashes with ColumnIndex from
ThreadsWidget, which violates C++ ODR (-Werror=odr). This brings
ProcessesWidget in line with other widgets that define the column
index enums within their respective classes.

Signed-off-by: John Helmert III <ajak@gentoo.org>
This commit is contained in:
John Helmert III 2024-03-10 09:47:53 -07:00 committed by karliss
parent bffe193708
commit 1a09a5cbe7
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/widgets/ProcessesWidget.cpp
View File

@ -9,13 +9,6 @@
#define DEBUGGED_PID (-1) #define DEBUGGED_PID (-1)
enum ColumnIndex {
COLUMN_PID = 0,
COLUMN_UID,
COLUMN_STATUS,
COLUMN_PATH,
};
ProcessesWidget::ProcessesWidget(MainWindow *main) ProcessesWidget::ProcessesWidget(MainWindow *main)
: CutterDockWidget(main), ui(new Ui::ProcessesWidget) : CutterDockWidget(main), ui(new Ui::ProcessesWidget)
{ {
@ -23,10 +16,14 @@ ProcessesWidget::ProcessesWidget(MainWindow *main)
// Setup processes model // Setup processes model
modelProcesses = new QStandardItemModel(1, 4, this); modelProcesses = new QStandardItemModel(1, 4, this);
modelProcesses->setHorizontalHeaderItem(COLUMN_PID, new QStandardItem(tr("PID"))); modelProcesses->setHorizontalHeaderItem(ProcessesWidget::COLUMN_PID,
modelProcesses->setHorizontalHeaderItem(COLUMN_UID, new QStandardItem(tr("UID"))); new QStandardItem(tr("PID")));
modelProcesses->setHorizontalHeaderItem(COLUMN_STATUS, new QStandardItem(tr("Status"))); modelProcesses->setHorizontalHeaderItem(ProcessesWidget::COLUMN_UID,
modelProcesses->setHorizontalHeaderItem(COLUMN_PATH, new QStandardItem(tr("Path"))); new QStandardItem(tr("UID")));
modelProcesses->setHorizontalHeaderItem(ProcessesWidget::COLUMN_STATUS,
new QStandardItem(tr("Status")));
modelProcesses->setHorizontalHeaderItem(ProcessesWidget::COLUMN_PATH,
new QStandardItem(tr("Path")));
ui->viewProcesses->horizontalHeader()->setDefaultAlignment(Qt::AlignLeft | Qt::AlignVCenter); ui->viewProcesses->horizontalHeader()->setDefaultAlignment(Qt::AlignLeft | Qt::AlignVCenter);
ui->viewProcesses->verticalHeader()->setVisible(false); ui->viewProcesses->verticalHeader()->setVisible(false);
ui->viewProcesses->setFont(Config()->getFont()); ui->viewProcesses->setFont(Config()->getFont());
@ -129,10 +126,10 @@ void ProcessesWidget::setProcessesGrid()
rowStatus->setFont(font); rowStatus->setFont(font);
rowPath->setFont(font); rowPath->setFont(font);
modelProcesses->setItem(i, COLUMN_PID, rowPid); modelProcesses->setItem(i, ProcessesWidget::COLUMN_PID, rowPid);
modelProcesses->setItem(i, COLUMN_UID, rowUid); modelProcesses->setItem(i, ProcessesWidget::COLUMN_UID, rowUid);
modelProcesses->setItem(i, COLUMN_STATUS, rowStatus); modelProcesses->setItem(i, ProcessesWidget::COLUMN_STATUS, rowStatus);
modelProcesses->setItem(i, COLUMN_PATH, rowPath); modelProcesses->setItem(i, ProcessesWidget::COLUMN_PATH, rowPath);
i++; i++;
} }
@ -155,7 +152,7 @@ void ProcessesWidget::onActivated(const QModelIndex &index)
if (!index.isValid()) if (!index.isValid())
return; return;
int pid = modelFilter->data(index.sibling(index.row(), COLUMN_PID)).toInt(); int pid = modelFilter->data(index.sibling(index.row(), ProcessesWidget::COLUMN_PID)).toInt();
// Verify that the selected pid is still in the processes list since dp= will // Verify that the selected pid is still in the processes list since dp= will
// attach to any given id. If it isn't found simply update the UI. // attach to any given id. If it isn't found simply update the UI.
for (const auto &value : Core()->getAllProcesses()) { for (const auto &value : Core()->getAllProcesses()) {
@ -185,7 +182,7 @@ ProcessesFilterModel::ProcessesFilterModel(QObject *parent) : QSortFilterProxyMo
bool ProcessesFilterModel::filterAcceptsRow(int row, const QModelIndex &parent) const bool ProcessesFilterModel::filterAcceptsRow(int row, const QModelIndex &parent) const
{ {
// All columns are checked for a match // All columns are checked for a match
for (int i = COLUMN_PID; i <= COLUMN_PATH; ++i) { for (int i = ProcessesWidget::COLUMN_PID; i <= ProcessesWidget::COLUMN_PATH; ++i) {
QModelIndex index = sourceModel()->index(row, i, parent); QModelIndex index = sourceModel()->index(row, i, parent);
if (qhelpers::filterStringContains(sourceModel()->data(index).toString(), this)) { if (qhelpers::filterStringContains(sourceModel()->data(index).toString(), this)) {
return true; return true;

7
src/widgets/ProcessesWidget.h
View File

@ -31,6 +31,13 @@ class ProcessesWidget : public CutterDockWidget
Q_OBJECT Q_OBJECT
public: public:
enum ColumnIndex {
COLUMN_PID = 0,
COLUMN_UID,
COLUMN_STATUS,
COLUMN_PATH,
};
explicit ProcessesWidget(MainWindow *main); explicit ProcessesWidget(MainWindow *main);
~ProcessesWidget(); ~ProcessesWidget();