Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move of code to packages #1460

Merged
merged 2 commits into from
Jun 24, 2023
Merged

Move of code to packages #1460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7a9617
Move of code to packages
Framstag Jun 24, 2023
e3a0cad
- Fix header in iOSX
Framstag Jun 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion BasemapImport/src/BasemapImport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

#include <osmscout/projection/MercatorProjection.h>

#include <osmscout/util/CmdLineParsing.h>
#include <osmscout/cli/CmdLineParsing.h>

#include <osmscout/io/File.h>

Expand Down
2 changes: 1 addition & 1 deletion Demos/include/DrawMap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

#include <osmscout/projection/MercatorProjection.h>

#include <osmscout/util/CmdLineParsing.h>
#include <osmscout/cli/CmdLineParsing.h>

#include <osmscoutmap/MapService.h>

Expand Down
2 changes: 1 addition & 1 deletion Demos/include/QtDemoApp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/

#include <osmscout/util/CmdLineParsing.h>
#include <osmscout/cli/CmdLineParsing.h>

#include <QStringList>
#include <QGuiApplication>
Expand Down
2 changes: 1 addition & 1 deletion Demos/src/Coverage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

#include <osmscout/db/CoverageIndex.h>

#include <osmscout/util/CmdLineParsing.h>
#include <osmscout/cli/CmdLineParsing.h>

