Thomas Sailer a8d6f2c
diff --git a/src/Makefile.am b/src/Makefile.am
Thomas Sailer a8d6f2c
index dd30d58c..4fbaea31 100644
Thomas Sailer a8d6f2c
--- a/src/Makefile.am
Thomas Sailer a8d6f2c
+++ b/src/Makefile.am
Thomas Sailer a8d6f2c
@@ -81,8 +81,10 @@ genfascrc_SOURCES = genfascrc.cc
Thomas Sailer a8d6f2c
 genfascrc_LDADD = @PQXX_LIBS@
Thomas Sailer a8d6f2c
 
Thomas Sailer a8d6f2c
 genmodescrc_SOURCES = genmodescrc.cc
Thomas Sailer a8d6f2c
+genmodescrc_LDADD = @PQXX_LIBS@
Thomas Sailer a8d6f2c
 
Thomas Sailer a8d6f2c
 gengrib2paramtbl_SOURCES = gengrib2paramtbl.cc
Thomas Sailer a8d6f2c
+gengrib2paramtbl_LDADD = @PQXX_LIBS@
Thomas Sailer a8d6f2c
 
Thomas Sailer a8d6f2c
 genwmostn_SOURCES = genwmostn.cc
Thomas Sailer a8d6f2c
 genwmostn_LDADD = libvfrnav.la @CURL_LIBS@ @JSONCPP_LIBS@
Thomas Sailer a8d6f2c
diff --git a/utils/basulmimport.cc b/utils/basulmimport.cc
Thomas Sailer a8d6f2c
index ccee3fa0..27279d0c 100644
Thomas Sailer a8d6f2c
--- a/utils/basulmimport.cc
Thomas Sailer a8d6f2c
+++ b/utils/basulmimport.cc
Thomas Sailer a8d6f2c
@@ -4,7 +4,7 @@
Thomas Sailer a8d6f2c
 // Description: Import basulm gps files
Thomas Sailer a8d6f2c
 //
Thomas Sailer a8d6f2c
 //
Thomas Sailer a8d6f2c
-// Author: Thomas Sailer <t.sailer@alumni.ethz.ch>, (C) 2007, 2009, 2012, 2013, 2018
Thomas Sailer a8d6f2c
+// Author: Thomas Sailer <t.sailer@alumni.ethz.ch>, (C) 2007, 2009, 2012, 2013, 2018, 2021
Thomas Sailer a8d6f2c
 //
Thomas Sailer a8d6f2c
 // Copyright: See COPYING file that comes with this distribution
Thomas Sailer a8d6f2c
 //
Thomas Sailer a8d6f2c
@@ -46,7 +46,7 @@ public:
Thomas Sailer a8d6f2c
 		ulm  = 2
Thomas Sailer a8d6f2c
 	};
Thomas Sailer a8d6f2c
 
Thomas Sailer a8d6f2c
-	DbXmlImporter(const Glib::ustring& output_dir, bool pgsql, filter_t filter);
Thomas Sailer a8d6f2c
+	DbXmlImporter(const std::string& output_dir, bool pgsql, filter_t filter);
Thomas Sailer a8d6f2c
 	virtual ~DbXmlImporter();
Thomas Sailer a8d6f2c
 
Thomas Sailer a8d6f2c
 protected:
Thomas Sailer a8d6f2c
@@ -85,7 +85,7 @@ private:
Thomas Sailer a8d6f2c
 	} state_t;
Thomas Sailer a8d6f2c
 	state_t m_state;
Thomas Sailer a8d6f2c
 
Thomas Sailer a8d6f2c
-	Glib::ustring m_outputdir;
Thomas Sailer a8d6f2c
+	std::string m_outputdir;
Thomas Sailer a8d6f2c
 	bool m_purgedb;
Thomas Sailer a8d6f2c
 	filter_t m_filter;
Thomas Sailer a8d6f2c
 #ifdef HAVE_PQXX
