summaryrefslogtreecommitdiff
path: root/ui/qt/packet_list_record.cpp
diff options
context:
space:
mode:
authorGerald Combs <gerald@zing.org>2014-10-05 12:23:33 -0700
committerGerald Combs <gerald@wireshark.org>2014-10-06 21:10:11 +0000
commit798eb9705341bdf330e8e238b6f0f2fb278a64c8 (patch)
tree41e809957cfddc69049fd48181bfff7036e8b5f5 /ui/qt/packet_list_record.cpp
parent5051ae1cbe00fb57dd94d584554f731a83f932f6 (diff)
downloadwireshark-798eb9705341bdf330e8e238b6f0f2fb278a64c8.tar.gz
Qt: Packet list column sorting.
Sorting behavior should be identical to GTK+. Pass the correct position to beginInsertRows. Add a list of to-do items to packet_list.cpp. Change-Id: Ie6ab4b9f2d780a2af430d0f90529edca5485dada Reviewed-on: https://code.wireshark.org/review/4481 Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/qt/packet_list_record.cpp')
-rw-r--r--ui/qt/packet_list_record.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/ui/qt/packet_list_record.cpp b/ui/qt/packet_list_record.cpp
index 296693b59b..1799ddfc78 100644
--- a/ui/qt/packet_list_record.cpp
+++ b/ui/qt/packet_list_record.cpp
@@ -33,7 +33,7 @@
#include <QStringList>
-QMap<int, int> cinfo_column_;
+QMap<int, int> PacketListRecord::cinfo_column_;
PacketListRecord::PacketListRecord(frame_data *frameData) :
fdata_(frameData),
@@ -42,7 +42,7 @@ PacketListRecord::PacketListRecord(frame_data *frameData) :
{
}
-QVariant PacketListRecord::columnString(capture_file *cap_file, int column)
+const QVariant PacketListRecord::columnString(capture_file *cap_file, int column)
{
// packet_list_store.c:packet_list_get_value
g_assert(fdata_);
@@ -58,10 +58,6 @@ QVariant PacketListRecord::columnString(capture_file *cap_file, int column)
return col_text_.value(column, QByteArray());
}
-frame_data *PacketListRecord::frameData() {
- return fdata_;
-}
-
void PacketListRecord::resetColumns(column_info *cinfo)
{
if (!cinfo) {