root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-28 05:34:47 +01:00
Code Issues Projects Releases Activity

Switched to Qt5 signal/slot API

Browse Source
This commit is contained in:
Martin Tůma 2021-04-28 00:01:07 +02:00
parent 9f3917b0f2
commit 2e2fee560f
19 changed files with 136 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/GUI/filebrowser.cpp
View File

@ -7,8 +7,8 @@ FileBrowser::FileBrowser(QObject *parent) : QObject(parent)
{ {
_watcher = new QFileSystemWatcher(this); _watcher = new QFileSystemWatcher(this);
connect(_watcher, SIGNAL(directoryChanged(const QString &)), this, connect(_watcher, &QFileSystemWatcher::directoryChanged, this,
SLOT(reloadDirectory(const QString &))); &FileBrowser::reloadDirectory);
_index = -1; _index = -1;
} }

2
src/GUI/fileselectwidget.cpp
View File

@ -21,7 +21,7 @@ FileSelectWidget::FileSelectWidget(QWidget *parent) : QWidget(parent)
_button = new QToolButton(); _button = new QToolButton();
_button->setText("..."); _button->setText("...");
#endif // Q_OS_WIN32 #endif // Q_OS_WIN32
connect(_button, SIGNAL(clicked()), this, SLOT(browse())); connect(_button, &QToolButton::clicked, this, &FileSelectWidget::browse);
QHBoxLayout *layout = new QHBoxLayout(); QHBoxLayout *layout = new QHBoxLayout();
layout->setContentsMargins(QMargins()); layout->setContentsMargins(QMargins());

4
src/GUI/graphview.cpp
View File

@ -56,8 +56,8 @@ GraphView::GraphView(QWidget *parent)
_message->setBrush(QPalette().brush(QPalette::Disabled, _message->setBrush(QPalette().brush(QPalette::Disabled,
QPalette::WindowText)); QPalette::WindowText));
connect(_slider, SIGNAL(positionChanged(const QPointF&)), this, connect(_slider, &SliderItem::positionChanged, this,
SLOT(emitSliderPositionChanged(const QPointF&))); &GraphView::emitSliderPositionChanged);
_width = 1; _width = 1;

190
src/GUI/gui.cpp
View File

