[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [marble] src/plugins/render: Several EBN Krazy fixes
From: Kevin Krammer <krammer () kde ! org>
Date: 2012-12-31 16:02:14
Message-ID: 20121231160214.448AEA6091 () git ! kde ! org
[Download RAW message or body]
Git commit bd4c577345d069d873fb65ce8960312adad1d697 by Kevin Krammer.
Committed on 31/12/2012 at 17:00.
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: 108052
DIGEST: Google Code-in contribution
M +6 -6 src/plugins/render/fileview/FileViewFloatItem.cpp
M +2 -2 src/plugins/render/gpsinfo/GpsInfo.cpp
M +7 -7 src/plugins/render/mapscale/MapScaleFloatItem.cpp
M +24 -24 src/plugins/render/stars/StarsPlugin.cpp
M +1 -1 src/plugins/render/wikipedia/WikipediaItem.cpp
M +10 -10 src/plugins/render/wikipedia/WikipediaPlugin.cpp
http://commits.kde.org/marble/bd4c577345d069d873fb65ce8960312adad1d697
diff --git a/src/plugins/render/fileview/FileViewFloatItem.cpp \
b/src/plugins/render/fileview/FileViewFloatItem.cpp index cf4d23b..786bc28 100644
--- a/src/plugins/render/fileview/FileViewFloatItem.cpp
+++ b/src/plugins/render/fileview/FileViewFloatItem.cpp
@@ -85,8 +85,8 @@ void FileViewFloatItem::initialize()
m_fileView->resize(100, 240);
m_fileView->setResizeMode(QListView::Adjust);
m_fileView->setContextMenuPolicy( Qt::CustomContextMenu );
- connect(m_fileView, SIGNAL(customContextMenuRequested ( const QPoint & )),
- this, SLOT(contextMenu(const QPoint& )));
+ connect(m_fileView, SIGNAL(customContextMenuRequested(QPoint)),
+ this, SLOT(contextMenu(QPoint)));
}
bool FileViewFloatItem::isInitialized() const
@@ -216,10 +216,10 @@ void FileViewFloatItem::contextMenu( const QPoint& pos )
// We need the global position to move the menu.
// pos contains the relative position.
test->move( m_itemPosition );
- connect( test->addAction( tr( "Open file..." ) ), SIGNAL( triggered() ),
- this, SLOT( addFile() ) );
- connect( test->addAction( tr( "Close this file" ) ), SIGNAL( triggered() ),
- this, SLOT( removeFile() ) );
+ connect( test->addAction( tr( "Open file..." ) ), SIGNAL(triggered()),
+ this, SLOT(addFile()) );
+ connect( test->addAction( tr( "Close this file" ) ), SIGNAL(triggered()),
+ this, SLOT(removeFile()) );
m_persIndex = new QPersistentModelIndex( m_fileView->indexAt( pos ) );
test->exec();
}
diff --git a/src/plugins/render/gpsinfo/GpsInfo.cpp b/src/plugins/render/gpsinfo/GpsInfo.cpp
index e755c81..ea7e568 100644
--- a/src/plugins/render/gpsinfo/GpsInfo.cpp
+++ b/src/plugins/render/gpsinfo/GpsInfo.cpp
@@ -101,8 +101,8 @@ void GpsInfo::initialize ()
setPadding( 0 );
m_locale = MarbleGlobal::getInstance()->locale();
- connect( marbleModel()->positionTracking(), SIGNAL( gpsLocation(GeoDataCoordinates,qreal) ),
- this, SLOT( updateLocation(GeoDataCoordinates,qreal) ) );
+ connect( marbleModel()->positionTracking(), SIGNAL(gpsLocation(GeoDataCoordinates,qreal)),
+ this, SLOT(updateLocation(GeoDataCoordinates,qreal)) );
}
}
diff --git a/src/plugins/render/mapscale/MapScaleFloatItem.cpp \
b/src/plugins/render/mapscale/MapScaleFloatItem.cpp index efa678d..4770ec3 100644
--- a/src/plugins/render/mapscale/MapScaleFloatItem.cpp
+++ b/src/plugins/render/mapscale/MapScaleFloatItem.cpp
@@ -344,13 +344,13 @@ QDialog *MapScaleFloatItem::configDialog()
readSettings();
- connect( ui_configWidget->m_buttonBox, SIGNAL( accepted() ),
- SLOT( writeSettings() ) );
- connect( ui_configWidget->m_buttonBox, SIGNAL( rejected() ),
- SLOT( readSettings() ) );
+ connect( ui_configWidget->m_buttonBox, SIGNAL(accepted()),
+ SLOT(writeSettings()) );
+ connect( ui_configWidget->m_buttonBox, SIGNAL(rejected()),
+ SLOT(readSettings()) );
QPushButton *applyButton = ui_configWidget->m_buttonBox->button( QDialogButtonBox::Apply );
- connect( applyButton, SIGNAL( clicked()) ,
- this, SLOT( writeSettings() ) );
+ connect( applyButton, SIGNAL(clicked()) ,
+ this, SLOT(writeSettings()) );
}
return m_configDialog;
}
@@ -368,7 +368,7 @@ void MapScaleFloatItem::contextMenuEvent( QWidget *w, QContextMenuEvent *e )
}
QAction *toggleAction = m_contextMenu->addAction( tr("&Ratio Scale"), this,
- SLOT( toggleRatioScaleVisibility() ) );
+ SLOT(toggleRatioScaleVisibility()) );
toggleAction->setCheckable( true );
toggleAction->setChecked( m_showRatioScale );
}
diff --git a/src/plugins/render/stars/StarsPlugin.cpp b/src/plugins/render/stars/StarsPlugin.cpp
index 0e41c6f..9839601 100644
--- a/src/plugins/render/stars/StarsPlugin.cpp
+++ b/src/plugins/render/stars/StarsPlugin.cpp
@@ -135,26 +135,26 @@ QDialog *StarsPlugin::configDialog()
readSettings();
- connect( ui_configWidget->m_buttonBox, SIGNAL( accepted() ), SLOT( writeSettings() ) );
- connect( ui_configWidget->m_buttonBox, SIGNAL( rejected() ), SLOT( readSettings() ) );
+ connect( ui_configWidget->m_buttonBox, SIGNAL(accepted()), SLOT(writeSettings()) );
+ connect( ui_configWidget->m_buttonBox, SIGNAL(rejected()), SLOT(readSettings()) );
- connect( ui_configWidget->m_constellationColorButton, SIGNAL( clicked() ), this,
- SLOT( constellationGetColor() ) );
+ connect( ui_configWidget->m_constellationColorButton, SIGNAL(clicked()), this,
+ SLOT(constellationGetColor()) );
- connect( ui_configWidget->m_constellationLabelColorButton, SIGNAL( clicked() ), this,
- SLOT( constellationLabelGetColor() ) );
+ connect( ui_configWidget->m_constellationLabelColorButton, SIGNAL(clicked()), this,
+ SLOT(constellationLabelGetColor()) );
- connect( ui_configWidget->m_dsoLabelColorButton, SIGNAL( clicked() ), this,
- SLOT( dsoLabelGetColor() ) );
+ connect( ui_configWidget->m_dsoLabelColorButton, SIGNAL(clicked()), this,
+ SLOT(dsoLabelGetColor()) );
- connect( ui_configWidget->m_eclipticColorButton, SIGNAL( clicked() ), this,
- SLOT( eclipticGetColor() ) );
+ connect( ui_configWidget->m_eclipticColorButton, SIGNAL(clicked()), this,
+ SLOT(eclipticGetColor()) );
- connect( ui_configWidget->m_celestialEquatorColorButton, SIGNAL( clicked() ), this,
- SLOT( celestialEquatorGetColor() ) );
+ connect( ui_configWidget->m_celestialEquatorColorButton, SIGNAL(clicked()), this,
+ SLOT(celestialEquatorGetColor()) );
- connect( ui_configWidget->m_celestialPoleColorButton, SIGNAL( clicked() ), this,
- SLOT( celestialPoleGetColor() ) );
+ connect( ui_configWidget->m_celestialPoleColorButton, SIGNAL(clicked()), this,
+ SLOT(celestialPoleGetColor()) );
// FIXME: Could Not Make Apply Button Work.
@@ -979,11 +979,11 @@ bool StarsPlugin::render( GeoPainter *painter, ViewportParams *viewport,
if ( renderStars != m_renderStars ) {
if ( renderStars ) {
- connect( marbleModel()->clock(), SIGNAL( timeChanged() ),
- this, SLOT( requestRepaint() ) );
+ connect( marbleModel()->clock(), SIGNAL(timeChanged()),
+ this, SLOT(requestRepaint()) );
} else {
- disconnect( marbleModel()->clock(), SIGNAL( timeChanged() ),
- this, SLOT( requestRepaint() ) );
+ disconnect( marbleModel()->clock(), SIGNAL(timeChanged()),
+ this, SLOT(requestRepaint()) );
}
m_renderStars = renderStars;
@@ -1096,24 +1096,24 @@ bool StarsPlugin::eventFilter( QObject *object, QEvent *e )
}
QMenu menu;
- QAction *constellationLinesAction = menu.addAction( tr("Show &Constellation Lines"), this, \
SLOT( toggleConstellationLines() ) ); + QAction *constellationLinesAction = menu.addAction( \
tr("Show &Constellation Lines"), this, SLOT(toggleConstellationLines()) ); \
constellationLinesAction->setCheckable( true );
constellationLinesAction->setChecked( m_renderConstellationLines );
- QAction *constellationLabelsAction = menu.addAction( tr("Show Constellation &Labels"), this, \
SLOT( toggleConstellationLabels() ) ); + QAction *constellationLabelsAction = menu.addAction( \
tr("Show Constellation &Labels"), this, SLOT(toggleConstellationLabels()) ); \
constellationLabelsAction->setCheckable( true );
constellationLabelsAction->setChecked( m_renderConstellationLabels );
- QAction *dsoAction = menu.addAction( tr("Show &Deep Sky Objects"), this, SLOT( toggleDsos() \
) ); + QAction *dsoAction = menu.addAction( tr("Show &Deep Sky Objects"), this, \
SLOT(toggleDsos()) ); dsoAction->setCheckable( true );
dsoAction->setChecked( m_renderDsos );
- QAction *dsoLabelAction = menu.addAction( tr("Show Deep Sky Object Labels"), this, SLOT( \
toggleDsoLabels() ) ); + QAction *dsoLabelAction = menu.addAction( tr("Show Deep Sky Object \
Labels"), this, SLOT(toggleDsoLabels()) ); dsoLabelAction->setCheckable( true );
dsoLabelAction->setChecked( m_renderDsoLabels );
- QAction *sunAction = menu.addAction( tr("Show &Sun"), this, SLOT( toggleSun() ) );
+ QAction *sunAction = menu.addAction( tr("Show &Sun"), this, SLOT(toggleSun()) );
sunAction->setCheckable( true );
sunAction->setChecked( m_renderSun );
@@ -1121,7 +1121,7 @@ bool StarsPlugin::eventFilter( QObject *object, QEvent *e )
Q_ASSERT( dialog );
menu.addSeparator();
QAction *configAction = menu.addAction( tr( "&Configure..." ) );
- connect( configAction, SIGNAL( triggered() ), dialog, SLOT( exec() ) );
+ connect( configAction, SIGNAL(triggered()), dialog, SLOT(exec()) );
menu.exec(widget->mapToGlobal(menuEvent->pos()));
return true;
diff --git a/src/plugins/render/wikipedia/WikipediaItem.cpp \
b/src/plugins/render/wikipedia/WikipediaItem.cpp index e469f02..49c0530 100644
--- a/src/plugins/render/wikipedia/WikipediaItem.cpp
+++ b/src/plugins/render/wikipedia/WikipediaItem.cpp
@@ -46,7 +46,7 @@ WikipediaItem::WikipediaItem( MarbleWidget* widget, QObject *parent )
m_showThumbnail( false )
{
m_action = new QAction( this );
- connect( m_action, SIGNAL( triggered() ), this, SLOT( openBrowser() ) );
+ connect( m_action, SIGNAL(triggered()), this, SLOT(openBrowser()) );
setCacheMode( MarbleGraphicsItem::ItemCoordinateCache );
}
diff --git a/src/plugins/render/wikipedia/WikipediaPlugin.cpp \
b/src/plugins/render/wikipedia/WikipediaPlugin.cpp index 43eb175..d5bc24a 100644
--- a/src/plugins/render/wikipedia/WikipediaPlugin.cpp
+++ b/src/plugins/render/wikipedia/WikipediaPlugin.cpp
@@ -48,10 +48,10 @@ WikipediaPlugin::WikipediaPlugin( const MarbleModel *marbleModel )
// Plugin is not visible by default
setVisible( false );
- connect( this, SIGNAL( settingsChanged( QString ) ),
- this, SLOT( updateSettings() ) );
- connect( this, SIGNAL( changedNumberOfItems( quint32 ) ),
- this, SLOT( checkNumberOfItems( quint32 ) ) );
+ connect( this, SIGNAL(settingsChanged(QString)),
+ this, SLOT(updateSettings()) );
+ connect( this, SIGNAL(changedNumberOfItems(quint32)),
+ this, SLOT(checkNumberOfItems(quint32)) );
setSettings( QHash<QString,QVariant>() );
}
@@ -125,13 +125,13 @@ QDialog *WikipediaPlugin::configDialog()
ui_configWidget->setupUi( m_configDialog );
readSettings();
ui_configWidget->m_itemNumberSpinBox->setRange( 0, maximumNumberOfItems );
- connect( ui_configWidget->m_buttonBox, SIGNAL( accepted() ),
- SLOT( writeSettings() ) );
- connect( ui_configWidget->m_buttonBox, SIGNAL( rejected() ),
- SLOT( readSettings() ) );
+ connect( ui_configWidget->m_buttonBox, SIGNAL(accepted()),
+ SLOT(writeSettings()) );
+ connect( ui_configWidget->m_buttonBox, SIGNAL(rejected()),
+ SLOT(readSettings()) );
QPushButton *applyButton = ui_configWidget->m_buttonBox->button( QDialogButtonBox::Apply );
- connect( applyButton, SIGNAL( clicked() ),
- this, SLOT( writeSettings() ) );
+ connect( applyButton, SIGNAL(clicked()),
+ this, SLOT(writeSettings()) );
}
return m_configDialog;
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic