summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <kossebau@kde.org>2016-08-17 18:10:41 (GMT)
committerFriedrich W. H. Kossebau <kossebau@kde.org>2016-08-24 18:00:13 (GMT)
commite25f8b7b92e3c5ade103d99c8e5c9b7878c6f041 (patch)
tree65965b4ec18573b577c59c58d579018ce8bba3ad
parent61da9616b85a53203a11417c96ff0028d6d4880b (diff)
Use QStringLiteral with QIcon ids
-rw-r--r--src/apps/marble-kde/marble_part.cpp20
-rw-r--r--src/apps/marble-qt/QtMainWindow.cpp54
-rw-r--r--src/lib/marble/AbstractFloatItem.cpp4
-rw-r--r--src/lib/marble/FlyToEditWidget.cpp4
-rw-r--r--src/lib/marble/GoToDialog.cpp6
-rw-r--r--src/lib/marble/MapThemeDownloadDialog.cpp8
-rw-r--r--src/lib/marble/MapViewWidget.cpp24
-rw-r--r--src/lib/marble/MarbleWebView.cpp2
-rw-r--r--src/lib/marble/MarbleWidgetPopupMenu.cpp8
-rw-r--r--src/lib/marble/QtMarbleConfigDialog.cpp4
-rw-r--r--src/lib/marble/RemoveItemEditWidget.cpp2
-rw-r--r--src/lib/marble/SoundCueEditWidget.cpp4
-rw-r--r--src/lib/marble/TourControlEditWidget.cpp2
-rw-r--r--src/lib/marble/TourItemDelegate.cpp20
-rw-r--r--src/lib/marble/TourWidget.cpp20
-rw-r--r--src/lib/marble/WaitEditWidget.cpp2
-rw-r--r--src/lib/marble/cloudsync/RouteItemDelegate.cpp10
-rw-r--r--src/lib/marble/osm/OsmRelationManagerWidget_p.cpp2
-rw-r--r--src/lib/marble/osm/OsmTagEditorWidget_p.cpp2
-rw-r--r--src/lib/marble/projections/AzimuthalEquidistantProjection.cpp2
-rw-r--r--src/lib/marble/projections/EquirectProjection.cpp2
-rw-r--r--src/lib/marble/projections/GnomonicProjection.cpp2
-rw-r--r--src/lib/marble/projections/LambertAzimuthalProjection.cpp2
-rw-r--r--src/lib/marble/projections/MercatorProjection.cpp2
-rw-r--r--src/lib/marble/projections/SphericalProjection.cpp2
-rw-r--r--src/lib/marble/projections/StereographicProjection.cpp2
-rw-r--r--src/lib/marble/projections/VerticalPerspectiveProjection.cpp2
-rw-r--r--src/lib/marble/routing/RoutingInputWidget.cpp14
-rw-r--r--src/lib/marble/routing/RoutingWidget.cpp26
-rw-r--r--src/plugins/designer/latloneditwidget/LatLonEditPlugin.cpp2
-rw-r--r--src/plugins/designer/marblewidget/MarbleWidgetPlugin.cpp2
-rw-r--r--src/plugins/designer/navigator/MarbleNavigatorPlugin.cpp2
-rw-r--r--src/plugins/render/annotate/AnnotatePlugin.cpp22
-rw-r--r--src/plugins/render/eclipses/EclipsesPlugin.cpp2
-rw-r--r--src/plugins/render/measure/MeasureToolPlugin.cpp2
-rw-r--r--src/plugins/render/navigation/NavigationFloatItem.cpp2
-rw-r--r--src/plugins/render/opencachingcom/OpenCachingComItem.cpp2
-rw-r--r--src/plugins/render/weather/WeatherItem.cpp2
-rw-r--r--src/plugins/runner/monav/MonavConfigWidget.cpp4
39 files changed, 148 insertions, 148 deletions
diff --git a/src/apps/marble-kde/marble_part.cpp b/src/apps/marble-kde/marble_part.cpp
index 2b00b9b..4ce068b 100644
--- a/src/apps/marble-kde/marble_part.cpp
+++ b/src/apps/marble-kde/marble_part.cpp
@@ -751,7 +751,7 @@ void MarblePart::setupActions()
m_copyCoordinatesAction );
m_copyCoordinatesAction->setText( i18nc( "Action for copying the coordinates to the clipboard",
"C&opy Coordinates" ) );
- m_copyCoordinatesAction->setIcon( QIcon( ":/icons/copy-coordinates.png" ) );
+ m_copyCoordinatesAction->setIcon(QIcon(QStringLiteral(":/icons/copy-coordinates.png")));
connect( m_copyCoordinatesAction, SIGNAL(triggered(bool)),
this, SLOT(copyCoordinates()) );
@@ -777,7 +777,7 @@ void MarblePart::setupActions()
m_mapWizardAct = new QAction( i18nc( "Action for creating new maps",
"&Create a New Map..." ),
this );
- m_mapWizardAct->setIcon( QIcon( ":/icons/create-new-map.png" ) );
+ m_mapWizardAct->setIcon(QIcon(QStringLiteral(":/icons/create-new-map.png")));
actionCollection()->addAction( "createMap", m_mapWizardAct );
m_mapWizardAct->setStatusTip( i18nc( "Status tip",
"A wizard guides you through the creation of your own map theme." ) );
@@ -806,7 +806,7 @@ void MarblePart::setupActions()
actionCollection()->addAction( "show_clouds", m_showCloudsAction );
m_showCloudsAction->setCheckable( true );
m_showCloudsAction->setChecked( true );
- m_showCloudsAction->setIcon( QIcon( ":/icons/clouds.png" ) );
+ m_showCloudsAction->setIcon(QIcon(QStringLiteral(":/icons/clouds.png")));
m_showCloudsAction->setText( i18nc( "Action for toggling clouds", "&Clouds" ) );
connect( m_showCloudsAction, SIGNAL(triggered(bool)),
this, SLOT(setShowClouds(bool)) );
@@ -823,7 +823,7 @@ void MarblePart::setupActions()
// Action: Show Time options
m_controlTimeAction = new QAction( this );
actionCollection()->addAction( "control_time", m_controlTimeAction );
- m_controlTimeAction->setIcon( QIcon( ":/icons/clock.png" ) );
+ m_controlTimeAction->setIcon(QIcon(QStringLiteral(":/icons/clock.png")));
m_controlTimeAction->setText( i18nc( "Action for time control dialog", "&Time Control..." ) );
connect( m_controlTimeAction, SIGNAL(triggered(bool)),
this, SLOT(controlTime()) );
@@ -834,7 +834,7 @@ void MarblePart::setupActions()
m_lockFloatItemsAct );
m_lockFloatItemsAct->setText( i18nc( "Action for locking float items on the map",
"Lock Position" ) );
- m_lockFloatItemsAct->setIcon( QIcon( ":/icons/unlock.png" ) );
+ m_lockFloatItemsAct->setIcon(QIcon(QStringLiteral(":/icons/unlock.png")));
m_lockFloatItemsAct->setCheckable( true );
m_lockFloatItemsAct->setChecked( false );
connect( m_lockFloatItemsAct, SIGNAL(triggered(bool)),
@@ -845,7 +845,7 @@ void MarblePart::setupActions()
//Toggle Action: Show sun shadow
m_showShadow = new KToggleAction( i18n( "Show Shadow" ), this );
- m_showShadow->setIcon( QIcon( "" ) ); // Fixme: Add Icon
+// m_showShadow->setIcon(QIcon(QStringLiteral(""))); // Fixme: Add Icon
actionCollection()->addAction( "sun_shadow", m_showShadow );
m_showShadow->setCheckedState( KGuiItem( i18n( "Hide Shadow" ) ) );
m_showShadow->setToolTip(i18n("Shows and hides the shadow of the sun"));
@@ -879,7 +879,7 @@ void MarblePart::setupActions()
m_addBookmarkAction = new QAction( this );
actionCollection()->addAction( "add_bookmark", m_addBookmarkAction );
m_addBookmarkAction->setText( i18nc( "Add Bookmark", "&Add Bookmark" ) );
- m_addBookmarkAction->setIcon( QIcon( ":/icons/bookmark-new.png" ) );
+ m_addBookmarkAction->setIcon(QIcon(QStringLiteral(":/icons/bookmark-new.png")));
actionCollection()->setDefaultShortcut( m_addBookmarkAction, Qt::CTRL + Qt::Key_B );
connect( m_addBookmarkAction, SIGNAL(triggered()),
this, SLOT(openEditBookmarkDialog()) );
@@ -903,7 +903,7 @@ void MarblePart::setupActions()
m_manageBookmarksAction = new QAction( this );
actionCollection()->addAction( "manage_bookmarks", m_manageBookmarksAction );
m_manageBookmarksAction->setText( i18nc( "Manage Bookmarks", "&Manage Bookmarks" ) );
- m_manageBookmarksAction->setIcon( QIcon( ":/icons/bookmarks-organize.png" ) );
+ m_manageBookmarksAction->setIcon(QIcon(QStringLiteral(":/icons/bookmarks-organize.png")));
connect( m_manageBookmarksAction, SIGNAL(triggered()),
this, SLOT(openManageBookmarksDialog()) );
@@ -915,7 +915,7 @@ void MarblePart::setupActions()
m_externalMapEditorAction = new QAction( this );
actionCollection()->addAction( "external_editor", m_externalMapEditorAction );
m_externalMapEditorAction->setText( i18nc( "Edit the map in an external application", "&Edit Map" ) );
- m_externalMapEditorAction->setIcon( QIcon( ":/icons/edit-map.png" ) );
+ m_externalMapEditorAction->setIcon(QIcon(QStringLiteral(":/icons/edit-map.png")));
actionCollection()->setDefaultShortcut( m_externalMapEditorAction, Qt::CTRL + Qt::Key_E );
connect( m_externalMapEditorAction, SIGNAL(triggered()),
m_controlView, SLOT(launchExternalMapEditor()) );
@@ -926,7 +926,7 @@ void MarblePart::setupActions()
actionCollection()->addAction( "record_movie" , m_recordMovieAction );
m_recordMovieAction->setStatusTip( i18n( "Records a movie of the globe" ) );
actionCollection()->setDefaultShortcut( m_recordMovieAction, Qt::CTRL + Qt::SHIFT + Qt::Key_R );
- m_recordMovieAction->setIcon( QIcon( ":/icons/animator.png" ) );
+ m_recordMovieAction->setIcon(QIcon(QStringLiteral(":/icons/animator.png")));
connect( m_recordMovieAction, SIGNAL(triggered()),
this, SLOT(showMovieCaptureDialog()) );
diff --git a/src/apps/marble-qt/QtMainWindow.cpp b/src/apps/marble-qt/QtMainWindow.cpp
index 754e12a..cc68032 100644
--- a/src/apps/marble-qt/QtMainWindow.cpp
+++ b/src/apps/marble-qt/QtMainWindow.cpp
@@ -182,7 +182,7 @@ MainWindow::MainWindow(const QString& marbleDataPath, const QVariantMap& cmdLine
m_controlView = new ControlView( this );
- setWindowIcon( QIcon(":/icons/marble.png") );
+ setWindowIcon(QIcon(QStringLiteral(":/icons/marble.png")));
setCentralWidget( m_controlView );
// Initializing config dialog
@@ -264,16 +264,16 @@ void MainWindow::initObject(const QVariantMap& cmdLineSettings)
void MainWindow::createActions()
{
- m_openAction = new QAction( QIcon(":/icons/document-open.png"), tr( "&Open..."), this );
+ m_openAction = new QAction(QIcon(QStringLiteral(":/icons/document-open.png")), tr("&Open..."), this);
m_openAction->setShortcut( tr( "Ctrl+O" ) );
m_openAction->setStatusTip( tr( "Open a file for viewing on Marble"));
connect( m_openAction, SIGNAL(triggered()),
this, SLOT(openFile()) );
- m_downloadAction = new QAction( QIcon(":/icons/get-hot-new-stuff.png"), tr("&Download Maps..."), this);
+ m_downloadAction = new QAction(QIcon(QStringLiteral(":/icons/get-hot-new-stuff.png")), tr("&Download Maps..."), this);
connect(m_downloadAction, SIGNAL(triggered()), this, SLOT(openMapDialog()));
- m_exportMapAction = new QAction( QIcon(":/icons/document-save-as.png"), tr("&Export Map..."), this);
+ m_exportMapAction = new QAction(QIcon(QStringLiteral(":/icons/document-save-as.png")), tr("&Export Map..."), this);
m_exportMapAction->setShortcut(tr("Ctrl+S"));
m_exportMapAction->setStatusTip(tr("Save a screenshot of the map"));
connect(m_exportMapAction, SIGNAL(triggered()), this, SLOT(exportMapScreenShot()));
@@ -283,26 +283,26 @@ void MainWindow::createActions()
m_downloadRegionAction->setStatusTip( tr( "Download a map region in different zoom levels for offline usage" ) );
connect( m_downloadRegionAction, SIGNAL(triggered()), SLOT(showDownloadRegionDialog()) );
- m_printAction = new QAction( QIcon(":/icons/document-print.png"), tr("&Print..."), this);
+ m_printAction = new QAction(QIcon(QStringLiteral(":/icons/document-print.png")), tr("&Print..."), this);
m_printAction->setShortcut(tr("Ctrl+P"));
m_printAction->setStatusTip(tr("Print a screenshot of the map"));
connect(m_printAction, SIGNAL(triggered()), this, SLOT(printMapScreenShot()));
- m_printPreviewAction = new QAction( QIcon(":/icons/document-print-preview.png"), tr("Print Previe&w ..."), this);
+ m_printPreviewAction = new QAction(QIcon(QStringLiteral(":/icons/document-print-preview.png")), tr("Print Previe&w ..."), this);
m_printPreviewAction->setStatusTip(tr("Print a screenshot of the map"));
connect(m_printPreviewAction, SIGNAL(triggered()), m_controlView, SLOT(printPreview()));
- m_quitAction = new QAction( QIcon(":/icons/application-exit.png"), tr("&Quit"), this);
+ m_quitAction = new QAction(QIcon(QStringLiteral(":/icons/application-exit.png")), tr("&Quit"), this);
m_quitAction->setShortcut(tr("Ctrl+Q"));
m_quitAction->setStatusTip(tr("Quit the Application"));
connect(m_quitAction, SIGNAL(triggered()), this, SLOT(close()));
- m_copyMapAction = new QAction( QIcon(":/icons/edit-copy.png"), tr("&Copy Map"), this);
+ m_copyMapAction = new QAction(QIcon(QStringLiteral(":/icons/edit-copy.png")), tr("&Copy Map"), this);
m_copyMapAction->setShortcut(tr("Ctrl+C"));
m_copyMapAction->setStatusTip(tr("Copy a screenshot of the map"));
connect(m_copyMapAction, SIGNAL(triggered()), this, SLOT(copyMap()));
- m_osmEditAction = new QAction( QIcon(":/icons/edit-map.png"), tr( "&Edit Map" ), this );
+ m_osmEditAction = new QAction(QIcon(QStringLiteral(":/icons/edit-map.png")), tr("&Edit Map"), this );
m_osmEditAction->setShortcut(tr( "Ctrl+E" ) );
m_osmEditAction->setStatusTip(tr( "Edit the current map region in an external editor" ) );
updateMapEditButtonVisibility( m_controlView->marbleWidget()->mapThemeId() );
@@ -311,7 +311,7 @@ void MainWindow::createActions()
m_recordMovieAction = new QAction(tr("&Record Movie"), this);
m_recordMovieAction->setStatusTip(tr("Records a movie of the globe"));
m_recordMovieAction->setShortcut(QKeySequence("Ctrl+Shift+R"));
- m_recordMovieAction->setIcon(QIcon(":/icons/animator.png"));
+ m_recordMovieAction->setIcon(QIcon(QStringLiteral(":/icons/animator.png")));
connect(m_recordMovieAction, SIGNAL(triggered()),
this, SLOT(showMovieCaptureDialog()));
@@ -322,15 +322,15 @@ void MainWindow::createActions()
connect( m_stopRecordingAction, SIGNAL(triggered()),
this, SLOT(stopRecording()) );
- m_configDialogAction = new QAction( QIcon(":/icons/settings-configure.png"),tr("&Configure Marble"), this);
+ m_configDialogAction = new QAction(QIcon(QStringLiteral(":/icons/settings-configure.png")), tr("&Configure Marble"), this);
m_configDialogAction->setStatusTip(tr("Show the configuration dialog"));
connect(m_configDialogAction, SIGNAL(triggered()), this, SLOT(editSettings()));
- m_copyCoordinatesAction = new QAction( QIcon(":/icons/copy-coordinates.png"), tr("C&opy Coordinates"), this);
+ m_copyCoordinatesAction = new QAction(QIcon(QStringLiteral(":/icons/copy-coordinates.png")), tr("C&opy Coordinates"), this);
m_copyCoordinatesAction->setStatusTip(tr("Copy the center coordinates as text"));
connect(m_copyCoordinatesAction, SIGNAL(triggered()), this, SLOT(copyCoordinates()));
- m_fullScreenAction = new QAction( QIcon(":/icons/view-fullscreen.png"), tr("&Full Screen Mode"), this);
+ m_fullScreenAction = new QAction(QIcon(QStringLiteral(":/icons/view-fullscreen.png")), tr("&Full Screen Mode"), this);
m_fullScreenAction->setShortcut(tr("Ctrl+Shift+F"));
m_fullScreenAction->setCheckable( true );
m_fullScreenAction->setStatusTip(tr("Full Screen Mode"));
@@ -342,21 +342,21 @@ void MainWindow::createActions()
connect(m_statusBarAction, SIGNAL(triggered(bool)), this, SLOT(showStatusBar(bool)));
- m_lockFloatItemsAction = new QAction( QIcon(":/icons/unlock.png"), tr("Lock Position"),this);
+ m_lockFloatItemsAction = new QAction(QIcon(QStringLiteral(":/icons/unlock.png")), tr("Lock Position"), this);
m_lockFloatItemsAction->setCheckable( true );
m_lockFloatItemsAction->setStatusTip(tr("Lock Position of Floating Items"));
connect(m_lockFloatItemsAction, SIGNAL(triggered(bool)), this, SLOT(lockPosition(bool)));
- m_showCloudsAction = new QAction( QIcon(":/icons/clouds.png"), tr("&Clouds"), this);
+ m_showCloudsAction = new QAction(QIcon(QStringLiteral(":/icons/clouds.png")), tr("&Clouds"), this);
m_showCloudsAction->setCheckable( true );
m_showCloudsAction->setStatusTip(tr("Show Real Time Cloud Cover"));
connect(m_showCloudsAction, SIGNAL(triggered(bool)), this, SLOT(showClouds(bool)));
- m_workOfflineAction = new QAction( QIcon(":/icons/user-offline.png"), tr("Work Off&line"), this);
+ m_workOfflineAction = new QAction(QIcon(QStringLiteral(":/icons/user-offline.png")), tr("Work Off&line"), this);
m_workOfflineAction->setCheckable( true );
connect(m_workOfflineAction, SIGNAL(triggered(bool)), this, SLOT(workOffline(bool)));
- m_controlTimeAction = new QAction( QIcon(":/icons/clock.png"), tr( "&Time Control..." ), this );
+ m_controlTimeAction = new QAction(QIcon(QStringLiteral(":/icons/clock.png")), tr("&Time Control..."), this );
m_controlTimeAction->setStatusTip( tr( "Configure Time Control " ) );
connect( m_controlTimeAction, SIGNAL(triggered()), this, SLOT(controlTime()) );
@@ -364,17 +364,17 @@ void MainWindow::createActions()
m_controlSunAction->setStatusTip( tr( "Configure Sun Control" ) );
connect( m_controlSunAction, SIGNAL(triggered()), this, SLOT(controlSun()) );
- m_reloadAction = new QAction( QIcon(":/icons/view-refresh.png"), tr("&Redisplay"), this);
+ m_reloadAction = new QAction(QIcon(QStringLiteral(":/icons/view-refresh.png")), tr("&Redisplay"), this);
m_reloadAction->setShortcut(tr("F5"));
m_reloadAction->setStatusTip(tr("Reload Current Map"));
connect(m_reloadAction, SIGNAL(triggered()), this, SLOT(reload()));
- m_handbookAction = new QAction( QIcon(":/icons/help-contents.png"), tr("Marble Virtual Globe &Handbook"), this);
+ m_handbookAction = new QAction(QIcon(QStringLiteral(":/icons/help-contents.png")), tr("Marble Virtual Globe &Handbook"), this);
m_handbookAction->setShortcut(tr("F1"));
m_handbookAction->setStatusTip(tr("Show the Handbook for Marble Virtual Globe"));
connect(m_handbookAction, SIGNAL(triggered()), this, SLOT(handbook()));
- m_whatsThisAction = new QAction( QIcon(":/icons/help-whatsthis.png"), tr("What's &This"), this);
+ m_whatsThisAction = new QAction(QIcon(QStringLiteral(":/icons/help-whatsthis.png")), tr("What's &This"), this);
m_whatsThisAction->setShortcut(tr("Shift+F1"));
m_whatsThisAction->setStatusTip(tr("Show a detailed explanation of the action."));
connect(m_whatsThisAction, SIGNAL(triggered()), this, SLOT(enterWhatsThis()));
@@ -383,7 +383,7 @@ void MainWindow::createActions()
m_forumAction->setStatusTip(tr("Visit Marble's Community Forum"));
connect(m_forumAction, SIGNAL(triggered()), this, SLOT(openForum()));
- m_aboutMarbleAction = new QAction( QIcon(":/icons/marble.png"), tr("&About Marble Virtual Globe"), this);
+ m_aboutMarbleAction = new QAction(QIcon(QStringLiteral(":/icons/marble.png")), tr("&About Marble Virtual Globe"), this);
m_aboutMarbleAction->setStatusTip(tr("Show the application's About Box"));
connect(m_aboutMarbleAction, SIGNAL(triggered()), this, SLOT(aboutMarble()));
@@ -392,12 +392,12 @@ void MainWindow::createActions()
connect(m_aboutQtAction, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
//Bookmark Actions
- m_addBookmarkAction = new QAction( QIcon(":/icons/bookmark-new.png"), tr("&Add Bookmark"),this);
+ m_addBookmarkAction = new QAction(QIcon(QStringLiteral(":/icons/bookmark-new.png")), tr("&Add Bookmark"), this);
m_addBookmarkAction->setShortcut(tr("Ctrl+B"));
m_addBookmarkAction->setStatusTip(tr("Add Bookmark"));
connect( m_addBookmarkAction, SIGNAL(triggered()), this, SLOT(openEditBookmarkDialog()) );
- m_setHomeAction = new QAction( QIcon(":/icons/go-home.png"), tr( "&Set Home Location" ),this);
+ m_setHomeAction = new QAction(QIcon(QStringLiteral(":/icons/go-home.png")), tr("&Set Home Location"), this);
m_setHomeAction->setStatusTip( tr( "&Set Home Location" ) );
connect( m_setHomeAction, SIGNAL(triggered()), this, SLOT(setHome()) );
@@ -406,12 +406,12 @@ void MainWindow::createActions()
m_toggleBookmarkDisplayAction->setCheckable( true );
connect( m_toggleBookmarkDisplayAction, SIGNAL(triggered(bool)), this, SLOT(showBookmarks(bool)) );
- m_manageBookmarksAction = new QAction( QIcon( ":/icons/bookmarks-organize.png" ), tr( "&Manage Bookmarks" ), this);
+ m_manageBookmarksAction = new QAction(QIcon(QStringLiteral(":/icons/bookmarks-organize.png")), tr("&Manage Bookmarks"), this);
m_manageBookmarksAction->setStatusTip( tr( "Manage Bookmarks" ) );
connect( m_manageBookmarksAction, SIGNAL(triggered()), this, SLOT(manageBookmarks()) );
// Map Wizard action
- m_mapWizardAction = new QAction( QIcon( ":/icons/create-new-map.png" ), tr("&Create a New Map..."), this );
+ m_mapWizardAction = new QAction(QIcon(QStringLiteral(":/icons/create-new-map.png")), tr("&Create a New Map..."), this);
m_mapWizardAction->setStatusTip( tr( "A wizard guides you through the creation of your own map theme." ) );
connect( m_mapWizardAction, SIGNAL(triggered()), SLOT(showMapWizard()) );
@@ -601,7 +601,7 @@ void MainWindow::createBookmarkMenu()
m_bookmarkMenu->addSeparator();
- m_bookmarkMenu->addAction( QIcon( ":/icons/go-home.png" ), "&Home",
+ m_bookmarkMenu->addAction( QIcon(QStringLiteral(":/icons/go-home.png")), tr("&Home"),
m_controlView->marbleWidget(), SLOT(goHome()) );
createFolderList( m_bookmarkMenu, m_controlView->marbleModel()->bookmarkManager()->document() );
}
@@ -615,7 +615,7 @@ void MainWindow::createFolderList( QMenu *bookmarksListMenu, const GeoDataContai
}
else {
foreach ( const GeoDataFolder *folder, folders ) {
- QMenu *subMenu = bookmarksListMenu->addMenu( QIcon( ":/icons/folder-bookmark.png" ), folder->name() );
+ QMenu *subMenu = bookmarksListMenu->addMenu(QIcon(QStringLiteral(":/icons/folder-bookmark.png")), folder->name());
createFolderList( subMenu, folder );
connect( subMenu, SIGNAL(triggered(QAction*)),
this, SLOT(lookAtBookmark(QAction*)) );
diff --git a/src/lib/marble/AbstractFloatItem.cpp b/src/lib/marble/AbstractFloatItem.cpp
index a9ae6e0..c17c8a8 100644
--- a/src/lib/marble/AbstractFloatItem.cpp
+++ b/src/lib/marble/AbstractFloatItem.cpp
@@ -229,7 +229,7 @@ QMenu* AbstractFloatItem::contextMenu()
{
d->m_contextMenu = new QMenu;
- QAction *lockAction = d->m_contextMenu->addAction( QIcon(":/icons/unlock.png"), tr( "&Lock" ) );
+ QAction *lockAction = d->m_contextMenu->addAction(QIcon(QStringLiteral(":/icons/unlock.png")), tr("&Lock"));
lockAction->setCheckable( true );
lockAction->setChecked( positionLocked() );
connect( lockAction, SIGNAL(triggered(bool)), this, SLOT(setPositionLocked(bool)) );
@@ -244,7 +244,7 @@ QMenu* AbstractFloatItem::contextMenu()
if( dialog )
{
d->m_contextMenu->addSeparator();
- QAction *configAction = d->m_contextMenu->addAction( QIcon(":/icons/settings-configure.png"), tr( "&Configure..." ) );
+ QAction *configAction = d->m_contextMenu->addAction(QIcon(QStringLiteral(":/icons/settings-configure.png")), tr("&Configure..."));
connect( configAction, SIGNAL(triggered()), dialog, SLOT(exec()) );
}
}
diff --git a/src/lib/marble/FlyToEditWidget.cpp b/src/lib/marble/FlyToEditWidget.cpp
index 03c3875..cd2f8cc 100644
--- a/src/lib/marble/FlyToEditWidget.cpp
+++ b/src/lib/marble/FlyToEditWidget.cpp
@@ -80,12 +80,12 @@ FlyToEditWidget::FlyToEditWidget( const QModelIndex &index, MarbleWidget* widget
layout->addLayout( pairLayout );
QToolButton* flyToPinCenter = new QToolButton;
- flyToPinCenter->setIcon(QIcon(":/marble/places.png"));
+ flyToPinCenter->setIcon(QIcon(QStringLiteral(":/marble/places.png")));
flyToPinCenter->setToolTip(tr("Current map center"));
connect(flyToPinCenter, SIGNAL(clicked()), this, SLOT(updateCoordinates()));
layout->addWidget(flyToPinCenter);
- m_button->setIcon( QIcon( ":/marble/document-save.png" ) );
+ m_button->setIcon(QIcon(QStringLiteral(":/marble/document-save.png")));
connect(m_button, SIGNAL(clicked()), this, SLOT(save()));
layout->addWidget( m_button );
diff --git a/src/lib/marble/GoToDialog.cpp b/src/lib/marble/GoToDialog.cpp
index e39770e..42e888a 100644
--- a/src/lib/marble/GoToDialog.cpp
+++ b/src/lib/marble/GoToDialog.cpp
@@ -166,7 +166,7 @@ QVariant TargetModel::currentLocationData ( int role ) const
GeoDataCoordinates currentLocation = tracking->currentLocation();
switch( role ) {
case Qt::DisplayRole: return tr( "Current Location: %1" ).arg( currentLocation.toString() ) ;
- case Qt::DecorationRole: return QIcon( ":/icons/gps.png" );
+ case Qt::DecorationRole: return QIcon(QStringLiteral(":/icons/gps.png"));
case MarblePlacemarkModel::CoordinateRole: {
return qVariantFromValue( currentLocation );
}
@@ -195,7 +195,7 @@ QVariant TargetModel::homeData ( int role ) const
{
switch( role ) {
case Qt::DisplayRole: return tr( "Home" );
- case Qt::DecorationRole: return QIcon( ":/icons/go-home.png" );
+ case Qt::DecorationRole: return QIcon(QStringLiteral(":/icons/go-home.png"));
case MarblePlacemarkModel::CoordinateRole: {
qreal lon( 0.0 ), lat( 0.0 );
int zoom( 0 );
@@ -218,7 +218,7 @@ QVariant TargetModel::bookmarkData ( int index, int role ) const
return QString(folder->name() + QLatin1String(" / ") + m_bookmarks[index]->name());
}
}
- case Qt::DecorationRole: return QIcon( ":/icons/bookmarks.png" );
+ case Qt::DecorationRole: return QIcon(QStringLiteral(":/icons/bookmarks.png"));
case MarblePlacemarkModel::CoordinateRole: return qVariantFromValue( m_bookmarks[index]->lookAt()->coordinates() );
}
diff --git a/src/lib/marble/MapThemeDownloadDialog.cpp b/src/lib/marble/MapThemeDownloadDialog.cpp
index 71d6d4b..534ef1d 100644
--- a/src/lib/marble/MapThemeDownloadDialog.cpp
+++ b/src/lib/marble/MapThemeDownloadDialog.cpp
@@ -277,17 +277,17 @@ QStyleOptionButton MapItemDelegate::button( Element element, const QStyleOptionV
switch (element) {
case InstallButton:
result.text = tr( "Install" );
- result.icon = QIcon( ":/marble/dialog-ok.png" );
+ result.icon = QIcon(QStringLiteral(":/marble/dialog-ok.png"));
result.iconSize = QSize( m_iconSize, m_iconSize );
break;
case UpgradeButton:
result.text = tr( "Update" );
- result.icon = QIcon( ":/marble/system-software-update.png" );
+ result.icon = QIcon(QStringLiteral(":/marble/system-software-update.png"));
result.iconSize = QSize( m_iconSize, m_iconSize );
break;
case OpenButton:
result.text = tr( "Open" );
- result.icon = QIcon( ":/marble/document-open.png" );
+ result.icon = QIcon(QStringLiteral(":/marble/document-open.png"));
result.iconSize = QSize( m_iconSize, m_iconSize );
break;
case CancelButton:
@@ -295,7 +295,7 @@ QStyleOptionButton MapItemDelegate::button( Element element, const QStyleOptionV
break;
case RemoveButton:
result.text = tr( "Remove" );
- result.icon = QIcon( ":/marble/edit-delete.png" );
+ result.icon = QIcon(QStringLiteral(":/marble/edit-delete.png"));
result.iconSize = QSize( m_iconSize, m_iconSize );
break;
default:
diff --git a/src/lib/marble/MapViewWidget.cpp b/src/lib/marble/MapViewWidget.cpp
index 9d861bf..5c7fd5b 100644
--- a/src/lib/marble/MapViewWidget.cpp
+++ b/src/lib/marble/MapViewWidget.cpp
@@ -107,19 +107,19 @@ class Q_DECL_HIDDEN MapViewWidget::Private {
m_toolBar = new QToolBar;
m_globeViewButton = new QToolButton;
- m_globeViewButton->setIcon( QIcon(":/icons/map-globe.png") );
+ m_globeViewButton->setIcon(QIcon(QStringLiteral(":/icons/map-globe.png")));
m_globeViewButton->setToolTip( tr("Globe View") );
m_globeViewButton->setCheckable(true);
m_globeViewButton->setChecked(false);
- m_globeViewAction = new QAction( QIcon(":/icons/map-globe.png"),
+ m_globeViewAction = new QAction(QIcon(QStringLiteral(":/icons/map-globe.png")),
tr( "Spherical view" ),
m_globeViewButton );
m_globeViewAction->setCheckable( true );
m_globeViewAction->setChecked( false );
m_mercatorViewButton = new QToolButton;
- m_mercatorViewButton->setIcon( QIcon(":/icons/map-mercator.png") );
+ m_mercatorViewButton->setIcon(QIcon(QStringLiteral(":/icons/map-mercator.png")));
m_mercatorViewButton->setToolTip( tr("Mercator View") );
m_mercatorViewButton->setCheckable(true);
m_mercatorViewButton->setChecked(false);
@@ -127,43 +127,43 @@ class Q_DECL_HIDDEN MapViewWidget::Private {
m_popupMenuFlat = new QMenu;
- m_mercatorViewAction = new QAction( QIcon(":/icons/map-mercator.png"),
+ m_mercatorViewAction = new QAction(QIcon(QStringLiteral(":/icons/map-mercator.png")),
tr("Mercator View"),
m_popupMenuFlat );
m_mercatorViewAction->setCheckable(true);
m_mercatorViewAction->setChecked(false);
- m_flatViewAction = new QAction( QIcon(":/icons/map-flat.png"),
+ m_flatViewAction = new QAction( QIcon(QStringLiteral(":/icons/map-flat.png")),
tr("Flat View"),
m_popupMenuFlat );
m_flatViewAction->setCheckable(true);
m_flatViewAction->setChecked(false);
- m_gnomonicViewAction = new QAction( QIcon(":/icons/map-gnomonic.png"),
+ m_gnomonicViewAction = new QAction( QIcon(QStringLiteral(":/icons/map-gnomonic.png")),
tr( "Gnomonic view" ),
m_popupMenuFlat);
m_gnomonicViewAction->setCheckable( true );
m_gnomonicViewAction->setChecked( false );
- m_stereographicViewAction = new QAction( QIcon(":/icons/map-globe.png"),
+ m_stereographicViewAction = new QAction(QIcon(QStringLiteral(":/icons/map-globe.png")),
tr( "Stereographic view" ),
m_popupMenuFlat);
m_stereographicViewAction->setCheckable( true );
m_stereographicViewAction->setChecked( false );
- m_lambertAzimuthalViewAction = new QAction( QIcon(":/icons/map-globe.png"),
+ m_lambertAzimuthalViewAction = new QAction(QIcon(QStringLiteral(":/icons/map-globe.png")),
tr( "Lambert Azimuthal Equal-Area view" ),
m_popupMenuFlat);
m_lambertAzimuthalViewAction->setCheckable( true );
m_lambertAzimuthalViewAction->setChecked( false );
- m_azimuthalEquidistantViewAction = new QAction( QIcon(":/icons/map-globe.png"),
+ m_azimuthalEquidistantViewAction = new QAction(QIcon(QStringLiteral(":/icons/map-globe.png")),
tr( "Azimuthal Equidistant view" ),
m_popupMenuFlat);
m_azimuthalEquidistantViewAction->setCheckable( true );
m_azimuthalEquidistantViewAction->setChecked( false );
- m_verticalPerspectiveViewAction = new QAction( QIcon(":/icons/map-globe.png"),
+ m_verticalPerspectiveViewAction = new QAction(QIcon(QStringLiteral(":/icons/map-globe.png")),
tr( "Perspective Globe view" ),
m_popupMenuFlat);
m_verticalPerspectiveViewAction->setCheckable( true );
@@ -642,12 +642,12 @@ void MapViewWidget::Private::showContextMenu( const QPoint& pos )
QAction* iconSizeAction = menu.addAction( tr( "&Show Large Icons" ), q, SLOT(toggleIconSize()) );
iconSizeAction->setCheckable( true );
iconSizeAction->setChecked( m_mapViewUi.marbleThemeSelectView->iconSize() == QSize( 96, 96 ) );
- QAction *favAction = menu.addAction( QIcon( ":/icons/bookmarks.png" ), tr( "&Favorite" ), q, SLOT(toggleFavorite()) );
+ QAction *favAction = menu.addAction(QIcon(QStringLiteral(":/icons/bookmarks.png")), tr("&Favorite"), q, SLOT(toggleFavorite()));
favAction->setCheckable( true );
favAction->setChecked( isCurrentFavorite() );
menu.addSeparator();
- menu.addAction( QIcon( ":/icons/create-new-map.png" ), tr("&Create a New Map..."), q, SIGNAL(showMapWizard()) );
+ menu.addAction(QIcon(QStringLiteral(":/icons/create-new-map.png")), tr("&Create a New Map..."), q, SIGNAL(showMapWizard()));
if( QFileInfo( MarbleDirs::localPath() + "/maps/" + currentThemePath() ).exists() )
menu.addAction( tr( "&Delete Map Theme" ), q, SLOT(deleteMap()) );
menu.addAction( tr( "&Upload Map..." ), q, SIGNAL(showUploadDialog()) );
diff --git a/src/lib/marble/MarbleWebView.cpp b/src/lib/marble/MarbleWebView.cpp
index a6c1321..16ec4ea 100644
--- a/src/lib/marble/MarbleWebView.cpp
+++ b/src/lib/marble/MarbleWebView.cpp
@@ -21,7 +21,7 @@ MarbleWebView::MarbleWebView(QWidget *parent) :
m_copyAction(new QAction(this))
{
m_copyAction->setText(tr("Copy"));
- m_copyAction->setIcon(QIcon(":/icons/edit-copy.png"));
+ m_copyAction->setIcon(QIcon(QStringLiteral(":/icons/edit-copy.png")));
m_copyAction->setIconVisibleInMenu(true);
m_copyAction->setToolTip(tr("Copy selected content"));
connect(m_copyAction, SIGNAL(triggered()),
diff --git a/src/lib/marble/MarbleWidgetPopupMenu.cpp b/src/lib/marble/MarbleWidgetPopupMenu.cpp
index 278cde5..c192ea2 100644
--- a/src/lib/marble/MarbleWidgetPopupMenu.cpp
+++ b/src/lib/marble/MarbleWidgetPopupMenu.cpp
@@ -109,7 +109,7 @@ MarbleWidgetPopupMenu::Private::Private( MarbleWidget *widget, const MarbleModel
m_rmbMenu( m_widget ),
m_directionsFromHereAction( 0 ),
m_directionsToHereAction( 0 ),
- m_copyCoordinateAction( new QAction( QIcon(":/icons/copy-coordinates.png"), tr("Copy Coordinates"), parent ) ),
+ m_copyCoordinateAction(new QAction(QIcon(QStringLiteral(":/icons/copy-coordinates.png")), tr("Copy Coordinates"), parent)),
m_rmbExtensionPoint( 0 ),
m_runnerManager( model )
{
@@ -126,12 +126,12 @@ MarbleWidgetPopupMenu::Private::Private( MarbleWidget *widget, const MarbleModel
int const lastIndex = qMax( 1, request->size()-1 );
m_directionsToHereAction->setIcon( QIcon( request->pixmap( lastIndex, 16 ) ) );
}
- QAction* addBookmark = new QAction( QIcon(":/icons/bookmark-new.png"),
+ QAction* addBookmark = new QAction( QIcon(QStringLiteral(":/icons/bookmark-new.png")),
tr( "Add &Bookmark" ), parent );
QAction* fullscreenAction = new QAction( tr( "&Full Screen Mode" ), parent );
fullscreenAction->setCheckable( true );
- QAction* aboutDialogAction = new QAction( QIcon(":/icons/marble.png"), tr( "&About" ), parent );
+ QAction* aboutDialogAction = new QAction(QIcon(QStringLiteral(":/icons/marble.png")), tr("&About"), parent);
QMenu* infoBoxMenu = createInfoBoxMenu();
@@ -148,7 +148,7 @@ MarbleWidgetPopupMenu::Private::Private( MarbleWidget *widget, const MarbleModel
if ( !smallScreen ) {
m_rmbMenu.addAction( m_copyCoordinateAction );
}
- m_rmbMenu.addAction( QIcon(":/icons/addressbook-details.png"), tr( "&Address Details" ), parent, SLOT(startReverseGeocoding()) );
+ m_rmbMenu.addAction(QIcon(QStringLiteral(":/icons/addressbook-details.png")), tr("&Address Details"), parent, SLOT(startReverseGeocoding()));
m_rmbMenu.addSeparator();
m_rmbMenu.addMenu( infoBoxMenu );
diff --git a/src/lib/marble/QtMarbleConfigDialog.cpp b/src/lib/marble/QtMarbleConfigDialog.cpp
index 7575d05..3b40f9c 100644
--- a/src/lib/marble/QtMarbleConfigDialog.cpp
+++ b/src/lib/marble/QtMarbleConfigDialog.cpp
@@ -149,8 +149,8 @@ QtMarbleConfigDialog::QtMarbleConfigDialog(MarbleWidget *marbleWidget, CloudSync
tabWidget->addTab( d->w_pluginSettings, tr( "Plugins" ) );
// Setting the icons for the plugin dialog.
- d->w_pluginSettings->setAboutIcon( QIcon(":/icons/help-about.png") );
- d->w_pluginSettings->setConfigIcon( QIcon(":/icons/settings-configure.png") );
+ d->w_pluginSettings->setAboutIcon(QIcon(QStringLiteral(":/icons/help-about.png")));
+ d->w_pluginSettings->setConfigIcon(QIcon(QStringLiteral(":/icons/settings-configure.png")));
connect( this, SIGNAL(rejected()), &d->m_pluginModel, SLOT(retrievePluginState()) );
connect( this, SIGNAL(accepted()), &d->m_pluginModel, SLOT(applyPluginState()) );
diff --git a/src/lib/marble/RemoveItemEditWidget.cpp b/src/lib/marble/RemoveItemEditWidget.cpp
index 6029411..7102787 100644
--- a/src/lib/marble/RemoveItemEditWidget.cpp
+++ b/src/lib/marble/RemoveItemEditWidget.cpp
@@ -41,7 +41,7 @@ RemoveItemEditWidget::RemoveItemEditWidget( const QModelIndex &index, QWidget *p
layout->addWidget( m_comboBox );
- m_button->setIcon( QIcon( ":/marble/document-save.png" ) );
+ m_button->setIcon(QIcon(QStringLiteral(":/marble/document-save.png")));
connect(m_button, SIGNAL(clicked()), this, SLOT(save()));
layout->addWidget( m_button );
diff --git a/src/lib/marble/SoundCueEditWidget.cpp b/src/lib/marble/SoundCueEditWidget.cpp
index 4abf523..bb257f3 100644
--- a/src/lib/marble/SoundCueEditWidget.cpp
+++ b/src/lib/marble/SoundCueEditWidget.cpp
@@ -42,11 +42,11 @@ SoundCueEditWidget::SoundCueEditWidget( const QModelIndex &index, QWidget *paren
m_lineEdit->setText( soundCueElement()->href() );
layout->addWidget( m_lineEdit );
- m_button2->setIcon( QIcon( ":/marble/document-open.png" ) );
+ m_button2->setIcon(QIcon(QStringLiteral(":/marble/document-open.png")));
connect(m_button2, SIGNAL(clicked()), this, SLOT(open()));
layout->addWidget( m_button2 );
- m_button->setIcon( QIcon( ":/marble/document-save.png" ) );
+ m_button->setIcon(QIcon(QStringLiteral(":/marble/document-save.png")));
connect(m_button, SIGNAL(clicked()), this, SLOT(save()));
layout->addWidget( m_button );
diff --git a/src/lib/marble/TourControlEditWidget.cpp b/src/lib/marble/TourControlEditWidget.cpp
index e32514f..df7b695 100644
--- a/src/lib/marble/TourControlEditWidget.cpp
+++ b/src/lib/marble/TourControlEditWidget.cpp
@@ -49,7 +49,7 @@ TourControlEditWidget::TourControlEditWidget( const QModelIndex &index, QWidget
m_radio_pause->setChecked( true );
}
- m_button->setIcon( QIcon( ":/marble/document-save.png" ) );
+ m_button->setIcon(QIcon(QStringLiteral(":/marble/document-save.png")));
connect(m_button, SIGNAL(clicked()), this, SLOT(save()));
layout->addWidget( m_button );
diff --git a/src/lib/marble/TourItemDelegate.cpp b/src/lib/marble/TourItemDelegate.cpp
index 3b2e01c..be517c9 100644
--- a/src/lib/marble/TourItemDelegate.cpp
+++ b/src/lib/marble/TourItemDelegate.cpp
@@ -95,18 +95,18 @@ void TourItemDelegate::paint( QPainter *painter, const QStyleOptionViewItem &opt
painter->setClipRect( 0, 0, labelRect.width(), labelRect.height() );
label.documentLayout()->draw( painter, paintContext );
painter->restore();
- button.icon = QIcon( ":/marble/document-edit.png" );
+ button.icon = QIcon(QStringLiteral(":/marble/document-edit.png"));
QRect const buttonRect = position( EditButton, option );;
button.rect = buttonRect;
- QIcon const icon = QIcon( ":/marble/media-playback-pause.png" );
+ QIcon const icon = QIcon(QStringLiteral(":/marble/media-playback-pause.png"));
painter->drawPixmap( iconRect, icon.pixmap( iconRect.size() ) );
} else if ( object->nodeType() == GeoDataTypes::GeoDataFlyToType && !m_editingIndices.contains( index ) ) {
GeoDataCoordinates const flyToCoords = index.data( MarblePlacemarkModel::CoordinateRole ).value<GeoDataCoordinates>();
label.setHtml( flyToCoords.toString() );
- button.icon = QIcon( ":/marble/document-edit.png" );
+ button.icon = QIcon(QStringLiteral(":/marble/document-edit.png"));
painter->save();
painter->translate( labelRect.topLeft() );
@@ -117,7 +117,7 @@ void TourItemDelegate::paint( QPainter *painter, const QStyleOptionViewItem &opt
QRect const buttonRect = position( EditButton, option );
button.rect = buttonRect;
- QIcon const icon = QIcon( ":/marble/flag.png" );
+ QIcon const icon = QIcon(QStringLiteral(":/marble/flag.png"));
painter->drawPixmap( iconRect, icon.pixmap( iconRect.size() ) );
} else if ( object->nodeType() == GeoDataTypes::GeoDataWaitType && !m_editingIndices.contains( index ) ) {
@@ -130,12 +130,12 @@ void TourItemDelegate::paint( QPainter *painter, const QStyleOptionViewItem &opt
label.documentLayout()->draw( painter, paintContext );
painter->restore();
- button.icon = QIcon( ":/marble/document-edit.png" );
+ button.icon = QIcon(QStringLiteral(":/marble/document-edit.png"));
QRect const buttonRect = position( EditButton, option );
button.rect = buttonRect;
- QIcon const icon = QIcon( ":/marble/player-time.png" );
+ QIcon const icon = QIcon(QStringLiteral(":/marble/player-time.png"));
painter->drawPixmap( iconRect, icon.pixmap( iconRect.size() ) );
} else if ( object->nodeType() == GeoDataTypes::GeoDataSoundCueType && !m_editingIndices.contains( index ) ) {
@@ -150,16 +150,16 @@ void TourItemDelegate::paint( QPainter *painter, const QStyleOptionViewItem &opt
QStyleOptionButton playButton = button;
- button.icon = QIcon( ":/marble/document-edit.png" );
+ button.icon = QIcon(QStringLiteral(":/marble/document-edit.png"));
QRect const buttonRect = position( EditButton, option );
button.rect = buttonRect;
- playButton.icon = QIcon( ":/marble/playback-play.png" );
+ playButton.icon = QIcon(QStringLiteral(":/marble/playback-play.png"));
QRect const playButtonRect = position( ActionButton, option );
playButton.rect = playButtonRect;
QApplication::style()->drawControl( QStyle::CE_PushButton, &playButton, painter );
- QIcon const icon = QIcon( ":/marble/audio-x-generic.png" );
+ QIcon const icon = QIcon(QStringLiteral(":/marble/audio-x-generic.png"));
painter->drawPixmap( iconRect, icon.pixmap( iconRect.size() ) );
} else if ( object->nodeType() == GeoDataTypes::GeoDataAnimatedUpdateType && !m_editingIndices.contains( index ) ){
GeoDataAnimatedUpdate *animUpdate = static_cast<GeoDataAnimatedUpdate*>( object );
@@ -196,7 +196,7 @@ void TourItemDelegate::paint( QPainter *painter, const QStyleOptionViewItem &opt
label.documentLayout()->draw( painter, paintContext );
painter->restore();
- button.icon = QIcon( ":/marble/document-edit.png" );
+ button.icon = QIcon(QStringLiteral(":/marble/document-edit.png"));
QRect const buttonRect = position( EditButton, option );
button.rect = buttonRect;
diff --git a/src/lib/marble/TourWidget.cpp b/src/lib/marble/TourWidget.cpp
index 750f0fc..fc904ec 100644
--- a/src/lib/marble/TourWidget.cpp
+++ b/src/lib/marble/TourWidget.cpp
@@ -130,24 +130,24 @@ TourWidgetPrivate::TourWidgetPrivate( TourWidget *parent )
QAction *separator = m_tourUi.m_toolBarControl->insertSeparator( m_tourUi.m_actionMoveUp );
- m_addPrimitiveButton->setIcon( QIcon( ":/marble/flag.png" ) );
+ m_addPrimitiveButton->setIcon(QIcon(QStringLiteral(":/marble/flag.png")));
m_addPrimitiveButton->setToolTip( QObject::tr( "Add FlyTo" ) );
m_addPrimitiveButton->setPopupMode( QToolButton::MenuButtonPopup );
QMenu *addPrimitiveMenu = new QMenu;
- m_actionAddFlyTo = new QAction( QIcon( ":/marble/flag.png" ), QObject::tr( "Add FlyTo" ), addPrimitiveMenu );
+ m_actionAddFlyTo = new QAction(QIcon(QStringLiteral(":/marble/flag.png")), QObject::tr("Add FlyTo"), addPrimitiveMenu);
addPrimitiveMenu->addAction( m_actionAddFlyTo );
- m_actionAddWait = new QAction( QIcon( ":/marble/player-time.png" ), QObject::tr( "Add Wait" ), addPrimitiveMenu );
+ m_actionAddWait = new QAction(QIcon(QStringLiteral(":/marble/player-time.png")), QObject::tr("Add Wait"), addPrimitiveMenu);
addPrimitiveMenu->addAction( m_actionAddWait );
- m_actionAddSoundCue = new QAction( QIcon( ":/marble/audio-x-generic.png" ), QObject::tr( "Add SoundCue" ), addPrimitiveMenu );
+ m_actionAddSoundCue = new QAction(QIcon(QStringLiteral(":/marble/audio-x-generic.png")), QObject::tr("Add SoundCue"), addPrimitiveMenu);
addPrimitiveMenu->addAction( m_actionAddSoundCue );
addPrimitiveMenu->addSeparator();
- m_actionAddPlacemark = new QAction( QIcon( ":/icons/add-placemark.png" ), QObject::tr( "Add Placemark" ), addPrimitiveMenu );
+ m_actionAddPlacemark = new QAction(QIcon(QStringLiteral(":/icons/add-placemark.png")), QObject::tr("Add Placemark"), addPrimitiveMenu);
addPrimitiveMenu->addAction( m_actionAddPlacemark );
- m_actionAddRemovePlacemark = new QAction( QIcon( ":/icons/remove.png" ), QObject::tr( "Remove placemark" ), addPrimitiveMenu );
+ m_actionAddRemovePlacemark = new QAction(QIcon(QStringLiteral(":/icons/remove.png")), QObject::tr("Remove placemark"), addPrimitiveMenu);
addPrimitiveMenu->addAction( m_actionAddRemovePlacemark );
- m_actionAddChangePlacemark = new QAction( QIcon( ":/marble/document-edit.png" ), QObject::tr( "Change placemark" ), addPrimitiveMenu );
+ m_actionAddChangePlacemark = new QAction(QIcon(QStringLiteral(":/marble/document-edit.png")), QObject::tr("Change placemark"), addPrimitiveMenu);
addPrimitiveMenu->addAction( m_actionAddChangePlacemark );
m_actionToggleLoopPlay = new QAction( QObject::tr( "Loop" ), m_tourUi.m_slider );
m_actionToggleLoopPlay->setCheckable( true );
@@ -281,7 +281,7 @@ void TourWidget::startPlaying()
setHighlightedItemIndex( 0 );
d->m_isLoopingStopped = false;
d->m_playback.play();
- d->m_tourUi.actionPlay->setIcon( QIcon( ":/marble/playback-pause.png" ) );
+ d->m_tourUi.actionPlay->setIcon(QIcon(QStringLiteral(":/marble/playback-pause.png")));
d->m_tourUi.actionPlay->setEnabled( true );
d->m_tourUi.actionStop->setEnabled( true );
d->m_tourUi.m_actionRecord->setEnabled( false );
@@ -293,7 +293,7 @@ void TourWidget::startPlaying()
void TourWidget::pausePlaying()
{
d->m_playback.pause();
- d->m_tourUi.actionPlay->setIcon( QIcon( ":/marble/playback-play.png" ) );
+ d->m_tourUi.actionPlay->setIcon(QIcon(QStringLiteral(":/marble/playback-play.png")));
d->m_tourUi.actionPlay->setEnabled( true );
d->m_tourUi.actionStop->setEnabled( true );
}
@@ -302,7 +302,7 @@ void TourWidget::stopPlaying()
{
removeHighlight();
d->m_playback.stop();
- d->m_tourUi.actionPlay->setIcon( QIcon( ":/marble/playback-play.png" ) );
+ d->m_tourUi.actionPlay->setIcon(QIcon(QStringLiteral(":/marble/playback-play.png")));
d->m_tourUi.actionPlay->setEnabled( true );
d->m_tourUi.m_actionRecord->setEnabled( true );
d->m_tourUi.actionStop->setEnabled( false );
diff --git a/src/lib/marble/WaitEditWidget.cpp b/src/lib/marble/WaitEditWidget.cpp
index bc74ae9..0accc73 100644
--- a/src/lib/marble/WaitEditWidget.cpp
+++ b/src/lib/marble/WaitEditWidget.cpp
@@ -45,7 +45,7 @@ WaitEditWidget::WaitEditWidget( const QModelIndex &index, QWidget *parent ) :
m_spinBox->setValue( waitElement()->duration() );
m_spinBox->setSuffix( tr(" s", "seconds") );
- m_button->setIcon( QIcon( ":/marble/document-save.png" ) );
+ m_button->setIcon(QIcon(QStringLiteral(":/marble/document-save.png")));
connect(m_button, SIGNAL(clicked()), this, SLOT(save()));
layout->addWidget( m_button );
diff --git a/src/lib/marble/cloudsync/RouteItemDelegate.cpp b/src/lib/marble/cloudsync/RouteItemDelegate.cpp
index 0b1b1f2..a395c01 100644
--- a/src/lib/marble/cloudsync/RouteItemDelegate.cpp
+++ b/src/lib/marble/cloudsync/RouteItemDelegate.cpp
@@ -199,27 +199,27 @@ QStyleOptionButton RouteItemDelegate::button( Element element, const QStyleOptio
switch ( element ) {
case OpenButton:
result.text = tr( "Open" );
- result.icon = QIcon( ":/marble/document-open.png" );
+ result.icon = QIcon(QStringLiteral(":/marble/document-open.png"));
result.iconSize = QSize( m_iconSize, m_iconSize );
break;
case DownloadButton:
result.text = tr( "Load" );
- result.icon = QIcon( ":/marble/dialog-ok.png" );
+ result.icon = QIcon(QStringLiteral(":/marble/dialog-ok.png"));
result.iconSize = QSize( m_iconSize, m_iconSize );
break;
case RemoveFromCacheButton:
result.text = tr( "Remove from device" );
- result.icon = QIcon( ":/marble/edit-clear.png" );
+ result.icon = QIcon(QStringLiteral(":/marble/edit-clear.png"));
result.iconSize = QSize( m_iconSize, m_iconSize );
break;
case RemoveFromCloudButton:
result.text = tr( "Delete from cloud" );
- result.icon = QIcon( ":/marble/edit-delete.png" );
+ result.icon = QIcon(QStringLiteral(":/marble/edit-delete.png"));
result.iconSize = QSize( m_iconSize, m_iconSize );
break;
case UploadToCloudButton:
result.text = tr( "Upload to cloud" );
- result.icon = QIcon( ":/icons/cloud-upload.png" );
+ result.icon = QIcon(QStringLiteral(":/icons/cloud-upload.png"));
result.iconSize = QSize( m_iconSize, m_iconSize );
break;
default:
diff --git a/src/lib/marble/osm/OsmRelationManagerWidget_p.cpp b/src/lib/marble/osm/OsmRelationManagerWidget_p.cpp
index 7a0dcb4..878937c 100644
--- a/src/lib/marble/osm/OsmRelationManagerWidget_p.cpp
+++ b/src/lib/marble/osm/OsmRelationManagerWidget_p.cpp
@@ -77,7 +77,7 @@ void OsmRelationManagerWidgetPrivate::populateDropMenu()
{
m_relationDropMenu->clear();
- m_addRelation->setIcon( QIcon( ":marble/list-add.png" ) );
+ m_addRelation->setIcon(QIcon(QStringLiteral(":marble/list-add.png")));
// The new relation adder
m_relationDropMenu->addAction( QObject::tr( "New Relation" ) );
diff --git a/src/lib/marble/osm/OsmTagEditorWidget_p.cpp b/src/lib/marble/osm/OsmTagEditorWidget_p.cpp
index 2069a7c..cba3f23 100644
--- a/src/lib/marble/osm/OsmTagEditorWidget_p.cpp
+++ b/src/lib/marble/osm/OsmTagEditorWidget_p.cpp
@@ -77,7 +77,7 @@ void OsmTagEditorWidgetPrivate::populateCurrentTagsList()
QTreeWidgetItem *adderItem = new QTreeWidgetItem();
adderItem->setText( 0, m_customTagAdderText );
adderItem->setTextColor( 0, Qt::gray );
- adderItem->setIcon( 0, QIcon( ":marble/list-add.png" ) );
+ adderItem->setIcon(0, QIcon(QStringLiteral(":marble/list-add.png")));
adderItem->setFlags( adderItem->flags() | Qt::ItemIsEditable );
m_currentTagsList->addTopLevelItem( adderItem );
m_currentTagsList->resizeColumnToContents( 0 );
diff --git a/src/lib/marble/projections/AzimuthalEquidistantProjection.cpp b/src/lib/marble/projections/AzimuthalEquidistantProjection.cpp
index 965dc11..c8f4e6b 100644
--- a/src/lib/marble/projections/AzimuthalEquidistantProjection.cpp
+++ b/src/lib/marble/projections/AzimuthalEquidistantProjection.cpp
@@ -68,7 +68,7 @@ QString AzimuthalEquidistantProjection::description() const
QIcon AzimuthalEquidistantProjection::icon() const
{
- return QIcon(":/icons/map-globe.png");
+ return QIcon(QStringLiteral(":/icons/map-globe.png"));
}
AzimuthalEquidistantProjectionPrivate::AzimuthalEquidistantProjectionPrivate( AzimuthalEquidistantProjection * parent )
diff --git a/src/lib/marble/projections/EquirectProjection.cpp b/src/lib/marble/projections/EquirectProjection.cpp
index a8818ec..327d756 100644
--- a/src/lib/marble/projections/EquirectProjection.cpp
+++ b/src/lib/marble/projections/EquirectProjection.cpp
@@ -46,7 +46,7 @@ QString EquirectProjection::description() const
QIcon EquirectProjection::icon() const
{
- return QIcon(":/icons/map-flat.png");
+ return QIcon(QStringLiteral(":/icons/map-flat.png"));
}
qreal EquirectProjection::maxValidLat() const
diff --git a/src/lib/marble/projections/GnomonicProjection.cpp b/src/lib/marble/projections/GnomonicProjection.cpp
index 835819f..7ed85d4 100644
--- a/src/lib/marble/projections/GnomonicProjection.cpp
+++ b/src/lib/marble/projections/GnomonicProjection.cpp
@@ -74,7 +74,7 @@ QString GnomonicProjection::description() const
QIcon GnomonicProjection::icon() const
{
- return QIcon(":/icons/map-gnomonic.png");
+ return QIcon(QStringLiteral(":/icons/map-gnomonic.png"));
}
qreal GnomonicProjection::clippingRadius() const
diff --git a/src/lib/marble/projections/LambertAzimuthalProjection.cpp b/src/lib/marble/projections/LambertAzimuthalProjection.cpp
index ba9eefd..e785291 100644
--- a/src/lib/marble/projections/LambertAzimuthalProjection.cpp
+++ b/src/lib/marble/projections/LambertAzimuthalProjection.cpp
@@ -74,7 +74,7 @@ QString LambertAzimuthalProjection::description() const
QIcon LambertAzimuthalProjection::icon() const
{
- return QIcon(":/icons/map-globe.png");
+ return QIcon(QStringLiteral(":/icons/map-globe.png"));
}
qreal LambertAzimuthalProjection::clippingRadius() const
diff --git a/src/lib/marble/projections/MercatorProjection.cpp b/src/lib/marble/projections/MercatorProjection.cpp
index 6c14025..2ddae01 100644
--- a/src/lib/marble/projections/MercatorProjection.cpp
+++ b/src/lib/marble/projections/MercatorProjection.cpp
@@ -49,7 +49,7 @@ QString MercatorProjection::description() const
QIcon MercatorProjection::icon() const
{
- return QIcon(":/icons/map-mercator.png");
+ return QIcon(QStringLiteral(":/icons/map-mercator.png"));
}
qreal MercatorProjection::maxValidLat() const
diff --git a/src/lib/marble/projections/SphericalProjection.cpp b/src/lib/marble/projections/SphericalProjection.cpp
index 9531fbc..5a37429 100644
--- a/src/lib/marble/projections/SphericalProjection.cpp
+++ b/src/lib/marble/projections/SphericalProjection.cpp
@@ -76,7 +76,7 @@ QString SphericalProjection::description() const
QIcon SphericalProjection::icon() const
{
- return QIcon(":/icons/map-globe.png");
+ return QIcon(QStringLiteral(":/icons/map-globe.png"));
}
bool SphericalProjection::screenCoordinates( const GeoDataCoordinates &coordinates,
diff --git a/src/lib/marble/projections/StereographicProjection.cpp b/src/lib/marble/projections/StereographicProjection.cpp
index 933d2d9..fb073db 100644
--- a/src/lib/marble/projections/StereographicProjection.cpp
+++ b/src/lib/marble/projections/StereographicProjection.cpp
@@ -74,7 +74,7 @@ QString StereographicProjection::description() const
QIcon StereographicProjection::icon() const
{
- return QIcon(":/icons/map-globe.png");
+ return QIcon(QStringLiteral(":/icons/map-globe.png"));
}
qreal StereographicProjection::clippingRadius() const
diff --git a/src/lib/marble/projections/VerticalPerspectiveProjection.cpp b/src/lib/marble/projections/VerticalPerspectiveProjection.cpp
index 361caaf..6002710 100644
--- a/src/lib/marble/projections/VerticalPerspectiveProjection.cpp
+++ b/src/lib/marble/projections/VerticalPerspectiveProjection.cpp
@@ -88,7 +88,7 @@ QString VerticalPerspectiveProjection::description() const
QIcon VerticalPerspectiveProjection::icon() const
{
- return QIcon(":/icons/map-globe.png");
+ return QIcon(QStringLiteral(":/icons/map-globe.png"));
}
void VerticalPerspectiveProjectionPrivate::calculateConstants(qreal radius) const
diff --git a/src/lib/marble/routing/RoutingInputWidget.cpp b/src/lib/marble/routing/RoutingInputWidget.cpp
index f7d8117..45007e6 100644
--- a/src/lib/marble/routing/RoutingInputWidget.cpp
+++ b/src/lib/marble/routing/RoutingInputWidget.cpp
@@ -169,9 +169,9 @@ RoutingInputWidgetPrivate::RoutingInputWidgetPrivate( MarbleModel* model, int in
m_removeButton = new QPushButton( parent );
#ifdef Q_WS_MAEMO_5
// maemo window background color is black, the 'X' is not visible -> use the red '-' sign
- m_removeButton->setIcon( QIcon( ":/icons/remove.png" ) );
+ m_removeButton->setIcon(QIcon(QStringLiteral(":/icons/remove.png")));
#else
- m_removeButton->setIcon( QIcon( ":/marble/routing/icon-remove.png" ) );
+ m_removeButton->setIcon(QIcon(QStringLiteral(":/marble/routing/icon-remove.png")));
#endif
m_removeButton->setToolTip( QObject::tr( "Remove via point" ) );
m_removeButton->setFlat( true );
@@ -194,15 +194,15 @@ void RoutingInputWidgetPrivate::createMenu( RoutingInputWidget *parent )
parent, SLOT(requestActivity()) );
result->addSeparator();
- m_currentLocationAction = result->addAction( QIcon( ":/icons/gps.png" ), QObject::tr( "Current &Location" ),
+ m_currentLocationAction = result->addAction( QIcon(QStringLiteral(":/icons/gps.png")), QObject::tr("Current &Location"),
parent, SLOT(setCurrentLocation()) );
m_currentLocationAction->setEnabled( false );
- m_mapInput = result->addAction( QIcon( ":/icons/crosshairs.png" ), QObject::tr( "From &Map..." ) );
+ m_mapInput = result->addAction(QIcon(QStringLiteral(":/icons/crosshairs.png")), QObject::tr("From &Map..."));
m_mapInput->setCheckable( true );
QObject::connect( m_mapInput, SIGNAL(triggered(bool)), parent, SLOT(setMapInputModeEnabled(bool)) );
- m_bookmarkAction = result->addAction( QIcon( ":/icons/bookmarks.png" ), QObject::tr( "From &Bookmark" ) );
+ m_bookmarkAction = result->addAction(QIcon(QStringLiteral(":/icons/bookmarks.png")), QObject::tr("From &Bookmark"));
m_bookmarkAction->setMenu( createBookmarkMenu( parent ) );
m_menu = result;
@@ -211,7 +211,7 @@ void RoutingInputWidgetPrivate::createMenu( RoutingInputWidget *parent )
QMenu* RoutingInputWidgetPrivate::createBookmarkMenu( RoutingInputWidget *parent )
{
QMenu* result = new QMenu( parent );
- result->addAction( QIcon( ":/icons/go-home.png" ), QObject::tr( "&Home" ), parent, SLOT(setHomePosition()) );
+ result->addAction(QIcon(QStringLiteral(":/icons/go-home.png")), QObject::tr("&Home"), parent, SLOT(setHomePosition()));
QVector<GeoDataFolder*> folders = m_marbleModel->bookmarkManager()->folders();
@@ -222,7 +222,7 @@ QMenu* RoutingInputWidgetPrivate::createBookmarkMenu( RoutingInputWidget *parent
QVector<GeoDataFolder*>::const_iterator end = folders.constEnd();
for (; i != end; ++i ) {
- QMenu* menu = result->addMenu( QIcon( ":/icons/folder-bookmark.png" ), (*i)->name() );
+ QMenu* menu = result->addMenu(QIcon(QStringLiteral(":/icons/folder-bookmark.png")), (*i)->name());
createBookmarkActions( menu, *i, parent );
}
}
diff --git a/src/lib/marble/routing/RoutingWidget.cpp b/src/lib/marble/routing/RoutingWidget.cpp
index 198ccb0..1effe3d 100644
--- a/src/lib/marble/routing/RoutingWidget.cpp
+++ b/src/lib/marble/routing/RoutingWidget.cpp
@@ -224,49 +224,49 @@ void RoutingWidgetPrivate::setupToolBar()
m_openRouteButton = new QToolButton;
m_openRouteButton->setToolTip( QObject::tr("Open Route") );
- m_openRouteButton->setIcon( QIcon(":/icons/16x16/document-open.png") );
+ m_openRouteButton->setIcon(QIcon(QStringLiteral(":/icons/16x16/document-open.png")));
m_toolBar->addWidget(m_openRouteButton);
m_saveRouteButton = new QToolButton;
m_saveRouteButton->setToolTip( QObject::tr("Save Route") );
- m_saveRouteButton->setIcon( QIcon(":/icons/16x16/document-save.png") );
+ m_saveRouteButton->setIcon(QIcon(QStringLiteral(":/icons/16x16/document-save.png")));
m_toolBar->addWidget(m_saveRouteButton);
m_playButton = new QToolButton;
m_playButton->setToolTip( QObject::tr("Preview Route") );
- m_playButton->setIcon( QIcon( ":/marble/playback-play.png" ) );
+ m_playButton->setIcon(QIcon(QStringLiteral(":/marble/playback-play.png")));
m_toolBar->addWidget(m_playButton);
m_cloudSyncSeparator = m_toolBar->addSeparator();
m_uploadToCloudAction = m_toolBar->addAction( QObject::tr("Upload to Cloud") );
m_uploadToCloudAction->setToolTip( QObject::tr("Upload to Cloud") );
- m_uploadToCloudAction->setIcon( QIcon(":/icons/cloud-upload.png") );
+ m_uploadToCloudAction->setIcon(QIcon(QStringLiteral(":/icons/cloud-upload.png")));
m_openCloudRoutesAction = m_toolBar->addAction( QObject::tr("Manage Cloud Routes") );
m_openCloudRoutesAction->setToolTip( QObject::tr("Manage Cloud Routes") );
- m_openCloudRoutesAction->setIcon( QIcon(":/icons/cloud-download.png") );
+ m_openCloudRoutesAction->setIcon(QIcon(QStringLiteral(":/icons/cloud-download.png")));
m_toolBar->addSeparator();
m_addViaButton = new QToolButton;
m_addViaButton->setToolTip( QObject::tr("Add Via") );
- m_addViaButton->setIcon( QIcon(":/marble/list-add.png") );
+ m_addViaButton->setIcon(QIcon(QStringLiteral(":/marble/list-add.png")));
m_toolBar->addWidget(m_addViaButton);
m_reverseRouteButton = new QToolButton;
m_reverseRouteButton->setToolTip( QObject::tr("Reverse Route") );
- m_reverseRouteButton->setIcon( QIcon(":/marble/reverse.png") );
+ m_reverseRouteButton->setIcon(QIcon(QStringLiteral(":/marble/reverse.png")));
m_toolBar->addWidget(m_reverseRouteButton);
m_clearRouteButton = new QToolButton;
m_clearRouteButton->setToolTip( QObject::tr("Clear Route") );
- m_clearRouteButton->setIcon( QIcon(":/marble/edit-clear.png") );
+ m_clearRouteButton->setIcon(QIcon(QStringLiteral(":/marble/edit-clear.png")));
m_toolBar->addWidget(m_clearRouteButton);
m_toolBar->addSeparator();
m_configureButton = new QToolButton;
m_configureButton->setToolTip( QObject::tr("Settings") );
- m_configureButton->setIcon( QIcon(":/icons/16x16/configure.png") );
+ m_configureButton->setIcon(QIcon(QStringLiteral(":/icons/16x16/configure.png")));
m_toolBar->addWidget(m_configureButton);
QObject::connect( m_openRouteButton, SIGNAL(clicked()),
@@ -867,14 +867,14 @@ void RoutingWidget::toggleRoutePlay()
if( !d->m_playing ){
d->m_playing = true;
- d->m_playButton->setIcon( QIcon( ":/marble/playback-pause.png" ) );
+ d->m_playButton->setIcon(QIcon(QStringLiteral(":/marble/playback-pause.png")));
if( d->m_playback ){
d->m_playback->play();
}
} else {
d->m_playing = false;
- d->m_playButton->setIcon( QIcon( ":/marble/playback-play.png" ) );
+ d->m_playButton->setIcon(QIcon(QStringLiteral(":/marble/playback-play.png")));
d->m_playback->pause();
}
}
@@ -993,7 +993,7 @@ void RoutingWidget::centerOn( const GeoDataCoordinates &coordinates )
void RoutingWidget::clearTour()
{
d->m_playing = false;
- d->m_playButton->setIcon( QIcon( ":/marble/playback-play.png" ) );
+ d->m_playButton->setIcon(QIcon(QStringLiteral(":/marble/playback-play.png")));
delete d->m_playback;
d->m_playback = 0;
if( d->m_document ){
@@ -1009,7 +1009,7 @@ void RoutingWidget::seekTourToStart()
Q_ASSERT( d->m_playback );
d->m_playback->stop();
d->m_playback->seek( 0 );
- d->m_playButton->setIcon( QIcon( ":/marble/playback-play.png" ) );
+ d->m_playButton->setIcon(QIcon(QStringLiteral(":/marble/playback-play.png")));
d->m_playing = false;
}
diff --git a/src/plugins/designer/latloneditwidget/LatLonEditPlugin.cpp b/src/plugins/designer/latloneditwidget/LatLonEditPlugin.cpp
index 14c8d65..f2f43c0 100644
--- a/src/plugins/designer/latloneditwidget/LatLonEditPlugin.cpp
+++ b/src/plugins/designer/latloneditwidget/LatLonEditPlugin.cpp
@@ -43,7 +43,7 @@ bool LatLonEditPlugin::isContainer() const
QIcon LatLonEditPlugin::icon() const
{
- return QIcon(":/icons/marble.png");
+ return QIcon(QStringLiteral(":/icons/marble.png"));
}
QString LatLonEditPlugin::domXml() const
diff --git a/src/plugins/designer/marblewidget/MarbleWidgetPlugin.cpp b/src/plugins/designer/marblewidget/MarbleWidgetPlugin.cpp
index bcc45f0..5398394 100644
--- a/src/plugins/designer/marblewidget/MarbleWidgetPlugin.cpp
+++ b/src/plugins/designer/marblewidget/MarbleWidgetPlugin.cpp
@@ -53,7 +53,7 @@ QString MarbleWidgetPlugin::group() const
QIcon MarbleWidgetPlugin::icon() const
{
- return QIcon(":/icons/marble.png");
+ return QIcon(QStringLiteral(":/icons/marble.png"));
}
QString MarbleWidgetPlugin::toolTip() const
diff --git a/src/plugins/designer/navigator/MarbleNavigatorPlugin.cpp b/src/plugins/designer/navigator/MarbleNavigatorPlugin.cpp
index 389b626..443637a 100644
--- a/src/plugins/designer/navigator/MarbleNavigatorPlugin.cpp
+++ b/src/plugins/designer/navigator/MarbleNavigatorPlugin.cpp
@@ -49,7 +49,7 @@ QString MarbleNavigatorPlugin::group() const
QIcon MarbleNavigatorPlugin::icon() const
{
- return QIcon(":/icons/marble.png");
+ return QIcon(QStringLiteral(":/icons/marble.png"));
}
QString MarbleNavigatorPlugin::toolTip() const
diff --git a/src/plugins/render/annotate/AnnotatePlugin.cpp b/src/plugins/render/annotate/AnnotatePlugin.cpp
index ebc1a89..d846e49 100644
--- a/src/plugins/render/annotate/AnnotatePlugin.cpp
+++ b/src/plugins/render/annotate/AnnotatePlugin.cpp
@@ -877,63 +877,63 @@ void AnnotatePlugin::setupActions( MarbleWidget *widget )
group->setExclusive( true );
- QAction *selectItem = new QAction( QIcon(":/icons/edit-select.png"),
+ QAction *selectItem = new QAction( QIcon(QStringLiteral(":/icons/edit-select.png")),
tr("Select Item"),
this );
selectItem->setCheckable( true );
selectItem->setChecked( true );
- QAction *drawPolygon = new QAction( QIcon(":/icons/draw-polygon.png"),
+ QAction *drawPolygon = new QAction( QIcon(QStringLiteral(":/icons/draw-polygon.png")),
tr("Add Polygon"),
this );
connect( drawPolygon, SIGNAL(triggered()), this, SLOT(addPolygon()) );
- QAction *addHole = new QAction( QIcon(":/icons/polygon-draw-hole.png"),
+ QAction *addHole = new QAction( QIcon(QStringLiteral(":/icons/polygon-draw-hole.png")),
tr("Add Polygon Hole"),
this );
addHole->setCheckable( true );
addHole->setEnabled( false );
connect( addHole, SIGNAL(toggled(bool)), this, SLOT(setAddingPolygonHole(bool)) );
- QAction *addNodes = new QAction( QIcon(":/icons/polygon-add-nodes.png"),
+ QAction *addNodes = new QAction( QIcon(QStringLiteral(":/icons/polygon-add-nodes.png")),
tr("Add Nodes"),
this );
addNodes->setCheckable( true );
addNodes->setEnabled( false );
connect( addNodes, SIGNAL(toggled(bool)), this, SLOT(setAddingNodes(bool)) );
- QAction *addTextAnnotation = new QAction( QIcon(":/icons/add-placemark.png"),
+ QAction *addTextAnnotation = new QAction( QIcon(QStringLiteral(":/icons/add-placemark.png")),
tr("Add Placemark"),
this );
connect( addTextAnnotation, SIGNAL(triggered()), this, SLOT(addTextAnnotation()) );
- QAction *addPath = new QAction( QIcon(":/icons/draw-path.png" ),
+ QAction *addPath = new QAction( QIcon(QStringLiteral(":/icons/draw-path.png")),
tr("Add Path"),
this );
connect( addPath, SIGNAL(triggered()), this, SLOT(addPolyline()) );
- QAction *addOverlay = new QAction( QIcon( ":/icons/draw-overlay.png"),
+ QAction *addOverlay = new QAction( QIcon(QStringLiteral(":/icons/draw-overlay.png")),
tr("Add Ground Overlay"),
this );
connect( addOverlay, SIGNAL(triggered()), this, SLOT(addOverlay()) );
- QAction *removeItem = new QAction( QIcon( ":/icons/edit-delete-shred.png"),
+ QAction *removeItem = new QAction( QIcon(QStringLiteral(":/icons/edit-delete-shred.png")),
tr("Remove Item"),
this );
removeItem->setEnabled( false );
connect( removeItem, SIGNAL(triggered()), this, SLOT(askToRemoveFocusItem()) );
- QAction *loadAnnotationFile = new QAction( QIcon( ":/icons/open-for-editing.png"),
+ QAction *loadAnnotationFile = new QAction( QIcon(QStringLiteral(":/icons/open-for-editing.png")),
tr("Load Annotation File" ),
this );
connect( loadAnnotationFile, SIGNAL(triggered()), this, SLOT(loadAnnotationFile()) );
- QAction *saveAnnotationFile = new QAction( QIcon( ":/icons//document-save-as.png"),
+ QAction *saveAnnotationFile = new QAction( QIcon(QStringLiteral(":/icons/document-save-as.png")),
tr("Save Annotation File"),
this );
connect( saveAnnotationFile, SIGNAL(triggered()), this, SLOT(saveAnnotationFile()) );
- QAction *clearAnnotations = new QAction( QIcon( ":/icons/remove.png"),
+ QAction *clearAnnotations = new QAction( QIcon(QStringLiteral(":/icons/remove.png")),
tr("Clear all Annotations"),
this );
connect( drawPolygon, SIGNAL(toggled(bool)), clearAnnotations, SLOT(setDisabled(bool)) );
diff --git a/src/plugins/render/eclipses/EclipsesPlugin.cpp b/src/plugins/render/eclipses/EclipsesPlugin.cpp
index 3684208..1ae3970 100644
--- a/src/plugins/render/eclipses/EclipsesPlugin.cpp
+++ b/src/plugins/render/eclipses/EclipsesPlugin.cpp
@@ -195,7 +195,7 @@ void EclipsesPlugin::initialize()
m_eclipsesMenuAction = new QAction(
tr("Browse Ecli&pses..."), m_eclipsesActionGroup );
- m_eclipsesMenuAction->setIcon( QIcon( ":res/eclipses.png" ) );
+ m_eclipsesMenuAction->setIcon(QIcon(QStringLiteral(":res/eclipses.png")));
m_eclipsesActionGroup->addAction( m_eclipsesMenuAction );
connect( m_eclipsesMenuAction, SIGNAL(triggered()),
m_browserDialog, SLOT(show()) );
diff --git a/src/plugins/render/measure/MeasureToolPlugin.cpp b/src/plugins/render/measure/MeasureToolPlugin.cpp
index 554c069..4ab8f45 100644
--- a/src/plugins/render/measure/MeasureToolPlugin.cpp
+++ b/src/plugins/render/measure/MeasureToolPlugin.cpp
@@ -617,7 +617,7 @@ void MeasureToolPlugin::addContextItems()
MarbleWidgetPopupMenu *menu = m_marbleWidget->popupMenu();
// Connect the inputHandler and the measure tool to the popup menu
- m_addMeasurePointAction = new QAction( QIcon(":/icons/measure.png"), tr( "Add &Measure Point" ), this );
+ m_addMeasurePointAction = new QAction(QIcon(QStringLiteral(":/icons/measure.png")), tr("Add &Measure Point"), this);
m_removeLastMeasurePointAction = new QAction( tr( "Remove &Last Measure Point" ), this );
m_removeLastMeasurePointAction->setEnabled( false );
m_removeMeasurePointsAction = new QAction( tr( "&Remove Measure Points" ), this );
diff --git a/src/plugins/render/navigation/NavigationFloatItem.cpp b/src/plugins/render/navigation/NavigationFloatItem.cpp
index d8de6aa..1e0939e 100644
--- a/src/plugins/render/navigation/NavigationFloatItem.cpp
+++ b/src/plugins/render/navigation/NavigationFloatItem.cpp
@@ -251,7 +251,7 @@ void NavigationFloatItem::contextMenuEvent( QWidget *w, QContextMenuEvent *e )
m_activateCurrentPositionButtonAction = new QAction( QIcon(),
tr( "Current Location Button" ),
m_contextMenu );
- m_activateHomeButtonAction = new QAction( QIcon( ":/icons/go-home.png" ),
+ m_activateHomeButtonAction = new QAction(QIcon(QStringLiteral(":/icons/go-home.png")),
tr( "Home Button" ),
m_contextMenu );
m_activateHomeButtonAction->setVisible( !m_showHomeButton );
diff --git a/src/plugins/render/opencachingcom/OpenCachingComItem.cpp b/src/plugins/render/opencachingcom/OpenCachingComItem.cpp
index d8d4cc0..afadc34 100644
--- a/src/plugins/render/opencachingcom/OpenCachingComItem.cpp
+++ b/src/plugins/render/opencachingcom/OpenCachingComItem.cpp
@@ -87,7 +87,7 @@ void OpenCachingComItem::showInfoDialog()
m_ui->labelIcon->setPixmap(QPixmap(":/" + iconName() + ".png"));
m_ui->labelHeader->setText(QString("<big><strong>" + m_cache["name"].toString() + "</strong></big>"));
- m_ui->buttonWww->setIcon( QIcon( ":/internet.png" ) );
+ m_ui->buttonWww->setIcon(QIcon(QStringLiteral(":/internet.png")));
m_ui->buttonWww->setToolTip( tr("Click to open this cache's page in a browser") );
connect( m_ui->buttonWww, SIGNAL(clicked()), SLOT(openWww()) );
diff --git a/src/plugins/render/weather/WeatherItem.cpp b/src/plugins/render/weather/WeatherItem.cpp
index 3a42b65..c66bdff 100644
--- a/src/plugins/render/weather/WeatherItem.cpp
+++ b/src/plugins/render/weather/WeatherItem.cpp
@@ -67,7 +67,7 @@ class WeatherItemPrivate
QPushButton *button = new QPushButton();
button->setStyleSheet( "border-style: outset;" );
- button->setIcon( QIcon( ":/icons/bookmarks.png" ) );
+ button->setIcon(QIcon(QStringLiteral(":/icons/bookmarks.png")));
button->setFixedSize( 22, 22 );
button->setFlat( true );
button->setCheckable( true );
diff --git a/src/plugins/runner/monav/MonavConfigWidget.cpp b/src/plugins/runner/monav/MonavConfigWidget.cpp
index ab652e3..b388798 100644
--- a/src/plugins/runner/monav/MonavConfigWidget.cpp
+++ b/src/plugins/runner/monav/MonavConfigWidget.cpp
@@ -613,7 +613,7 @@ void MonavConfigWidgetPrivate::updateInstalledMapsViewButtons()
m_upgradeMapSignalMapper.removeMappings( m_parent );
for( int i=0; i<m_mapsModel->rowCount(); ++i ) {
{
- QPushButton* button = new QPushButton( QIcon( ":/system-software-update.png" ), "" );
+ QPushButton* button = new QPushButton(QIcon(QStringLiteral(":/system-software-update.png")), QString());
button->setAutoFillBackground( true );
QModelIndex index = m_mapsModel->index( i, 3 );
m_parent->m_installedMapsListView->setIndexWidget( index, button );
@@ -626,7 +626,7 @@ void MonavConfigWidgetPrivate::updateInstalledMapsViewButtons()
button->setEnabled( upgradable );
}
{
- QPushButton* button = new QPushButton( QIcon( ":/edit-delete.png" ), "" );
+ QPushButton* button = new QPushButton(QIcon(QStringLiteral(":/edit-delete.png")), QString());
button->setAutoFillBackground( true );
QModelIndex index = m_mapsModel->index( i, 4 );
m_parent->m_installedMapsListView->setIndexWidget( index, button );