@ -115,8 +115,7 @@ TreeNode<MapAction*> GUI::createMapActions()
{ {
_mapsActionGroup = new QActionGroup(this); _mapsActionGroup = new QActionGroup(this);
_mapsActionGroup->setExclusive(true); _mapsActionGroup->setExclusive(true);
connect(_mapsActionGroup, SIGNAL(triggered(QAction*)), this, connect(_mapsActionGroup, &QActionGroup::triggered, this, &GUI::mapChanged);
SLOT(mapChanged(QAction*)));
QString mapDir(ProgramPaths::mapDir()); QString mapDir(ProgramPaths::mapDir());
if (mapDir.isNull()) if (mapDir.isNull())
@ -137,7 +136,7 @@ TreeNode<MapAction*> GUI::createMapActionsNode(const TreeNode<Map*> &node)
Map *map = node.items().at(i); Map *map = node.items().at(i);
if (map->isValid()) { if (map->isValid()) {
MapAction *a = new MapAction(map, _mapsActionGroup); MapAction *a = new MapAction(map, _mapsActionGroup);
connect(a, SIGNAL(loaded()), this, SLOT(mapInitialized())); connect(a, &MapAction::loaded, this, &GUI::mapInitialized);
tree.addItem(a); tree.addItem(a);
} else { } else {
qWarning("%s: %s", qPrintable(map->path()), qWarning("%s: %s", qPrintable(map->path()),
@ -169,8 +168,8 @@ TreeNode<POIAction *> GUI::createPOIActions()
{ {
_poisActionGroup = new QActionGroup(this); _poisActionGroup = new QActionGroup(this);
_poisActionGroup->setExclusive(false); _poisActionGroup->setExclusive(false);
connect(_poisActionGroup, SIGNAL(triggered(QAction*)), this, connect(_poisActionGroup, &QActionGroup::triggered, this,
SLOT(poiFileChecked(QAction*))); &GUI::poiFileChecked);
TreeNode<QString> poiFiles; TreeNode<QString> poiFiles;
QString poiDir(ProgramPaths::poiDir()); QString poiDir(ProgramPaths::poiDir());
@ -209,64 +208,65 @@ void GUI::createActions(TreeNode<MapAction*> &mapActions,
_exitAction = new QAction(QIcon(QUIT_ICON), tr("Quit"), this); _exitAction = new QAction(QIcon(QUIT_ICON), tr("Quit"), this);
_exitAction->setShortcut(QUIT_SHORTCUT); _exitAction->setShortcut(QUIT_SHORTCUT);
_exitAction->setMenuRole(QAction::QuitRole); _exitAction->setMenuRole(QAction::QuitRole);
connect(_exitAction, SIGNAL(triggered()), this, SLOT(close())); connect(_exitAction, &QAction::triggered, this, &GUI::close);
addAction(_exitAction); addAction(_exitAction);
// Help & About // Help & About
_pathsAction = new QAction(tr("Paths"), this); _pathsAction = new QAction(tr("Paths"), this);
_pathsAction->setMenuRole(QAction::NoRole); _pathsAction->setMenuRole(QAction::NoRole);
connect(_pathsAction, SIGNAL(triggered()), this, SLOT(paths())); connect(_pathsAction, &QAction::triggered, this, &GUI::paths);
_keysAction = new QAction(tr("Keyboard controls"), this); _keysAction = new QAction(tr("Keyboard controls"), this);
_keysAction->setMenuRole(QAction::NoRole); _keysAction->setMenuRole(QAction::NoRole);
connect(_keysAction, SIGNAL(triggered()), this, SLOT(keys())); connect(_keysAction, &QAction::triggered, this, &GUI::keys);
_aboutAction = new QAction(QIcon(APP_ICON), tr("About GPXSee"), this); _aboutAction = new QAction(QIcon(APP_ICON), tr("About GPXSee"), this);
_aboutAction->setMenuRole(QAction::AboutRole); _aboutAction->setMenuRole(QAction::AboutRole);
connect(_aboutAction, SIGNAL(triggered()), this, SLOT(about())); connect(_aboutAction, &QAction::triggered, this, &GUI::about);
// File actions // File actions
_openFileAction = new QAction(QIcon(OPEN_FILE_ICON), tr("Open..."), this); _openFileAction = new QAction(QIcon(OPEN_FILE_ICON), tr("Open..."), this);
_openFileAction->setMenuRole(QAction::NoRole); _openFileAction->setMenuRole(QAction::NoRole);
_openFileAction->setShortcut(OPEN_SHORTCUT); _openFileAction->setShortcut(OPEN_SHORTCUT);
connect(_openFileAction, SIGNAL(triggered()), this, SLOT(openFile())); connect(_openFileAction, &QAction::triggered, this,
QOverload<>::of(&GUI::openFile));
addAction(_openFileAction); addAction(_openFileAction);
_printFileAction = new QAction(QIcon(PRINT_FILE_ICON), tr("Print..."), _printFileAction = new QAction(QIcon(PRINT_FILE_ICON), tr("Print..."),
this); this);
_printFileAction->setMenuRole(QAction::NoRole); _printFileAction->setMenuRole(QAction::NoRole);
_printFileAction->setActionGroup(_fileActionGroup); _printFileAction->setActionGroup(_fileActionGroup);
connect(_printFileAction, SIGNAL(triggered()), this, SLOT(printFile())); connect(_printFileAction, &QAction::triggered, this, &GUI::printFile);
addAction(_printFileAction); addAction(_printFileAction);
_exportPDFFileAction = new QAction(QIcon(EXPORT_FILE_ICON), _exportPDFFileAction = new QAction(QIcon(EXPORT_FILE_ICON),
tr("Export to PDF..."), this); tr("Export to PDF..."), this);
_exportPDFFileAction->setMenuRole(QAction::NoRole); _exportPDFFileAction->setMenuRole(QAction::NoRole);
_exportPDFFileAction->setShortcut(PDF_EXPORT_SHORTCUT); _exportPDFFileAction->setShortcut(PDF_EXPORT_SHORTCUT);
_exportPDFFileAction->setActionGroup(_fileActionGroup); _exportPDFFileAction->setActionGroup(_fileActionGroup);
connect(_exportPDFFileAction, SIGNAL(triggered()), this, SLOT(exportPDFFile())); connect(_exportPDFFileAction, &QAction::triggered, this, &GUI::exportPDFFile);
addAction(_exportPDFFileAction); addAction(_exportPDFFileAction);
_exportPNGFileAction = new QAction(QIcon(EXPORT_FILE_ICON), _exportPNGFileAction = new QAction(QIcon(EXPORT_FILE_ICON),
tr("Export to PNG..."), this); tr("Export to PNG..."), this);
_exportPNGFileAction->setMenuRole(QAction::NoRole); _exportPNGFileAction->setMenuRole(QAction::NoRole);
_exportPNGFileAction->setShortcut(PNG_EXPORT_SHORTCUT); _exportPNGFileAction->setShortcut(PNG_EXPORT_SHORTCUT);
_exportPNGFileAction->setActionGroup(_fileActionGroup); _exportPNGFileAction->setActionGroup(_fileActionGroup);
connect(_exportPNGFileAction, SIGNAL(triggered()), this, SLOT(exportPNGFile())); connect(_exportPNGFileAction, &QAction::triggered, this, &GUI::exportPNGFile);
addAction(_exportPNGFileAction); addAction(_exportPNGFileAction);
_closeFileAction = new QAction(QIcon(CLOSE_FILE_ICON), tr("Close"), this); _closeFileAction = new QAction(QIcon(CLOSE_FILE_ICON), tr("Close"), this);
_closeFileAction->setMenuRole(QAction::NoRole); _closeFileAction->setMenuRole(QAction::NoRole);
_closeFileAction->setShortcut(CLOSE_SHORTCUT); _closeFileAction->setShortcut(CLOSE_SHORTCUT);
_closeFileAction->setActionGroup(_fileActionGroup); _closeFileAction->setActionGroup(_fileActionGroup);
connect(_closeFileAction, SIGNAL(triggered()), this, SLOT(closeAll())); connect(_closeFileAction, &QAction::triggered, this, &GUI::closeAll);
addAction(_closeFileAction); addAction(_closeFileAction);
_reloadFileAction = new QAction(QIcon(RELOAD_FILE_ICON), tr("Reload"), _reloadFileAction = new QAction(QIcon(RELOAD_FILE_ICON), tr("Reload"),
this); this);
_reloadFileAction->setMenuRole(QAction::NoRole); _reloadFileAction->setMenuRole(QAction::NoRole);
_reloadFileAction->setShortcut(RELOAD_SHORTCUT); _reloadFileAction->setShortcut(RELOAD_SHORTCUT);
_reloadFileAction->setActionGroup(_fileActionGroup); _reloadFileAction->setActionGroup(_fileActionGroup);
connect(_reloadFileAction, SIGNAL(triggered()), this, SLOT(reloadFiles())); connect(_reloadFileAction, &QAction::triggered, this, &GUI::reloadFiles);
addAction(_reloadFileAction); addAction(_reloadFileAction);
_statisticsAction = new QAction(tr("Statistics..."), this); _statisticsAction = new QAction(tr("Statistics..."), this);
_statisticsAction->setMenuRole(QAction::NoRole); _statisticsAction->setMenuRole(QAction::NoRole);
_statisticsAction->setShortcut(STATISTICS_SHORTCUT); _statisticsAction->setShortcut(STATISTICS_SHORTCUT);
_statisticsAction->setActionGroup(_fileActionGroup); _statisticsAction->setActionGroup(_fileActionGroup);
connect(_statisticsAction, SIGNAL(triggered()), this, SLOT(statistics())); connect(_statisticsAction, &QAction::triggered, this, &GUI::statistics);
addAction(_statisticsAction); addAction(_statisticsAction);
// POI actions // POI actions
@ -274,33 +274,33 @@ void GUI::createActions(TreeNode<MapAction*> &mapActions,
_openPOIAction = new QAction(QIcon(OPEN_FILE_ICON), tr("Load POI file..."), _openPOIAction = new QAction(QIcon(OPEN_FILE_ICON), tr("Load POI file..."),
this); this);
_openPOIAction->setMenuRole(QAction::NoRole); _openPOIAction->setMenuRole(QAction::NoRole);
connect(_openPOIAction, SIGNAL(triggered()), this, SLOT(openPOIFile())); connect(_openPOIAction, &QAction::triggered, this,
QOverload<>::of(&GUI::openPOIFile));
_selectAllPOIAction = new QAction(tr("Select all files"), this); _selectAllPOIAction = new QAction(tr("Select all files"), this);
_selectAllPOIAction->setMenuRole(QAction::NoRole); _selectAllPOIAction->setMenuRole(QAction::NoRole);
_selectAllPOIAction->setEnabled(!_poisActionGroup->actions().isEmpty()); _selectAllPOIAction->setEnabled(!_poisActionGroup->actions().isEmpty());
connect(_selectAllPOIAction, SIGNAL(triggered()), this, connect(_selectAllPOIAction, &QAction::triggered, this,
SLOT(selectAllPOIs())); &GUI::selectAllPOIs);
_unselectAllPOIAction = new QAction(tr("Unselect all files"), this); _unselectAllPOIAction = new QAction(tr("Unselect all files"), this);
_unselectAllPOIAction->setMenuRole(QAction::NoRole); _unselectAllPOIAction->setMenuRole(QAction::NoRole);
_unselectAllPOIAction->setEnabled(_selectAllPOIAction->isEnabled()); _unselectAllPOIAction->setEnabled(_selectAllPOIAction->isEnabled());
connect(_unselectAllPOIAction, SIGNAL(triggered()), this, connect(_unselectAllPOIAction, &QAction::triggered, this,
SLOT(unselectAllPOIs())); &GUI::unselectAllPOIs);
_overlapPOIAction = new QAction(tr("Overlap POIs"), this); _overlapPOIAction = new QAction(tr("Overlap POIs"), this);
_overlapPOIAction->setMenuRole(QAction::NoRole); _overlapPOIAction->setMenuRole(QAction::NoRole);
_overlapPOIAction->setCheckable(true); _overlapPOIAction->setCheckable(true);
connect(_overlapPOIAction, SIGNAL(triggered(bool)), _mapView, connect(_overlapPOIAction, &QAction::triggered, _mapView,
SLOT(showOverlappedPOIs(bool))); &MapView::showOverlappedPOIs);
_showPOILabelsAction = new QAction(tr("Show POI labels"), this); _showPOILabelsAction = new QAction(tr("Show POI labels"), this);
_showPOILabelsAction->setMenuRole(QAction::NoRole); _showPOILabelsAction->setMenuRole(QAction::NoRole);
_showPOILabelsAction->setCheckable(true); _showPOILabelsAction->setCheckable(true);
connect(_showPOILabelsAction, SIGNAL(triggered(bool)), _mapView, connect(_showPOILabelsAction, &QAction::triggered, _mapView,
SLOT(showPOILabels(bool))); &MapView::showPOILabels);
_showPOIAction = new QAction(QIcon(SHOW_POI_ICON), tr("Show POIs"), this); _showPOIAction = new QAction(QIcon(SHOW_POI_ICON), tr("Show POIs"), this);
_showPOIAction->setMenuRole(QAction::NoRole); _showPOIAction->setMenuRole(QAction::NoRole);
_showPOIAction->setCheckable(true); _showPOIAction->setCheckable(true);
_showPOIAction->setShortcut(SHOW_POI_SHORTCUT); _showPOIAction->setShortcut(SHOW_POI_SHORTCUT);
connect(_showPOIAction, SIGNAL(triggered(bool)), _mapView, connect(_showPOIAction, &QAction::triggered, _mapView, &MapView::showPOI);
SLOT(showPOI(bool)));
addAction(_showPOIAction); addAction(_showPOIAction);
// Map actions // Map actions
@ -311,77 +311,76 @@ void GUI::createActions(TreeNode<MapAction*> &mapActions,
_showMapAction->setMenuRole(QAction::NoRole); _showMapAction->setMenuRole(QAction::NoRole);
_showMapAction->setCheckable(true); _showMapAction->setCheckable(true);
_showMapAction->setShortcut(SHOW_MAP_SHORTCUT); _showMapAction->setShortcut(SHOW_MAP_SHORTCUT);
connect(_showMapAction, SIGNAL(triggered(bool)), _mapView, connect(_showMapAction, &QAction::triggered, _mapView,
SLOT(showMap(bool))); &MapView::showMap);
addAction(_showMapAction); addAction(_showMapAction);
_loadMapAction = new QAction(QIcon(OPEN_FILE_ICON), tr("Load map..."), _loadMapAction = new QAction(QIcon(OPEN_FILE_ICON), tr("Load map..."),
this); this);
_loadMapAction->setMenuRole(QAction::NoRole); _loadMapAction->setMenuRole(QAction::NoRole);
connect(_loadMapAction, SIGNAL(triggered()), this, SLOT(loadMap())); connect(_loadMapAction, &QAction::triggered, this,
QOverload<>::of(&GUI::loadMap));
_loadMapDirAction = new QAction(QIcon(OPEN_FILE_ICON), _loadMapDirAction = new QAction(QIcon(OPEN_FILE_ICON),
tr("Load map directory..."), this); tr("Load map directory..."), this);
_loadMapDirAction->setMenuRole(QAction::NoRole); _loadMapDirAction->setMenuRole(QAction::NoRole);
connect(_loadMapDirAction, SIGNAL(triggered()), this, SLOT(loadMapDir())); connect(_loadMapDirAction, &QAction::triggered, this, &GUI::loadMapDir);
_clearMapCacheAction = new QAction(tr("Clear tile cache"), this); _clearMapCacheAction = new QAction(tr("Clear tile cache"), this);
_clearMapCacheAction->setEnabled(false); _clearMapCacheAction->setEnabled(false);
_clearMapCacheAction->setMenuRole(QAction::NoRole); _clearMapCacheAction->setMenuRole(QAction::NoRole);
connect(_clearMapCacheAction, SIGNAL(triggered()), this, connect(_clearMapCacheAction, &QAction::triggered, this,
SLOT(clearMapCache())); &GUI::clearMapCache);
_nextMapAction = new QAction(tr("Next map"), this); _nextMapAction = new QAction(tr("Next map"), this);
_nextMapAction->setMenuRole(QAction::NoRole); _nextMapAction->setMenuRole(QAction::NoRole);
_nextMapAction->setShortcut(NEXT_MAP_SHORTCUT); _nextMapAction->setShortcut(NEXT_MAP_SHORTCUT);
connect(_nextMapAction, SIGNAL(triggered()), this, SLOT(nextMap())); connect(_nextMapAction, &QAction::triggered, this, &GUI::nextMap);
addAction(_nextMapAction); addAction(_nextMapAction);
_prevMapAction = new QAction(tr("Next map"), this); _prevMapAction = new QAction(tr("Next map"), this);
_prevMapAction->setMenuRole(QAction::NoRole); _prevMapAction->setMenuRole(QAction::NoRole);
_prevMapAction->setShortcut(PREV_MAP_SHORTCUT); _prevMapAction->setShortcut(PREV_MAP_SHORTCUT);
connect(_prevMapAction, SIGNAL(triggered()), this, SLOT(prevMap())); connect(_prevMapAction, &QAction::triggered, this, &GUI::prevMap);
addAction(_prevMapAction); addAction(_prevMapAction);
_showCoordinatesAction = new QAction(tr("Show cursor coordinates"), this); _showCoordinatesAction = new QAction(tr("Show cursor coordinates"), this);
_showCoordinatesAction->setMenuRole(QAction::NoRole); _showCoordinatesAction->setMenuRole(QAction::NoRole);
_showCoordinatesAction->setCheckable(true); _showCoordinatesAction->setCheckable(true);
connect(_showCoordinatesAction, SIGNAL(triggered(bool)), _mapView, connect(_showCoordinatesAction, &QAction::triggered, _mapView,
SLOT(showCoordinates(bool))); &MapView::showCoordinates);
// Data actions // Data actions
_showTracksAction = new QAction(tr("Show tracks"), this); _showTracksAction = new QAction(tr("Show tracks"), this);
_showTracksAction->setMenuRole(QAction::NoRole); _showTracksAction->setMenuRole(QAction::NoRole);
_showTracksAction->setCheckable(true); _showTracksAction->setCheckable(true);
connect(_showTracksAction, SIGNAL(triggered(bool)), this, connect(_showTracksAction, &QAction::triggered, this, &GUI::showTracks);
SLOT(showTracks(bool)));
_showRoutesAction = new QAction(tr("Show routes"), this); _showRoutesAction = new QAction(tr("Show routes"), this);
_showRoutesAction->setMenuRole(QAction::NoRole); _showRoutesAction->setMenuRole(QAction::NoRole);
_showRoutesAction->setCheckable(true); _showRoutesAction->setCheckable(true);
connect(_showRoutesAction, SIGNAL(triggered(bool)), this, connect(_showRoutesAction, &QAction::triggered, this, &GUI::showRoutes);
SLOT(showRoutes(bool)));
_showWaypointsAction = new QAction(tr("Show waypoints"), this); _showWaypointsAction = new QAction(tr("Show waypoints"), this);
_showWaypointsAction->setMenuRole(QAction::NoRole); _showWaypointsAction->setMenuRole(QAction::NoRole);
_showWaypointsAction->setCheckable(true); _showWaypointsAction->setCheckable(true);
connect(_showWaypointsAction, SIGNAL(triggered(bool)), _mapView, connect(_showWaypointsAction, &QAction::triggered, _mapView,
SLOT(showWaypoints(bool))); &MapView::showWaypoints);
_showAreasAction = new QAction(tr("Show areas"), this); _showAreasAction = new QAction(tr("Show areas"), this);
_showAreasAction->setMenuRole(QAction::NoRole); _showAreasAction->setMenuRole(QAction::NoRole);
_showAreasAction->setCheckable(true); _showAreasAction->setCheckable(true);
connect(_showAreasAction, SIGNAL(triggered(bool)), _mapView, connect(_showAreasAction, &QAction::triggered, _mapView,
SLOT(showAreas(bool))); &MapView::showAreas);
_showWaypointLabelsAction = new QAction(tr("Waypoint labels"), this); _showWaypointLabelsAction = new QAction(tr("Waypoint labels"), this);
_showWaypointLabelsAction->setMenuRole(QAction::NoRole); _showWaypointLabelsAction->setMenuRole(QAction::NoRole);
_showWaypointLabelsAction->setCheckable(true); _showWaypointLabelsAction->setCheckable(true);
connect(_showWaypointLabelsAction, SIGNAL(triggered(bool)), _mapView, connect(_showWaypointLabelsAction, &QAction::triggered, _mapView,
SLOT(showWaypointLabels(bool))); &MapView::showWaypointLabels);
_showRouteWaypointsAction = new QAction(tr("Route waypoints"), this); _showRouteWaypointsAction = new QAction(tr("Route waypoints"), this);
_showRouteWaypointsAction->setMenuRole(QAction::NoRole); _showRouteWaypointsAction->setMenuRole(QAction::NoRole);
_showRouteWaypointsAction->setCheckable(true); _showRouteWaypointsAction->setCheckable(true);
connect(_showRouteWaypointsAction, SIGNAL(triggered(bool)), _mapView, connect(_showRouteWaypointsAction, &QAction::triggered, _mapView,
SLOT(showRouteWaypoints(bool))); &MapView::showRouteWaypoints);
_showTicksAction = new QAction(tr("km/mi markers"), this); _showTicksAction = new QAction(tr("km/mi markers"), this);
_showTicksAction->setMenuRole(QAction::NoRole); _showTicksAction->setMenuRole(QAction::NoRole);
_showTicksAction->setCheckable(true); _showTicksAction->setCheckable(true);
connect(_showTicksAction, SIGNAL(triggered(bool)), _mapView, connect(_showTicksAction, &QAction::triggered, _mapView,
SLOT(showTicks(bool))); &MapView::showTicks);
QActionGroup *markerInfoGroup = new QActionGroup(this); QActionGroup *markerInfoGroup = new QActionGroup(this);
connect(markerInfoGroup, SIGNAL(triggered(QAction*)), this, connect(markerInfoGroup, &QActionGroup::triggered, this,
SLOT(showPathMarkerInfo(QAction*))); &GUI::showPathMarkerInfo);
_hideMarkersAction = new QAction(tr("Do not show"), this); _hideMarkersAction = new QAction(tr("Do not show"), this);
_hideMarkersAction->setMenuRole(QAction::NoRole); _hideMarkersAction->setMenuRole(QAction::NoRole);
_hideMarkersAction->setCheckable(true); _hideMarkersAction->setCheckable(true);
@ -405,8 +404,7 @@ void GUI::createActions(TreeNode<MapAction*> &mapActions,
_showGraphsAction->setMenuRole(QAction::NoRole); _showGraphsAction->setMenuRole(QAction::NoRole);
_showGraphsAction->setCheckable(true); _showGraphsAction->setCheckable(true);
_showGraphsAction->setShortcut(SHOW_GRAPHS_SHORTCUT); _showGraphsAction->setShortcut(SHOW_GRAPHS_SHORTCUT);
connect(_showGraphsAction, SIGNAL(triggered(bool)), this, connect(_showGraphsAction, &QAction::triggered, this, &GUI::showGraphs);
SLOT(showGraphs(bool)));
addAction(_showGraphsAction); addAction(_showGraphsAction);
ag = new QActionGroup(this); ag = new QActionGroup(this);
ag->setExclusive(true); ag->setExclusive(true);
@ -414,117 +412,110 @@ void GUI::createActions(TreeNode<MapAction*> &mapActions,
_distanceGraphAction->setMenuRole(QAction::NoRole); _distanceGraphAction->setMenuRole(QAction::NoRole);
_distanceGraphAction->setCheckable(true); _distanceGraphAction->setCheckable(true);
_distanceGraphAction->setActionGroup(ag); _distanceGraphAction->setActionGroup(ag);
connect(_distanceGraphAction, SIGNAL(triggered()), this, connect(_distanceGraphAction, &QAction::triggered, this,
SLOT(setDistanceGraph())); &GUI::setDistanceGraph);
addAction(_distanceGraphAction); addAction(_distanceGraphAction);
_timeGraphAction = new QAction(tr("Time"), this); _timeGraphAction = new QAction(tr("Time"), this);
_timeGraphAction->setMenuRole(QAction::NoRole); _timeGraphAction->setMenuRole(QAction::NoRole);
_timeGraphAction->setCheckable(true); _timeGraphAction->setCheckable(true);
_timeGraphAction->setActionGroup(ag); _timeGraphAction->setActionGroup(ag);
connect(_timeGraphAction, SIGNAL(triggered()), this, connect(_timeGraphAction, &QAction::triggered, this, &GUI::setTimeGraph);
SLOT(setTimeGraph()));
addAction(_timeGraphAction); addAction(_timeGraphAction);
_showGraphGridAction = new QAction(tr("Show grid"), this); _showGraphGridAction = new QAction(tr("Show grid"), this);
_showGraphGridAction->setMenuRole(QAction::NoRole); _showGraphGridAction->setMenuRole(QAction::NoRole);
_showGraphGridAction->setCheckable(true); _showGraphGridAction->setCheckable(true);
connect(_showGraphGridAction, SIGNAL(triggered(bool)), this, connect(_showGraphGridAction, &QAction::triggered, this,
SLOT(showGraphGrids(bool))); &GUI::showGraphGrids);
_showGraphSliderInfoAction = new QAction(tr("Show slider info"), this); _showGraphSliderInfoAction = new QAction(tr("Show slider info"), this);
_showGraphSliderInfoAction->setMenuRole(QAction::NoRole); _showGraphSliderInfoAction->setMenuRole(QAction::NoRole);
_showGraphSliderInfoAction->setCheckable(true); _showGraphSliderInfoAction->setCheckable(true);
connect(_showGraphSliderInfoAction, SIGNAL(triggered(bool)), this, connect(_showGraphSliderInfoAction, &QAction::triggered, this,
SLOT(showGraphSliderInfo(bool))); &GUI::showGraphSliderInfo);
// Settings actions // Settings actions
_showToolbarsAction = new QAction(tr("Show toolbars"), this); _showToolbarsAction = new QAction(tr("Show toolbars"), this);
_showToolbarsAction->setMenuRole(QAction::NoRole); _showToolbarsAction->setMenuRole(QAction::NoRole);
_showToolbarsAction->setCheckable(true); _showToolbarsAction->setCheckable(true);
connect(_showToolbarsAction, SIGNAL(triggered(bool)), this, connect(_showToolbarsAction, &QAction::triggered, this, &GUI::showToolbars);
SLOT(showToolbars(bool)));
ag = new QActionGroup(this); ag = new QActionGroup(this);
ag->setExclusive(true); ag->setExclusive(true);
_totalTimeAction = new QAction(tr("Total time"), this); _totalTimeAction = new QAction(tr("Total time"), this);
_totalTimeAction->setMenuRole(QAction::NoRole); _totalTimeAction->setMenuRole(QAction::NoRole);
_totalTimeAction->setCheckable(true); _totalTimeAction->setCheckable(true);
_totalTimeAction->setActionGroup(ag); _totalTimeAction->setActionGroup(ag);
connect(_totalTimeAction, SIGNAL(triggered()), this, connect(_totalTimeAction, &QAction::triggered, this, &GUI::setTotalTime);
SLOT(setTotalTime()));
_movingTimeAction = new QAction(tr("Moving time"), this); _movingTimeAction = new QAction(tr("Moving time"), this);
_movingTimeAction->setMenuRole(QAction::NoRole); _movingTimeAction->setMenuRole(QAction::NoRole);
_movingTimeAction->setCheckable(true); _movingTimeAction->setCheckable(true);
_movingTimeAction->setActionGroup(ag); _movingTimeAction->setActionGroup(ag);
connect(_movingTimeAction, SIGNAL(triggered()), this, connect(_movingTimeAction, &QAction::triggered, this, &GUI::setMovingTime);
SLOT(setMovingTime()));
ag = new QActionGroup(this); ag = new QActionGroup(this);
ag->setExclusive(true); ag->setExclusive(true);
_metricUnitsAction = new QAction(tr("Metric"), this); _metricUnitsAction = new QAction(tr("Metric"), this);
_metricUnitsAction->setMenuRole(QAction::NoRole); _metricUnitsAction->setMenuRole(QAction::NoRole);
_metricUnitsAction->setCheckable(true); _metricUnitsAction->setCheckable(true);
_metricUnitsAction->setActionGroup(ag); _metricUnitsAction->setActionGroup(ag);
connect(_metricUnitsAction, SIGNAL(triggered()), this, connect(_metricUnitsAction, &QAction::triggered, this, &GUI::setMetricUnits);
SLOT(setMetricUnits()));
_imperialUnitsAction = new QAction(tr("Imperial"), this); _imperialUnitsAction = new QAction(tr("Imperial"), this);
_imperialUnitsAction->setMenuRole(QAction::NoRole); _imperialUnitsAction->setMenuRole(QAction::NoRole);
_imperialUnitsAction->setCheckable(true); _imperialUnitsAction->setCheckable(true);
_imperialUnitsAction->setActionGroup(ag); _imperialUnitsAction->setActionGroup(ag);
connect(_imperialUnitsAction, SIGNAL(triggered()), this, connect(_imperialUnitsAction, &QAction::triggered, this,
SLOT(setImperialUnits())); &GUI::setImperialUnits);
_nauticalUnitsAction = new QAction(tr("Nautical"), this); _nauticalUnitsAction = new QAction(tr("Nautical"), this);
_nauticalUnitsAction->setMenuRole(QAction::NoRole); _nauticalUnitsAction->setMenuRole(QAction::NoRole);
_nauticalUnitsAction->setCheckable(true); _nauticalUnitsAction->setCheckable(true);
_nauticalUnitsAction->setActionGroup(ag); _nauticalUnitsAction->setActionGroup(ag);
connect(_nauticalUnitsAction, SIGNAL(triggered()), this, connect(_nauticalUnitsAction, &QAction::triggered, this,
SLOT(setNauticalUnits())); &GUI::setNauticalUnits);
ag = new QActionGroup(this); ag = new QActionGroup(this);
ag->setExclusive(true); ag->setExclusive(true);
_decimalDegreesAction = new QAction(tr("Decimal degrees (DD)"), this); _decimalDegreesAction = new QAction(tr("Decimal degrees (DD)"), this);
_decimalDegreesAction->setMenuRole(QAction::NoRole); _decimalDegreesAction->setMenuRole(QAction::NoRole);
_decimalDegreesAction->setCheckable(true); _decimalDegreesAction->setCheckable(true);
_decimalDegreesAction->setActionGroup(ag); _decimalDegreesAction->setActionGroup(ag);
connect(_decimalDegreesAction, SIGNAL(triggered()), this, connect(_decimalDegreesAction, &QAction::triggered, this,
SLOT(setDecimalDegrees())); &GUI::setDecimalDegrees);
_degreesMinutesAction = new QAction(tr("Degrees and decimal minutes (DMM)"), _degreesMinutesAction = new QAction(tr("Degrees and decimal minutes (DMM)"),
this); this);
_degreesMinutesAction->setMenuRole(QAction::NoRole); _degreesMinutesAction->setMenuRole(QAction::NoRole);
_degreesMinutesAction->setCheckable(true); _degreesMinutesAction->setCheckable(true);
_degreesMinutesAction->setActionGroup(ag); _degreesMinutesAction->setActionGroup(ag);
connect(_degreesMinutesAction, SIGNAL(triggered()), this, connect(_degreesMinutesAction, &QAction::triggered, this,
SLOT(setDegreesMinutes())); &GUI::setDegreesMinutes);
_dmsAction = new QAction(tr("Degrees, minutes, seconds (DMS)"), this); _dmsAction = new QAction(tr("Degrees, minutes, seconds (DMS)"), this);
_dmsAction->setMenuRole(QAction::NoRole); _dmsAction->setMenuRole(QAction::NoRole);
_dmsAction->setCheckable(true); _dmsAction->setCheckable(true);
_dmsAction->setActionGroup(ag); _dmsAction->setActionGroup(ag);
connect(_dmsAction, SIGNAL(triggered()), this, SLOT(setDMS())); connect(_dmsAction, &QAction::triggered, this, &GUI::setDMS);
_fullscreenAction = new QAction(QIcon(FULLSCREEN_ICON), _fullscreenAction = new QAction(QIcon(FULLSCREEN_ICON),
tr("Fullscreen mode"), this); tr("Fullscreen mode"), this);
_fullscreenAction->setMenuRole(QAction::NoRole); _fullscreenAction->setMenuRole(QAction::NoRole);
_fullscreenAction->setCheckable(true); _fullscreenAction->setCheckable(true);
_fullscreenAction->setShortcut(FULLSCREEN_SHORTCUT); _fullscreenAction->setShortcut(FULLSCREEN_SHORTCUT);
connect(_fullscreenAction, SIGNAL(triggered(bool)), this, connect(_fullscreenAction, &QAction::triggered, this, &GUI::showFullscreen);
SLOT(showFullscreen(bool)));
addAction(_fullscreenAction); addAction(_fullscreenAction);
_openOptionsAction = new QAction(tr("Options..."), this); _openOptionsAction = new QAction(tr("Options..."), this);
_openOptionsAction->setMenuRole(QAction::PreferencesRole); _openOptionsAction->setMenuRole(QAction::PreferencesRole);
connect(_openOptionsAction, SIGNAL(triggered()), this, connect(_openOptionsAction, &QAction::triggered, this, &GUI::openOptions);
SLOT(openOptions()));
// Navigation actions // Navigation actions
_nextAction = new QAction(QIcon(NEXT_FILE_ICON), tr("Next"), this); _nextAction = new QAction(QIcon(NEXT_FILE_ICON), tr("Next"), this);
_nextAction->setActionGroup(_navigationActionGroup); _nextAction->setActionGroup(_navigationActionGroup);
_nextAction->setMenuRole(QAction::NoRole); _nextAction->setMenuRole(QAction::NoRole);
connect(_nextAction, SIGNAL(triggered()), this, SLOT(next())); connect(_nextAction, &QAction::triggered, this, &GUI::next);
_prevAction = new QAction(QIcon(PREV_FILE_ICON), tr("Previous"), this); _prevAction = new QAction(QIcon(PREV_FILE_ICON), tr("Previous"), this);
_prevAction->setMenuRole(QAction::NoRole); _prevAction->setMenuRole(QAction::NoRole);
_prevAction->setActionGroup(_navigationActionGroup); _prevAction->setActionGroup(_navigationActionGroup);
connect(_prevAction, SIGNAL(triggered()), this, SLOT(prev())); connect(_prevAction, &QAction::triggered, this, &GUI::prev);
_lastAction = new QAction(QIcon(LAST_FILE_ICON), tr("Last"), this); _lastAction = new QAction(QIcon(LAST_FILE_ICON), tr("Last"), this);
_lastAction->setMenuRole(QAction::NoRole); _lastAction->setMenuRole(QAction::NoRole);
_lastAction->setActionGroup(_navigationActionGroup); _lastAction->setActionGroup(_navigationActionGroup);
connect(_lastAction, SIGNAL(triggered()), this, SLOT(last())); connect(_lastAction, &QAction::triggered, this, &GUI::last);
_firstAction = new QAction(QIcon(FIRST_FILE_ICON), tr("First"), this); _firstAction = new QAction(QIcon(FIRST_FILE_ICON), tr("First"), this);
_firstAction->setMenuRole(QAction::NoRole); _firstAction->setMenuRole(QAction::NoRole);
_firstAction->setActionGroup(_navigationActionGroup); _firstAction->setActionGroup(_navigationActionGroup);
connect(_firstAction, SIGNAL(triggered()), this, SLOT(first())); connect(_firstAction, &QAction::triggered, this, &GUI::first);
} }
void GUI::createMapNodeMenu(const TreeNode<MapAction*> &node, QMenu *menu) void GUI::createMapNodeMenu(const TreeNode<MapAction*> &node, QMenu *menu)
@ -697,8 +688,8 @@ void GUI::createGraphTabs()
_graphTabWidget->setDocumentMode(true); _graphTabWidget->setDocumentMode(true);
#endif // Q_OS_MAC #endif // Q_OS_MAC
connect(_graphTabWidget, SIGNAL(currentChanged(int)), this, connect(_graphTabWidget, &QTabWidget::currentChanged, this,
SLOT(graphChanged(int))); &GUI::graphChanged);
_tabs.append(new ElevationGraph(_graphTabWidget)); _tabs.append(new ElevationGraph(_graphTabWidget));
_tabs.append(new SpeedGraph(_graphTabWidget)); _tabs.append(new SpeedGraph(_graphTabWidget));
@ -709,8 +700,8 @@ void GUI::createGraphTabs()
_tabs.append(new GearRatioGraph(_graphTabWidget)); _tabs.append(new GearRatioGraph(_graphTabWidget));
for (int i = 0; i < _tabs.size(); i++) for (int i = 0; i < _tabs.size(); i++)
connect(_tabs.at(i), SIGNAL(sliderPositionChanged(qreal)), _mapView, connect(_tabs.at(i), &GraphTab::sliderPositionChanged, _mapView,
SLOT(setMarkerPosition(qreal))); &MapView::setMarkerPosition);
} }
void GUI::createStatusBar() void GUI::createStatusBar()
@ -1553,7 +1544,7 @@ bool GUI::loadMapNode(const TreeNode<Map*> &node, MapAction *&action,
_showMapAction->setEnabled(true); _showMapAction->setEnabled(true);
_clearMapCacheAction->setEnabled(true); _clearMapCacheAction->setEnabled(true);
} else } else
connect(a, SIGNAL(loaded()), this, SLOT(mapLoaded())); connect(a, &MapAction::loaded, this, &GUI::mapLoaded);
} }
} else { } else {
valid = true; valid = true;
@ -1637,7 +1628,7 @@ void GUI::loadMapDirNode(const TreeNode<Map *> &node, QList<MapAction*> &actions
_clearMapCacheAction->setEnabled(true); _clearMapCacheAction->setEnabled(true);
actions.append(a); actions.append(a);
} else } else
connect(a, SIGNAL(loaded()), this, SLOT(mapLoadedDir())); connect(a, &MapAction::loaded, this, &GUI::mapLoadedDir);
} }
_areaCount++; _areaCount++;
@ -2689,10 +2680,9 @@ void GUI::show()
QMainWindow::show(); QMainWindow::show();
QWindow *w = windowHandle(); QWindow *w = windowHandle();
connect(w->screen(), SIGNAL(logicalDotsPerInchChanged(qreal)), this, connect(w->screen(), &QScreen::logicalDotsPerInchChanged, this,
SLOT(logicalDotsPerInchChanged(qreal))); &GUI::logicalDotsPerInchChanged);
connect(w, SIGNAL(screenChanged(QScreen*)), this, connect(w, &QWindow::screenChanged, this, &GUI::screenChanged);
SLOT(screenChanged(QScreen*)));
_mapView->fitContentToSize(); _mapView->fitContentToSize();
} }
@ -2704,8 +2694,8 @@ void GUI::screenChanged(QScreen *screen)
disconnect(SIGNAL(logicalDotsPerInchChanged(qreal)), this, disconnect(SIGNAL(logicalDotsPerInchChanged(qreal)), this,
SLOT(logicalDotsPerInchChanged(qreal))); SLOT(logicalDotsPerInchChanged(qreal)));
connect(screen, SIGNAL(logicalDotsPerInchChanged(qreal)), this, connect(screen, &QScreen::logicalDotsPerInchChanged, this,
SLOT(logicalDotsPerInchChanged(qreal))); &GUI::logicalDotsPerInchChanged);
} }
void GUI::logicalDotsPerInchChanged(qreal dpi) void GUI::logicalDotsPerInchChanged(qreal dpi)

