[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [marble] src/plugins: Several EBN Krazy fixes
From: Kevin Krammer <krammer () kde ! org>
Date: 2012-12-31 15:01:49
Message-ID: 20121231150149.5E006A6091 () git ! kde ! org
[Download RAW message or body]
Git commit b40fd58247d18b85c4de61418665425b8e7264b8 by Kevin Krammer.
Committed on 31/12/2012 at 16:01.
Pushed by krake into branch 'master'.
Several EBN Krazy fixes
Fixing various issues found by the EnglishBreakfastNetwork's
code checker Krazy.
Submitted by Mayank Madan <maddiemadan@gmail.com>, completing
a Google Code-in task.
CCMAIL: maddiemadan@gmail.com
REVIEW: 108048
DIGEST: Google Code-in contribution
M +8 -8 src/plugins/network/kio/KIONetworkPlugin.cpp
M +2 -2 src/plugins/network/qhttp/QHttpNetworkPlugin.cpp
M +4 -4 src/plugins/positionprovider/geoclue/GeoCluePositionProviderPlugin.cpp
M +1 -1 src/plugins/positionprovider/gpsd/GpsdConnection.cpp
M +4 -4 src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp
M +4 -4 src/plugins/positionprovider/gpsd/GpsdThread.cpp
M +1 -1 src/plugins/positionprovider/maemo/MaemoPositionProviderPlugin.cpp
M +4 -4 src/plugins/positionprovider/placemark/PlacemarkPositionProviderPlugin.cpp
M +1 -1 src/plugins/positionprovider/qtmobility/QtMobilityPositionProviderPlugin.cpp
M +2 -2 src/plugins/positionprovider/routesimulation/RouteSimulationPositionProviderPlugin.cpp
M +1 -1 src/plugins/positionprovider/wlocate/WlocatePositionProviderPlugin.cpp
M +38 -38 src/plugins/render/navigation/NavigationFloatItem.cpp
http://commits.kde.org/marble/b40fd58247d18b85c4de61418665425b8e7264b8
diff --git a/src/plugins/network/kio/KIONetworkPlugin.cpp \
b/src/plugins/network/kio/KIONetworkPlugin.cpp index 3adcaca..9b466fc 100644
--- a/src/plugins/network/kio/KIONetworkPlugin.cpp
+++ b/src/plugins/network/kio/KIONetworkPlugin.cpp
@@ -29,14 +29,14 @@ void KIOHttpJob::execute()
m_job = KIO::storedGet( KUrl( sourceUrl() ), KIO::Reload,
KIO::HideProgressInfo | KIO::Overwrite );
- connect( m_job, SIGNAL( canceled( KJob * ) ),
- this, SLOT( slotCanceled( KJob * ) ) );
- connect( m_job, SIGNAL( finished( KJob * ) ),
- this, SLOT( slotFinished( KJob * ) ) );
- connect( m_job, SIGNAL( infoMessage( KJob *, QString, QString ) ),
- this, SLOT( slotInfoMessage( KJob *, QString, QString ) ) );
- connect( m_job, SIGNAL( warning( KJob *, QString, QString ) ),
- this, SLOT( slotWarning( KJob *, QString, QString ) ) );
+ connect( m_job, SIGNAL(canceled(KJob*)),
+ this, SLOT(slotCanceled(KJob*)) );
+ connect( m_job, SIGNAL(finished(KJob*)),
+ this, SLOT(slotFinished(KJob*)) );
+ connect( m_job, SIGNAL(infoMessage(KJob*,QString,QString)),
+ this, SLOT(slotInfoMessage(KJob*,QString,QString)) );
+ connect( m_job, SIGNAL(warning(KJob*,QString,QString)),
+ this, SLOT(slotWarning(KJob*,QString,QString)) );
}
void KIOHttpJob::slotCanceled( KJob *job )
diff --git a/src/plugins/network/qhttp/QHttpNetworkPlugin.cpp \
b/src/plugins/network/qhttp/QHttpNetworkPlugin.cpp index fa2dca8..9215c66 100644
--- a/src/plugins/network/qhttp/QHttpNetworkPlugin.cpp
+++ b/src/plugins/network/qhttp/QHttpNetworkPlugin.cpp
@@ -43,8 +43,8 @@ void QHttpHttpJob::execute()
m_buffer = new QBuffer( &m_data );
m_buffer->open( QIODevice::WriteOnly );
- connect( m_http, SIGNAL( requestFinished( int, bool ) ),
- this, SLOT( httpRequestFinished( int, bool ) ) );
+ connect( m_http, SIGNAL(requestFinished(int,bool)),
+ this, SLOT(httpRequestFinished(int,bool)) );
}
m_http->setHost( sourceUrl().host(),
diff --git a/src/plugins/positionprovider/geoclue/GeoCluePositionProviderPlugin.cpp \
b/src/plugins/positionprovider/geoclue/GeoCluePositionProviderPlugin.cpp index \
f09e0b1..1a20e02 100644
--- a/src/plugins/positionprovider/geoclue/GeoCluePositionProviderPlugin.cpp
+++ b/src/plugins/positionprovider/geoclue/GeoCluePositionProviderPlugin.cpp
@@ -45,10 +45,10 @@ void GeoCluePositionProviderPlugin::initialize()
{
m_positionProvider = GeoCute::PositionProvider::detailed();
if (m_positionProvider) {
- connect( m_positionProvider, SIGNAL( positionChanged(GeoCute::Position) ),
- SLOT( updatePosition(GeoCute::Position) ) );
- connect( m_positionProvider, SIGNAL( statusChanged(GeoCute::Status) ),
- SLOT( updateStatus(GeoCute::Status) ) );
+ connect( m_positionProvider, SIGNAL(positionChanged(GeoCute::Position)),
+ SLOT(updatePosition(GeoCute::Position)) );
+ connect( m_positionProvider, SIGNAL(statusChanged(GeoCute::Status)),
+ SLOT(updateStatus(GeoCute::Status)) );
}
}
diff --git a/src/plugins/positionprovider/gpsd/GpsdConnection.cpp \
b/src/plugins/positionprovider/gpsd/GpsdConnection.cpp index 24fc783..feb077f 100644
--- a/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
+++ b/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
@@ -33,7 +33,7 @@ GpsdConnection::GpsdConnection( QObject* parent )
{
m_oldLocale = setlocale( LC_NUMERIC, NULL );
setlocale( LC_NUMERIC, "C" );
- connect( &m_timer, SIGNAL( timeout() ), this, SLOT( update() ) );
+ connect( &m_timer, SIGNAL(timeout()), this, SLOT(update()) );
}
GpsdConnection::~GpsdConnection()
diff --git a/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp \
b/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp index \
39ff9b2..e64ad27 100644
--- a/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp
+++ b/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp
@@ -65,10 +65,10 @@ void GpsdPositionProviderPlugin::initialize()
emit statusChanged( m_status );
m_thread = new GpsdThread;
- connect( m_thread, SIGNAL( gpsdInfo( gps_data_t ) ),
- this, SLOT( update( gps_data_t ) ) );
- connect( m_thread, SIGNAL( statusChanged( PositionProviderStatus ) ),
- this, SIGNAL( statusChanged( PositionProviderStatus ) ) );
+ connect( m_thread, SIGNAL(gpsdInfo(gps_data_t)),
+ this, SLOT(update(gps_data_t)) );
+ connect( m_thread, SIGNAL(statusChanged(PositionProviderStatus)),
+ this, SIGNAL(statusChanged(PositionProviderStatus)) );
m_thread->start();
}
diff --git a/src/plugins/positionprovider/gpsd/GpsdThread.cpp \
b/src/plugins/positionprovider/gpsd/GpsdThread.cpp index 6cc015f..ffb8ed6 100644
--- a/src/plugins/positionprovider/gpsd/GpsdThread.cpp
+++ b/src/plugins/positionprovider/gpsd/GpsdThread.cpp
@@ -32,10 +32,10 @@ void GpsdThread::run()
qRegisterMetaType<gps_data_t>( "gps_data_t" );
qRegisterMetaType<PositionProviderStatus>("PositionProviderStatus");
m_connection = new GpsdConnection;
- connect( m_connection, SIGNAL( statusChanged( PositionProviderStatus) ),
- this, SIGNAL( statusChanged( PositionProviderStatus) ) );
- connect( m_connection, SIGNAL( gpsdInfo( gps_data_t ) ),
- this, SIGNAL( gpsdInfo( gps_data_t ) ) );
+ connect( m_connection, SIGNAL(statusChanged(PositionProviderStatus)),
+ this, SIGNAL(statusChanged(PositionProviderStatus)) );
+ connect( m_connection, SIGNAL(gpsdInfo(gps_data_t)),
+ this, SIGNAL(gpsdInfo(gps_data_t)) );
m_connection->initialize();
exec();
}
diff --git a/src/plugins/positionprovider/maemo/MaemoPositionProviderPlugin.cpp \
b/src/plugins/positionprovider/maemo/MaemoPositionProviderPlugin.cpp index \
00d3e92..dcf9be6 100644
--- a/src/plugins/positionprovider/maemo/MaemoPositionProviderPlugin.cpp
+++ b/src/plugins/positionprovider/maemo/MaemoPositionProviderPlugin.cpp
@@ -159,7 +159,7 @@ QDateTime MaemoPositionProviderPlugin::timestamp() const
MaemoPositionProviderPlugin::MaemoPositionProviderPlugin() :
d( new MaemoPositionProviderPluginPrivate )
{
- connect( &d->m_timer, SIGNAL( timeout() ), this, SLOT( update() ) );
+ connect( &d->m_timer, SIGNAL(timeout()), this, SLOT(update()) );
}
MaemoPositionProviderPlugin::~MaemoPositionProviderPlugin()
diff --git a/src/plugins/positionprovider/placemark/PlacemarkPositionProviderPlugin.cpp \
b/src/plugins/positionprovider/placemark/PlacemarkPositionProviderPlugin.cpp index \
163f1bf..2bc43b4 100644
--- a/src/plugins/positionprovider/placemark/PlacemarkPositionProviderPlugin.cpp
+++ b/src/plugins/positionprovider/placemark/PlacemarkPositionProviderPlugin.cpp
@@ -76,8 +76,8 @@ void PlacemarkPositionProviderPlugin::initialize()
{
if ( marbleModel() ) {
setPlacemark( marbleModel()->trackedPlacemark() );
- connect( marbleModel(), SIGNAL( trackedPlacemarkChanged( const \
GeoDataPlacemark* ) ),
- this, SLOT( setPlacemark( const GeoDataPlacemark * ) ) );
+ connect( marbleModel(), SIGNAL(trackedPlacemarkChanged(GeoDataPlacemark*)),
+ this, SLOT(setPlacemark(GeoDataPlacemark*)) );
} else {
mDebug() << "PlacemarkPositionProviderPlugin: MarbleModel not set, cannot \
track placemarks."; }
@@ -142,9 +142,9 @@ void PlacemarkPositionProviderPlugin::setPlacemark( const \
GeoDataPlacemark *plac
m_status = placemark ? PositionProviderStatusAvailable : \
PositionProviderStatusUnavailable; m_speed = 0.0;
- disconnect( marbleModel()->clock(), SIGNAL( timeChanged() ), this, SLOT( \
updatePosition() ) ); + disconnect( marbleModel()->clock(), SIGNAL(timeChanged()), \
this, SLOT(updatePosition()) ); if ( placemark ) {
- connect( marbleModel()->clock(), SIGNAL( timeChanged() ), this, SLOT( \
updatePosition() ) ); + connect( marbleModel()->clock(), \
SIGNAL(timeChanged()), this, SLOT(updatePosition()) ); }
if ( oldPlacemark != m_placemark && m_placemark != 0 ) {
diff --git a/src/plugins/positionprovider/qtmobility/QtMobilityPositionProviderPlugin.cpp \
b/src/plugins/positionprovider/qtmobility/QtMobilityPositionProviderPlugin.cpp index \
fe51411..be3bf1a 100644
--- a/src/plugins/positionprovider/qtmobility/QtMobilityPositionProviderPlugin.cpp
+++ b/src/plugins/positionprovider/qtmobility/QtMobilityPositionProviderPlugin.cpp
@@ -132,7 +132,7 @@ QtMobilityPositionProviderPlugin::~QtMobilityPositionProviderPlugin()
void QtMobilityPositionProviderPlugin::initialize()
{
if( d->m_source ) {
- connect( d->m_source, SIGNAL( positionUpdated ( const QGeoPositionInfo& ) ), \
this, SLOT( update() ) ); + connect( d->m_source, \
SIGNAL(positionUpdated(QGeoPositionInfo)), this, SLOT(update()) ); \
d->m_source->setUpdateInterval( 1000 ); d->m_source->startUpdates();
}
diff --git a/src/plugins/positionprovider/routesimulation/RouteSimulationPositionProviderPlugin.cpp \
b/src/plugins/positionprovider/routesimulation/RouteSimulationPositionProviderPlugin.cpp
index 29bbb15..4fd32d4 100644
--- a/src/plugins/positionprovider/routesimulation/RouteSimulationPositionProviderPlugin.cpp
+++ b/src/plugins/positionprovider/routesimulation/RouteSimulationPositionProviderPlugin.cpp
@@ -132,7 +132,7 @@ void RouteSimulationPositionProviderPlugin::initialize()
m_status = m_lineString.isEmpty() ? PositionProviderStatusUnavailable : \
PositionProviderStatusAcquiring;
if ( !m_lineString.isEmpty() ) {
- QTimer::singleShot( 1000.0 / c_frequency, this, SLOT( update() ) );
+ QTimer::singleShot( 1000.0 / c_frequency, this, SLOT(update()) );
}
}
@@ -183,7 +183,7 @@ void RouteSimulationPositionProviderPlugin::update()
}
}
- QTimer::singleShot( 1000.0 / c_frequency, this, SLOT( update() ) );
+ QTimer::singleShot( 1000.0 / c_frequency, this, SLOT(update()) );
}
} // namespace Marble
diff --git a/src/plugins/positionprovider/wlocate/WlocatePositionProviderPlugin.cpp \
b/src/plugins/positionprovider/wlocate/WlocatePositionProviderPlugin.cpp index \
469eafb..ae49766 100644
--- a/src/plugins/positionprovider/wlocate/WlocatePositionProviderPlugin.cpp
+++ b/src/plugins/positionprovider/wlocate/WlocatePositionProviderPlugin.cpp
@@ -174,7 +174,7 @@ void WlocatePositionProviderPlugin::update()
{
if ( !d->m_futureWatcher ) {
d->m_futureWatcher = new QFutureWatcher<int>( this );
- connect( d->m_futureWatcher, SIGNAL( finished() ), this, SLOT( \
handleWlocateResult() ) ); + connect( d->m_futureWatcher, SIGNAL(finished()), \
this, SLOT(handleWlocateResult()) ); }
QFuture<int> future = QtConcurrent::run( &wloc_get_location, &d->m_latitude, \
&d->m_longitude, &d->m_quality, &d->m_ccode );
diff --git a/src/plugins/render/navigation/NavigationFloatItem.cpp \
b/src/plugins/render/navigation/NavigationFloatItem.cpp index a8b5ca9..ab57dae 100644
--- a/src/plugins/render/navigation/NavigationFloatItem.cpp
+++ b/src/plugins/render/navigation/NavigationFloatItem.cpp
@@ -136,14 +136,14 @@ void NavigationFloatItem::initialize()
setLayout( layout );
if( !( m_profiles & MarbleGlobal::SmallScreen ) ) {
- connect( m_navigationWidget->zoomSlider, SIGNAL( sliderPressed() ),
- this, SLOT( adjustForAnimation() ) );
- connect( m_navigationWidget->zoomSlider, SIGNAL( sliderReleased() ),
- this, SLOT( adjustForStill() ) );
- connect( m_navigationWidget->zoomSlider, SIGNAL( valueChanged( int ) ),
- this, SLOT( updateButtons( int ) ) );
- connect( m_navigationWidget->zoomSlider, SIGNAL( sliderMoved(int) ),
- this, SLOT( setMarbleZoomValue(int) ) );
+ connect( m_navigationWidget->zoomSlider, SIGNAL(sliderPressed()),
+ this, SLOT(adjustForAnimation()) );
+ connect( m_navigationWidget->zoomSlider, SIGNAL(sliderReleased()),
+ this, SLOT(adjustForStill()) );
+ connect( m_navigationWidget->zoomSlider, SIGNAL(valueChanged(int)),
+ this, SLOT(updateButtons(int)) );
+ connect( m_navigationWidget->zoomSlider, SIGNAL(sliderMoved(int)),
+ this, SLOT(setMarbleZoomValue(int)) );
// Other signal/slot connections will be initialized when the marble widget \
is known }
}
@@ -184,12 +184,12 @@ bool NavigationFloatItem::eventFilter( QObject *object, QEvent \
*e ) //m_navigationWidget->zoomSlider->setRange(minZoom, maxZoom);
if( m_profiles & MarbleGlobal::SmallScreen ) {
- connect( m_navigationWidgetSmall->zoomInButton, SIGNAL( clicked() ),
- m_marbleWidget, SLOT( zoomIn() ) );
- connect( m_navigationWidgetSmall->zoomOutButton, SIGNAL( clicked() ),
- m_marbleWidget, SLOT( zoomOut() ) );
- connect( m_navigationWidgetSmall->goHomeButton, SIGNAL( clicked() ),
- m_marbleWidget, SLOT( goHome() ) );
+ connect( m_navigationWidgetSmall->zoomInButton, SIGNAL(clicked()),
+ m_marbleWidget, SLOT(zoomIn()) );
+ connect( m_navigationWidgetSmall->zoomOutButton, SIGNAL(clicked()),
+ m_marbleWidget, SLOT(zoomOut()) );
+ connect( m_navigationWidgetSmall->goHomeButton, SIGNAL(clicked()),
+ m_marbleWidget, SLOT(goHome()) );
}
else {
m_navigationWidget->zoomSlider->setMinimum(minZoom);
@@ -197,28 +197,28 @@ bool NavigationFloatItem::eventFilter( QObject *object, QEvent \
*e )
m_navigationWidget->zoomSlider->setValue(m_marbleWidget->zoom());
m_navigationWidget->zoomSlider->setTickInterval((maxZoom - minZoom) / \
15);
- connect( m_navigationWidget->zoomInButton, SIGNAL( clicked() ),
- m_marbleWidget, SLOT( zoomIn() ) );
- connect( m_navigationWidget->zoomOutButton, SIGNAL( clicked() ),
- m_marbleWidget, SLOT( zoomOut() ) );
-
- connect( m_navigationWidget->moveLeftButton, SIGNAL( clicked() ),
- m_marbleWidget, SLOT( moveLeft() ) );
- connect( m_navigationWidget->moveRightButton, SIGNAL( clicked() ),
- m_marbleWidget, SLOT( moveRight() ) );
- connect( m_navigationWidget->moveUpButton, SIGNAL( clicked() ),
- m_marbleWidget, SLOT( moveUp() ) );
- connect( m_navigationWidget->moveDownButton, SIGNAL( clicked() ),
- m_marbleWidget, SLOT( moveDown() ) );
-
- connect( m_navigationWidget->goHomeButton, SIGNAL( clicked() ),
- m_marbleWidget, SLOT( goHome() ) );
+ connect( m_navigationWidget->zoomInButton, SIGNAL(clicked()),
+ m_marbleWidget, SLOT(zoomIn()) );
+ connect( m_navigationWidget->zoomOutButton, SIGNAL(clicked()),
+ m_marbleWidget, SLOT(zoomOut()) );
+
+ connect( m_navigationWidget->moveLeftButton, SIGNAL(clicked()),
+ m_marbleWidget, SLOT(moveLeft()) );
+ connect( m_navigationWidget->moveRightButton, SIGNAL(clicked()),
+ m_marbleWidget, SLOT(moveRight()) );
+ connect( m_navigationWidget->moveUpButton, SIGNAL(clicked()),
+ m_marbleWidget, SLOT(moveUp()) );
+ connect( m_navigationWidget->moveDownButton, SIGNAL(clicked()),
+ m_marbleWidget, SLOT(moveDown()) );
+
+ connect( m_navigationWidget->goHomeButton, SIGNAL(clicked()),
+ m_marbleWidget, SLOT(goHome()) );
}
- connect( m_marbleWidget, SIGNAL( zoomChanged(int) ),
- this, SLOT( setZoomSliderValue( int ) ) );
- connect( m_marbleWidget, SIGNAL( themeChanged( QString ) ),
- this, SLOT( selectTheme( QString ) ) );
+ connect( m_marbleWidget, SIGNAL(zoomChanged(int)),
+ this, SLOT(setZoomSliderValue(int)) );
+ connect( m_marbleWidget, SIGNAL(themeChanged(QString)),
+ this, SLOT(selectTheme(QString)) );
updateButtons( m_marbleWidget->zoom() );
}
@@ -249,11 +249,11 @@ void NavigationFloatItem::setMarbleZoomValue( int level )
return;
}
- disconnect( m_marbleWidget, SIGNAL( zoomChanged(int) ),
- this, SLOT( setZoomSliderValue( int ) ) );
+ disconnect( m_marbleWidget, SIGNAL(zoomChanged(int)),
+ this, SLOT(setZoomSliderValue(int)) );
m_marbleWidget->zoomView( level );
- connect( m_marbleWidget, SIGNAL( zoomChanged(int) ),
- this, SLOT( setZoomSliderValue( int ) ) );
+ connect( m_marbleWidget, SIGNAL(zoomChanged(int)),
+ this, SLOT(setZoomSliderValue(int)) );
}
void NavigationFloatItem::selectTheme( QString theme )
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic