aboutsummaryrefslogtreecommitdiffstats
path: root/ui/qt/proto_tree.cpp
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2012-08-14 17:35:50 +0000
committerGerald Combs <gerald@wireshark.org>2012-08-14 17:35:50 +0000
commitc8a48320502996cd41f893ff74e9fa091aa2ff3e (patch)
tree424a0586ebf5333055642b7dc8490c2221866d72 /ui/qt/proto_tree.cpp
parentbc67498fb4b5d3f36027b0c1f65b15d13b4efcca (diff)
Fix compilation with gcc. Remove an unused variable.
svn path=/trunk/; revision=44495
Diffstat (limited to 'ui/qt/proto_tree.cpp')
-rw-r--r--ui/qt/proto_tree.cpp13
1 files changed, 3 insertions, 10 deletions
diff --git a/ui/qt/proto_tree.cpp b/ui/qt/proto_tree.cpp
index 197ebc5e0f..46617c602e 100644
--- a/ui/qt/proto_tree.cpp
+++ b/ui/qt/proto_tree.cpp
@@ -46,7 +46,7 @@ proto_tree_draw_node(proto_node *node, gpointer data)
field_info *fi = PNODE_FINFO(node);
gchar label_str[ITEM_LABEL_LENGTH];
gchar *label_ptr;
- gboolean is_leaf, is_expanded;
+ gboolean is_leaf;
g_assert(fi && "dissection with an invisible proto tree?");
@@ -66,16 +66,9 @@ proto_tree_draw_node(proto_node *node, gpointer data)
if (node->first_child != NULL) {
is_leaf = FALSE;
g_assert(fi->tree_type >= 0 && fi->tree_type < num_tree_types);
- if (tree_is_expanded[fi->tree_type]) {
- is_expanded = TRUE;
- }
- else {
- is_expanded = FALSE;
- }
}
else {
is_leaf = TRUE;
- is_expanded = FALSE;
}
if (PROTO_ITEM_IS_GENERATED(node)) {
@@ -190,7 +183,7 @@ void ProtoTree::updateSelectionStatus(QTreeWidgetItem* item) {
itemInfo.append(QString(tr(", %1 bytes")).arg(finfo_length));
}
- emit protoItemSelected(QString());
+ emit protoItemSelected(new QString());
emit protoItemSelected(false);
emit protoItemSelected(itemInfo);
emit protoItemSelected(true);
@@ -216,7 +209,7 @@ void ProtoTree::updateSelectionStatus(QTreeWidgetItem* item) {
*/
} else {
- emit protoItemSelected(QString());
+ emit protoItemSelected(new QString());
emit protoItemSelected(false);
}
}