2
src/GUI/mapaction.h
View File

@ -18,7 +18,7 @@ public:
setMenuRole(QAction::NoRole); setMenuRole(QAction::NoRole);
setCheckable(true); setCheckable(true);
connect(map, SIGNAL(mapLoaded()), this, SLOT(mapLoaded())); connect(map, &Map::mapLoaded, this, &MapAction::mapLoaded);
} }
signals: signals:

2
src/GUI/mapitem.cpp
View File

@ -91,7 +91,7 @@ MapItem::MapItem(MapAction *action, Map *map, GraphicsItem *parent)
_fileName = src->path(); _fileName = src->path();
_bounds = src->llBounds(); _bounds = src->llBounds();
connect(this, SIGNAL(triggered()), action, SLOT(trigger())); connect(this, &MapItem::triggered, action, &MapAction::trigger);
_map = map; _map = map;
_digitalZoom = 0; _digitalZoom = 0;

12
src/GUI/mapview.cpp
View File

@ -74,10 +74,10 @@ MapView::MapView(Map *map, POI *poi, QWidget *parent)
_map->load(); _map->load();
_map->setOutputProjection(_outputProjection); _map->setOutputProjection(_outputProjection);
_map->setInputProjection(_inputProjection); _map->setInputProjection(_inputProjection);
connect(_map, SIGNAL(tilesLoaded()), this, SLOT(reloadMap())); connect(_map, &Map::tilesLoaded, this, &MapView::reloadMap);
_poi = poi; _poi = poi;
connect(_poi, SIGNAL(pointsChanged()), this, SLOT(updatePOI())); connect(_poi, &POI::pointsChanged, this, &MapView::updatePOI);
_mapOpacity = 1.0; _mapOpacity = 1.0;
_backgroundColor = Qt::white; _backgroundColor = Qt::white;
@ -371,14 +371,14 @@ void MapView::setMap(Map *map)
RectC cr(_map->xy2ll(vr.topLeft()), _map->xy2ll(vr.bottomRight())); RectC cr(_map->xy2ll(vr.topLeft()), _map->xy2ll(vr.bottomRight()));
_map->unload(); _map->unload();
disconnect(_map, SIGNAL(tilesLoaded()), this, SLOT(reloadMap())); disconnect(_map, &Map::tilesLoaded, this, &MapView::reloadMap);
_map = map; _map = map;
_map->load(); _map->load();
_map->setOutputProjection(_outputProjection); _map->setOutputProjection(_outputProjection);
_map->setInputProjection(_inputProjection); _map->setInputProjection(_inputProjection);
_map->setDevicePixelRatio(_deviceRatio, _mapRatio); _map->setDevicePixelRatio(_deviceRatio, _mapRatio);
connect(_map, SIGNAL(tilesLoaded()), this, SLOT(reloadMap())); connect(_map, &Map::tilesLoaded, this, &MapView::reloadMap);
digitalZoom(0); digitalZoom(0);
@ -408,8 +408,8 @@ void MapView::setMap(Map *map)
void MapView::setPOI(POI *poi) void MapView::setPOI(POI *poi)
{ {
disconnect(_poi, SIGNAL(pointsChanged()), this, SLOT(updatePOI())); disconnect(_poi, &POI::pointsChanged, this, &MapView::updatePOI);
connect(poi, SIGNAL(pointsChanged()), this, SLOT(updatePOI())); connect(poi, &POI::pointsChanged, this, &MapView::updatePOI);
_poi = poi; _poi = poi;

18
src/GUI/optionsdialog.cpp
View File

@ -421,8 +421,8 @@ QWidget *OptionsDialog::createDataPage()
_pauseInterval->setValue(_options.pauseInterval); _pauseInterval->setValue(_options.pauseInterval);
_pauseInterval->setEnabled(_manualPause->isChecked()); _pauseInterval->setEnabled(_manualPause->isChecked());
connect(_automaticPause, SIGNAL(toggled(bool)), this, connect(_automaticPause, &QRadioButton::toggled, this,
SLOT(automaticPauseDetectionSet(bool))); &OptionsDialog::automaticPauseDetectionSet);
QHBoxLayout *pauseTypeLayout = new QHBoxLayout(); QHBoxLayout *pauseTypeLayout = new QHBoxLayout();
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
@ -477,8 +477,8 @@ QWidget *OptionsDialog::createDataPage()
for (int i = 0; i < zones.size(); i++) for (int i = 0; i < zones.size(); i++)
_timeZone->addItem(zones.at(i)); _timeZone->addItem(zones.at(i));
_timeZone->setCurrentText(_options.timeZone.customZone().id()); _timeZone->setCurrentText(_options.timeZone.customZone().id());
connect(_customZone, SIGNAL(toggled(bool)), _timeZone, connect(_customZone, &QRadioButton::toggled, _timeZone,
SLOT(setEnabled(bool))); &QComboBox::setEnabled);
QHBoxLayout *customZoneLayout = new QHBoxLayout(); QHBoxLayout *customZoneLayout = new QHBoxLayout();
customZoneLayout->addSpacing(20); customZoneLayout->addSpacing(20);
customZoneLayout->addWidget(_timeZone); customZoneLayout->addWidget(_timeZone);
@ -750,15 +750,17 @@ OptionsDialog::OptionsDialog(Options &options, Units units, QWidget *parent)
pages->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred); pages->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);
pages->setMinimumWidth(2 * menu->size().width()); pages->setMinimumWidth(2 * menu->size().width());
connect(menu, SIGNAL(currentRowChanged(int)), pages, connect(menu, &QListWidget::currentRowChanged, pages,
SLOT(setCurrentIndex(int))); &QStackedWidget::setCurrentIndex);
menu->item(0)->setSelected(true); menu->item(0)->setSelected(true);
QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok
| QDialogButtonBox::Cancel); | QDialogButtonBox::Cancel);
connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept())); connect(buttonBox, &QDialogButtonBox::accepted, this,
connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject())); &OptionsDialog::accept);
connect(buttonBox, &QDialogButtonBox::rejected, this,
&OptionsDialog::reject);
QVBoxLayout *layout = new QVBoxLayout; QVBoxLayout *layout = new QVBoxLayout;
layout->addLayout(contentLayout); layout->addLayout(contentLayout);

