Skip to content

Commit

Permalink
Don't use Qt module names in include directives. (GPSBabel#727)
Browse files Browse the repository at this point in the history 
This simplifies migration to Qt6 where some classes moved.

This was done mostly by an ed script, although mkstyle.sh took some
hand holding.

1,$g/#include <QtCore\// s/<QtCore\/\([^>]*\)>/<\1>       /
1,$g/#include <QtGui\// s/<QtGui\/\([^>]*\)>/<\1>      /
1,$g/#include <QtNetwork\// s/<QtNetwork\/\([^>]*\)>/<\1>          /
1,$g/#include <QtWidgets\// s/<QtWidgets\/\([^>]*\)>/<\1>          /
1,$g/ *$/ s/ *$//
w
q
  • Loading branch information
@tsteven4
tsteven4 authored Oct 4, 2021
1 parent 0f3a8a2 commit 37c4083
Show file tree
Hide file tree
Showing 194 changed files with 870 additions and 870 deletions.
6 changes: 3 additions & 3 deletions arcdist.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
#include <cstdlib> // for strtod
#include <cstring> // for strchr, strlen, strncmp, strspn

#include <QtCore/QByteArray> // for QByteArray
#include <QtCore/QString> // for QString
#include <QtCore/QtGlobal> // for foreach, qPrintable, qint64
#include <QByteArray> // for QByteArray
#include <QString> // for QString
#include <QtGlobal> // for foreach, qPrintable, qint64

#include "defs.h"
#include "arcdist.h"
Expand Down
2 changes: 1 addition & 1 deletion arcdist.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#ifndef ARCDIST_H_INCLUDED_
#define ARCDIST_H_INCLUDED_

#include <QtCore/QVector> // for QVector
#include <QVector> // for QVector

#include "defs.h" // for ARG_NOMINMAX, ARGTYPE_BOOL, Waypoint (ptr only)
#include "filter.h" // for Filter
Expand Down
6 changes: 3 additions & 3 deletions bcr.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
#include <cstdio> // for printf, snprintf, sscanf
#include <cstdlib> // for atof, atoi

#include <QtCore/QString> // for QString, operator+
#include <QtCore/Qt> // for CaseInsensitive
#include <QtCore/QtGlobal> // for foreach
#include <QString> // for QString, operator+
#include <Qt> // for CaseInsensitive
#include <QtGlobal> // for foreach

#include "defs.h"
#include "csv_util.h" // for csv_stringclean
Expand Down
4 changes: 2 additions & 2 deletions bend.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
#include <cmath> // macos wants abs from here!
#include <cstdlib> // for strtod, abs

#include <QtCore/QString> // for QString
#include <QtCore/QtGlobal> // for qAsConst, QAddConst<>::Type, foreach
#include <QString> // for QString
#include <QtGlobal> // for qAsConst, QAddConst<>::Type, foreach

#include "defs.h"
#include "bend.h"
Expand Down
2 changes: 1 addition & 1 deletion bend.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#ifndef BEND_H_INCLUDED_
#define BEND_H_INCLUDED_

#include <QtCore/QVector> // for QVector
#include <QVector> // for QVector

#include "defs.h" // for route_head (ptr only), ARGTYPE_FLOAT, ARG_NOMINMAX
#include "filter.h" // for Filter
Expand Down
6 changes: 3 additions & 3 deletions cet_util.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

#include <QtCore/QByteArray> // for QByteArray
#include <QtCore/QDebug> // for QDebug
#include <QtCore/QTextCodec> // for QTextCodec
#include <QByteArray> // for QByteArray
#include <QDebug> // for QDebug
#include <QTextCodec> // for QTextCodec

#include "defs.h"
#include "cet_util.h"
Expand Down
2 changes: 1 addition & 1 deletion cet_util.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#ifndef CET_UTIL_H_INCLUDED_
#define CET_UTIL_H_INCLUDED_

#include <QtCore/QString>
#include <QString>
#include "defs.h"


Expand Down
6 changes: 3 additions & 3 deletions coverity_model.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ void fatal(const char *msg, ...) {
}

// Forward decls to make the signature match.
class Waypoint;
class Waypoint;
class route_head;
class QString;
class route;