Thomas Sailer a8d6f2c
@@ -110,7 +110,7 @@ inline DbXmlImporter::filter_t& operator&=(DbXmlImporter::filter_t& x, DbXmlImpo
Thomas Sailer a8d6f2c
 inline DbXmlImporter::filter_t& operator^=(DbXmlImporter::filter_t& x, DbXmlImporter::filter_t y) { x = x ^ y; return x; }
Thomas Sailer a8d6f2c
 inline bool operator!(DbXmlImporter::filter_t x) { return !(unsigned int)x; }
Thomas Sailer a8d6f2c
 
Thomas Sailer a8d6f2c
-DbXmlImporter::DbXmlImporter(const Glib::ustring & output_dir, bool pgsql, filter_t filter)
Thomas Sailer a8d6f2c
+DbXmlImporter::DbXmlImporter(const std::string& output_dir, bool pgsql, filter_t filter)
Thomas Sailer a8d6f2c
         : xmlpp::SaxParser(false), m_state(state_document_c), m_outputdir(output_dir), m_purgedb(false),
Thomas Sailer a8d6f2c
 	  m_filter(filter), m_starttime(0), m_rec_point(Point::invalid)
Thomas Sailer a8d6f2c
 {
Thomas Sailer a8d6f2c
diff --git a/utils/gshhs.cc b/utils/gshhs.cc
Thomas Sailer a8d6f2c
index 57a97fb1..f2fe875c 100644
Thomas Sailer a8d6f2c
--- a/utils/gshhs.cc
Thomas Sailer a8d6f2c
+++ b/utils/gshhs.cc
Thomas Sailer a8d6f2c
@@ -948,7 +948,7 @@ int main(int argc, char *argv[])
Thomas Sailer a8d6f2c
 	};
Thomas Sailer a8d6f2c
 	int c, err(0);
Thomas Sailer a8d6f2c
 	bool quiet(false), purge(false), info(false), domerge(false), doextend(false), pgsql(false);
Thomas Sailer a8d6f2c
-	Glib::ustring output_dir("."), export_file("");
Thomas Sailer a8d6f2c
+	std::string output_dir("."), export_file("");
Thomas Sailer a8d6f2c
 	std::list<Glib::ustring> gshhs_dir;
Thomas Sailer a8d6f2c
 	// check gshhs database with: ogrinfo GSHHS_shp/h/GSHHS_h_L1.shp GSHHS_h_L1
Thomas Sailer a8d6f2c
 	Rect bbox(Point(Point::lon_min, Point::lat_min), Point(Point::lon_max, Point::lat_max));
Thomas Sailer a8d6f2c
@@ -957,7 +957,7 @@ int main(int argc, char *argv[])
Thomas Sailer a8d6f2c
 	while (((c = getopt_long(argc, argv, "hvqo:k:m:p:PiME", long_options, NULL)) != -1)) {
Thomas Sailer a8d6f2c
 		switch (c) {
Thomas Sailer a8d6f2c
 		case 'v':
Thomas Sailer a8d6f2c
-			std::cout << argv[0] << ": (C) 2007, 2015 Thomas Sailer" << std::endl;
Thomas Sailer a8d6f2c
+			std::cout << argv[0] << ": (C) 2007, 2015, 2021 Thomas Sailer" << std::endl;
Thomas Sailer a8d6f2c
 			return 0;
Thomas Sailer a8d6f2c
 
Thomas Sailer a8d6f2c
 		case 'o':
Thomas Sailer a8d6f2c
diff --git a/utils/vfrnavfixdb.cc b/utils/vfrnavfixdb.cc
Thomas Sailer a8d6f2c
index 344f514e..505e4531 100644
Thomas Sailer a8d6f2c
--- a/utils/vfrnavfixdb.cc
Thomas Sailer a8d6f2c
+++ b/utils/vfrnavfixdb.cc
Thomas Sailer a8d6f2c
@@ -4,7 +4,7 @@
Thomas Sailer a8d6f2c
 // Description: Database fix routines
Thomas Sailer a8d6f2c
 //
Thomas Sailer a8d6f2c
 //
Thomas Sailer a8d6f2c
-// Author: Thomas Sailer <t.sailer@alumni.ethz.ch>, (C) 2007, 2009, 2012, 2013, 2015, 2016
Thomas Sailer a8d6f2c
+// Author: Thomas Sailer <t.sailer@alumni.ethz.ch>, (C) 2007, 2009, 2012, 2013, 2015, 2016, 2021
Thomas Sailer a8d6f2c
 //
Thomas Sailer a8d6f2c
 // Copyright: See COPYING file that comes with this distribution
Thomas Sailer a8d6f2c
 //
Thomas Sailer a8d6f2c
@@ -29,7 +29,7 @@
Thomas Sailer a8d6f2c
 
Thomas Sailer a8d6f2c
 class DbFix {
Thomas Sailer a8d6f2c
 public:
Thomas Sailer a8d6f2c
-	DbFix(const Glib::ustring& output_dir, bool pgsql = false, bool trace = false, bool nomodify = false);
Thomas Sailer a8d6f2c
+	DbFix(const std::string& output_dir, bool pgsql = false, bool trace = false, bool nomodify = false);
Thomas Sailer a8d6f2c
 	virtual ~DbFix();
Thomas Sailer a8d6f2c
 
Thomas Sailer a8d6f2c
 	void tile(void);
Thomas Sailer a8d6f2c
@@ -45,7 +45,7 @@ protected:
Thomas Sailer a8d6f2c
 	void close_db(void);
Thomas Sailer a8d6f2c
 
Thomas Sailer a8d6f2c
 private:
Thomas Sailer a8d6f2c
-	Glib::ustring m_outputdir;
Thomas Sailer a8d6f2c
+	std::string m_outputdir;
Thomas Sailer a8d6f2c
 	bool m_trace;
Thomas Sailer a8d6f2c
 #ifdef HAVE_PQXX
Thomas Sailer a8d6f2c
 	typedef std::unique_ptr<pqxx::connection> pgconn_t;
Thomas Sailer a8d6f2c
@@ -67,7 +67,7 @@ private:
Thomas Sailer a8d6f2c
 	TracksDb::Track m_trk;
Thomas Sailer a8d6f2c
 };
Thomas Sailer a8d6f2c
 
Thomas Sailer a8d6f2c
-DbFix::DbFix(const Glib::ustring & output_dir, bool pgsql, bool trace, bool nomodify)
Thomas Sailer a8d6f2c
+DbFix::DbFix(const std::string& output_dir, bool pgsql, bool trace, bool nomodify)
Thomas Sailer a8d6f2c
 	: m_outputdir(output_dir), m_trace(trace), m_nomodify(nomodify)
Thomas Sailer a8d6f2c
 {
Thomas Sailer a8d6f2c
 #ifdef HAVE_PQXX
Thomas Sailer a8d6f2c
diff --git a/utils/vfrnavxml2db.cc b/utils/vfrnavxml2db.cc
Thomas Sailer a8d6f2c
index 25581b32..4e8fcfc4 100644
Thomas Sailer a8d6f2c
--- a/utils/vfrnavxml2db.cc
Thomas Sailer a8d6f2c
+++ b/utils/vfrnavxml2db.cc
Thomas Sailer a8d6f2c
@@ -4,7 +4,7 @@
Thomas Sailer a8d6f2c
 // Description: Database XML representation to sqlite db conversion
Thomas Sailer a8d6f2c
 //
Thomas Sailer a8d6f2c
 //
Thomas Sailer a8d6f2c
-// Author: Thomas Sailer <t.sailer@alumni.ethz.ch>, (C) 2007, 2009, 2012, 2013, 2015, 2016
Thomas Sailer a8d6f2c
+// Author: Thomas Sailer <t.sailer@alumni.ethz.ch>, (C) 2007, 2009, 2012, 2013, 2015, 2016, 2021
Thomas Sailer a8d6f2c
 //
Thomas Sailer a8d6f2c
 // Copyright: See COPYING file that comes with this distribution
Thomas Sailer a8d6f2c
 //
Thomas Sailer a8d6f2c
@@ -32,7 +32,7 @@
Thomas Sailer a8d6f2c
 
Thomas Sailer a8d6f2c
 class DbXmlImporter : public xmlpp::SaxParser {
Thomas Sailer a8d6f2c
 public:
Thomas Sailer a8d6f2c
-	DbXmlImporter(const Glib::ustring& output_dir, bool pgsql = false, bool trace = false);
Thomas Sailer a8d6f2c
+	DbXmlImporter(const std::string& output_dir, bool pgsql = false, bool trace = false);
Thomas Sailer a8d6f2c
 	virtual ~DbXmlImporter();
Thomas Sailer a8d6f2c
 
Thomas Sailer a8d6f2c
 protected:
Thomas Sailer a8d6f2c
@@ -144,7 +144,7 @@ private:
Thomas Sailer a8d6f2c
 	state_t m_state;
Thomas Sailer a8d6f2c
 	bool m_trace;
Thomas Sailer a8d6f2c
 
Thomas Sailer a8d6f2c
-	Glib::ustring m_outputdir;
Thomas Sailer a8d6f2c
+	std::string m_outputdir;
Thomas Sailer a8d6f2c
 	bool m_purgedb;
Thomas Sailer a8d6f2c
 #ifdef HAVE_PQXX
Thomas Sailer a8d6f2c
 	typedef std::unique_ptr<pqxx::connection> pgconn_t;
Thomas Sailer a8d6f2c
@@ -239,7 +239,7 @@ bool DbXmlImporter::AirspaceDeps::AirspaceDeps::operator<(const AirspaceDeps& x)
Thomas Sailer a8d6f2c
 	return get_bdryclass() < x.get_bdryclass();
Thomas Sailer a8d6f2c
 }
Thomas Sailer a8d6f2c
 
Thomas Sailer a8d6f2c
-DbXmlImporter::DbXmlImporter(const Glib::ustring & output_dir, bool pgsql, bool trace)
Thomas Sailer a8d6f2c
+DbXmlImporter::DbXmlImporter(const std::string& output_dir, bool pgsql, bool trace)
Thomas Sailer a8d6f2c
 	: xmlpp::SaxParser(false), m_state(state_document_c), m_trace(trace), m_outputdir(output_dir),
Thomas Sailer a8d6f2c
 	  m_purgedb(false), m_fplan(0), m_fplanroute(0)
Thomas Sailer a8d6f2c
 {
Thomas Sailer a8d6f2c
diff --git a/utils/vmap.cc b/utils/vmap.cc
Thomas Sailer a8d6f2c
index 0ea6d06e..ecf7e225 100644
Thomas Sailer a8d6f2c
--- a/utils/vmap.cc
Thomas Sailer a8d6f2c
+++ b/utils/vmap.cc
Thomas Sailer a8d6f2c
@@ -746,7 +746,7 @@ int main(int argc, char *argv[])
Thomas Sailer a8d6f2c
 	};
Thomas Sailer a8d6f2c
 	int c, err(0);
Thomas Sailer a8d6f2c
 	bool quiet(false), purge(false), info(false), pgsql(false);
Thomas Sailer a8d6f2c
-	Glib::ustring output_dir(".");
Thomas Sailer a8d6f2c
+	std::string output_dir(".");
Thomas Sailer a8d6f2c
 	std::list<Glib::ustring> vmap_dir;
Thomas Sailer a8d6f2c
 	// check vmap database with: ogrinfo gltp:/vrf/tmp/v0eur/vmaplv0/eurnasia 'tundraa@veg(*)_area'
Thomas Sailer a8d6f2c
 	Rect bbox(Point(Point::lon_min, Point::lat_min), Point(Point::lon_max, Point::lat_max));
Thomas Sailer a8d6f2c
@@ -754,7 +754,7 @@ int main(int argc, char *argv[])
Thomas Sailer a8d6f2c
 	while (((c = getopt_long(argc, argv, "hvqo:k:m:p:Pi", long_options, NULL)) != -1)) {
Thomas Sailer a8d6f2c
 		switch (c) {
Thomas Sailer a8d6f2c
 		case 'v':
Thomas Sailer a8d6f2c
-			std::cout << argv[0] << ": (C) 2007 Thomas Sailer" << std::endl;
Thomas Sailer a8d6f2c
+			std::cout << argv[0] << ": (C) 2007, 2021 Thomas Sailer" << std::endl;
Thomas Sailer a8d6f2c
 			return 0;
Thomas Sailer a8d6f2c
 
Thomas Sailer a8d6f2c
 		case 'o':