4
src/GUI/pathitem.cpp
View File

@ -409,8 +409,8 @@ void PathItem::addGraph(GraphItem *graph)
_graphs.append(graph); _graphs.append(graph);
if (graph) { if (graph) {
connect(this, SIGNAL(selected(bool)), graph, SLOT(hover(bool))); connect(this, &PathItem::selected, graph, &GraphItem::hover);
connect(graph, SIGNAL(selected(bool)), this, SLOT(hover(bool))); connect(graph, &GraphItem::selected, this, &PathItem::hover);
} }
} }

6
src/GUI/pdfexportdialog.cpp
View File

@ -91,8 +91,10 @@ PDFExportDialog::PDFExportDialog(PDFExport &exp, Units units, QWidget *parent)
QDialogButtonBox *buttonBox = new QDialogButtonBox(); QDialogButtonBox *buttonBox = new QDialogButtonBox();
buttonBox->addButton(tr("Export"), QDialogButtonBox::AcceptRole); buttonBox->addButton(tr("Export"), QDialogButtonBox::AcceptRole);
buttonBox->addButton(QDialogButtonBox::Cancel); buttonBox->addButton(QDialogButtonBox::Cancel);
connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept())); connect(buttonBox, &QDialogButtonBox::accepted, this,
connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject())); &PDFExportDialog::accept);
connect(buttonBox, &QDialogButtonBox::rejected, this,
&PDFExportDialog::reject);
QVBoxLayout *layout = new QVBoxLayout; QVBoxLayout *layout = new QVBoxLayout;
#ifdef Q_OS_MAC #ifdef Q_OS_MAC

2
src/GUI/percentslider.cpp
View File

@ -24,7 +24,7 @@ PercentSlider::PercentSlider(QWidget *parent) : QWidget(parent)
_label->setAlignment(Qt::AlignRight); _label->setAlignment(Qt::AlignRight);
_label->setText(format(_slider->value())); _label->setText(format(_slider->value()));
connect(_slider, SIGNAL(valueChanged(int)), this, SLOT(updateLabel(int))); connect(_slider, &QSlider::valueChanged, this, &PercentSlider::updateLabel);
QHBoxLayout *layout = new QHBoxLayout(); QHBoxLayout *layout = new QHBoxLayout();
layout->addWidget(_slider); layout->addWidget(_slider);

6
src/GUI/pngexportdialog.cpp
View File

@ -67,8 +67,10 @@ PNGExportDialog::PNGExportDialog(PNGExport &exp, QWidget *parent)
QDialogButtonBox *buttonBox = new QDialogButtonBox(); QDialogButtonBox *buttonBox = new QDialogButtonBox();
buttonBox->addButton(tr("Export"), QDialogButtonBox::AcceptRole); buttonBox->addButton(tr("Export"), QDialogButtonBox::AcceptRole);
buttonBox->addButton(QDialogButtonBox::Cancel); buttonBox->addButton(QDialogButtonBox::Cancel);
connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept())); connect(buttonBox, &QDialogButtonBox::accepted, this,
connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject())); &PNGExportDialog::accept);
connect(buttonBox, &QDialogButtonBox::rejected, this,
&PNGExportDialog::reject);
QVBoxLayout *layout = new QVBoxLayout; QVBoxLayout *layout = new QVBoxLayout;
#ifdef Q_OS_MAC #ifdef Q_OS_MAC

