GTK Remote Capturing

Move the GTK files necessary for managing the recnet remote host from capture_dlg.c to recent.c in order to use them in QT, too.

Change-Id: I3f3fd31ce928162de08c6db7309ef2a9b1e97760
Reviewed-on: https://code.wireshark.org/review/2955
Reviewed-by: Anders Broman <a.broman58@gmail.com>

5 files changed, 0 insertions, 177 deletions

diff --git a/ui/qt/CMakeLists.txt b/ui/qt/CMakeLists.txt
index 0e01ac0fde..c58063e66f 100644
--- a/ui/qt/CMakeLists.txt
+++ b/ui/qt/CMakeLists.txt
@@ -31,7 +31,6 @@ set(WIRESHARK_QT_HEADERS
 	capture_filter_edit.h
 	capture_filter_syntax_worker.h
 	capture_info_dialog.h
-	capture_interface_dialog.h
 	capture_interfaces_dialog.h
 	capture_preferences_frame.h
 	color_dialog.h
@@ -113,7 +112,6 @@ set(WIRESHARK_QT_SRC
 	capture_filter_edit.cpp
 	capture_filter_syntax_worker.cpp
 	capture_info_dialog.cpp
-	capture_interface_dialog.cpp
 	capture_interfaces_dialog.cpp
 	color_dialog.cpp
 	color_utils.cpp
diff --git a/ui/qt/Makefile.common b/ui/qt/Makefile.common
index 5c80ae8dbe..75157073c9 100644
--- a/ui/qt/Makefile.common
+++ b/ui/qt/Makefile.common
@@ -117,7 +117,6 @@ MOC_HDRS =	\
 	capture_filter_edit.h	\
 	capture_filter_syntax_worker.h	\
 	capture_info_dialog.h	\
-	capture_interface_dialog.h	\
 	capture_interfaces_dialog.h	\
 	color_dialog.h	\
 	color_utils.h	\
@@ -295,7 +294,6 @@ WIRESHARK_QT_SRC =	\
 	capture_filter_edit.cpp	\
 	capture_filter_syntax_worker.cpp	\
 	capture_info_dialog.cpp	\
-	capture_interface_dialog.cpp	\
 	capture_interfaces_dialog.cpp	\
 	color_dialog.cpp	\
 	color_utils.cpp	\
diff --git a/ui/qt/QtShark.pro b/ui/qt/QtShark.pro
index f9a447b57e..b992f773f3 100644
--- a/ui/qt/QtShark.pro
+++ b/ui/qt/QtShark.pro
@@ -536,7 +536,6 @@ HEADERS += \
     capture_filter_edit.h \
     capture_filter_syntax_worker.h \
     capture_info_dialog.h \
-    capture_interface_dialog.h \
     color_dialog.h \
     color_utils.h \
     display_filter_combo.h \
@@ -579,7 +578,6 @@ SOURCES += \
     capture_filter_edit.cpp \
     capture_filter_syntax_worker.cpp \
     capture_info_dialog.cpp \
-    capture_interface_dialog.cpp \
     capture_interfaces_dialog.cpp \
     capture_preferences_frame.cpp \
     color_dialog.cpp \
diff --git a/ui/qt/capture_interface_dialog.cpp b/ui/qt/capture_interface_dialog.cpp
deleted file mode 100644
index 9919ecb70b..0000000000
--- a/ui/qt/capture_interface_dialog.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/* capture_interface_dialog.cpp
- *
- * Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald@wireshark.org>
- * Copyright 1998 Gerald Combs
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "capture_interface_dialog.h"
-
-#ifdef HAVE_PCAP_REMOTE
-
-#include "qt_ui_utils.h"
-
-#include "ui/recent.h"
-#include "ui/recent_utils.h"
-
-#include "capture_opts.h"
-
-#include <epan/prefs.h>
-
-#include <QHash>
-
-QHash<QString, remote_host_t *> remote_host_list;
-
-// xxx - copied from capture_dlg.c
-void
-capture_remote_combo_recent_write_all(FILE *rf)
-{
-    remote_host_t *rh;
-    foreach (rh, remote_host_list) {
-        fprintf (rf, RECENT_KEY_REMOTE_HOST ": %s,%s,%d\n", rh->remote_host, rh->remote_port, rh->auth_type);
-    }
-}
-
-gboolean
-capture_remote_combo_add_recent(const gchar *s)
-{
-  GList *vals = prefs_get_string_list (s);
-  GList *valp = vals;
-  struct remote_host_t *rh;
-  gint auth_type;
-  char *p;
-
-  if (valp == NULL)
-    return FALSE;
-
-  if (strlen((const gchar*) valp->data) == 0)
-    /* Empty remote host */
-    return FALSE;
-
-  rh = g_new (remote_host_t, 1);
-
-  /* First value is the host */
-  rh->remote_host = g_strdup ((const gchar *) valp->data);
-  rh->auth_type = CAPTURE_AUTH_NULL;
-  valp = valp->next;
-
-  if (valp) {
-    /* Found value 2, this is the port number */
-    rh->remote_port = g_strdup ((const gchar *) valp->data);
-    valp = valp->next;
-  } else {
-    /* Did not find a port number */
-    rh->remote_port = g_strdup ("");
-  }
-
-  if (valp) {
-    /* Found value 3, this is the authentication type */
-    auth_type = strtol((const gchar *) valp->data, &p, 0);
-    if (p != valp->data && *p == '\0') {
-      rh->auth_type = auth_type;
-    }
-  }
-
-  /* Do not store username and password */
-  rh->auth_username = g_strdup ("");
-  rh->auth_password = g_strdup ("");
-
-  prefs_clear_string_list(vals);
-
-  remote_host_list.insert(QString::fromUtf8(rh->remote_host), rh);
-
-  return TRUE;
-}
-#endif /* HAVE_PCAP_REMOTE */
-
-CaptureInterfaceDialog::CaptureInterfaceDialog(QWidget *parent) :
-    QDialog(parent)
-{
-}
-
-/*
- * Editor modelines
- *
- * Local Variables:
- * c-basic-offset: 4
- * tab-width: 8
- * indent-tabs-mode: nil
- * End:
- *
- * ex: set shiftwidth=4 tabstop=8 expandtab:
- * :indentSize=4:tabSize=8:noTabs=true:
- */
diff --git a/ui/qt/capture_interface_dialog.h b/ui/qt/capture_interface_dialog.h
deleted file mode 100644
index 53cee2f644..0000000000
--- a/ui/qt/capture_interface_dialog.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* capture_interface_dialog.h
- *
- * Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald@wireshark.org>
- * Copyright 1998 Gerald Combs
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef CAPTURE_INTERFACE_DIALOG_H
-#define CAPTURE_INTERFACE_DIALOG_H
-
-#include "config.h"
-
-#include <QDialog>
-
-class CaptureInterfaceDialog : public QDialog
-{
-    Q_OBJECT
-public:
-    explicit CaptureInterfaceDialog(QWidget *parent = 0);
-
-signals:
-
-public slots:
-
-};
-
-#endif // CAPTURE_INTERFACE_DIALOG_H
-
-/*
- * Editor modelines
- *
- * Local Variables:
- * c-basic-offset: 4
- * tab-width: 8
- * indent-tabs-mode: nil
- * End:
- *
- * ex: set shiftwidth=4 tabstop=8 expandtab:
- * :indentSize=4:tabSize=8:noTabs=true:
- */