[Marble-commits] KDE/kdeedu/marble
Jens-Michael Hoffmann
jensmh at gmx.de
Mon Aug 17 22:03:51 CEST 2009
SVN commit 1012543 by jmhoffmann:
Coding style: opening braces of structs, classes, functions and namespaces should be on their own line.
M +2 -1 src/MarbleTest.h
M +2 -1 src/lib/PlacemarkLoader.cpp
M +2 -1 src/lib/PlacemarkManager.cpp
M +2 -1 src/lib/Planet.cpp
M +2 -1 src/lib/Planet.h
M +28 -14 src/lib/PluginAboutDialog.cpp
M +4 -2 src/lib/PluginAboutDialog.h
M +8 -4 src/lib/PluginItemDelegate.cpp
M +2 -1 src/lib/PluginItemDelegate.h
M +6 -2 src/lib/PositionProviderPlugin.cpp
M +3 -1 src/lib/PositionProviderPluginInterface.cpp
M +18 -9 src/lib/QtMarbleConfigDialog.cpp
M +2 -1 src/lib/QtMarbleConfigDialog.h
M +13 -7 src/lib/RenderPlugin.cpp
M +2 -1 src/lib/SunLocator.cpp
M +2 -1 src/lib/TileLoaderHelper.h
M +2 -1 src/lib/geodata/handlers/gpx/GPXgpxTagHandler.h
M +2 -1 src/lib/geodata/writer/GeoTagWriter.h
M +2 -1 src/lib/geodata/writer/GeoWriter.h
M +2 -1 src/lib/geodata/writers/kml/KmlPlacemarkTagWriter.cpp
M +2 -1 src/lib/geodata/writers/kml/KmlPlacemarkTagWriter.h
M +2 -1 src/lib/geodata/writers/kml/KmlPointTagWriter.cpp
M +2 -1 src/lib/global.cpp
M +6 -3 src/lib/graphicsview/FrameGraphicsItem.cpp
M +2 -1 src/plasmoid/worldclock.cpp
M +2 -1 src/plasmoid/worldclock.h
M +2 -1 tests/KMLTest.cpp
M +2 -1 tests/PluginManagerTest.cpp
--- trunk/KDE/kdeedu/marble/src/MarbleTest.h #1012542:1012543
@@ -21,7 +21,8 @@
class MarbleWidget;
-class MarbleTest {
+class MarbleTest
+{
public:
explicit MarbleTest( MarbleWidget* marbleWidget );
virtual ~MarbleTest(){ }
--- trunk/KDE/kdeedu/marble/src/lib/PlacemarkLoader.cpp #1012542:1012543
@@ -26,7 +26,8 @@
#include "PlacemarkContainer.h"
-namespace Marble {
+namespace Marble
+{
PlacemarkLoader::PlacemarkLoader( QObject* parent, const QString& file )
: QThread( parent ),
--- trunk/KDE/kdeedu/marble/src/lib/PlacemarkManager.cpp #1012542:1012543
@@ -35,7 +35,8 @@
using namespace Marble;
-namespace Marble {
+namespace Marble
+{
class PlacemarkManagerPrivate
{
public:
--- trunk/KDE/kdeedu/marble/src/lib/Planet.cpp #1012542:1012543
@@ -16,7 +16,8 @@
#include "global.h"
-namespace Marble {
+namespace Marble
+{
class PlanetPrivate
{
--- trunk/KDE/kdeedu/marble/src/lib/Planet.h #1012542:1012543
@@ -13,7 +13,8 @@
#include "marble_export.h"
-namespace Marble {
+namespace Marble
+{
class PlanetPrivate;
--- trunk/KDE/kdeedu/marble/src/lib/PluginAboutDialog.cpp #1012542:1012543
@@ -18,16 +18,20 @@
// Qt
#include <QtCore/QTextStream>
-namespace Marble {
+namespace Marble
+{
// The index of the "Data" tab.
int dataTabIndex = 2;
-class PluginAboutDialogPrivate {
+class PluginAboutDialogPrivate
+{
public:
- PluginAboutDialogPrivate() {
+ PluginAboutDialogPrivate()
+ {
}
- ~PluginAboutDialogPrivate() {
+ ~PluginAboutDialogPrivate()
+ {
}
Ui::MarbleAboutDialog u_dialog;
@@ -45,28 +49,34 @@
setLicenseAgreementText( QString() );
}
-PluginAboutDialog::~PluginAboutDialog() {
+PluginAboutDialog::~PluginAboutDialog()
+{
delete d;
}
-void PluginAboutDialog::setName( const QString& name ) {
+void PluginAboutDialog::setName( const QString& name )
+{
d->u_dialog.m_pMarbleTitleLabel->setText( name );
setWindowTitle( tr( "About %1" ).arg( name ) );
}
-void PluginAboutDialog::setVersion( const QString& version ) {
+void PluginAboutDialog::setVersion( const QString& version )
+{
d->u_dialog.m_pMarbleVersionLabel->setText( tr( "Version %1" ).arg( version ) );
}
-void PluginAboutDialog::setPixmap( const QPixmap& pixmap ) {
+void PluginAboutDialog::setPixmap( const QPixmap& pixmap )
+{
d->u_dialog.m_pMarbleLogoLabel->setPixmap( pixmap );
}
-void PluginAboutDialog::setAboutText( const QString& about ) {
+void PluginAboutDialog::setAboutText( const QString& about )
+{
d->u_dialog.m_pMarbleAboutBrowser->setText( about );
}
-void PluginAboutDialog::setAuthors( const QList<Author>& authors ) {
+void PluginAboutDialog::setAuthors( const QList<Author>& authors )
+{
QString string;
foreach ( Author author, authors ) {
string += author.name;
@@ -80,11 +90,13 @@
setAuthorsText( string );
}
-void PluginAboutDialog::setAuthorsText( const QString& authors ) {
+void PluginAboutDialog::setAuthorsText( const QString& authors )
+{
d->u_dialog.m_pMarbleAuthorsBrowser->setText( authors );
}
-void PluginAboutDialog::setDataText( const QString& data ) {
+void PluginAboutDialog::setDataText( const QString& data )
+{
if ( data.isNull() ) {
d->u_dialog.tabWidget->removeTab( d->u_dialog.tabWidget->indexOf( d->u_dialog.m_dataTab ) );
}
@@ -94,7 +106,8 @@
}
}
-void PluginAboutDialog::setLicense( PluginAboutDialog::LicenseKey license ) {
+void PluginAboutDialog::setLicense( PluginAboutDialog::LicenseKey license )
+{
QString filename;
switch ( license ) {
case PluginAboutDialog::License_LGPL_V2:
@@ -119,7 +132,8 @@
}
}
-void PluginAboutDialog::setLicenseAgreementText( const QString& license ) {
+void PluginAboutDialog::setLicenseAgreementText( const QString& license )
+{
if ( license.isNull() ) {
setLicense( PluginAboutDialog::License_LGPL_V2 );
}
--- trunk/KDE/kdeedu/marble/src/lib/PluginAboutDialog.h #1012542:1012543
@@ -17,11 +17,13 @@
// Marble
#include "marble_export.h"
-namespace Marble {
+namespace Marble
+{
class PluginAboutDialogPrivate;
-struct Author {
+struct Author
+{
QString name;
QString task;
QString email;
--- trunk/KDE/kdeedu/marble/src/lib/PluginItemDelegate.cpp #1012542:1012543
@@ -38,7 +38,8 @@
view->setMouseTracking( true );
}
-PluginItemDelegate::~PluginItemDelegate() {
+PluginItemDelegate::~PluginItemDelegate()
+{
}
void PluginItemDelegate::paint( QPainter *painter,
@@ -128,11 +129,13 @@
return size;
}
-void PluginItemDelegate::setAboutIcon( const QIcon& icon ) {
+void PluginItemDelegate::setAboutIcon( const QIcon& icon )
+{
m_aboutIcon = icon;
}
-void PluginItemDelegate::setConfigIcon( const QIcon& icon ) {
+void PluginItemDelegate::setConfigIcon( const QIcon& icon )
+{
m_configIcon = icon;
}
@@ -377,7 +380,8 @@
return buttonOption;
}
-QSize PluginItemDelegate::nameSize( const QModelIndex& index ) const {
+QSize PluginItemDelegate::nameSize( const QModelIndex& index ) const
+{
QString name = index.data( Qt::DisplayRole ).toString();
QSize nameSize( QApplication::fontMetrics().size( 0, name ) );
return nameSize;
--- trunk/KDE/kdeedu/marble/src/lib/PluginItemDelegate.h #1012542:1012543
@@ -20,7 +20,8 @@
class QStyleOptionButton;
class QStyleOptionViewItem;
-namespace Marble {
+namespace Marble
+{
class PluginItemDelegate : public QAbstractItemDelegate
{
--- trunk/KDE/kdeedu/marble/src/lib/PositionProviderPlugin.cpp #1012542:1012543
@@ -12,9 +12,13 @@
-Marble::PositionProviderPlugin::PositionProviderPlugin() {}
+Marble::PositionProviderPlugin::PositionProviderPlugin()
+{
+}
-Marble::PositionProviderPlugin::~PositionProviderPlugin() {}
+Marble::PositionProviderPlugin::~PositionProviderPlugin()
+{
+}
--- trunk/KDE/kdeedu/marble/src/lib/PositionProviderPluginInterface.cpp #1012542:1012543
@@ -12,4 +12,6 @@
-Marble::PositionProviderPluginInterface::~PositionProviderPluginInterface() {}
+Marble::PositionProviderPluginInterface::~PositionProviderPluginInterface()
+{
+}
--- trunk/KDE/kdeedu/marble/src/lib/QtMarbleConfigDialog.cpp #1012542:1012543
@@ -33,9 +33,11 @@
#include "MarbleWidget.h"
#include "RenderPlugin.h"
-namespace Marble {
+namespace Marble
+{
-class QtMarbleConfigDialogPrivate {
+class QtMarbleConfigDialogPrivate
+{
public:
QtMarbleConfigDialogPrivate( MarbleWidget *marbleWidget )
: ui_viewSettings(),
@@ -44,11 +46,13 @@
{
}
- ~QtMarbleConfigDialogPrivate() {
+ ~QtMarbleConfigDialogPrivate()
+ {
delete m_settings;
}
- void initSettings() {
+ void initSettings()
+ {
m_settings = new QSettings("kde.org", "Marble Desktop Globe");
}
@@ -205,7 +209,8 @@
QNetworkProxy::setApplicationProxy(proxy);
}
-void QtMarbleConfigDialog::showPluginAboutDialog( QString nameId ) {
+void QtMarbleConfigDialog::showPluginAboutDialog( QString nameId )
+{
QList<RenderPlugin *> renderItemList = d->m_marbleWidget->renderPlugins();
foreach ( RenderPlugin *renderItem, renderItemList ) {
@@ -218,7 +223,8 @@
}
}
-void QtMarbleConfigDialog::showPluginConfigDialog( QString nameId ) {
+void QtMarbleConfigDialog::showPluginConfigDialog( QString nameId )
+{
QList<RenderPlugin *> renderItemList = d->m_marbleWidget->renderPlugins();
foreach ( RenderPlugin *renderItem, renderItemList ) {
@@ -231,7 +237,8 @@
}
}
-void QtMarbleConfigDialog::writePluginSettings() {
+void QtMarbleConfigDialog::writePluginSettings()
+{
d->m_marbleWidget->writePluginSettings( *d->m_settings );
}
@@ -409,7 +416,8 @@
d->m_previousGraphicsSystem = graphicsSystem();
}
-void QtMarbleConfigDialog::retrievePluginState() {
+void QtMarbleConfigDialog::retrievePluginState()
+{
QList<RenderPlugin *> pluginList = d->m_marbleWidget->renderPlugins();
QList<RenderPlugin *>::const_iterator i = pluginList.constBegin();
for (; i != pluginList.constEnd(); ++i) {
@@ -417,7 +425,8 @@
}
}
-void QtMarbleConfigDialog::applyPluginState() {
+void QtMarbleConfigDialog::applyPluginState()
+{
QList<RenderPlugin *> pluginList = d->m_marbleWidget->renderPlugins();
QList<RenderPlugin *>::const_iterator i = pluginList.constBegin();
for (; i != pluginList.constEnd(); ++i) {
--- trunk/KDE/kdeedu/marble/src/lib/QtMarbleConfigDialog.h #1012542:1012543
@@ -22,7 +22,8 @@
class QSettings;
class QStandardItemModel;
-namespace Marble {
+namespace Marble
+{
class MarbleCacheSettingsWidget;
class MarblePluginSettingsWidget;
--- trunk/KDE/kdeedu/marble/src/lib/RenderPlugin.cpp #1012542:1012543
@@ -96,7 +96,8 @@
return 0;
}
-QStandardItem* RenderPlugin::item() const {
+QStandardItem* RenderPlugin::item() const
+{
d->m_item->setIcon( icon() );
d->m_item->setText( name() );
d->m_item->setEditable( false );
@@ -158,25 +159,30 @@
return d->m_visible;
}
-QDialog *RenderPlugin::aboutDialog() const {
+QDialog *RenderPlugin::aboutDialog() const
+{
return 0;
}
-QDialog *RenderPlugin::configDialog() const {
+QDialog *RenderPlugin::configDialog() const
+{
return 0;
}
-QHash<QString,QVariant> RenderPlugin::settings() const {
+QHash<QString,QVariant> RenderPlugin::settings() const
+{
return QHash<QString,QVariant>();
}
-void RenderPlugin::setSettings( QHash<QString,QVariant> settings ) {
+void RenderPlugin::setSettings( QHash<QString,QVariant> settings )
+{
Q_UNUSED( settings );
}
-bool RenderPlugin::eventFilter( QObject *, QEvent * ) {
+bool RenderPlugin::eventFilter( QObject *, QEvent * )
+{
return false;
-}
+}
} // namespace Marble
--- trunk/KDE/kdeedu/marble/src/lib/SunLocator.cpp #1012542:1012543
@@ -28,7 +28,8 @@
#define M_PI 3.14159265358979323846264338327950288419717
#endif
-namespace Marble {
+namespace Marble
+{
using std::sin;
using std::cos;
--- trunk/KDE/kdeedu/marble/src/lib/TileLoaderHelper.h #1012542:1012543
@@ -33,7 +33,8 @@
class GeoSceneTexture;
-namespace TileLoaderHelper {
+namespace TileLoaderHelper
+{
/**
* @brief Get the maximum number of tile rows for a given tile level.
* @param levelZeroRows the number of rows in level zero
--- trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/gpx/GPXgpxTagHandler.h #1012542:1012543
@@ -29,7 +29,8 @@
namespace gpx
{
-class GPXgpxTagHandler : public GeoTagHandler {
+class GPXgpxTagHandler : public GeoTagHandler
+{
public:
virtual GeoNode* parse(GeoParser&) const;
};
--- trunk/KDE/kdeedu/marble/src/lib/geodata/writer/GeoTagWriter.h #1012542:1012543
@@ -70,7 +70,8 @@
};
// Helper structure
-struct GeoTagWriterRegistrar {
+struct GeoTagWriterRegistrar
+{
public:
GeoTagWriterRegistrar(const GeoTagWriter::QualifiedName& name, const GeoTagWriter* writer)
{
--- trunk/KDE/kdeedu/marble/src/lib/geodata/writer/GeoWriter.h #1012542:1012543
@@ -16,7 +16,8 @@
#include <QtXml/QXmlStreamWriter>
-namespace Marble{
+namespace Marble
+{
/**
* @brief Standard Marble way of writing XML
--- trunk/KDE/kdeedu/marble/src/lib/geodata/writers/kml/KmlPlacemarkTagWriter.cpp #1012542:1012543
@@ -16,7 +16,8 @@
#include "GeoDocument.h"
#include "GeoWriter.h"
-namespace Marble{
+namespace Marble
+{
//needs to handle a specific doctype. different versions different writer classes?
//don't use the tag dictionary for tag names, because with the writer we are using
--- trunk/KDE/kdeedu/marble/src/lib/geodata/writers/kml/KmlPlacemarkTagWriter.h #1012542:1012543
@@ -13,7 +13,8 @@
#include "GeoTagWriter.h"
-namespace Marble{
+namespace Marble
+{
class KmlPlacemarkTagWriter : public GeoTagWriter
{
--- trunk/KDE/kdeedu/marble/src/lib/geodata/writers/kml/KmlPointTagWriter.cpp #1012542:1012543
@@ -15,7 +15,8 @@
#include "GeoWriter.h"
#include "KmlElementDictionary.h"
-namespace Marble {
+namespace Marble
+{
static GeoTagWriterRegistrar s_writerPoint( GeoTagWriter::QualifiedName(GeoDataTypes::GeoDataPointType,
kml::kmlTag_nameSpace22),
--- trunk/KDE/kdeedu/marble/src/lib/global.cpp #1012542:1012543
@@ -12,7 +12,8 @@
#include "global_p.h"
-namespace Marble {
+namespace Marble
+{
MarbleGlobalPrivate::MarbleGlobalPrivate()
{
--- trunk/KDE/kdeedu/marble/src/lib/graphicsview/FrameGraphicsItem.cpp #1012542:1012543
@@ -47,7 +47,8 @@
return d->m_frame;
}
-void FrameGraphicsItem::setFrame( FrameType type ) {
+void FrameGraphicsItem::setFrame( FrameType type )
+{
d->m_frame = type;
setPadding( padding() );
}
@@ -186,11 +187,13 @@
return contentRect;
}
-QRectF FrameGraphicsItem::contentRect() const {
+QRectF FrameGraphicsItem::contentRect() const
+{
return contentRect( QPointF( 0.0, 0.0 ) );
}
-QSizeF FrameGraphicsItem::contentSize() const {
+QSizeF FrameGraphicsItem::contentSize() const
+{
return contentRect().size();
}
--- trunk/KDE/kdeedu/marble/src/plasmoid/worldclock.cpp #1012542:1012543
@@ -54,7 +54,8 @@
#include "ViewportParams.h"
#include "AbstractProjection.h"
-namespace Marble {
+namespace Marble
+{
WorldClock::WorldClock(QObject *parent, const QVariantList &args)
: Plasma::Applet(parent, args),
--- trunk/KDE/kdeedu/marble/src/plasmoid/worldclock.h #1012542:1012543
@@ -34,7 +34,8 @@
class KTimeZone;
-namespace Marble {
+namespace Marble
+{
class MarbleMap;
class SunLocator;
--- trunk/KDE/kdeedu/marble/tests/KMLTest.cpp #1012542:1012543
@@ -26,7 +26,8 @@
namespace Marble
{
-class KMLTest : public QObject {
+class KMLTest : public QObject
+{
Q_OBJECT
private slots:
void initTestCase();
--- trunk/KDE/kdeedu/marble/tests/PluginManagerTest.cpp #1012542:1012543
@@ -16,7 +16,8 @@
namespace Marble
{
-class PluginManagerTest : public QObject {
+class PluginManagerTest : public QObject
+{
Q_OBJECT
private slots:
void loadPlugins();
More information about the Marble-commits
mailing list