Skip to content

Commit

Permalink
clean up filter includes. (GPSBabel#431)
Browse files Browse the repository at this point in the history 
remove obsolete definition of filter_vecs_t.
don't included filterdefs.h in each filters .cc file.
add QVector include to each filters .h file.
  • Loading branch information
@tsteven4
tsteven4 authored Dec 6, 2019
1 parent 6b72a53 commit 5488970
Show file tree
Hide file tree
Showing 38 changed files with 44 additions and 41 deletions.
1 change: 0 additions & 1 deletion arcdist.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

#include "defs.h"
#include "arcdist.h"
#include "filterdefs.h"
#include "grtcirc.h"

#include <cmath>
Expand Down
2 changes: 2 additions & 0 deletions arcdist.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
#ifndef ARCDIST_H_INCLUDED_
#define ARCDIST_H_INCLUDED_

#include <QtCore/QVector> // for QVector

#include "defs.h" // for ARG_NOMINMAX, ARGTYPE_BOOL, Waypoint (ptr only)
#include "filter.h" // for Filter

Expand Down
1 change: 0 additions & 1 deletion bend.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
#include <QtCore/QtGlobal> // for qAsConst, QAddConst<>::Type, foreach

#include "defs.h"
#include "filterdefs.h"
#include "bend.h"
#include "grtcirc.h" // for RAD, heading_true_degrees, gcdist, linepart, radtometers, DEG

Expand Down
2 changes: 2 additions & 0 deletions bend.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
#ifndef BEND_H_INCLUDED_
#define BEND_H_INCLUDED_

#include <QtCore/QVector> // for QVector

#include "defs.h" // for route_head (ptr only), ARGTYPE_FLOAT, ARG_NOMINMAX
#include "filter.h" // for Filter

Expand Down
1 change: 0 additions & 1 deletion discard.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@

#include "defs.h"
#include "discard.h"
#include "filterdefs.h"
#include <cstdlib>
// Can't use QRegularExpression because Linux won't get Qt 5 for years.
#include <QtCore/QRegExp>
Expand Down
2 changes: 2 additions & 0 deletions discard.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@

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

#include "defs.h" // for ARG_NOMINMAX, ARGTYPE_BEGIN_REQ, ARGTYPE_S...
#include "filter.h" // for Filter

Expand Down
1 change: 0 additions & 1 deletion duplicate.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
#include <QtCore/QtGlobal> // for foreach

#include "defs.h"
#include "filterdefs.h"
#include "duplicate.h"
#include "src/core/datetime.h" // for DateTime

Expand Down
2 changes: 2 additions & 0 deletions duplicate.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
#ifndef DUPLICATE_H_INCLUDED_
#define DUPLICATE_H_INCLUDED_

#include <QtCore/QVector> // for QVector

#include "defs.h" // for ARGTYPE_BOOL, ARG_NOMINMAX, Waypoint (ptr only)
#include "filter.h" // for Filter

Expand Down
4 changes: 4 additions & 0 deletions filter.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@

#include "defs.h"

// Filter have access to the global_waypoint_list, which formats really
// shouldn't have.
extern WaypointList* global_waypoint_list;

class Filter
{
public:
Expand Down
27 changes: 4 additions & 23 deletions filterdefs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,33 +19,14 @@
*/



/*
* Filters can do some things that modules really shouldn't do.
* This is our (weak) attempt to make that distinction.
*/

#ifndef FILTERDEFS_H_INCLUDED_
#define FILTERDEFS_H_INCLUDED_

#include "defs.h"
#include "filter.h"

extern WaypointList* global_waypoint_list;

using filter_init = void (*)();
using filter_process = void (*)();
using filter_deinit = void (*)();
using filter_exit = void (*)();

struct filter_vecs_t {
filter_init f_init;
filter_process f_process;
filter_deinit f_deinit;
filter_exit f_exit;
QVector<arglist_t>* args;
};


// forward declare filter to avoid exposing global_waypoint_list by filter.h
class Filter;

Filter* find_filter_vec(const QString&);
void free_filter_vec(Filter*);
Expand Down
1 change: 0 additions & 1 deletion height.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@


#include "defs.h"
#include "filterdefs.h"
#include "height.h"
#include <cmath>
#include <cstdlib>
Expand Down
2 changes: 2 additions & 0 deletions height.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
#ifndef HEIGHT_H_INCLUDED_
#define HEIGHT_H_INCLUDED_

#include <QtCore/QVector> // for QVector

#include "defs.h" // for ARG_NOMINMAX, Waypoint (ptr only), arglist_t
#include "filter.h" // for Filter

Expand Down
1 change: 0 additions & 1 deletion interpolate.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
#include <QtCore/QtGlobal> // for qAsConst, QAddConst<>::Type, foreach

#include "defs.h"
#include "filterdefs.h"
#include "interpolate.h"
#include "grtcirc.h" // for linepart, RAD, gcdist, radtomiles
#include "src/core/datetime.h" // for DateTime
Expand Down
2 changes: 2 additions & 0 deletions interpolate.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
#ifndef INTERPOLATE_H_INCLUDED_
#define INTERPOLATE_H_INCLUDED_

#include <QtCore/QVector> // for QVector

#include "defs.h" // for ARG_NOMINMAX, arglist_t, ARGTYPE_BEGIN_EXCL, ARG...
#include "filter.h" // for Filter

Expand Down
1 change: 0 additions & 1 deletion nukedata.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
*/

#include "defs.h"
#include "filterdefs.h"
#include "nukedata.h"

#if FILTERS_ENABLED
Expand Down
2 changes: 2 additions & 0 deletions nukedata.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
#ifndef NUKEDATA_H_INCLUDED_
#define NUKEDATA_H_INCLUDED_

#include <QtCore/QVector> // for QVector

#include "defs.h" // for ARGTYPE_BOOL, ARG_NOMINMAX, arglist_t, ARG_TERMI...
#include "filter.h" // for Filter

Expand Down
1 change: 0 additions & 1 deletion polygon.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
#include <QtCore/QtGlobal> // for foreach

#include "defs.h"
#include "filterdefs.h" // for global_waypoint_list
#include "polygon.h"
#include "gbfile.h" // for gbfclose, gbfgetstr, gbfopen, gbfile

Expand Down
2 changes: 2 additions & 0 deletions polygon.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
#ifndef POLYGON_H_INCLUDED_
#define POLYGON_H_INCLUDED_

#include <QtCore/QVector> // for QVector

#include "defs.h" // for ARG_NOMINMAX, arglist_t, ARGTYPE_BOOL, ARGTYPE_FILE
#include "filter.h" // for Filter

Expand Down
1 change: 0 additions & 1 deletion position.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
#include <QtCore/QtGlobal> // for qAsConst, QAddConst<>::Type

#include "defs.h"
#include "filterdefs.h"
#include "grtcirc.h" // for RAD, gcdist, radtometers
#include "position.h"

Expand Down
2 changes: 2 additions & 0 deletions position.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
#ifndef POSITION_H_INCLUDED_
#define POSITION_H_INCLUDED_

#include <QtCore/QVector> // for QVector

#include "defs.h" // for route_head (ptr only), ARG_NOMINMAX, ARGTYPE_FLOAT
#include "filter.h" // for Filter

Expand Down
1 change: 0 additions & 1 deletion radius.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
#include <QtCore/QtGlobal> // for foreach

#include "defs.h"
#include "filterdefs.h"
#include "radius.h"
#include "grtcirc.h" // for RAD, gcdist, radtomiles

Expand Down
2 changes: 2 additions & 0 deletions radius.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
#ifndef RADIUS_H_INCLUDED_
#define RADIUS_H_INCLUDED_

#include <QtCore/QVector> // for QVector

#include "defs.h" // for ARG_NOMINMAX, ARGTYPE_FLOAT, ARGTYPE_REQUIRED
#include "filter.h" // for Filter

Expand Down
1 change: 0 additions & 1 deletion reverse_route.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#include <QtCore/QList> // for QList<>::iterator

#include "defs.h"
#include "filterdefs.h"
#include "reverse_route.h"

#if FILTERS_ENABLED
Expand Down
3 changes: 3 additions & 0 deletions reverse_route.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

#include <QtCore/QVector> // for QVector

#include "defs.h" // for Waypoint (ptr only), arglist_t, route_head (ptr ...
#include "filter.h" // for Filter

Expand Down
1 change: 0 additions & 1 deletion smplrout.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
*/

#include "defs.h"
#include "filterdefs.h"
#include "grtcirc.h"
#include "smplrout.h"
#include <cstdlib>
Expand Down
2 changes: 2 additions & 0 deletions smplrout.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@
#ifndef SMPLROUT_H_INCLUDED_
#define SMPLROUT_H_INCLUDED_

#include <QtCore/QVector> // for QVector

#include "defs.h" // for route_head (ptr only), Waypoint (ptr only), ARGT...
#include "filter.h" // for Filter

Expand Down
1 change: 0 additions & 1 deletion sort.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@

#include "defs.h"
#include "src/core/datetime.h" // for DateTime
#include "filterdefs.h"
#include "sort.h"

#if FILTERS_ENABLED
Expand Down
2 changes: 2 additions & 0 deletions sort.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
#ifndef SORT_H_INCLUDED_
#define SORT_H_INCLUDED_

#include <QtCore/QVector> // for QVector

#include "defs.h" // for ARGTYPE_BOOL, ARG_NOMINMAX, arglist_t, ARG_TERMI...
#include "filter.h" // for Filter

Expand Down
1 change: 0 additions & 1 deletion stackfilter.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
#include <cstdlib> // for atoi

#include "defs.h"
#include "filterdefs.h"
#include "stackfilter.h"

#if FILTERS_ENABLED
Expand Down
2 changes: 2 additions & 0 deletions stackfilter.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
#ifndef STACKFILTER_H_INCLUDED_
#define STACKFILTER_H_INCLUDED_

#include <QtCore/QVector> // for QVector

#include "defs.h" // for ARGTYPE_BOOL, ARG_NOMINMAX, ARGTYPE_BEGIN_EXCL
#include "filter.h" // for Filter

Expand Down
1 change: 0 additions & 1 deletion swapdata.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
*/

#include "defs.h"
#include "filterdefs.h"
#include "swapdata.h"

#define MYNAME "swapdata"
Expand Down
2 changes: 2 additions & 0 deletions swapdata.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
#ifndef SWAPDATA_H_INCLUDED_
#define SWAPDATA_H_INCLUDED_

#include <QtCore/QVector> // for QVector

#include "defs.h" // for arglist_t, Waypoint
#include "filter.h" // for Filter

Expand Down
1 change: 0 additions & 1 deletion trackfilter.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
#include <QtCore/QtGlobal> // for qAsConst, foreach, qPrintable, QAddConst<>::Type, qint64

#include "defs.h"
#include "filterdefs.h"
#include "trackfilter.h"

#include "grtcirc.h" // for RAD, gcdist, radtometers, heading_true_degrees
Expand Down
1 change: 1 addition & 0 deletions trackfilter.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

#include <QtCore/QDateTime> // for QDateTime
#include <QtCore/QList> // for QList
#include <QtCore/QVector> // for QVector
#include <QtCore/QtGlobal> // for qint64

#include "defs.h" // for ARG_NOMINMAX, route_head (ptr only), ARG...
Expand Down
1 change: 0 additions & 1 deletion transform.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
#include <QtCore/QtGlobal> // for foreach

#include "defs.h"
#include "filterdefs.h"
#include "transform.h"


Expand Down
2 changes: 2 additions & 0 deletions transform.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
#define TRANSFORM_H_INCLUDED_

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

#include "defs.h" // for route_head (ptr only), ARG_NOMINMAX, ARGTY...
#include "filter.h" // for Filter

Expand Down
1 change: 0 additions & 1 deletion validate.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
*/

#include "defs.h"
#include "filterdefs.h"
#include "validate.h"
#include <cstdio>

Expand Down
2 changes: 2 additions & 0 deletions validate.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
#ifndef VALIDATE_H_INCLUDED_
#define VALIDATE_H_INCLUDED_

#include <QtCore/QVector> // for QVector

#include "defs.h" // for route_head (ptr only), ARGTYPE_BOOL, ARG_NOMINMAX
#include "filter.h" // for Filter

Expand Down

0 comments on commit 5488970

Please sign in to comment.