struct Arguments
{
Expand Down
4 changes: 2 additions & 2 deletions Demos/src/DrawMapOpenGL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
#include <sstream>
#include <iomanip>

#include <osmscout/util/CmdLineParsing.h>
#include <osmscout/util/Logger.h>
#include <osmscout/cli/CmdLineParsing.h>
#include <osmscout/log/Logger.h>

#include <osmscoutmapopengl/MapPainterOpenGL.h>

Expand Down
2 changes: 1 addition & 1 deletion Demos/src/DumpOSS.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <osmscout/TypeConfig.h>
#include <osmscoutmap/StyleConfig.h>

#include <osmscout/util/CmdLineParsing.h>
#include <osmscout/cli/CmdLineParsing.h>

struct Arguments
{
Expand Down
4 changes: 2 additions & 2 deletions Demos/src/ElevationProfile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@

#include <osmscout/ElevationService.h>

#include <osmscout/util/CmdLineParsing.h>
#include <osmscout/util/Logger.h>
#include <osmscout/cli/CmdLineParsing.h>
#include <osmscout/log/Logger.h>
#include <osmscout/util/Distance.h>

#include <iostream>
Expand Down
4 changes: 2 additions & 2 deletions Demos/src/GpxPipe.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
#include <osmscoutgpx/Import.h>
#include <osmscoutgpx/Export.h>

#include <osmscout/util/CmdLineParsing.h>
#include <osmscout/util/Logger.h>
#include <osmscout/cli/CmdLineParsing.h>
#include <osmscout/log/Logger.h>
#include <osmscout/util/Distance.h>

#include <iostream>
Expand Down
2 changes: 1 addition & 1 deletion Demos/src/LocationDescription.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

#include <osmscout/feature/AdminLevelFeature.h>

#include <osmscout/util/CmdLineParsing.h>
#include <osmscout/cli/CmdLineParsing.h>

struct Arguments
{
Expand Down
2 changes: 1 addition & 1 deletion Demos/src/LocationLookup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <osmscout/location/LocationService.h>
#include <osmscout/location/LocationDescriptionService.h>

#include <osmscout/util/CmdLineParsing.h>
#include <osmscout/cli/CmdLineParsing.h>

struct Arguments
{
Expand Down
2 changes: 1 addition & 1 deletion Demos/src/LocationLookupForm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

#include <osmscout/location/LocationService.h>

#include <osmscout/util/CmdLineParsing.h>
#include <osmscout/cli/CmdLineParsing.h>

struct Arguments
{
Expand Down
2 changes: 1 addition & 1 deletion Demos/src/LookupPOI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

#include <osmscout/feature/NameFeature.h>

#include <osmscout/util/CmdLineParsing.h>
#include <osmscout/cli/CmdLineParsing.h>
#include <osmscout/util/GeoBox.h>

struct Arguments
Expand Down
2 changes: 1 addition & 1 deletion Demos/src/LookupText.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <osmscout/db/TextSearchIndex.h>
#include <osmscout/db/Database.h>

#include <osmscout/util/CmdLineParsing.h>
#include <osmscout/cli/CmdLineParsing.h>

struct Arguments
{
Expand Down
2 changes: 1 addition & 1 deletion Demos/src/NavigationSimulator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
#include <osmscout/navigation/ArrivalEstimateAgent.h>
#include <osmscout/navigation/SpeedAgent.h>

#include <osmscout/util/CmdLineParsing.h>
#include <osmscout/cli/CmdLineParsing.h>

struct Arguments
{
Expand Down
2 changes: 1 addition & 1 deletion Demos/src/POILookupForm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

#include <osmscout/location/LocationService.h>

#include <osmscout/util/CmdLineParsing.h>
#include <osmscout/cli/CmdLineParsing.h>

struct Arguments
{
Expand Down
2 changes: 1 addition & 1 deletion Demos/src/PositionSimulator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

#include <PositionSimulator.h>

#include <osmscout/util/Logger.h>
#include <osmscout/log/Logger.h>

#include <osmscoutgpx/Import.h>

Expand Down
2 changes: 1 addition & 1 deletion Demos/src/Routing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#include <osmscout/routing/DBFileOffset.h>
#include <osmscout/routing/RouteDescriptionPostprocessor.h>

#include <osmscout/util/CmdLineParsing.h>
#include <osmscout/cli/CmdLineParsing.h>
#include <osmscout/util/Geometry.h>
#include <osmscout/util/Time.h>

Expand Down
2 changes: 1 addition & 1 deletion Demos/src/RoutingAnimation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include <osmscout/db/Database.h>

#include <osmscout/util/Geometry.h>
#include <osmscout/util/CmdLineParsing.h>
#include <osmscout/cli/CmdLineParsing.h>

#include <osmscoutmap/MapService.h>

Expand Down
2 changes: 1 addition & 1 deletion Demos/src/Tiler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

#include <osmscout/util/StopClock.h>
#include <osmscout/util/Tiling.h>
#include <osmscout/util/CmdLineParsing.h>
#include <osmscout/cli/CmdLineParsing.h>

#include <osmscoutmap/MapService.h>

Expand Down
3 changes: 2 additions & 1 deletion Import/src/Import.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@
#include <vector>
#include <optional>

#include <osmscout/util/CmdLineParsing.h>
#include <osmscout/cli/CmdLineParsing.h>
#include <osmscout/util/String.h>

#include <osmscout/io/File.h>

Expand Down
4 changes: 2 additions & 2 deletions OSMScout2/src/OSMScout.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@

#include <AppSettings.h>

#include <osmscout/util/Logger.h>
#include <osmscout/util/CmdLineParsing.h>
#include <osmscout/log/Logger.h>
#include <osmscout/cli/CmdLineParsing.h>

using namespace osmscout;

Expand Down
4 changes: 2 additions & 2 deletions OSMScoutOpenGL/src/OSMScoutOpenGL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@

#include <osmscout/db/Database.h>

#include <osmscout/util/CmdLineParsing.h>
#include <osmscout/util/Logger.h>
#include <osmscout/cli/CmdLineParsing.h>
#include <osmscout/log/Logger.h>

#include <osmscoutmap/MapService.h>

Expand Down
2 changes: 1 addition & 1 deletion PublicTransportMap/src/PublicTransportMap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

#include <osmscout/feature/NameFeature.h>

#include <osmscout/util/CmdLineParsing.h>
#include <osmscout/cli/CmdLineParsing.h>

#include <osmscout/io/FileScanner.h>

Expand Down
2 changes: 1 addition & 1 deletion StyleEditor/src/MainWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

#include <MainWindow.h>

#include <osmscout/util/Logger.h>
#include <osmscout/log/Logger.h>

#include <QGuiApplication>
#include <SettingsDialog.h>
Expand Down
2 changes: 1 addition & 1 deletion StyleEditor/src/StyleEditor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/

#include <osmscout/util/Logger.h>
#include <osmscout/log/Logger.h>

// Qt includes
#include <QGuiApplication>
Expand Down
2 changes: 1 addition & 1 deletion Tests/src/CachePerformance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

#include <osmscout/util/Cache.h>
#include <osmscout/util/StopClock.h>
#include <osmscout/util/CmdLineParsing.h>
#include <osmscout/cli/CmdLineParsing.h>

/**
Check performance of
Expand Down
4 changes: 2 additions & 2 deletions Tests/src/ClientQtThreading.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

#include <ClientQtThreading.h>

#include <osmscout/util/Logger.h>
#include <osmscout/util/CmdLineParsing.h>
#include <osmscout/log/Logger.h>
#include <osmscout/cli/CmdLineParsing.h>

#include <osmscoutclientqt/OSMScoutQt.h>

Expand Down
2 changes: 1 addition & 1 deletion Tests/src/CmdLineParsing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <iostream>

#include <osmscout/util/CmdLineParsing.h>
#include <osmscout/cli/CmdLineParsing.h>

#include <TestMain.h>

Expand Down
31 changes: 30 additions & 1 deletion Tests/src/HeaderCheck.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ static const std::list<fs::path> projects{
*
* osmscout.private
* osmscout.system
* osmscout.log
* osmscout.cli
* osmscout.util
* osmscout.projection
* osmscout.io
Expand All @@ -44,26 +46,42 @@ static const std::list<fs::path> projects{
*/

static const std::set<std::string> allowedDependencies{
"osmscout => osmscout.lib",
"osmscout => osmscout.system",
"osmscout => osmscout.log",
"osmscout => osmscout.util",
"osmscout => osmscout.io",
"osmscout => osmscout.db",
"osmscout => osmscout.feature",
"osmscout => osmscout.ost",
"osmscout.system => osmscout.lib",
"osmscout.system => osmscout.private",
"osmscout.system => osmscout", // Fix this
"osmscout.log => osmscout.lib",
"osmscout.log => osmscout.system",
"osmscout.log => osmscout.util", // Fix this -> Move database to package
"osmscout.cli => osmscout.system",
"osmscout.cli => osmscout.lib",
"osmscout.cli => osmscout.util", // Fix this -> Move String.h into package
"osmscout.cli => osmscout", // Fix this -> Move GeoCoord into package
"osmscout.util => osmscout.lib",
"osmscout.util => osmscout.private",
"osmscout.util => osmscout.system",
"osmscout.util => osmscout.log", // Fix this? Which parts of util should use a logger?
"osmscout.util => osmscout.projection", // Fix this
"osmscout.util => osmscout", // Fix this
"osmscout.projection => osmscout.lib",
"osmscout.projection => osmscout.system",
"osmscout.projection => osmscout.util",
"osmscout.projection => osmscout", // Fix this
"osmscout.io => osmscout.lib",
"osmscout.io => osmscout.private",
"osmscout.io => osmscout.system",
"osmscout.io => osmscout.log",
"osmscout.io => osmscout.util",
"osmscout.io => osmscout", // Fix this
"osmscout.db => osmscout.lib",
"osmscout.db => osmscout.system",
"osmscout.db => osmscout.log",
"osmscout.db => osmscout.util",
"osmscout.db => osmscout.io",
"osmscout.db => osmscout.location", // Fix this
Expand All @@ -77,25 +95,30 @@ static const std::set<std::string> allowedDependencies{
"osmscout.ost => osmscout.feature",
"osmscout.ost => osmscout", // Fix this
"osmscout.location => osmscout.system",
"osmscout.location => osmscout.log",
"osmscout.location => osmscout.util",
"osmscout.location => osmscout.db",
"osmscout.location => osmscout.feature",
"osmscout.location => osmscout", // Fix this
"osmscout.routing => osmscout.lib",
"osmscout.routing => osmscout.system",
"osmscout.routing => osmscout.log",
"osmscout.routing => osmscout.util",
"osmscout.routing => osmscout.io",
"osmscout.routing => osmscout.db",
"osmscout.routing => osmscout.feature",
"osmscout.routing => osmscout.location",
"osmscout.routing => osmscout", // Fix this
"osmscout.navigation => osmscout.system",
"osmscout.navigation => osmscout.log",
"osmscout.navigation => osmscout.util",
"osmscout.navigation => osmscout.feature",
"osmscout.navigation => osmscout.location",
"osmscout.navigation => osmscout.routing",
"osmscout.navigation => osmscout", // Fix this

"osmscoutclientqt => osmscout.system",
"osmscoutclientqt => osmscout.log",
"osmscoutclientqt => osmscout.util",
"osmscoutclientqt => osmscout.projection",
"osmscoutclientqt => osmscout.db",
Expand All @@ -109,6 +132,7 @@ static const std::set<std::string> allowedDependencies{
"osmscoutclientqt => osmscoutclientqt.private",

"osmscoutgpx => osmscout.system",
"osmscoutgpx => osmscout.log",
"osmscoutgpx => osmscout.util",
"osmscoutgpx => osmscout.io",
"osmscoutgpx => osmscout", // Fix this
Expand All @@ -125,11 +149,13 @@ static const std::set<std::string> allowedDependencies{
"osmscoutimport => osmscoutimport.pbf",

"osmscoutmap.oss => osmscout.system",
"osmscoutmap.oss => osmscout.log",
"osmscoutmap.oss => osmscout.util",
"osmscoutmap.oss => osmscout.io",
"osmscoutmap.oss => osmscout", // Fix this -> Helper and TypeService
"osmscoutmap.oss => osmscoutmap", // Fix this -> use of StyleConfig
"osmscoutmap => osmscout.system",
"osmscoutmap => osmscout.log",
"osmscoutmap => osmscout.util",
"osmscoutmap => osmscout.projection",
"osmscoutmap => osmscout.feature",
Expand All @@ -143,6 +169,7 @@ static const std::set<std::string> allowedDependencies{
"osmscoutmapagg => osmscoutmap",

"osmscoutmapcairo => osmscout.system",
"osmscoutmapcairo => osmscout.log",
"osmscoutmapcairo => osmscout.util",
"osmscoutmapcairo => osmscoutmap",

Expand All @@ -156,12 +183,14 @@ static const std::set<std::string> allowedDependencies{
"osmscoutmapgdi => osmscoutmap",

"osmscoutmapopengl => osmscout.system",
"osmscoutmapopengl => osmscout.log",
"osmscoutmapopengl => osmscout.util",
"osmscoutmapopengl => osmscout.projection",
"osmscoutmapopengl => osmscout.io",
"osmscoutmapopengl => osmscoutmap",

"osmscoutmapqt => osmscout.system",
"osmscoutmapqt => osmscout.log",
"osmscoutmapqt => osmscout.util",
"osmscoutmapqt => osmscout.io",
"osmscoutmapqt => osmscoutmap",
Expand Down
Loading
Loading