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