// These functions "claim" their arguments
// These functions "claim" their arguments
void
waypt_add(Waypoint* wpt) {
__coverity_escape__(wpt);
Expand All @@ -31,7 +31,7 @@ void route_add_wpt(route_head* rte, Waypoint* wpt) {
void track_add_wpt(route_head* rte, Waypoint* wpt) {
__coverity_escape__(wpt);
}
void route_add_wpt_named(route_head* rte, Waypoint* wpt,
void route_add_wpt_named(route_head* rte, Waypoint* wpt,
const QString& namepart, int number_digits) {
__coverity_escape__(wpt);
}
Expand Down
4 changes: 2 additions & 2 deletions csv_util.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
#include <cctype> // for isspace
#include <cstring> // for strlen, strchr, strncmp, strcmp, memmove, strcpy, strcspn, strncpy

#include <QtCore/QRegExp> // for QRegExp
#include <QtCore/QString> // for QString
#include <QRegExp> // for QRegExp
#include <QString> // for QString

#include "defs.h"
#include "csv_util.h"
Expand Down
2 changes: 1 addition & 1 deletion csv_util.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#ifndef CSV_UTIL_H_INCLUDED_
#define CSV_UTIL_H_INCLUDED_

#include <QtCore/QString> // for QString
#include <QString> // for QString

#include "defs.h"

Expand Down
18 changes: 9 additions & 9 deletions defs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@
#include "zlib.h" // doesn't really belong here, but is missing elsewhere.
#endif

#include <QtCore/QDebug> // for QDebug
#include <QtCore/QList> // for QList, QList<>::const_reverse_iterator, QList<>::reverse_iterator
#include <QtCore/QScopedPointer> // for QScopedPointer
#include <QtCore/QString> // for QString
#include <QtCore/QTextCodec> // for QTextCodec
#include <QtCore/QVector> // for QVector
#include <QtCore/Qt> // for CaseInsensitive
#include <QtCore/QtGlobal> // for foreach
#include <QDebug> // for QDebug
#include <QList> // for QList, QList<>::const_reverse_iterator, QList<>::reverse_iterator
#include <QScopedPointer> // for QScopedPointer
#include <QString> // for QString
#include <QTextCodec> // for QTextCodec
#include <QVector> // for QVector
#include <Qt> // for CaseInsensitive
#include <QtGlobal> // for foreach

#include "formspec.h" // for FormatSpecificData
#include "inifile.h" // for inifile_t
Expand Down Expand Up @@ -742,7 +742,7 @@ class RouteList : private QList<route_head*>
void disp_all(std::nullptr_t /* rh */, std::nullptr_t /* rt */, T3 wc);

// Only expose methods from our underlying container that won't corrupt our private data.
// Our contained element (route_head) also contains a container (waypoint_list),
// Our contained element (route_head) also contains a container (waypoint_list),
// and we maintain a total count the elements in these contained containers, i.e.
// the total number of waypoints in all the routes in the RouteList.
// public types
Expand Down
20 changes: 10 additions & 10 deletions destinator.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <QtCore/QDebug>
#include <QDebug>

#include <cassert> // for assert
#include <cmath> // for fabs, lround
Expand All @@ -30,14 +30,14 @@
#include <cstring> // for strcmp, memmove, memset, strlen
#include <ctime> // for gmtime

#include <QtCore/QByteArray> // for QByteArray
#include <QtCore/QScopedPointer> // for QScopedPointer
#include <QtCore/QString> // for QString
#include <QtCore/QTextCodec> // for QTextCodec, QTextCodec::IgnoreHeader
#include <QtCore/QTextDecoder> // for QTextDecoder
#include <QtCore/QTextEncoder> // for QTextEncoder
#include <QtCore/QTime> // for QTime
#include <QtCore/QVector> // for QVector
#include <QByteArray> // for QByteArray
#include <QScopedPointer> // for QScopedPointer
#include <QString> // for QString
#include <QTextCodec> // for QTextCodec, QTextCodec::IgnoreHeader
#include <QTextDecoder> // for QTextDecoder
#include <QTextEncoder> // for QTextEncoder
#include <QTime> // for QTime
#include <QVector> // for QVector

#include "defs.h"
#include "garmin_fs.h" // for garmin_fs_t, garmin_fs_flags_t, GMSD_GET, GMSD_SETSTRQ, garmin_fs_alloc, GMSD_FIND
Expand Down Expand Up @@ -109,7 +109,7 @@ read_until_wcstr(const QString& str)
QScopedPointer<QTextEncoder> encoder(utf16le_codec->makeEncoder(QTextCodec::IgnoreHeader));
QByteArray target = encoder->fromUnicode(str).append(2, 0);
assert((target.size() % 2) == 0);

int eos = 0;

int sz = target.size();
Expand Down
18 changes: 9 additions & 9 deletions dg-100.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@
#include <cstdlib> // for abs
#include <cstring> // for memcpy, memcmp, strcmp

#include <QtCore/QByteArray> // for QByteArray
#include <QtCore/QDate> // for QDate
#include <QtCore/QDateTime> // for QDateTime
#include <QtCore/QList> // for QList
#include <QtCore/QScopedArrayPointer> // for QScopedArrayPointer
#include <QtCore/QString> // for QString
#include <QtCore/QTime> // for QTime
#include <QtCore/Qt> // for TextDate, UTC
#include <QtCore/QtGlobal> // for qPrintable
#include <QByteArray> // for QByteArray
#include <QDate> // for QDate
#include <QDateTime> // for QDateTime
#include <QList> // for QList
#include <QScopedArrayPointer> // for QScopedArrayPointer
#include <QString> // for QString
#include <QTime> // for QTime
#include <Qt> // for TextDate, UTC
#include <QtGlobal> // for qPrintable

#include "defs.h"
#include "dg-100.h"
Expand Down
8 changes: 4 additions & 4 deletions dg-100.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
#include <cstdint> // for uint8_t, int16_t, uint16_t
#include <cstdio> // for size_t

#include <QtCore/QDateTime> // for QDateTime
#include <QtCore/QList> // for QList
#include <QtCore/QString> // for QString
#include <QtCore/QVector> // for QVector
#include <QDateTime> // for QDateTime
#include <QList> // for QList
#include <QString> // for QString
#include <QVector> // for QVector

#include "defs.h"
#include "format.h" // for Format
Expand Down
2 changes: 1 addition & 1 deletion discard.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "discard.h"
#include <cstdlib>
// Can't use QRegularExpression because Linux won't get Qt 5 for years.
#include <QtCore/QRegExp>
#include <QRegExp>
#include <cstdio>
#include <cstdlib>

Expand Down
4 changes: 2 additions & 2 deletions discard.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
#define DISCARD_H_INCLUDED_

// Can't use QRegularExpression because Linux won't get Qt 5 for years.
#include <QtCore/QRegExp> // for QRegExp
#include <QtCore/QVector> // for QVector
#include <QRegExp> // for QRegExp
#include <QVector> // for QVector

#include "defs.h" // for ARG_NOMINMAX, ARGTYPE_BEGIN_REQ, ARGTYPE_S...
#include "filter.h" // for Filter
Expand Down
10 changes: 5 additions & 5 deletions dmtlog.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
#include <cstdlib> // for atoi
#include <cstring> // for strncmp, memcpy, strcmp, strlen

#include <QtCore/QByteArray> // for QByteArray
#include <QtCore/QString> // for QString, operator+
#include <QtCore/QXmlStreamAttributes> // for QXmlStreamAttributes
#include <QtCore/QtGlobal> // for qPrintable
#include <QByteArray> // for QByteArray
#include <QString> // for QString, operator+
#include <QXmlStreamAttributes> // for QXmlStreamAttributes
#include <QtGlobal> // for qPrintable

#include "defs.h"
#include "gbfile.h" // for gbfgetdbl, gbfgetint32, gbfputint32, gbfgetint16, gbfputdbl, gbfputc, gbfread, gbfseek, gbfgetc, gbfile, gbfclose, gbfungetc, gbfeof, gbfputs, gbfwrite, gbfopen_le, gbfgetuint32, gbfputuint16, gbfputuint32
Expand Down Expand Up @@ -707,7 +707,7 @@ write_header(const route_head* trk)
write_str(trk->rte_name, fout);
}

// This fails for internationalization, but as this text is in the
// This fails for internationalization, but as this text is in the
// file itself, it shouldn't be localized.
QString cout = QString::number(count) + " trackpoints and " +
QString::number(waypt_count()) + " waypoints";
Expand Down
4 changes: 2 additions & 2 deletions duplicate.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
#include <cstdlib> // for qsort
#include <cstring> // for memset, strncpy

#include <QtCore/QDateTime> // for QDateTime
#include <QtCore/QtGlobal> // for foreach
#include <QDateTime> // for QDateTime
#include <QtGlobal> // for foreach

#include "defs.h"
#include "duplicate.h"
Expand Down
2 changes: 1 addition & 1 deletion duplicate.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#ifndef DUPLICATE_H_INCLUDED_
#define DUPLICATE_H_INCLUDED_

#include <QtCore/QVector> // for QVector
#include <QVector> // for QVector

#include "defs.h" // for ARGTYPE_BOOL, ARG_NOMINMAX, Waypoint (ptr only)
#include "filter.h" // for Filter
Expand Down
14 changes: 7 additions & 7 deletions energympro.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
#include <cstdint> // for int32_t
#include <cstdio> // for printf, SEEK_SET, SEEK_CUR, SEEK_END

#include <QtCore/QDate> // for QDate
#include <QtCore/QDateTime> // for QDateTime
#include <QtCore/QDebug> // for QDebug
#include <QtCore/QString> // for QString
#include <QtCore/QTime> // for QTime
#include <QtCore/QTimeZone> // for QTimeZone
#include <QtCore/Qt> // for UTC
#include <QDate> // for QDate
#include <QDateTime> // for QDateTime
#include <QDebug> // for QDebug
#include <QString> // for QString
#include <QTime> // for QTime
#include <QTimeZone> // for QTimeZone
#include <Qt> // for UTC

#include "defs.h"
#include "energympro.h"
Expand Down
6 changes: 3 additions & 3 deletions energympro.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@

#include <cstdint> // for uint8_t, uint16_t, uint32_t, int16_t

#include <QtCore/QString> // for QString
#include <QtCore/QTimeZone> // for QTimeZone
#include <QtCore/QVector> // for QVector
#include <QString> // for QString
#include <QTimeZone> // for QTimeZone
#include <QVector> // for QVector

#include "defs.h"
#include "format.h" // for Format
Expand Down
2 changes: 1 addition & 1 deletion enigma.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include <cstdlib> // for abs
#include <cstring> // for strlen, memcpy, memset

#include <QtCore/QString> // for QString
#include <QString> // for QString

#include "defs.h"
#include "gbfile.h" // for gbfclose, gbfopen_le, gbfread, gbfwrite, gbfile
Expand Down
32 changes: 16 additions & 16 deletions exif.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,22 +40,22 @@
#include "jeeps/gpsmath.h" // for GPS_Math_WGS84_To_Known_Datum_M
#include "src/core/datetime.h" // for DateTime

#include <QtCore/QByteArray> // for QByteArray
#include <QtCore/QDate> // for QDate
#include <QtCore/QDateTime> // for QDateTime
#include <QtCore/QFile> // for QFile
#include <QtCore/QFileInfo> // for QFileInfo
#include <QtCore/QList> // for QList<>::iterator, QList
#include <QtCore/QPair> // for QPair
#include <QtCore/QRegularExpression> // for QRegularExpression
#include <QtCore/QRegularExpressionMatch> // for QRegularExpressionMatch
#include <QtCore/QString> // for QString
#include <QtCore/QTextCodec> // for QTextCodec
#include <QtCore/QTime> // for QTime
#include <QtCore/QVariant> // for QVariant
#include <QtCore/QVector> // for QVector
#include <QtCore/Qt> // for UTC, ISODate
#include <QtCore/QtGlobal> // for qSwap, qPrintable, qint64
#include <QByteArray> // for QByteArray
#include <QDate> // for QDate
#include <QDateTime> // for QDateTime
#include <QFile> // for QFile
#include <QFileInfo> // for QFileInfo
#include <QList> // for QList<>::iterator, QList
#include <QPair> // for QPair
#include <QRegularExpression> // for QRegularExpression
#include <QRegularExpressionMatch> // for QRegularExpressionMatch
#include <QString> // for QString
#include <QTextCodec> // for QTextCodec
#include <QTime> // for QTime
#include <QVariant> // for QVariant
#include <QVector> // for QVector
#include <Qt> // for UTC, ISODate
#include <QtGlobal> // for qSwap, qPrintable, qint64

#include <algorithm> // for sort, min
#include <cassert> // for assert
Expand Down
4 changes: 2 additions & 2 deletions f90g_track.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@

#include "defs.h"
#include "gbfile.h"
#include <QtCore/QDebug>
#include <QtCore/QFileInfo>
#include <QDebug>
#include <QFileInfo>

#define MYNAME "f90g_track"
#define TTRECORDSIZE 249
Expand Down
Loading

0 comments on commit 37c4083

Please sign in to comment.