Update the Qt byte view widget to reflect the recent changes in the GTK+

byte view.

Move the packet_char_enc enum from packet.h to frame_data.h. Make the
encoding flag a packet_char_enc and make it one bit.

Get rid of the "cfile" global in a few places. C++-ize some of the font
code. Clean up some variable names.

svn path=/trunk/; revision=45838

1 files changed, 3 insertions, 2 deletions

diff --git a/ui/qt/packet_list_model.h b/ui/qt/packet_list_model.h
index 84a2832a5a..6f56054be0 100644
--- a/ui/qt/packet_list_model.h
+++ b/ui/qt/packet_list_model.h
@@ -44,7 +44,8 @@ class PacketListModel : public QAbstractItemModel
 {
     Q_OBJECT
 public:
-    explicit PacketListModel(QObject *parent = 0, capture_file *cfPtr = NULL);
+    explicit PacketListModel(QObject *parent = 0, capture_file *cf = NULL);
+    void setCaptureFile(capture_file *cf);
     QModelIndex index(int row, int column,
                       const QModelIndex &parent = QModelIndex()) const;
     QModelIndex parent(const QModelIndex &index) const;
@@ -68,7 +69,7 @@ signals:
 public slots:
 
 private:
-    capture_file *cf;
+    capture_file *cap_file_;
     QList<QString> col_names_;
     QVector<PacketListRecord *> visible_rows_;
     QVector<PacketListRecord *> physical_rows_;