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

ThreadsWidget: make ColumnIndex a class member

Browse Source 
This brings ThreadsWidget into alignment with ProcessesWidget and
others which have column index enumerators as class members. This also
avoids cluttering global scope with generic names, making it easier to
avoid C++ ODR violations with differing definitions.

Closes: #3316
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 1a09a5cbe7
commit 43950242ae
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/widgets/ThreadsWidget.cpp
View File

@ -9,21 +9,17 @@
#define DEBUGGED_PID (-1) #define DEBUGGED_PID (-1)
enum ColumnIndex {
COLUMN_PID = 0,
COLUMN_STATUS,
COLUMN_PATH,
};
ThreadsWidget::ThreadsWidget(MainWindow *main) : CutterDockWidget(main), ui(new Ui::ThreadsWidget) ThreadsWidget::ThreadsWidget(MainWindow *main) : CutterDockWidget(main), ui(new Ui::ThreadsWidget)
{ {
ui->setupUi(this); ui->setupUi(this);
// Setup threads model // Setup threads model
modelThreads = new QStandardItemModel(1, 3, this); modelThreads = new QStandardItemModel(1, 3, this);
modelThreads->setHorizontalHeaderItem(COLUMN_PID, new QStandardItem(tr("PID"))); modelThreads->setHorizontalHeaderItem(ThreadsWidget::COLUMN_PID, new QStandardItem(tr("PID")));
modelThreads->setHorizontalHeaderItem(COLUMN_STATUS, new QStandardItem(tr("Status"))); modelThreads->setHorizontalHeaderItem(ThreadsWidget::COLUMN_STATUS,
modelThreads->setHorizontalHeaderItem(COLUMN_PATH, new QStandardItem(tr("Path"))); new QStandardItem(tr("Status")));
modelThreads->setHorizontalHeaderItem(ThreadsWidget::COLUMN_PATH,
new QStandardItem(tr("Path")));
ui->viewThreads->horizontalHeader()->setDefaultAlignment(Qt::AlignLeft | Qt::AlignVCenter); ui->viewThreads->horizontalHeader()->setDefaultAlignment(Qt::AlignLeft | Qt::AlignVCenter);
ui->viewThreads->verticalHeader()->setVisible(false); ui->viewThreads->verticalHeader()->setVisible(false);
ui->viewThreads->setFont(Config()->getFont()); ui->viewThreads->setFont(Config()->getFont());
@ -120,9 +116,9 @@ void ThreadsWidget::setThreadsGrid()
rowStatus->setFont(font); rowStatus->setFont(font);
QStandardItem *rowPath = new QStandardItem(path); QStandardItem *rowPath = new QStandardItem(path);
rowPath->setFont(font); rowPath->setFont(font);
modelThreads->setItem(i, COLUMN_PID, rowPid); modelThreads->setItem(i, ThreadsWidget::COLUMN_PID, rowPid);
modelThreads->setItem(i, COLUMN_STATUS, rowStatus); modelThreads->setItem(i, ThreadsWidget::COLUMN_STATUS, rowStatus);
modelThreads->setItem(i, COLUMN_PATH, rowPath); modelThreads->setItem(i, ThreadsWidget::COLUMN_PATH, rowPath);
i++; i++;
} }
@ -146,7 +142,7 @@ void ThreadsWidget::onActivated(const QModelIndex &index)
if (!index.isValid()) if (!index.isValid())
return; return;
int tid = modelFilter->data(index.sibling(index.row(), COLUMN_PID)).toInt(); int tid = modelFilter->data(index.sibling(index.row(), ThreadsWidget::COLUMN_PID)).toInt();
// Verify that the selected tid is still in the threads list since dpt= will // Verify that the selected tid is still in the threads list since dpt= 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.
@ -169,7 +165,7 @@ ThreadsFilterModel::ThreadsFilterModel(QObject *parent) : QSortFilterProxyModel(
bool ThreadsFilterModel::filterAcceptsRow(int row, const QModelIndex &parent) const bool ThreadsFilterModel::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 = ThreadsWidget::COLUMN_PID; i <= ThreadsWidget::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;

6
src/widgets/ThreadsWidget.h
View File

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