summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <kossebau@kde.org>2016-08-17 14:56:37 (GMT)
committerFriedrich W. H. Kossebau <kossebau@kde.org>2016-08-24 17:55:45 (GMT)
commitbed44d4640a452924bb6c103963204b5d456df9b (patch)
treefcfbd3f7025d75ef74efd7d1c71ae3f0e03f230c
parenta0e5ecab0e4f820efbebde207705b772fb07fe26 (diff)
Use QString(), not ""
-rw-r--r--src/apps/marble-qt/QtMainWindow.cpp2
-rw-r--r--src/lib/marble/PlacemarkEditHeader.cpp2
-rw-r--r--src/lib/marble/TourItemDelegate.cpp2
-rw-r--r--src/lib/marble/TourWidget.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlStyleUrlTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/parser/GeoParser.cpp2
-rw-r--r--src/plugins/render/annotate/EditPolygonDialog.cpp2
-rw-r--r--src/plugins/render/annotate/EditPolylineDialog.cpp2
-rw-r--r--src/plugins/render/overviewmap/OverviewMap.cpp2
-rw-r--r--src/plugins/render/satellites/SatellitesConfigModel.cpp2
-rw-r--r--tests/MapViewWidgetTest.cpp2
11 files changed, 11 insertions, 11 deletions
diff --git a/src/apps/marble-qt/QtMainWindow.cpp b/src/apps/marble-qt/QtMainWindow.cpp
index becebec..754e12a 100644
--- a/src/apps/marble-qt/QtMainWindow.cpp
+++ b/src/apps/marble-qt/QtMainWindow.cpp
@@ -1420,7 +1420,7 @@ void MainWindow::writeSettings()
settings.setValue( "Name", profile.name() );
foreach ( const QString& pluginName, settings.childGroups() ) {
settings.beginGroup( pluginName );
- settings.remove( "" ); //remove all keys
+ settings.remove(QString()); //remove all keys
settings.endGroup();
}
foreach ( const QString &key, profile.pluginSettings().keys() ) {
diff --git a/src/lib/marble/PlacemarkEditHeader.cpp b/src/lib/marble/PlacemarkEditHeader.cpp
index 0509084..7406631 100644
--- a/src/lib/marble/PlacemarkEditHeader.cpp
+++ b/src/lib/marble/PlacemarkEditHeader.cpp
@@ -116,7 +116,7 @@ void PlacemarkEditHeaderPrivate::setIconLink(const QString &iconLink)
if( !pixmap.isNull() ) {
QIcon icon(pixmap);
m_iconLink->setText(iconLink);
- iconLinkButton->setText( "" );
+ iconLinkButton->setText(QString());
iconLinkButton->setIcon( icon );
}
}
diff --git a/src/lib/marble/TourItemDelegate.cpp b/src/lib/marble/TourItemDelegate.cpp
index 2ab8f67..3b2e01c 100644
--- a/src/lib/marble/TourItemDelegate.cpp
+++ b/src/lib/marble/TourItemDelegate.cpp
@@ -404,7 +404,7 @@ bool TourItemDelegate::editAnimatedUpdate(GeoDataAnimatedUpdate *animatedUpdate,
placemark = new GeoDataPlacemark( *targetPlacemark );
animatedUpdate->update()->change()->placemarkList().insert( 0, placemark );
placemark->setTargetId( defaultFeatureId() );
- placemark->setId( "" );
+ placemark->setId(QString());
}
}
}
diff --git a/src/lib/marble/TourWidget.cpp b/src/lib/marble/TourWidget.cpp
index f40e7fc..750f0fc 100644
--- a/src/lib/marble/TourWidget.cpp
+++ b/src/lib/marble/TourWidget.cpp
@@ -503,7 +503,7 @@ void TourWidgetPrivate::addChangePlacemark()
GeoDataPlacemark *target = static_cast<GeoDataPlacemark*>( lastFeature );
placemark = new GeoDataPlacemark( *target );
placemark->setTargetId( m_delegate->defaultFeatureId() );
- placemark->setId( "" );
+ placemark->setId(QString());
} else {
placemark = new GeoDataPlacemark;
}
diff --git a/src/lib/marble/geodata/handlers/kml/KmlStyleUrlTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlStyleUrlTagHandler.cpp
index 935fc31..1021eeb 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlStyleUrlTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlStyleUrlTagHandler.cpp
@@ -48,7 +48,7 @@ GeoNode* KmlstyleUrlTagHandler::parse( GeoParser& parser ) const
QString key = parentItem.nodeAs<GeoDataStyleMap>()->lastKey();
(*parentItem.nodeAs<GeoDataStyleMap>())[ key ] = content;
- parentItem.nodeAs<GeoDataStyleMap>()->setLastKey( "" );
+ parentItem.nodeAs<GeoDataStyleMap>()->setLastKey(QString());
} else if( parentItem.is<GeoDataFeature>() ) {
QString content = parser.readElementText().trimmed();
diff --git a/src/lib/marble/geodata/parser/GeoParser.cpp b/src/lib/marble/geodata/parser/GeoParser.cpp
index 2db7758..71c948f 100644
--- a/src/lib/marble/geodata/parser/GeoParser.cpp
+++ b/src/lib/marble/geodata/parser/GeoParser.cpp
@@ -108,7 +108,7 @@ bool GeoParser::read( QIODevice* device )
if ( error() ) {
if ( lineNumber() == 1) {
- raiseError("");
+ raiseError(QString());
}
// Defer the deletion to the dtor
// This allows the BookmarkManager to recover the broken .kml files it produced in Marble 1.0 and 1.1
diff --git a/src/plugins/render/annotate/EditPolygonDialog.cpp b/src/plugins/render/annotate/EditPolygonDialog.cpp
index 1f7c70f..b6427ca 100644
--- a/src/plugins/render/annotate/EditPolygonDialog.cpp
+++ b/src/plugins/render/annotate/EditPolygonDialog.cpp
@@ -228,7 +228,7 @@ void EditPolygonDialog::handleChangingStyle()
{
// The default style of the polygon has been changed, thus the old style URL is no longer valid
- d->m_placemark->setStyleUrl( "" );
+ d->m_placemark->setStyleUrl(QString());
GeoDataStyle::Ptr style(new GeoDataStyle( *d->m_placemark->style() ));
style->lineStyle().setWidth( d->m_linesWidth->value() );
diff --git a/src/plugins/render/annotate/EditPolylineDialog.cpp b/src/plugins/render/annotate/EditPolylineDialog.cpp
index 84258a8..f936bc3 100644
--- a/src/plugins/render/annotate/EditPolylineDialog.cpp
+++ b/src/plugins/render/annotate/EditPolylineDialog.cpp
@@ -201,7 +201,7 @@ void EditPolylineDialog::handleChangingStyle()
{
// The default style has been changed, thus the old style URL is no longer valid
// The polyline is now considered to have a customStyle
- d->m_placemark->setStyleUrl( "" );
+ d->m_placemark->setStyleUrl(QString());
GeoDataStyle::Ptr newStyle(new GeoDataStyle( *d->m_placemark->style() ));
newStyle->lineStyle().setColor( d->m_linesDialog->currentColor() );
diff --git a/src/plugins/render/overviewmap/OverviewMap.cpp b/src/plugins/render/overviewmap/OverviewMap.cpp
index 14ca086..11e2353 100644
--- a/src/plugins/render/overviewmap/OverviewMap.cpp
+++ b/src/plugins/render/overviewmap/OverviewMap.cpp
@@ -467,7 +467,7 @@ void OverviewMap::loadPlanetMaps()
void OverviewMap::loadMapSuggestions()
{
- QStringList paths = QDir( MarbleDirs::pluginPath( "" ) ).entryList( QStringList( "*.svg" ), QDir::Files | QDir::NoDotAndDotDot );
+ QStringList paths = QDir(MarbleDirs::pluginPath(QString())).entryList(QStringList("*.svg"), QDir::Files | QDir::NoDotAndDotDot);
for( int i = 0; i < paths.size(); ++i ) {
paths[i] = MarbleDirs::pluginPath( QString() ) + '/' + paths[i];
}
diff --git a/src/plugins/render/satellites/SatellitesConfigModel.cpp b/src/plugins/render/satellites/SatellitesConfigModel.cpp
index 275b69c..a182738 100644
--- a/src/plugins/render/satellites/SatellitesConfigModel.cpp
+++ b/src/plugins/render/satellites/SatellitesConfigModel.cpp
@@ -18,7 +18,7 @@ namespace Marble {
SatellitesConfigModel::SatellitesConfigModel( QObject *parent )
: QAbstractItemModel( parent ),
- m_rootItem( new SatellitesConfigNodeItem( "" ) )
+ m_rootItem(new SatellitesConfigNodeItem(QString()))
{
}
diff --git a/tests/MapViewWidgetTest.cpp b/tests/MapViewWidgetTest.cpp
index 1c6e6f7..69f1fb9 100644
--- a/tests/MapViewWidgetTest.cpp
+++ b/tests/MapViewWidgetTest.cpp
@@ -38,7 +38,7 @@ void MapViewWidgetTest::setMapThemeId()
MapViewWidget widget;
QSignalSpy spy( &widget, SIGNAL(mapThemeIdChanged(QString)) );
- widget.setMapThemeId( "" );
+ widget.setMapThemeId(QString());
QCOMPARE( spy.count(), 0 );