2
src/map/downloader.cpp
View File

@ -126,7 +126,7 @@ bool Downloader::doDownload(const Download &dl,
if (reply && reply->isRunning()) { if (reply && reply->isRunning()) {
_currentDownloads.insert(url); _currentDownloads.insert(url);
ReplyTimeout::setTimeout(reply, _timeout); ReplyTimeout::setTimeout(reply, _timeout);
connect(reply, SIGNAL(finished()), this, SLOT(emitFinished())); connect(reply, &QNetworkReply::finished, this, &Downloader::emitFinished);
} else if (reply) } else if (reply)
downloadFinished(reply); downloadFinished(reply);
else else

2
src/map/onlinemap.cpp
View File

@ -21,7 +21,7 @@ OnlineMap::OnlineMap(const QString &fileName, const QString &name,
_tileLoader->setUrl(url); _tileLoader->setUrl(url);
_tileLoader->setAuthorization(authorization); _tileLoader->setAuthorization(authorization);
_tileLoader->setQuadTiles(quadTiles); _tileLoader->setQuadTiles(quadTiles);
connect(_tileLoader, SIGNAL(finished()), this, SIGNAL(tilesLoaded())); connect(_tileLoader, &TileLoader::finished, this, &OnlineMap::tilesLoaded);
} }
QRectF OnlineMap::bounds() QRectF OnlineMap::bounds()

