aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss.ws@gmail.com>2013-06-26 01:14:35 +0000
committerJeff Morriss <jeff.morriss.ws@gmail.com>2013-06-26 01:14:35 +0000
commitbbf6a3766e65ebc66f06f936e530e79ec2d5b31b (patch)
tree36807307f1569f29471ae157dcc82141c422a1ad /ui
parent3ab335948b76b1a87fd0c193050673ffd37c9a86 (diff)
Move tempfile.{h,c} into wsutil.
svn path=/trunk/; revision=50163
Diffstat (limited to 'ui')
-rw-r--r--ui/cli/tap-follow.c2
-rw-r--r--ui/gtk/export_pdu_dlg.c2
-rw-r--r--ui/gtk/file_import_dlg.c2
-rw-r--r--ui/gtk/follow_stream.c2
-rw-r--r--ui/gtk/follow_tcp.c2
-rw-r--r--ui/gtk/hostlist_table.c2
-rw-r--r--ui/gtk/iax2_analysis.c2
-rw-r--r--ui/gtk/print_dlg.c2
-rw-r--r--ui/gtk/rtp_analysis.c2
-rw-r--r--ui/qt/QtShark.pro1
-rw-r--r--ui/qt/import_text_dialog.cpp2
11 files changed, 10 insertions, 11 deletions
diff --git a/ui/cli/tap-follow.c b/ui/cli/tap-follow.c
index 0e6262c788..71ddd5898f 100644
--- a/ui/cli/tap-follow.c
+++ b/ui/cli/tap-follow.c
@@ -46,7 +46,7 @@
#include <epan/tvbuff-int.h>
#include "wsutil/file_util.h"
-#include "tempfile.h"
+#include "wsutil/tempfile.h"
#ifdef SSL_PLUGIN
#include "packet-ssl-utils.h"
diff --git a/ui/gtk/export_pdu_dlg.c b/ui/gtk/export_pdu_dlg.c
index 03e96b7c65..f3e334434c 100644
--- a/ui/gtk/export_pdu_dlg.c
+++ b/ui/gtk/export_pdu_dlg.c
@@ -30,7 +30,7 @@
#include "wtap.h"
#include "pcap-encap.h"
#include "version_info.h"
-#include "tempfile.h"
+#include "wsutil/tempfile.h"
#include <epan/tap.h>
#include <epan/exported_pdu.h>
diff --git a/ui/gtk/file_import_dlg.c b/ui/gtk/file_import_dlg.c
index fe4938385a..68990f4f7d 100644
--- a/ui/gtk/file_import_dlg.c
+++ b/ui/gtk/file_import_dlg.c
@@ -49,7 +49,7 @@
#include "file.h"
#include "wsutil/file_util.h"
-#include "tempfile.h"
+#include "wsutil/tempfile.h"
#define INPUT_FRM_KEY "input_frame"
diff --git a/ui/gtk/follow_stream.c b/ui/gtk/follow_stream.c
index c00839696a..f65ffe4b12 100644
--- a/ui/gtk/follow_stream.c
+++ b/ui/gtk/follow_stream.c
@@ -60,7 +60,7 @@
#include "ui/gtk/old-gtk-compat.h"
#ifdef _WIN32
-#include "../tempfile.h"
+#include "wsutil/tempfile.h"
#include "ui/win32/print_win32.h"
#endif
diff --git a/ui/gtk/follow_tcp.c b/ui/gtk/follow_tcp.c
index b079646195..1ad1cc8bce 100644
--- a/ui/gtk/follow_tcp.c
+++ b/ui/gtk/follow_tcp.c
@@ -50,7 +50,7 @@
#include "ui/alert_box.h"
#include "ui/simple_dialog.h"
#include "ui/utf8_entities.h"
-#include "../tempfile.h"
+#include "wsutil/tempfile.h"
#include <wsutil/file_util.h>
#include "gtkglobals.h"
diff --git a/ui/gtk/hostlist_table.c b/ui/gtk/hostlist_table.c
index 8e6138b6a2..350eeb57ff 100644
--- a/ui/gtk/hostlist_table.c
+++ b/ui/gtk/hostlist_table.c
@@ -50,7 +50,7 @@
#include "ui/simple_dialog.h"
#include "ui/alert_box.h"
#include "ui/utf8_entities.h"
-#include "../tempfile.h"
+#include "wsutil/tempfile.h"
#include "ui/gtk/hostlist_table.h"
#include "ui/gtk/filter_utils.h"
diff --git a/ui/gtk/iax2_analysis.c b/ui/gtk/iax2_analysis.c
index 81000bd629..d412eda5b5 100644
--- a/ui/gtk/iax2_analysis.c
+++ b/ui/gtk/iax2_analysis.c
@@ -65,7 +65,7 @@
#include "ui/util.h"
#include "../g711.h"
#include "../stat_menu.h"
-#include "../tempfile.h"
+#include "wsutil/tempfile.h"
#include "ui/alert_box.h"
#include "ui/last_open_dir.h"
diff --git a/ui/gtk/print_dlg.c b/ui/gtk/print_dlg.c
index 218f1fe7d8..bfbb640eec 100644
--- a/ui/gtk/print_dlg.c
+++ b/ui/gtk/print_dlg.c
@@ -53,7 +53,7 @@
#include <windows.h>
#include "ui/win32/file_dlg_win32.h"
#include "ui/win32/print_win32.h"
-#include "tempfile.h"
+#include "wsutil/tempfile.h"
#endif
/* dialog output action */
diff --git a/ui/gtk/rtp_analysis.c b/ui/gtk/rtp_analysis.c
index f8ac025b24..5bd3f49558 100644
--- a/ui/gtk/rtp_analysis.c
+++ b/ui/gtk/rtp_analysis.c
@@ -63,7 +63,7 @@
#include "ui/util.h"
#include "../g711.h"
#include "../stat_menu.h"
-#include "../tempfile.h"
+#include "wsutil/tempfile.h"
#include "ui/alert_box.h"
#include "ui/last_open_dir.h"
diff --git a/ui/qt/QtShark.pro b/ui/qt/QtShark.pro
index fe710a9451..d5474a8fdd 100644
--- a/ui/qt/QtShark.pro
+++ b/ui/qt/QtShark.pro
@@ -187,7 +187,6 @@ SOURCES_WS_C = \
../../sync_pipe_write.c \
../../tap-megaco-common.c \
../../tap-rtp-common.c \
- ../../tempfile.c \
../../u3.c \
../../version_info.c
diff --git a/ui/qt/import_text_dialog.cpp b/ui/qt/import_text_dialog.cpp
index 3612b3a263..a234f7cbc9 100644
--- a/ui/qt/import_text_dialog.cpp
+++ b/ui/qt/import_text_dialog.cpp
@@ -39,7 +39,7 @@
#include "file.h"
#include "wsutil/file_util.h"
-#include "tempfile.h"
+#include "wsutil/tempfile.h"
#include <ui_import_text_dialog.h>
#include <wireshark_application.h>