Remove or mark unused variables.

svn path=/trunk/; revision=40599

diff --git a/ui/qt/byte_view_text.cpp b/ui/qt/byte_view_text.cpp
index 32650593b35ad2ec45ac3aee5cf381df30470d00..0a3d691d9b845367a6c7081f48f5a623c6e3b2fb 100644 (file)
--- a/ui/qt/byte_view_text.cpp
+++ b/ui/qt/byte_view_text.cpp
@@ -82,14 +82,14 @@ ByteViewText::ByteViewText(QWidget *parent, tvbuff_t *tvb, proto_tree *tree, QTr
 void
 ByteViewText::hexPrintCommon()
 {
-    int            i = 0, j, k = 0, b, len;
+    int            i = 0, j, k = 0, len;
     const guint8  *pd;
     QString        line;
     static guchar  hexchars[16] = {
         '0', '1', '2', '3', '4', '5', '6', '7',
         '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
-    static const guint8 bitmask[8] = {
-        0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 };
+//    static const guint8 bitmask[8] = {
+//        0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 };
     guchar         c = '\0';
 
 //    progdlg_t  *progbar = NULL;
@@ -495,11 +495,11 @@ byte_num(int offset, int start_point)
 }
 
 // XXX - Copied from main_proto_draw.c
-static int
-bit_num(int offset, int start_point)
-{
-    return (offset - start_point) / 9;
-}
+//static int
+//bit_num(int offset, int start_point)
+//{
+//    return (offset - start_point) / 9;
+//}
 
 // XXX - Copied from main_proto_draw.c
 static int

diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp
index b12e4441dd658f6b58464ec1ac9b587ee013ef7f..61e8fc3f4e2feb1298b80a14fc7c41c49269f35d 100644 (file)
--- a/ui/qt/main.cpp
+++ b/ui/qt/main.cpp
@@ -496,8 +496,9 @@ cmdarg_err_cont(const char *fmt, ...)
 
 static void
 console_log_handler(const char *log_domain, GLogLevelFlags log_level,
-                    const char *message, gpointer user_data _U_)
+                    const char *message, gpointer user_data)
 {
+    Q_UNUSED(user_data);
     QString level;
     QDateTime qt = QDateTime::currentDateTime();
 
@@ -856,6 +857,7 @@ int main(int argc, char *argv[])
             stats_tree taps plugins will be registered as tap listeners
             by stats_tree_stat.c and need to registered before that */
 
+    g_log(NULL, G_LOG_LEVEL_DEBUG, "plugin_dir: %s", get_plugin_dir());
   #ifdef HAVE_PLUGINS
     register_all_plugin_tap_listeners();
   #endif

diff --git a/ui/qt/packet_list_model.cpp b/ui/qt/packet_list_model.cpp
index 940304bb44fa5e306c2bf11863d791112a464326..140df96fc31e1ee66ae48f21b8805fbde82200b7 100644 (file)
--- a/ui/qt/packet_list_model.cpp
+++ b/ui/qt/packet_list_model.cpp
@@ -122,6 +122,7 @@ int PacketListModel::visibleIndexOf(frame_data *fdata) const
 QModelIndex PacketListModel::index(int row, int column, const QModelIndex &parent)
             const
 {
+    Q_UNUSED(parent);
     if (row >= visibleRows.count() || row < 0 || column >= cf->cinfo.num_cols)
         return QModelIndex();
 
@@ -133,6 +134,7 @@ QModelIndex PacketListModel::index(int row, int column, const QModelIndex &paren
 // Everything is under the root.
 QModelIndex PacketListModel::parent(const QModelIndex &index) const
 {
+    Q_UNUSED(index);
     return QModelIndex();
 }
 
@@ -146,6 +148,7 @@ int PacketListModel::rowCount(const QModelIndex &parent) const
 
 int PacketListModel::columnCount(const QModelIndex &parent) const
 {
+    Q_UNUSED(parent);
     return cf->cinfo.num_cols;
 }