Get rid of a couple of unused variables. Other minor cleanup.

svn path=/trunk/; revision=45839

3 files changed, 4 insertions, 9 deletions

diff --git a/ui/qt/byte_view_tab.cpp b/ui/qt/byte_view_tab.cpp
index 6c84fb5ccb..6ea249f725 100644
--- a/ui/qt/byte_view_tab.cpp
+++ b/ui/qt/byte_view_tab.cpp
@@ -62,10 +62,9 @@ void ByteViewTab::protoTreeItemChanged(QTreeWidgetItem *current) {
         field_info *fi;
 
         fi = current->data(0, Qt::UserRole).value<field_info *>();
-//        g_log(NULL, G_LOG_LEVEL_DEBUG, "fi selected %p", fi);
 
         int i = 0;
-        ByteViewText *byte_view_text = dynamic_cast<ByteViewText*>(widget(i));
+        ByteViewText *byte_view_text = qobject_cast<ByteViewText*>(widget(i));
         while (byte_view_text) {
             if (byte_view_text->hasDataSource(fi->ds_tvb)) {
                 QTreeWidgetItem *parent = current->parent();
@@ -164,11 +163,11 @@ void ByteViewTab::protoTreeItemChanged(QTreeWidgetItem *current) {
                 // Appendix (trailer) bytes
                 byte_view_text->setFieldAppendixHighlight(fa_start, fa_end);
 
-                setCurrentIndex(i);
-
                 byte_view_text->render();
+
+                setCurrentIndex(i);
             }
-            byte_view_text = dynamic_cast<ByteViewText*>(widget(++i));
+            byte_view_text = qobject_cast<ByteViewText*>(widget(++i));
         }
     }
 }
diff --git a/ui/qt/byte_view_text.cpp b/ui/qt/byte_view_text.cpp
index fca655ed47..14bb4bdbc9 100644
--- a/ui/qt/byte_view_text.cpp
+++ b/ui/qt/byte_view_text.cpp
@@ -38,7 +38,6 @@ ByteViewText::ByteViewText(QWidget *parent, tvbuff_t *tvb, proto_tree *tree, QTr
     tvb_(tvb),
     proto_tree_(tree),
     tree_widget_(tree_widget),
-    max_width_(0),
     bold_highlight_(false),
     encoding_(encoding),
     format_(BYTES_HEX),
diff --git a/ui/qt/byte_view_text.h b/ui/qt/byte_view_text.h
index c20af58625..76d7124e04 100644
--- a/ui/qt/byte_view_text.h
+++ b/ui/qt/byte_view_text.h
@@ -74,9 +74,6 @@ private:
     proto_tree *proto_tree_;
     QTreeWidget *tree_widget_;
 
-    gint adj_tag_;
-    int max_width_;
-
     gboolean bold_highlight_;
 
 /* data */