From: GPSBabel <gpsbabel@users.noreply.github.com>
Date: Mon, 27 Nov 2017 03:11:53 +0000 (-0600)
Subject: Merge branch 'master' into cleanup
X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~115^2~1^2~197^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=140cf111b76e1803e66573d728d853ce9ce0f5d5;p=gpsbabel.git

Merge branch 'master' into cleanup
---

140cf111b76e1803e66573d728d853ce9ce0f5d5
diff --cc gopal.cc
index 0de7468be,ff5f9b2b3..603d1750b
--- a/gopal.cc
+++ b/gopal.cc
@@@ -51,12 -51,14 +51,15 @@@
  #include "defs.h"
  #include "cet_util.h"
  #include "csv_util.h"
 -#include "strptime.h"
 -#include "jeeps/gpsmath.h"
  #include "grtcirc.h"
 -#include <stdlib.h>
 -#include <stdio.h>
 +#include "jeeps/gpsmath.h"
 +#include "strptime.h"
  #include <cmath>
 +#include <cstdio>
 +#include <cstdlib>
+ #include <QtCore/QDateTime>
+ #include <QtCore/QString>
++
  #define MYNAME "gopal"
  
  static gbfile* fin, *fout;
diff --cc main.cc
index f57fb0ea2,409185f2b..e61e6fa7d
--- a/main.cc
+++ b/main.cc
@@@ -17,23 -17,29 +17,32 @@@
  
   */
  
 +#include <QtCore/QCoreApplication>
 +#include <QtCore/QTextCodec>
 +#include <QtCore/QVector>
+ #include <QtCore/QStack>
+ #include <QtCore/QString>
+ #include <QtCore/QTextCodec>
+ #include <QtCore/QTextStream>
+ #include <QtCore/QCoreApplication>
  
 -#include "defs.h"
 -#include "filterdefs.h"
  #include "cet.h"
  #include "cet_util.h"
  #include "csv_util.h"
 +#include "defs.h"
 +#include "filterdefs.h"
  #include "inifile.h"
  #include "session.h"
+ #include "src/core/file.h"
  #include "src/core/usasciicodec.h"
 -#include <ctype.h>
 -#include <locale.h>
 -#include <stdlib.h>
 -#include <stdio.h>
 +#include <cctype>
 +#include <clocale>
 +#include <cstdio>
 +#include <cstdlib>
  #include <signal.h>
+ #ifdef AFL_INPUT_FUZZING
+ #include "argv-fuzz-inl.h"
+ #endif
  
  #define MYNAME "main"
  
diff --cc shape.cc
index e24e5b069,28c94ca5a..32282b96e
--- a/shape.cc
+++ b/shape.cc
@@@ -19,9 -19,13 +19,14 @@@
      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 USA
  
   */
+ #include <QtCore/QLatin1String>
+ #include <QtCore/QString>
+ #include <QtCore/QStringList>
+ #include <QtCore/QVector>
+ 
  #include "defs.h"
  #include "shapelib/shapefil.h"
 +#include <cstdlib>
  
  #if SHAPELIB_ENABLED
  static SHPHandle ihandle;