osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Qt: Cleanup PacketListHeader 

Remove unnecessary for-loop and subroutine
This commit is contained in:
Roland Knall 2022-06-29 15:46:19 +02:00 committed by Roland Knall
parent 413b383224
commit ac4b9e174d
2 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ui/qt/widgets/packet_list_header.cpp
View File

@ -31,8 +31,7 @@
PacketListHeader::PacketListHeader(Qt::Orientation orientation, QWidget *parent) : PacketListHeader::PacketListHeader(Qt::Orientation orientation, QWidget *parent) :
QHeaderView(orientation, parent), QHeaderView(orientation, parent),
sectionIdx(-1), sectionIdx(-1)
lastSize(-1)
{ {
setAcceptDrops(true); setAcceptDrops(true);
setSectionsMovable(true); setSectionsMovable(true);
@ -129,7 +128,6 @@ void PacketListHeader::mousePressEvent(QMouseEvent *e)
#endif #endif
QString headerName = model()->headerData(sectIdx, orientation()).toString(); QString headerName = model()->headerData(sectIdx, orientation()).toString();
lastSize = sectionSize(sectIdx);
#if QT_VERSION >= QT_VERSION_CHECK(6, 0 ,0) #if QT_VERSION >= QT_VERSION_CHECK(6, 0 ,0)
QToolTip::showText(e->globalPosition().toPoint(), QString("Width: %1").arg(sectionSize(sectIdx))); QToolTip::showText(e->globalPosition().toPoint(), QString("Width: %1").arg(sectionSize(sectIdx)));
#else #else
@ -145,7 +143,6 @@ void PacketListHeader::mouseMoveEvent(QMouseEvent *e)
{ {
/* no move is happening */ /* no move is happening */
sectionIdx = -1; sectionIdx = -1;
lastSize = -1;
} }
else if (e->buttons() & Qt::LeftButton) else if (e->buttons() & Qt::LeftButton)
{ {
@ -162,11 +159,10 @@ void PacketListHeader::mouseMoveEvent(QMouseEvent *e)
{ {
/* Only run for the current moving section after a change */ /* Only run for the current moving section after a change */
QString headerName = model()->headerData(sectionIdx, orientation()).toString(); QString headerName = model()->headerData(sectionIdx, orientation()).toString();
lastSize = sectionSize(sectionIdx);
#if QT_VERSION >= QT_VERSION_CHECK(6, 0 ,0) #if QT_VERSION >= QT_VERSION_CHECK(6, 0 ,0)
QToolTip::showText(e->globalPosition().toPoint(), QString("Width: %1").arg(lastSize)); QToolTip::showText(e->globalPosition().toPoint(), QString("Width: %1").arg(sectionSize(sectionIdx)));
#else #else
QToolTip::showText(e->globalPos(), QString("Width: %1").arg(lastSize)); QToolTip::showText(e->globalPos(), QString("Width: %1").arg(sectionSize(sectionIdx)));
#endif #endif
} }
} }
@ -176,8 +172,12 @@ void PacketListHeader::mouseMoveEvent(QMouseEvent *e)
void PacketListHeader::contextMenuEvent(QContextMenuEvent *event) void PacketListHeader::contextMenuEvent(QContextMenuEvent *event)
{ {
int sectionIdx = logicalIndexAt(event->pos()); int sectionIdx = logicalIndexAt(event->pos());
if (sectionIdx < 0 || sectionIdx >= prefs.num_cols)
return;
char xalign = recent_get_column_xalign(sectionIdx); char xalign = recent_get_column_xalign(sectionIdx);
QAction * action = Q_NULLPTR; QAction * action = nullptr;
QMenu * contextMenu = new QMenu(this); QMenu * contextMenu = new QMenu(this);
contextMenu->setProperty("column", QVariant::fromValue(sectionIdx)); contextMenu->setProperty("column", QVariant::fromValue(sectionIdx));
@ -250,12 +250,6 @@ void PacketListHeader::contextMenuEvent(QContextMenuEvent *event)
contextMenu->popup(viewport()->mapToGlobal(event->pos())); contextMenu->popup(viewport()->mapToGlobal(event->pos()));
} }
void PacketListHeader::setSectionVisibility()
{
for (int cnt = 0; cnt < prefs.num_cols; cnt++)
setSectionHidden(cnt, get_column_visible(cnt) ? false : true);
}
void PacketListHeader::columnVisibilityTriggered() void PacketListHeader::columnVisibilityTriggered()
{ {
QAction *ha = qobject_cast<QAction*>(sender()); QAction *ha = qobject_cast<QAction*>(sender());
@ -263,7 +257,7 @@ void PacketListHeader::columnVisibilityTriggered()
int col = ha->data().toInt(); int col = ha->data().toInt();
set_column_visible(col, ha->isChecked()); set_column_visible(col, ha->isChecked());
setSectionVisibility(); setSectionHidden(col, ha->isChecked() ? false : true);
if (ha->isChecked()) if (ha->isChecked())
emit resetColumnWidth(col); emit resetColumnWidth(col);

4
ui/qt/widgets/packet_list_header.h
View File

@ -56,11 +56,7 @@ signals:
void columnsChanged(); void columnsChanged();
private: private:
int sectionIdx; int sectionIdx;
int lastSize;
void setSectionVisibility();
}; };
#endif #endif