[Marble-commits] KDE/kdeedu/marble/src/lib
Jens-Michael Hoffmann
jensmh at gmx.de
Thu Apr 8 01:34:24 CEST 2010
SVN commit 1112369 by jmhoffmann:
src/lib/{AbstractLayer|Projections|gps}: Adjust include guards after CODING update.
M +3 -4 AbstractLayer/AbstractLayer.h
M +3 -4 AbstractLayer/AbstractLayerContainer.h
M +3 -4 AbstractLayer/AbstractLayerData.h
M +2 -2 AbstractLayer/AbstractLayerInterface.h
M +3 -3 Projections/AbstractProjection.h
M +3 -3 Projections/AbstractProjection_p.h
M +3 -3 Projections/EquirectProjection.h
M +3 -3 Projections/MercatorProjection.h
M +3 -3 Projections/SphericalProjection.h
M +3 -3 gps/GpsElement.h
M +2 -2 gps/GpsLayer.h
M +2 -2 gps/GpxFile.h
M +2 -2 gps/GpxFileModel.h
M +2 -2 gps/GpxSax.h
M +3 -3 gps/Route.h
M +2 -2 gps/RouteContainer.h
M +3 -3 gps/Track.h
M +2 -2 gps/TrackContainer.h
M +2 -2 gps/TrackPoint.h
M +2 -3 gps/TrackSegment.h
M +3 -3 gps/Waypoint.h
M +3 -3 gps/WaypointContainer.h
M +3 -3 graphicsview/AbstractMarbleGraphicsLayout.h
--- trunk/KDE/kdeedu/marble/src/lib/AbstractLayer/AbstractLayer.h #1112368:1112369
@@ -11,8 +11,8 @@
//
-#ifndef ABSTRACTLAYER_H
-#define ABSTRACTLAYER_H
+#ifndef MARBLE_ABSTRACTLAYER_H
+#define MARBLE_ABSTRACTLAYER_H
// WARNING: This class is obsolete and will be removed, so do not use it
@@ -174,5 +174,4 @@
}
-#endif //ABSTRACTLAYER_H
-
+#endif
--- trunk/KDE/kdeedu/marble/src/lib/AbstractLayer/AbstractLayerContainer.h #1112368:1112369
@@ -9,8 +9,8 @@
//
-#ifndef ABSTRACTLAYERCONTAINER_H
-#define ABSTRACTLAYERCONTAINER_H
+#ifndef MARBLE_ABSTRACTLAYERCONTAINER_H
+#define MARBLE_ABSTRACTLAYERCONTAINER_H
#include <QtCore/QVector>
@@ -179,5 +179,4 @@
}
-#endif //ABSTRACTLAYERCONTAINER_H
-
+#endif
--- trunk/KDE/kdeedu/marble/src/lib/AbstractLayer/AbstractLayerData.h #1112368:1112369
@@ -9,8 +9,8 @@
//
-#ifndef ABSTRACTLAYERDATA_H
-#define ABSTRACTLAYERDATA_H
+#ifndef MARBLE_ABSTRACTLAYERDATA_H
+#define MARBLE_ABSTRACTLAYERDATA_H
#include "GeoDataCoordinates.h"
#include "AbstractLayerInterface.h"
@@ -166,5 +166,4 @@
}
-#endif //ABSTRACTLAYERDATA_H
-
+#endif
--- trunk/KDE/kdeedu/marble/src/lib/AbstractLayer/AbstractLayerInterface.h #1112368:1112369
@@ -7,8 +7,8 @@
//
// Copyright 2007 Andrew Manson <g.real.ate at gmail.com>
//
-#ifndef ABSTRACTLAYERINTERFACE_H
-#define ABSTRACTLAYERINTERFACE_H
+#ifndef MARBLE_ABSTRACTLAYERINTERFACE_H
+#define MARBLE_ABSTRACTLAYERINTERFACE_H
#include <QtCore/QTextStream>
--- trunk/KDE/kdeedu/marble/src/lib/Projections/AbstractProjection.h #1112368:1112369
@@ -10,8 +10,8 @@
//
-#ifndef ABSTRACTPROJECTION_H
-#define ABSTRACTPROJECTION_H
+#ifndef MARBLE_ABSTRACTPROJECTION_H
+#define MARBLE_ABSTRACTPROJECTION_H
/** @file
@@ -250,4 +250,4 @@
}
-#endif // ABSTRACTPROJECTION_H
+#endif
--- trunk/KDE/kdeedu/marble/src/lib/Projections/AbstractProjection_p.h #1112368:1112369
@@ -8,8 +8,8 @@
// Copyright 2009 Patrick Spendrin <ps_ml at gmx.de>
//
-#ifndef ABSTRACTPROJECTIONPRIVATE_H
-#define ABSTRACTPROJECTIONPRIVATE_H
+#ifndef MARBLE_ABSTRACTPROJECTIONPRIVATE_H
+#define MARBLE_ABSTRACTPROJECTIONPRIVATE_H
namespace Marble
@@ -60,4 +60,4 @@
} // namespace Marble
-#endif //ABSTRACTPROJECTIONPRIVATE_H
+#endif
--- trunk/KDE/kdeedu/marble/src/lib/Projections/EquirectProjection.h #1112368:1112369
@@ -10,8 +10,8 @@
//
-#ifndef EQUIRECTPROJECTION_H
-#define EQUIRECTPROJECTION_H
+#ifndef MARBLE_EQUIRECTPROJECTION_H
+#define MARBLE_EQUIRECTPROJECTION_H
/** @file
@@ -112,4 +112,4 @@
}
-#endif // EQUIRECTPROJECTION_H
+#endif
--- trunk/KDE/kdeedu/marble/src/lib/Projections/MercatorProjection.h #1112368:1112369
@@ -10,8 +10,8 @@
//
-#ifndef MERCATORPROJECTION_H
-#define MERCATORPROJECTION_H
+#ifndef MARBLE_MERCATORPROJECTION_H
+#define MARBLE_MERCATORPROJECTION_H
/** @file
@@ -111,4 +111,4 @@
}
-#endif // MERCATORPROJECTION_H
+#endif
--- trunk/KDE/kdeedu/marble/src/lib/Projections/SphericalProjection.h #1112368:1112369
@@ -10,8 +10,8 @@
//
-#ifndef SPHERICALPROJECTION_H
-#define SPHERICALPROJECTION_H
+#ifndef MARBLE_SPHERICALPROJECTION_H
+#define MARBLE_SPHERICALPROJECTION_H
/** @file
@@ -111,4 +111,4 @@
}
-#endif // SPHERICALPROJECTION_H
+#endif
--- trunk/KDE/kdeedu/marble/src/lib/gps/GpsElement.h #1112368:1112369
@@ -8,8 +8,8 @@
// Copyright 2007 Andrew Manson <g.real.ate at gmail.com>
// Copyright 2008 Jens-Michael Hoffmann <jensmh at gmx.de>
//
-#ifndef GPSELEMENT_H
-#define GPSELEMENT_H
+#ifndef MARBLE_GPSELEMENT_H
+#define MARBLE_GPSELEMENT_H
#include <QtCore/QString>
#include <QtCore/QUrl>
@@ -152,4 +152,4 @@
}
-#endif //GPSELEMENT_H
+#endif
--- trunk/KDE/kdeedu/marble/src/lib/gps/GpsLayer.h #1112368:1112369
@@ -9,8 +9,8 @@
//
-#ifndef GPSLAYER_H
-#define GPSLAYER_H
+#ifndef MARBLE_GPSLAYER_H
+#define MARBLE_GPSLAYER_H
#include "AbstractLayer.h"
--- trunk/KDE/kdeedu/marble/src/lib/gps/GpxFile.h #1112368:1112369
@@ -8,8 +8,8 @@
// Copyright 2007 Andrew Manson <g.real.ate at gmail.com>
//
-#ifndef GPXFILE_H
-#define GPXFILE_H
+#ifndef MARBLE_GPXFILE_H
+#define MARBLE_GPXFILE_H
#include <QtCore/QMetaType>
#include <QtCore/QString>
--- trunk/KDE/kdeedu/marble/src/lib/gps/GpxFileModel.h #1112368:1112369
@@ -9,8 +9,8 @@
//
-#ifndef GPXFILEMODEL_H
-#define GPXFILEMODEL_H
+#ifndef MARBLE_GPXFILEMODEL_H
+#define MARBLE_GPXFILEMODEL_H
#include <QtCore/QAbstractItemModel>
#include <QtCore/QModelIndex>
--- trunk/KDE/kdeedu/marble/src/lib/gps/GpxSax.h #1112368:1112369
@@ -8,8 +8,8 @@
// Copyright 2007 Andrew Manson <g.real.ate at gmail.com>
//
-#ifndef GPXSAX_H
-#define GPXSAX_H
+#ifndef MARBLE_GPXSAX_H
+#define MARBLE_GPXSAX_H
#include <QtXml/QXmlDefaultHandler>
--- trunk/KDE/kdeedu/marble/src/lib/gps/Route.h #1112368:1112369
@@ -7,8 +7,8 @@
//
// Copyright 2007 Andrew Manson <g.real.ate at gmail.com>
//
-#ifndef ROUTE_H
-#define ROUTE_H
+#ifndef MARBLE_ROUTE_H
+#define MARBLE_ROUTE_H
#include "AbstractLayerContainer.h"
#include "AbstractLayerData.h"
@@ -48,4 +48,4 @@
}
-#endif //ROUTE_H
+#endif
--- trunk/KDE/kdeedu/marble/src/lib/gps/RouteContainer.h #1112368:1112369
@@ -8,8 +8,8 @@
// Copyright 2007 Andrew Manson <g.real.ate at gmail.com>
//
-#ifndef ROUTECONTAINER_H
-#define ROUTECONTAINER_H
+#ifndef MARBLE_ROUTECONTAINER_H
+#define MARBLE_ROUTECONTAINER_H
#include "AbstractLayerContainer.h"
--- trunk/KDE/kdeedu/marble/src/lib/gps/Track.h #1112368:1112369
@@ -7,8 +7,8 @@
//
// Copyright 2007 Andrew Manson <g.real.ate at gmail.com>
//
-#ifndef TRACK_H
-#define TRACK_H
+#ifndef MARBLE_TRACK_H
+#define MARBLE_TRACK_H
#include "AbstractLayerContainer.h"
#include "AbstractLayerData.h"
@@ -57,4 +57,4 @@
}
-#endif //TRACK_H
+#endif
--- trunk/KDE/kdeedu/marble/src/lib/gps/TrackContainer.h #1112368:1112369
@@ -7,8 +7,8 @@
//
// Copyright 2007 Andrew Manson <g.real.ate at gmail.com>
//
-#ifndef TRACKCONTAINER_H
-#define TRACKCONTAINER_H
+#ifndef MARBLE_TRACKCONTAINER_H
+#define MARBLE_TRACKCONTAINER_H
#include "AbstractLayerContainer.h"
--- trunk/KDE/kdeedu/marble/src/lib/gps/TrackPoint.h #1112368:1112369
@@ -9,8 +9,8 @@
//
-#ifndef TRACKPOINT_H
-#define TRACKPOINT_H
+#ifndef MARBLE_TRACKPOINT_H
+#define MARBLE_TRACKPOINT_H
#include "Waypoint.h"
--- trunk/KDE/kdeedu/marble/src/lib/gps/TrackSegment.h #1112368:1112369
@@ -8,8 +8,8 @@
// Copyright 2007 Andrew Manson <g.real.ate at gmail.com>
//
-#ifndef TRACKSEG_H
-#define TRACKSEG_H
+#ifndef MARBLE_TRACKSEGMENT_H
+#define MARBLE_TRACKSEGMENT_H
#include "AbstractLayerContainer.h"
#include "AbstractLayerData.h"
@@ -41,4 +41,3 @@
}
#endif
-
--- trunk/KDE/kdeedu/marble/src/lib/gps/Waypoint.h #1112368:1112369
@@ -8,8 +8,8 @@
// Copyright 2007 Andrew Manson <g.real.ate at gmail.com>
// Copyright 2008 Jens-Michael Hoffmann <jensmh at gmx.de>
//
-#ifndef WAYPOINT_H
-#define WAYPOINT_H
+#ifndef MARBLE_WAYPOINT_H
+#define MARBLE_WAYPOINT_H
#include "AbstractLayerData.h"
#include "GpsElement.h"
@@ -284,4 +284,4 @@
}
-#endif //WAYPOINT_H
+#endif
--- trunk/KDE/kdeedu/marble/src/lib/gps/WaypointContainer.h #1112368:1112369
@@ -7,8 +7,8 @@
//
// Copyright 2007 Andrew Manson <g.real.ate at gmail.com>
//
-#ifndef WAYPOINTCONTAINER_H
-#define WAYPOINTCONTAINER_H
+#ifndef MARBLE_WAYPOINTCONTAINER_H
+#define MARBLE_WAYPOINTCONTAINER_H
#include "AbstractLayerContainer.h"
@@ -39,4 +39,4 @@
}
-#endif //WAYPOINTCONTAINER_H
+#endif
--- trunk/KDE/kdeedu/marble/src/lib/graphicsview/AbstractMarbleGraphicsLayout.h #1112368:1112369
@@ -8,8 +8,8 @@
// Copyright 2009 Bastian Holst <bastianholst at gmx.de>
//
-#ifndef ABSTRACTMARBLEGRAPHICSLAYOUT_H
-#define ABSTRACTMARBLEGRAPHICSLAYOUT_H
+#ifndef MARBLE_ABSTRACTMARBLEGRAPHICSLAYOUT_H
+#define MARBLE_ABSTRACTMARBLEGRAPHICSLAYOUT_H
#include "marble_export.h"
@@ -34,4 +34,4 @@
}
-#endif // ABSTRACTMARBLEGRAPHICSLAYOUT_H
+#endif
More information about the Marble-commits
mailing list