Put vikutils.h into viking.h

diff --git a/src/main.c b/src/main.c
index effecbe37ccabaeb13f3ebd205a5ecf4cff83892..98a501ce279db1e71923ea9b105d087d9d9f83b7 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -36,7 +36,6 @@
 #include "vikmapslayer.h"
 #include "vikgeoreflayer.h"
 #include "vikrouting.h"
-#include "vikutils.h"
 #include "util.h"
 #include "toolbar.h"
 

diff --git a/src/vikgeoreflayer.c b/src/vikgeoreflayer.c
index 7874e01172d8f405c2b1085f2a7167eed78aa7b4..fbd9f68d2b8e3415bf3e8a7475913faf05bdc99e 100644 (file)
--- a/src/vikgeoreflayer.c
+++ b/src/vikgeoreflayer.c
@@ -25,7 +25,6 @@
 #endif
 
 #include "viking.h"
-#include "vikutils.h"
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>

diff --git a/src/vikgpslayer.c b/src/vikgpslayer.c
index 71f526a7dcaaeeeefb45e79751dc12acd225b54b..ab7ba06ad09088c96db526a849290a0d6f82f19a 100644 (file)
--- a/src/vikgpslayer.c
+++ b/src/vikgpslayer.c
@@ -45,7 +45,6 @@
 #include <glib/gi18n.h>
 #ifdef VIK_CONFIG_REALTIME_GPS_TRACKING
 #include <gps.h>
-#include "vikutils.h"
 #endif
 
 static VikGpsLayer *vik_gps_layer_create (VikViewport *vp);

diff --git a/src/viking.h b/src/viking.h
index fedcb0d4e94488f998aceb5df6b871480ce709c4..f353c7a2b8c914cb7ad5093d4d9237403f0aa963 100644 (file)
--- a/src/viking.h
+++ b/src/viking.h
@@ -64,5 +64,6 @@
 #include "gpsmapper.h"
 #include "settings.h"
 #include "util.h"
+#include "vikutils.h"
 
 #endif

diff --git a/src/vikmapniklayer.c b/src/vikmapniklayer.c
index 47cd4e887fd52d1241c34a1a5d84de84fcff02e2..924a43c01ff725c24d3f15d118c34b463a996695 100644 (file)
--- a/src/vikmapniklayer.c
+++ b/src/vikmapniklayer.c
@@ -24,7 +24,6 @@
 #endif
 
 #include "viking.h"
-#include "vikutils.h"
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>

diff --git a/src/vikmapslayer.c b/src/vikmapslayer.c
index bb20063dec7423e76e6066e33fad84c67649ff1c..37bc411a9e34199a059ba026de7a713d8927e117 100644 (file)
--- a/src/vikmapslayer.c
+++ b/src/vikmapslayer.c
@@ -46,7 +46,6 @@
 
 #include "viking.h"
 #include "vikmapsourcedefault.h"
-#include "vikutils.h"
 #include "maputils.h"
 #include "mapcache.h"
 #include "background.h"

diff --git a/src/viktrwlayer.c b/src/viktrwlayer.c
index be644aa761b0d9a52ac15e27b8a76155a7f58fa4..720ff8fff62ae667b6bef371d5849484509f4d40 100644 (file)
--- a/src/viktrwlayer.c
+++ b/src/viktrwlayer.c
@@ -62,8 +62,6 @@
 #include "vikexttools.h"
 #include "vikexttool_datasources.h"
 #include "ui_util.h"
-#include "vikutils.h"
-
 #include "vikrouting.h"
 
 #include "icons/icons.h"

diff --git a/src/viktrwlayer_propwin.c b/src/viktrwlayer_propwin.c
index be0e3d6fb1931e35b16fa7316874e7897c3f1be1..d1d8a48bbf2ceb1d7ccdc383a80e2e05678af61a 100644 (file)
--- a/src/viktrwlayer_propwin.c
+++ b/src/viktrwlayer_propwin.c
@@ -41,7 +41,6 @@
 #include "dems.h"
 #include "viking.h"
 #include "vikviewport.h" /* ugh */
-#include "vikutils.h"
 #include "ui_util.h"
 #include <gdk-pixbuf/gdk-pixdata.h>
 

diff --git a/src/viktrwlayer_wpwin.c b/src/viktrwlayer_wpwin.c
index ff6b070c66c532fe2a46b83947b5f8db0f380aa7..4ebfa2ad768b55f326fece625a926485ad5cb259 100644 (file)
--- a/src/viktrwlayer_wpwin.c
+++ b/src/viktrwlayer_wpwin.c
@@ -32,7 +32,6 @@
 #include "viking.h"
 #include "vikdatetime_edit_dialog.h"
 #include "vikgoto.h"
-#include "vikutils.h"
 
 static void update_time ( GtkWidget *widget, VikWaypoint *wp )
 {

diff --git a/src/vikwindow.c b/src/vikwindow.c
index 875b52852a978180e374ed557809cee3f470b05e..3ebda9d822d6eae253e884df89f0e453dbb688d7 100644 (file)
--- a/src/vikwindow.c
+++ b/src/vikwindow.c
@@ -44,7 +44,6 @@
 #include "vikmapslayer.h"
 #include "vikrouting.h"
 #include "geonamessearch.h"
-#include "vikutils.h"
 #include "dir.h"
 #include "kmz.h"