4
src/map/tileloader.cpp
View File

@ -61,7 +61,7 @@ TileLoader::TileLoader(const QString &dir, QObject *parent)
qWarning("%s: %s", qPrintable(_dir), "Error creating tiles directory"); qWarning("%s: %s", qPrintable(_dir), "Error creating tiles directory");
_downloader = new Downloader(this); _downloader = new Downloader(this);
connect(_downloader, SIGNAL(finished()), this, SIGNAL(finished())); connect(_downloader, &Downloader::finished, this, &TileLoader::finished);
} }
void TileLoader::loadTilesAsync(QVector<Tile> &list) void TileLoader::loadTilesAsync(QVector<Tile> &list)
@ -132,7 +132,7 @@ void TileLoader::loadTilesSync(QVector<Tile> &list)
if (!dl.empty()) { if (!dl.empty()) {
QEventLoop wait; QEventLoop wait;
QObject::connect(_downloader, SIGNAL(finished()), &wait, SLOT(quit())); connect(_downloader, &Downloader::finished, &wait, &QEventLoop::quit);
if (_downloader->get(dl, _authorization)) if (_downloader->get(dl, _authorization))
wait.exec(); wait.exec();

4
src/map/wms.cpp
View File

@ -324,8 +324,8 @@ bool WMS::downloadCapabilities(const QString &url)
{ {
if (!_downloader) { if (!_downloader) {
_downloader = new Downloader(this); _downloader = new Downloader(this);
connect(_downloader, SIGNAL(finished()), this, connect(_downloader, &Downloader::finished, this,
SLOT(capabilitiesReady())); &WMS::capabilitiesReady);
} }
QList<Download> dl; QList<Download> dl;

4
src/map/wmsmap.cpp
View File

@ -76,10 +76,10 @@ WMSMap::WMSMap(const QString &fileName, const QString &name,
_tileLoader = new TileLoader(tilesDir, this); _tileLoader = new TileLoader(tilesDir, this);
_tileLoader->setAuthorization(setup.authorization()); _tileLoader->setAuthorization(setup.authorization());
connect(_tileLoader, SIGNAL(finished()), this, SIGNAL(tilesLoaded())); connect(_tileLoader, &TileLoader::finished, this, &WMSMap::tilesLoaded);
_wms = new WMS(QDir(tilesDir).filePath(CAPABILITIES_FILE), setup, this); _wms = new WMS(QDir(tilesDir).filePath(CAPABILITIES_FILE), setup, this);
connect(_wms, SIGNAL(downloadFinished()), this, SLOT(wmsReady())); connect(_wms, &WMS::downloadFinished, this, &WMSMap::wmsReady);
if (_wms->isReady()) if (_wms->isReady())
init(); init();
} }

4
src/map/wmts.cpp
View File

@ -306,8 +306,8 @@ bool WMTS::downloadCapabilities(const QString &url)
{ {
if (!_downloader) { if (!_downloader) {
_downloader = new Downloader(this); _downloader = new Downloader(this);
connect(_downloader, SIGNAL(finished()), this, connect(_downloader, &Downloader::finished, this,
SLOT(capabilitiesReady())); &WMTS::capabilitiesReady);
} }
QList<Download> dl; QList<Download> dl;

4
src/map/wmtsmap.cpp
View File

@ -21,10 +21,10 @@ WMTSMap::WMTSMap(const QString &fileName, const QString &name,
_tileLoader = new TileLoader(tilesDir, this); _tileLoader = new TileLoader(tilesDir, this);
_tileLoader->setAuthorization(setup.authorization()); _tileLoader->setAuthorization(setup.authorization());
connect(_tileLoader, SIGNAL(finished()), this, SIGNAL(tilesLoaded())); connect(_tileLoader, &TileLoader::finished, this, &WMTSMap::tilesLoaded);
_wmts = new WMTS(QDir(tilesDir).filePath(CAPABILITIES_FILE), setup, this); _wmts = new WMTS(QDir(tilesDir).filePath(CAPABILITIES_FILE), setup, this);
connect(_wmts, SIGNAL(downloadFinished()), this, SLOT(wmtsReady())); connect(_wmts, &WMTS::downloadFinished, this, &WMTSMap::wmtsReady);
if (_wmts->isReady()) if (_wmts->isReady())
init(); init();
} }