|
[-]
[+]
|
Changed |
marble.spec
|
|
|
|
[-]
[+]
|
Deleted |
marble-1.14.21_sfos_160510.tar.xz/cmake/modules/FindQextSerialPort.cmake
^
|
| @@ -1,16 +0,0 @@
-# QEXTSERIALPORT_FOUND - system has the QextSerialPort library
-# QEXTSERIALPORT_INCLUDE_DIR - the QextSerialPort include directory
-# QEXTSERIALPORT_LIBRARIES - The libraries needed to use QextSerialPort
-
-if(QEXTSERIALPORT_INCLUDE_DIR AND QEXTSERIALPORT_LIBRARIES)
- set(QEXTSERIALPORT_FOUND TRUE)
-else(QEXTSERIALPORT_INCLUDE_DIR AND QEXTSERIALPORT_LIBRARIES)
-
- find_path(QEXTSERIALPORT_INCLUDE_DIR NAMES qextserialport.h PATH_SUFFIXES QtExtSerialPort HINTS ${Qt5Core_INCLUDE_DIRS})
- find_library(QEXTSERIALPORT_LIBRARIES NAMES Qt5ExtSerialPort HINTS ${QT_LIBRARY_DIR})
-
- include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(QextSerialPort DEFAULT_MSG QEXTSERIALPORT_INCLUDE_DIR QEXTSERIALPORT_LIBRARIES)
-
- mark_as_advanced(QEXTSERIALPORT_INCLUDE_DIR QEXTSERIALPORT_LIBRARIES)
-endif(QEXTSERIALPORT_INCLUDE_DIR AND QEXTSERIALPORT_LIBRARIES)
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/.krazy
^
|
| @@ -1,2 +1,3 @@
CHECKSETS kde5
EXCLUDE qclasses,cpp
+SKIP /src/3rdparty/
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/CMakeLists.txt
^
|
| @@ -212,7 +212,11 @@
set (STATIC_BUILD FALSE CACHE BOOL "Link to static Qt libs (win32 only)?")
endif(WIN32)
-add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
+add_definitions(
+ -DQT_USE_FAST_CONCATENATION
+ -DQT_USE_FAST_OPERATOR_PLUS
+ -DQT_NO_SIGNALS_SLOTS_KEYWORDS
+)
####################################################
# Options for static build
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/examples/cpp/marble-game/ClickOnThat.h
^
|
| @@ -28,7 +28,7 @@
{
Q_OBJECT
public:
- ClickOnThat( MarbleWidget *marbleWidget );
+ explicit ClickOnThat( MarbleWidget *marbleWidget );
~ClickOnThat();
/**
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/examples/cpp/marble-game/CountryByFlag.h
^
|
| @@ -30,7 +30,7 @@
{
Q_OBJECT;
public:
- CountryByFlag( MarbleWidget *marbleWidget );
+ explicit CountryByFlag( MarbleWidget *marbleWidget );
~CountryByFlag();
public Q_SLOTS:
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/examples/cpp/marble-game/CountryByShape.h
^
|
| @@ -27,7 +27,7 @@
{
Q_OBJECT
public:
- CountryByShape( MarbleWidget *widget );
+ explicit CountryByShape( MarbleWidget *widget );
~CountryByShape();
Q_SIGNALS:
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/examples/cpp/marbleQuick2/main.cpp
^
|
| @@ -37,7 +37,7 @@
}
}
-public slots:
+public Q_SLOTS:
void handlePinchStart(QPointF center)
{
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/examples/cpp/squad-interpolation/squad-interpolation.h
^
|
| @@ -31,7 +31,7 @@
public:
// Constructor
- MyPaintLayer( MarbleWidget* widget );
+ explicit MyPaintLayer( MarbleWidget* widget );
// LayerInterface
QStringList renderPosition() const;
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/examples/cpp/vehicletracking/vehicletracking.h
^
|
| @@ -30,14 +30,14 @@
public:
CarWorker(const GeoDataCoordinates& city, qreal radius, qreal speed);
-signals:
+Q_SIGNALS:
void coordinatesChanged(GeoDataCoordinates coord);
-public slots:
+public Q_SLOTS:
void startWork();
void finishWork();
-private slots:
+private Q_SLOTS:
void iterate();
private:
@@ -53,10 +53,10 @@
{
Q_OBJECT
public:
- Window(QWidget *parent = 0);
+ explicit Window(QWidget *parent = 0);
void startCars();
-public slots:
+public Q_SLOTS:
void setCarCoordinates(const GeoDataCoordinates &coord);
private:
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/apps/behaim/main.cpp
^
|
| @@ -27,7 +27,7 @@
#endif
MarbleDeclarativePlugin declarativePlugin;
- const char * uri = "org.kde.edu.marble";
+ const char uri[] = "org.kde.edu.marble";
declarativePlugin.registerTypes(uri);
QQmlApplicationEngine engine;
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/apps/marble-kde/KdeMainWindow.h
^
|
| @@ -38,7 +38,7 @@
ControlView* marbleControl() const;
MarbleWidget* marbleWidget() const;
- public slots:
+ public Q_SLOTS:
void setMapTitle();
void changeViewSize( QAction* );
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/apps/marble-kde/marble_part.cpp
^
|
| @@ -28,7 +28,6 @@
#include <QStandardItemModel>
#include <QShortcut>
#include <QNetworkProxy>
-#include <QLabel>
#include <QDomDocument>
#include <QDomNodeList>
#include <QFileDialog>
@@ -109,10 +108,10 @@
namespace
{
- const char* POSITION_STRING = I18N_NOOP( "Position: %1" );
- const char* DISTANCE_STRING = I18N_NOOP( "Altitude: %1" );
- const char* TILEZOOMLEVEL_STRING = I18N_NOOP( "Tile Zoom Level: %1" );
- const char* DATETIME_STRING = I18N_NOOP( "Time: %1" );
+ const char POSITION_STRING[] = I18N_NOOP( "Position: %1" );
+ const char DISTANCE_STRING[] = I18N_NOOP( "Altitude: %1" );
+ const char TILEZOOMLEVEL_STRING[] = I18N_NOOP( "Tile Zoom Level: %1" );
+ const char DATETIME_STRING[] = I18N_NOOP( "Time: %1" );
}
K_PLUGIN_FACTORY(MarblePartFactory, registerPlugin<MarblePart>();)
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/apps/marble-maps-sailfishos/TextToSpeechClient.h
^
|
| @@ -21,7 +21,7 @@
TextToSpeechClient(QObject * parent = 0);
~TextToSpeechClient();
-public slots:
+public Q_SLOTS:
Q_INVOKABLE void readText(const QString & text);
Q_INVOKABLE void setLocale(const QString & locale);
};
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/apps/marble-maps/MarbleMaps.h
^
|
| @@ -22,7 +22,7 @@
Q_PROPERTY( bool suspended READ isSuspended NOTIFY isSuspendedChanged )
public:
- MarbleMaps(QQuickItem *parent = 0);
+ explicit MarbleMaps(QQuickItem *parent = 0);
bool isSuspended() const;
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/apps/marble-maps/TextToSpeechClient.h
^
|
| @@ -18,10 +18,10 @@
Q_OBJECT
public:
- TextToSpeechClient(QObject * parent = 0);
+ explicit TextToSpeechClient(QObject * parent = 0);
~TextToSpeechClient();
-public slots:
+public Q_SLOTS:
Q_INVOKABLE void readText(const QString & text);
Q_INVOKABLE void setLocale(const QString & locale);
};
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/apps/marble-maps/main.cpp
^
|
| @@ -29,7 +29,7 @@
#endif
MarbleDeclarativePlugin declarativePlugin;
- const char * uri = "org.kde.edu.marble";
+ const char uri[] = "org.kde.edu.marble";
declarativePlugin.registerTypes(uri);
qmlRegisterType<MarbleMaps>(uri, 0, 20, "MarbleMaps");
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/apps/marble-qt/QtMainWindow.cpp
^
|
| @@ -91,10 +91,10 @@
namespace
{
- const char* POSITION_STRING = "Position:";
- const char* DISTANCE_STRING = "Altitude:";
- const char* ZOOM_STRING = "Zoom:";
- const char* DATETIME_STRING = "Time:";
+ const char POSITION_STRING[] = "Position:";
+ const char DISTANCE_STRING[] = "Altitude:";
+ const char ZOOM_STRING[] = "Zoom:";
+ const char DATETIME_STRING[] = "Time:";
}
using namespace Marble;
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/apps/marble-ui/ControlView.h
^
|
| @@ -107,7 +107,7 @@
static QActionGroup* createViewSizeActionGroup( QObject* parent );
- public slots:
+ public Q_SLOTS:
void printMapScreenShot( QPointer<QPrintDialog> dialog );
void printPreview();
void paintPrintPreview( QPrinter * printer );
@@ -126,7 +126,7 @@
void openTour( const QString &filename );
-signals:
+Q_SIGNALS:
void showMapWizard();
void showUploadDialog();
void mapThemeDeleted();
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/AddLinkDialog.h
^
|
| @@ -28,7 +28,7 @@
QString name() const;
QString url() const;
-private slots:
+private Q_SLOTS:
void checkFields();
private:
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/AutoNavigation.h
^
|
| @@ -8,8 +8,8 @@
// Copyright 2010 Siddharth Srivastava <akssps011@gmail.com>
//
-#ifndef ADJUSTNAVIGATION_H
-#define ADJUSTNAVIGATION_H
+#ifndef MARBLE_AUTONAVIGATION_H
+#define MARBLE_AUTONAVIGATION_H
#include "marble_export.h"
#include "GeoDataCoordinates.h"
@@ -105,4 +105,4 @@
};
} //namespace marble
-#endif // ADJUSTNAVIGATION_H
+#endif // MARBLE_AUTONAVIGATION_H
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/EditBookmarkDialog.h
^
|
| @@ -9,8 +9,8 @@
// Copyright 2012 Thibaut Gridel <tgridel@free.fr>
//
-#ifndef MARBLE_BOOKMARKINFODIALOG_H
-#define MARBLE_BOOKMARKINFODIALOG_H
+#ifndef MARBLE_EDITBOOKMARKDIALOG_H
+#define MARBLE_EDITBOOKMARKDIALOG_H
#include <QDialog>
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/EditPlacemarkDialog.h
^
|
| @@ -61,7 +61,7 @@
*/
bool isIdFieldVisible() const;
-public slots:
+public Q_SLOTS:
/**
* @brief updateDialogFields is connected to a signal from AnnotatePlugin in order
* to update some fields in the dialog as the user interacts directly with the text
@@ -96,7 +96,7 @@
*/
void setReadOnly( bool state );
-private slots:
+private Q_SLOTS:
/**
* @brief checkFields shows warnings if there are important fields which don't hold
@@ -140,7 +140,7 @@
* @brief toogleDescriptionEditMode toggles edit mode for description field.
*/
-signals:
+Q_SIGNALS:
/**
* @brief textAnnotationUpdated signals that some property of the PlacemarkTextAnnotation
* instance has changed.
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/FormattedTextWidget.h
^
|
| @@ -33,7 +33,7 @@
const QString text();
void setReadOnly( bool state );
-private slots:
+private Q_SLOTS:
void toggleDescriptionEditMode( bool isFormattedTextMode = false );
void setTextCursorBold( bool bold );
void setTextCursorItalic( bool italic );
@@ -45,7 +45,7 @@
void addLinkToDescription();
void updateDescriptionEditButtons();
-signals:
+Q_SIGNALS:
void textUpdated();
private:
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/MarbleAbstractPresenter.h
^
|
| @@ -32,7 +32,7 @@
{
Q_OBJECT
- signals:
+ Q_SIGNALS:
void zoomChanged(int zoom);
void distanceChanged(const QString& distanceString);
@@ -43,7 +43,7 @@
void regionSelected(const QList<double>&);
public:
- MarbleAbstractPresenter(MarbleMap *map, QObject *parent = 0);
+ explicit MarbleAbstractPresenter(MarbleMap *map, QObject *parent = 0);
virtual ~MarbleAbstractPresenter();
qreal moveStep() const;
@@ -113,7 +113,7 @@
ViewportParams *viewport();
const ViewportParams* viewport() const;
- public slots:
+ public Q_SLOTS:
void rotateBy(const qreal deltaLon, const qreal deltaLat, FlyToMode mode = Instant);
void flyTo(const GeoDataLookAt &newLookAt, FlyToMode mode = Automatic);
void goHome(FlyToMode mode = Automatic);
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/MarbleLegendBrowser.h
^
|
| @@ -48,12 +48,12 @@
void setMarbleModel( MarbleModel *marbleModel );
QSize sizeHint() const;
- public slots:
+ public Q_SLOTS:
void setCheckedProperty( const QString& name, bool checked );
void setRadioCheckedProperty( const QString& value,const QString& name, bool checked );
- signals:
+ Q_SIGNALS:
void toggledShowProperty( QString, bool );
void tourLinkClicked( const QString &url );
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/MarbleLineEdit.h
^
|
| @@ -12,8 +12,8 @@
// Copyright 2010,2012 Dennis Nienhüser <nienhueser@kde.org>
//
-#ifndef MARBLE_ROUTINGLINEEDIT_H
-#define MARBLE_ROUTINGLINEEDIT_H
+#ifndef MARBLE_MARBLELINEEDIT_H
+#define MARBLE_MARBLELINEEDIT_H
#include "marble_export.h"
@@ -68,4 +68,4 @@
} // namespace Marble
-#endif // MARBLE_ROUTINGLINEEDIT_H
+#endif // MARBLE_MARBLELINEEDIT_H
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/MarbleWidgetInputHandler.h
^
|
| @@ -31,7 +31,7 @@
public:
MarbleWidgetInputHandler(MarbleAbstractPresenter *marblePresenter, MarbleWidget *marbleWidget);
-private slots:
+private Q_SLOTS:
void installPluginEventFilter(RenderPlugin *renderPlugin);
void showLmbMenu(int x, int y);
void showRmbMenu(int x, int y);
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/MovieCapture.h
^
|
| @@ -56,7 +56,7 @@
MovieCapture::SnapshotMethod snapshotMethod() const;
bool checkToolsAvailability();
-public slots:
+public Q_SLOTS:
void setFps(int fps);
void setFilename(const QString &path);
void setSnapshotMethod(MovieCapture::SnapshotMethod method);
@@ -65,10 +65,10 @@
void stopRecording();
void cancelRecording();
-private slots:
+private Q_SLOTS:
void processWrittenMovie(int exitCode);
-signals:
+Q_SIGNALS:
void rateCalculated( double );
void errorOccured();
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/MovieCaptureDialog.h
^
|
| @@ -32,14 +32,14 @@
explicit MovieCaptureDialog(MarbleWidget *widget, QWidget *parent = 0);
~MovieCaptureDialog();
-public slots:
+public Q_SLOTS:
void startRecording();
void stopRecording();
-private slots:
+private Q_SLOTS:
void loadDestinationFile();
-signals:
+Q_SIGNALS:
void started();
private:
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/NewBookmarkFolderDialog.h
^
|
| @@ -9,8 +9,8 @@
// Copyright 2012 Thibaut Gridel <tgridel@free.fr>
//
-#ifndef MARBLE_NEWBOOKMARKFOLDERINFODIALOG_H
-#define MARBLE_NEWBOOKMARKFOLDERINFODIALOG_H
+#ifndef MARBLE_NEWBOOKMARKFOLDERDIALOG_H
+#define MARBLE_NEWBOOKMARKFOLDERDIALOG_H
#include "ui_NewBookmarkFolderDialog.h"
#include "marble_export.h"
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/RemoveItemEditWidget.h
^
|
| @@ -27,7 +27,7 @@
Q_OBJECT
public:
- RemoveItemEditWidget( const QModelIndex& index, QWidget* parent=0 );
+ explicit RemoveItemEditWidget( const QModelIndex& index, QWidget* parent=0 );
bool editable() const;
Q_SIGNALS:
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/RouteSimulationPositionProviderPlugin.cpp
^
|
| @@ -243,7 +243,7 @@
// Repeat from start
m_currentIndex = 0;
m_lineStringInterpolated = m_lineString;
- m_currentPosition = GeoDataCoordinates(); //Reset The current position so that the the simulation starts from the correct starting point.
+ m_currentPosition = GeoDataCoordinates(); //Reset the current position so that the simulation starts from the correct starting point.
m_currentPositionWithNoise = GeoDataCoordinates();
m_speed = 0;
if ( m_status != PositionProviderStatusUnavailable ) {
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/SoundCueEditWidget.h
^
|
| @@ -29,7 +29,7 @@
Q_OBJECT
public:
- SoundCueEditWidget( const QModelIndex& index, QWidget* parent=0 );
+ explicit SoundCueEditWidget( const QModelIndex& index, QWidget* parent=0 );
bool editable() const;
Q_SIGNALS:
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/TourCaptureDialog.h
^
|
| @@ -33,7 +33,7 @@
explicit TourCaptureDialog(MarbleWidget *widget, QWidget *parent = 0);
~TourCaptureDialog();
-public slots:
+public Q_SLOTS:
void startRecording();
void stopRecording();
void setRate( double rate );
@@ -41,7 +41,7 @@
void setDefaultFilename( const QString &filename );
void handleError();
-private slots:
+private Q_SLOTS:
void loadDestinationFile();
void updateProgress( double position );
void recordNextFrame();
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/TourControlEditWidget.h
^
|
| @@ -29,7 +29,7 @@
Q_OBJECT
public:
- TourControlEditWidget( const QModelIndex& index, QWidget* parent=0 );
+ explicit TourControlEditWidget( const QModelIndex& index, QWidget* parent=0 );
bool editable() const;
Q_SIGNALS:
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/TreeViewDecoratorModel.h
^
|
| @@ -24,7 +24,7 @@
{
Q_OBJECT
-public slots:
+public Q_SLOTS:
void trackExpandedState( const QModelIndex &index );
void trackCollapsedState( const QModelIndex &index );
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/VectorTileModel.h
^
|
| @@ -9,8 +9,8 @@
Copyright 2013 Bernhard Beschow <bbeschow@cs.tu-berlin.de>
*/
-#ifndef MARBLE_VECTORTILEMAPPER_H
-#define MARBLE_VECTORTILEMAPPER_H
+#ifndef MARBLE_VECTORTILEMODEL_H
+#define MARBLE_VECTORTILEMODEL_H
#include <QObject>
#include <QRunnable>
@@ -115,4 +115,4 @@
}
-#endif // MARBLE_VECTORTILEMAPPER_H
+#endif // MARBLE_VECTORTILEMODEL_H
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/WaitEditWidget.h
^
|
| @@ -29,7 +29,7 @@
Q_OBJECT
public:
- WaitEditWidget( const QModelIndex& index, QWidget* parent=0 );
+ explicit WaitEditWidget( const QModelIndex& index, QWidget* parent=0 );
bool editable() const;
Q_SIGNALS:
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/cloudsync/CloudRouteModel.h
^
|
| @@ -98,7 +98,7 @@
*/
QIcon preview( const QModelIndex &index ) const;
-public slots:
+public Q_SLOTS:
void updateProgress( qint64 currentSize, qint64 totalSize );
void setPreview( QNetworkReply *reply );
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/cloudsync/CloudRoutesDialog.h
^
|
| @@ -29,10 +29,10 @@
~CloudRoutesDialog();
CloudRouteModel *model();
-public slots:
+public Q_SLOTS:
void updateListDownloadProgressbar( qint64 received, qint64 total );
-signals:
+Q_SIGNALS:
void downloadButtonClicked( QString timestamp );
void openButtonClicked( QString timestamp );
void deleteButtonClicked( QString timestamp );
@@ -43,7 +43,7 @@
class Private;
Private *d;
-private slots:
+private Q_SLOTS:
void updateNoRouteLabel();
};
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/cloudsync/ConflictDialog.h
^
|
| @@ -40,14 +40,14 @@
explicit ConflictDialog( QWidget *parent = 0 );
void setMergeItem( MergeItem *item );
-public slots:
+public Q_SLOTS:
void open();
void stopAutoResolve();
-signals:
+Q_SIGNALS:
void resolveConflict( MergeItem *mergeItem );
-private slots:
+private Q_SLOTS:
void resolveConflict( QAbstractButton *button );
private:
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/cloudsync/MergeItem.h
^
|
| @@ -78,7 +78,7 @@
MergeItem::Resolution resolution() const;
void setResolution( MergeItem::Resolution resolution );
-signals:
+Q_SIGNALS:
void pathAChanged();
void pathBChanged();
void placemarkAChanged();
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/cloudsync/OwncloudSyncBackend.h
^
|
| @@ -64,14 +64,14 @@
public Q_SLOTS:
void cancelUpload();
-private slots:
+private Q_SLOTS:
void checkAuthReply();
void checkAuthError(QNetworkReply::NetworkError error);
void prepareRouteList();
void saveDownloadedRoute();
void validateSettings();
-signals:
+Q_SIGNALS:
void routeListDownloaded( const QVector<RouteItem> &routeList );
void routeDownloaded();
void routeDeleted();
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/cloudsync/RouteItemDelegate.cpp
^
|
| @@ -1,7 +1,5 @@
#include "RouteItemDelegate.h"
-#include <QPainter>
-
#ifdef MARBLE_NO_WEBKITWIDGETS
#include <QWidget>
#else
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/cloudsync/RouteItemDelegate.h
^
|
| @@ -20,7 +20,7 @@
bool editorEvent(QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index);
-signals:
+Q_SIGNALS:
void downloadButtonClicked( QString timestamp );
void openButtonClicked( QString timestamp );
void deleteButtonClicked( QString timestamp );
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/cloudsync/RouteSyncManager.h
^
|
| @@ -76,7 +76,7 @@
*/
QVector<RouteItem> cachedRouteList() const;
-public slots:
+public Q_SLOTS:
/**
* Uploads the route with given timestamp.
* @param timestamp Timestamp of the route which will be uploaded.
@@ -122,7 +122,7 @@
*/
void updateUploadProgressbar( qint64 sent, qint64 total );
-private slots:
+private Q_SLOTS:
/**
* Appends downloaded route list to RouteSyncManager's private list
* and then forwards the list to CloudRouteModel
@@ -131,7 +131,7 @@
void setRouteModelItems( const QVector<RouteItem> &routeList );
-signals:
+Q_SIGNALS:
void routeSyncEnabledChanged(bool enabled);
void routeListDownloadProgress( qint64 received, qint64 total );
void routeUploadProgress( qint64 sent, qint64 total );
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/declarative/CloudSync.h
^
|
| @@ -47,7 +47,7 @@
QString owncloudPassword() const;
void setOwncloudPassword( const QString &password );
-public slots:
+public Q_SLOTS:
void uploadRoute();
void uploadRoute( const QString &identifier );
void openRoute( const QString &identifier );
@@ -57,7 +57,7 @@
void syncBookmarks();
void resolveConflict( Marble::MergeItem *item );
-signals:
+Q_SIGNALS:
void mapChanged();
void routeModelChanged();
void cloudSyncManagerChanged();
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/declarative/DeclarativeDataPluginItem.h
^
|
| @@ -9,8 +9,8 @@
// Copyright 2012 "LOTES TM" LLC <lotes.sis@gmail.com>
//
-#ifndef DECLARATIVEDATAPLUGINMODELITEM_H
-#define DECLARATIVEDATAPLUGINMODELITEM_H
+#ifndef MARBLE_DECLARATIVEDATAPLUGINITEM_H
+#define MARBLE_DECLARATIVEDATAPLUGINITEM_H
#include "AbstractDataPluginItem.h"
@@ -33,4 +33,4 @@
};
}
-#endif // DECLARATIVEDATAPLUGINMODELITEM_H
+#endif // MARBLE_DECLARATIVEDATAPLUGINITEM_H
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/declarative/MarbleDeclarativeWidget.cpp
^
|
| @@ -21,7 +21,6 @@
#include "AbstractFloatItem.h"
#include "AbstractDataPlugin.h"
#include "RenderPlugin.h"
-#include "MarbleMap.h"
#include "MarbleDirs.h"
#include "ViewParams.h"
#include "ViewportParams.h"
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/declarative/MarbleQuickItem.cpp
^
|
| @@ -68,7 +68,7 @@
(void)handlePinch(center, scale, state);
}
- private slots:
+ private Q_SLOTS:
void showLmbMenu(int, int) {}
void showRmbMenu(int, int) {}
void openItemToolTip() {}
@@ -77,7 +77,7 @@
m_marbleQuick->setCursor(cursor);
}
- private slots:
+ private Q_SLOTS:
void installPluginEventFilter(RenderPlugin *) {}
private:
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/declarative/MarbleQuickItem.h
^
|
| @@ -76,7 +76,7 @@
MarbleInputHandler *inputHandler();
int zoom() const;
- public slots:
+ public Q_SLOTS:
void goHome();
void setZoom(int zoom, FlyToMode mode = Instant);
Q_INVOKABLE void setZoomToMaximumLevel();
@@ -164,7 +164,7 @@
bool inertialGlobeRotation() const;
- signals:
+ Q_SIGNALS:
void mapWidthChanged(int mapWidth);
void mapHeightChanged(int mapHeight);
void showFrameRateChanged(bool showFrameRate);
@@ -195,7 +195,7 @@
QObject *getEventFilter() const;
void pinch(QPointF center, qreal scale, Qt::GestureState state);
- private slots:
+ private Q_SLOTS:
void resizeMap();
void positionDataStatusChanged(PositionProviderStatus status);
void positionChanged(const GeoDataCoordinates &, GeoDataAccuracy);
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/declarative/Navigation.h
^
|
| @@ -85,7 +85,7 @@
Q_INVOKABLE QPointF positionOnRoute() const;
-public slots:
+public Q_SLOTS:
void setMarbleQuickItem(Marble::MarbleQuickItem * marbleQuickItem);
Q_SIGNALS:
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/declarative/Placemark.cpp
^
|
| @@ -78,7 +78,7 @@
QString const street = data.value("road").value().toString();
QString const houseNumber = data.value("house_number").value().toString();
QString const fullStreet = houseNumber.isEmpty() ? street : tr("%1 %2",
- "House number (first argument) and street name (second argument) in an adress").arg(houseNumber).arg(street).trimmed();
+ "House number (first argument) and street name (second argument) in an address").arg(houseNumber).arg(street).trimmed();
address.setStreet(fullStreet);
}
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/declarative/Placemark.h
^
|
| @@ -43,7 +43,7 @@
QString name() const;
QString address() const;
-public slots:
+public Q_SLOTS:
void setName(const QString &name);
Q_SIGNALS:
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/declarative/SearchBackend.h
^
|
| @@ -8,8 +8,8 @@
// Copyright 2015 Gábor Péterffy <peterffy95@gmail.com>
//
-#ifndef MARBLE_SEARCHBARBACKEND_H
-#define MARBLE_SEARCHBARBACKEND_H
+#ifndef MARBLE_SEARCHBACKEND_H
+#define MARBLE_SEARCHBACKEND_H
#include <QObject>
#include <QSortFilterProxyModel>
@@ -40,14 +40,14 @@
const QObject* marbleQuickItem() const;
Placemark* selectedPlacemark();
-signals:
+Q_SIGNALS:
void marbleQuickItemChanged(QObject *marbleQuickItem);
void completionModelChanged(MarblePlacemarkModel *model);
void searchResultChanged(MarblePlacemarkModel *model);
void searchFinished(const QString &searchTerm);
void selectedPlacemarkChanged(Placemark * selectedPlacemark);
-public slots:
+public Q_SLOTS:
Q_INVOKABLE void setSelectedPlacemark(int placemarkIndex);
void setMarbleQuickItem(QObject *marbleQuickItem);
void updateSearchResult(QAbstractItemModel *result);
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/geodata/data/GeoDataCoordinates.cpp
^
|
| @@ -295,14 +295,14 @@
bool LonLatParser::tryMatchFromDms( const QString& input, DirPosition dirPosition )
{
// direction as postfix
- const char *postfixCapExp =
+ const char postfixCapExp[] =
"([-+]?)(\\d{1,3})(?:%3|\\s)\\s*(\\d{1,2})(?:%4|\\s)\\s*"
"(\\d{1,2}%1?\\d*)(?:%5)?\\s*%2[,;]?\\s*"
"([-+]?)(\\d{1,3})(?:%3|\\s)\\s*(\\d{1,2})(?:%4|\\s)\\s*"
"(\\d{1,2}%1?\\d*)(?:%5)?\\s*%2";
// direction as prefix
- const char *prefixCapExp =
+ const char prefixCapExp[] =
"%2\\s*([-+]?)(\\d{1,3})(?:%3|\\s)\\s*(\\d{1,2})(?:%4|\\s)\\s*"
"(\\d{1,2}%1?\\d*)(?:%5)?\\s*(?:,|;|\\s)\\s*"
"%2\\s*([-+]?)(\\d{1,3})(?:%3|\\s)\\s*(\\d{1,2})(?:%4|\\s)\\s*"
@@ -344,12 +344,12 @@
bool LonLatParser::tryMatchFromDm( const QString& input, DirPosition dirPosition )
{
// direction as postfix
- const char *postfixCapExp =
+ const char postfixCapExp[] =
"([-+]?)(\\d{1,3})(?:%3|\\s)\\s*(\\d{1,2}%1?\\d*)(?:%4)?\\s*%2[,;]?\\s*"
"([-+]?)(\\d{1,3})(?:%3|\\s)\\s*(\\d{1,2}%1?\\d*)(?:%4)?\\s*%2";
// direction as prefix
- const char *prefixCapExp =
+ const char prefixCapExp[] =
"%2\\s*([-+]?)(\\d{1,3})(?:%3|\\s)\\s*(\\d{1,2}%1?\\d*)(?:%4)?\\s*(?:,|;|\\s)\\s*"
"%2\\s*([-+]?)(\\d{1,3})(?:%3|\\s)\\s*(\\d{1,2}%1?\\d*)(?:%4)?";
@@ -388,12 +388,12 @@
bool LonLatParser::tryMatchFromD( const QString& input, DirPosition dirPosition )
{
// direction as postfix, e.g. 74.2245 N 32.2434 W
- const char *postfixCapExp =
+ const char postfixCapExp[] =
"([-+]?\\d{1,3}%1?\\d*)(?:%3)?(?:\\s*)%2(?:,|;|\\s)\\s*"
"([-+]?\\d{1,3}%1?\\d*)(?:%3)?(?:\\s*)%2";
// direction as prefix, e.g. N 74.2245 W 32.2434
- const char *prefixCapExp =
+ const char prefixCapExp[] =
"%2\\s*([-+]?\\d{1,3}%1?\\d*)(?:%3)?\\s*(?:,|;|\\s)\\s*"
"%2\\s*([-+]?\\d{1,3}%1?\\d*)(?:%3)?";
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/geodata/data/GeoDataHotSpot.cpp
^
|
| @@ -66,7 +66,7 @@
return *this;
}
-bool GeoDataHotSpot::operator==( const GeoDataHotSpot& other )
+bool GeoDataHotSpot::operator==( const GeoDataHotSpot& other ) const
{
return equals(other) &&
d->m_hotSpot == other.d->m_hotSpot &&
@@ -74,7 +74,7 @@
d->m_yunits == other.d->m_yunits;
}
-bool GeoDataHotSpot::operator!=( const GeoDataHotSpot& other )
+bool GeoDataHotSpot::operator!=( const GeoDataHotSpot& other ) const
{
return !this->operator==(other);
}
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/geodata/data/GeoDataHotSpot.h
^
|
| @@ -35,8 +35,8 @@
~GeoDataHotSpot();
GeoDataHotSpot& operator=( const GeoDataHotSpot& other );
- bool operator==( const GeoDataHotSpot& other );
- bool operator!=( const GeoDataHotSpot& other );
+ bool operator==( const GeoDataHotSpot& other ) const;
+ bool operator!=( const GeoDataHotSpot& other ) const;
/// Provides type information for downcasting a GeoData
virtual const char* nodeType() const;
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/geodata/data/GeoDataImagePyramid.cpp
^
|
| @@ -53,7 +53,7 @@
return *this;
}
-bool GeoDataImagePyramid::operator==( const GeoDataImagePyramid& other )
+bool GeoDataImagePyramid::operator==( const GeoDataImagePyramid& other ) const
{
return equals(other) &&
d->m_tileSize == other.d->m_tileSize &&
@@ -62,7 +62,7 @@
d->m_gridOrigin == other.d->m_gridOrigin;
}
-bool GeoDataImagePyramid::operator!=( const GeoDataImagePyramid& other )
+bool GeoDataImagePyramid::operator!=( const GeoDataImagePyramid& other ) const
{
return !this->operator==(other);
}
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/geodata/data/GeoDataImagePyramid.h
^
|
| @@ -27,8 +27,8 @@
GeoDataImagePyramid( const GeoDataImagePyramid &other );
GeoDataImagePyramid& operator=( const GeoDataImagePyramid &other );
- bool operator==( const GeoDataImagePyramid &other );
- bool operator!=( const GeoDataImagePyramid &other );
+ bool operator==( const GeoDataImagePyramid &other ) const;
+ bool operator!=( const GeoDataImagePyramid &other ) const;
~GeoDataImagePyramid();
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/geodata/data/GeoDataSimpleField.h
^
|
| @@ -8,8 +8,8 @@
// Copyright 2014 Abhinav Gangwar <abhgang@gmail.com>
//
-#ifndef MARBLE_GEODATDASIMPLEFIELD_H
-#define MARBLE_GEODATDASIMPLEFIELD_H
+#ifndef MARBLE_GEODATASIMPLEFIELD_H
+#define MARBLE_GEODATASIMPLEFIELD_H
#include "geodata_export.h"
#include "GeoDocument.h"
@@ -108,4 +108,4 @@
}
-#endif // MARBLE_GEODATDASIMPLEFIELD_H
+#endif // MARBLE_GEODATASIMPLEFIELD_H
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/geodata/data/GeoDataTrack.h
^
|
| @@ -8,8 +8,8 @@
// Copyright 2011 Guillaume Martres <smarter@ubuntu.com>
//
-#ifndef MARBLE_GEODATAGXTRACK_H
-#define MARBLE_GEODATAGXTRACK_H
+#ifndef MARBLE_GEODATATRACK_H
+#define MARBLE_GEODATATRACK_H
#include "GeoDataCoordinates.h"
#include "GeoDataGeometry.h"
@@ -193,4 +193,4 @@
Q_DECLARE_METATYPE( Marble::GeoDataTrack* )
-#endif // MARBLE_GEODATAGXTRACK_H
+#endif // MARBLE_GEODATATRACK_H
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/geodata/handlers/dgml/DgmlAttributeDictionary.cpp
^
|
| @@ -29,50 +29,50 @@
// One static list of all attribute names, to avoid string comparisons all-over-the-place
-const char* dgmlAttr_nameSpace20 = "http://edu.kde.org/marble/dgml/2.0";
+const char dgmlAttr_nameSpace20[] = "http://edu.kde.org/marble/dgml/2.0";
-const char* dgmlAttr_alpha = "alpha";
-const char* dgmlAttr_attribution = "attribution";
-const char* dgmlAttr_backend = "backend";
-const char* dgmlAttr_bgcolor = "bgcolor";
-const char* dgmlAttr_color = "color";
-const char* dgmlAttr_colorize = "colorize";
-const char* dgmlAttr_colorMap = "colorMap";
-const char* dgmlAttr_checkable = "checkable";
-const char* dgmlAttr_connect = "connect";
-const char* dgmlAttr_expire = "expire";
-const char* dgmlAttr_feature = "feature";
-const char* dgmlAttr_format = "format";
-const char* dgmlAttr_height = "height";
-const char* dgmlAttr_highlightBrush = "highlightBrush";
-const char* dgmlAttr_highlightPen = "highlightPen";
-const char* dgmlAttr_host = "host";
-const char* dgmlAttr_labelColor = "labelColor";
-const char* dgmlAttr_levelZeroColumns = "levelZeroColumns";
-const char* dgmlAttr_levelZeroRows = "levelZeroRows";
-const char* dgmlAttr_maximumConnections = "maximumConnections";
-const char* dgmlAttr_minimumTileLevel = "minimumTileLevel";
-const char* dgmlAttr_maximumTileLevel = "maximumTileLevel";
-const char* dgmlAttr_mode = "mode";
-const char* dgmlAttr_name = "name";
-const char* dgmlAttr_password = "password";
-const char* dgmlAttr_path = "path";
-const char* dgmlAttr_pixmap = "pixmap";
-const char* dgmlAttr_port = "port";
-const char* dgmlAttr_property = "property";
-const char* dgmlAttr_protocol = "protocol";
-const char* dgmlAttr_query = "query";
-const char* dgmlAttr_radio = "radio";
-const char* dgmlAttr_radius = "radius";
-const char* dgmlAttr_role = "role";
-const char* dgmlAttr_short = "short";
-const char* dgmlAttr_spacing = "spacing";
-const char* dgmlAttr_style = "style";
-const char* dgmlAttr_text = "text";
-const char* dgmlAttr_tileLevels = "tileLevels";
-const char* dgmlAttr_type = "type";
-const char* dgmlAttr_usage = "usage";
-const char* dgmlAttr_user = "user";
-const char* dgmlAttr_width = "width";
+const char dgmlAttr_alpha[] = "alpha";
+const char dgmlAttr_attribution[] = "attribution";
+const char dgmlAttr_backend[] = "backend";
+const char dgmlAttr_bgcolor[] = "bgcolor";
+const char dgmlAttr_color[] = "color";
+const char dgmlAttr_colorize[] = "colorize";
+const char dgmlAttr_colorMap[] = "colorMap";
+const char dgmlAttr_checkable[] = "checkable";
+const char dgmlAttr_connect[] = "connect";
+const char dgmlAttr_expire[] = "expire";
+const char dgmlAttr_feature[] = "feature";
+const char dgmlAttr_format[] = "format";
+const char dgmlAttr_height[] = "height";
+const char dgmlAttr_highlightBrush[] = "highlightBrush";
+const char dgmlAttr_highlightPen[] = "highlightPen";
+const char dgmlAttr_host[] = "host";
+const char dgmlAttr_labelColor[] = "labelColor";
+const char dgmlAttr_levelZeroColumns[] = "levelZeroColumns";
+const char dgmlAttr_levelZeroRows[] = "levelZeroRows";
+const char dgmlAttr_maximumConnections[] = "maximumConnections";
+const char dgmlAttr_minimumTileLevel[] = "minimumTileLevel";
+const char dgmlAttr_maximumTileLevel[] = "maximumTileLevel";
+const char dgmlAttr_mode[] = "mode";
+const char dgmlAttr_name[] = "name";
+const char dgmlAttr_password[] = "password";
+const char dgmlAttr_path[] = "path";
+const char dgmlAttr_pixmap[] = "pixmap";
+const char dgmlAttr_port[] = "port";
+const char dgmlAttr_property[] = "property";
+const char dgmlAttr_protocol[] = "protocol";
+const char dgmlAttr_query[] = "query";
+const char dgmlAttr_radio[] = "radio";
+const char dgmlAttr_radius[] = "radius";
+const char dgmlAttr_role[] = "role";
+const char dgmlAttr_short[] = "short";
+const char dgmlAttr_spacing[] = "spacing";
+const char dgmlAttr_style[] = "style";
+const char dgmlAttr_text[] = "text";
+const char dgmlAttr_tileLevels[] = "tileLevels";
+const char dgmlAttr_type[] = "type";
+const char dgmlAttr_usage[] = "usage";
+const char dgmlAttr_user[] = "user";
+const char dgmlAttr_width[] = "width";
}
}
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/geodata/handlers/dgml/DgmlAttributeDictionary.h
^
|
| @@ -31,51 +31,51 @@
// Lists all known DGML 2.0 attributes
// http://edu.kde.org/marble/apis/dgml/documentation/dgmltags.html)
- extern const char* dgmlAttr_nameSpace20;
+ extern const char dgmlAttr_nameSpace20[];
- extern const char* dgmlAttr_alpha;
- extern const char* dgmlAttr_attribution;
- extern const char* dgmlAttr_backend;
- extern const char* dgmlAttr_bgcolor;
- extern const char* dgmlAttr_color;
- extern const char* dgmlAttr_colorize;
- extern const char* dgmlAttr_colorMap;
- extern const char* dgmlAttr_checkable;
- extern const char* dgmlAttr_connect;
- extern const char* dgmlAttr_expire;
- extern const char* dgmlAttr_feature;
- extern const char* dgmlAttr_format;
- extern const char* dgmlAttr_height;
- extern const char* dgmlAttr_highlightBrush;
- extern const char* dgmlAttr_highlightPen;
- extern const char* dgmlAttr_host;
- extern const char* dgmlAttr_labelColor;
- extern const char* dgmlAttr_levelZeroColumns;
- extern const char* dgmlAttr_levelZeroRows;
- extern const char* dgmlAttr_maximumConnections;
- extern const char* dgmlAttr_minimumTileLevel;
- extern const char* dgmlAttr_maximumTileLevel;
- extern const char* dgmlAttr_mode;
- extern const char* dgmlAttr_name;
- extern const char* dgmlAttr_password;
- extern const char* dgmlAttr_path;
- extern const char* dgmlAttr_pixmap;
- extern const char* dgmlAttr_port;
- extern const char* dgmlAttr_property;
- extern const char* dgmlAttr_protocol;
- extern const char *dgmlAttr_query;
- extern const char* dgmlAttr_radio;
- extern const char* dgmlAttr_radius;
- extern const char* dgmlAttr_role;
- extern const char* dgmlAttr_short;
- extern const char* dgmlAttr_spacing;
- extern const char* dgmlAttr_style;
- extern const char* dgmlAttr_text;
- extern const char* dgmlAttr_tileLevels;
- extern const char* dgmlAttr_type;
- extern const char* dgmlAttr_usage;
- extern const char* dgmlAttr_user;
- extern const char* dgmlAttr_width;
+ extern const char dgmlAttr_alpha[];
+ extern const char dgmlAttr_attribution[];
+ extern const char dgmlAttr_backend[];
+ extern const char dgmlAttr_bgcolor[];
+ extern const char dgmlAttr_color[];
+ extern const char dgmlAttr_colorize[];
+ extern const char dgmlAttr_colorMap[];
+ extern const char dgmlAttr_checkable[];
+ extern const char dgmlAttr_connect[];
+ extern const char dgmlAttr_expire[];
+ extern const char dgmlAttr_feature[];
+ extern const char dgmlAttr_format[];
+ extern const char dgmlAttr_height[];
+ extern const char dgmlAttr_highlightBrush[];
+ extern const char dgmlAttr_highlightPen[];
+ extern const char dgmlAttr_host[];
+ extern const char dgmlAttr_labelColor[];
+ extern const char dgmlAttr_levelZeroColumns[];
+ extern const char dgmlAttr_levelZeroRows[];
+ extern const char dgmlAttr_maximumConnections[];
+ extern const char dgmlAttr_minimumTileLevel[];
+ extern const char dgmlAttr_maximumTileLevel[];
+ extern const char dgmlAttr_mode[];
+ extern const char dgmlAttr_name[];
+ extern const char dgmlAttr_password[];
+ extern const char dgmlAttr_path[];
+ extern const char dgmlAttr_pixmap[];
+ extern const char dgmlAttr_port[];
+ extern const char dgmlAttr_property[];
+ extern const char dgmlAttr_protocol[];
+ extern const char dgmlAttr_query[];
+ extern const char dgmlAttr_radio[];
+ extern const char dgmlAttr_radius[];
+ extern const char dgmlAttr_role[];
+ extern const char dgmlAttr_short[];
+ extern const char dgmlAttr_spacing[];
+ extern const char dgmlAttr_style[];
+ extern const char dgmlAttr_text[];
+ extern const char dgmlAttr_tileLevels[];
+ extern const char dgmlAttr_type[];
+ extern const char dgmlAttr_usage[];
+ extern const char dgmlAttr_user[];
+ extern const char dgmlAttr_width[];
}
}
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/geodata/handlers/dgml/DgmlAuxillaryDictionary.cpp
^
|
| @@ -33,11 +33,11 @@
{
namespace dgml
{
-const char* dgmlValue_true = "true";
-const char* dgmlValue_on = "on";
-const char* dgmlValue_texture = "texture";
-const char* dgmlValue_vector = "vector";
-const char* dgmlValue_vectortile = "vectortile";
-const char* dgmlValue_geodata = "geodata";
+const char dgmlValue_true[] = "true";
+const char dgmlValue_on[] = "on";
+const char dgmlValue_texture[] = "texture";
+const char dgmlValue_vector[] = "vector";
+const char dgmlValue_vectortile[] = "vectortile";
+const char dgmlValue_geodata[] = "geodata";
}
}
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/geodata/handlers/dgml/DgmlAuxillaryDictionary.h
^
|
| @@ -35,12 +35,12 @@
{
namespace dgml
{
- extern const char* dgmlValue_true;
- extern const char* dgmlValue_on;
- extern const char* dgmlValue_texture;
- extern const char* dgmlValue_vector;
- extern const char* dgmlValue_vectortile;
- extern const char* dgmlValue_geodata;
+ extern const char dgmlValue_true[];
+ extern const char dgmlValue_on[];
+ extern const char dgmlValue_texture[];
+ extern const char dgmlValue_vector[];
+ extern const char dgmlValue_vectortile[];
+ extern const char dgmlValue_geodata[];
}
}
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/geodata/handlers/dgml/DgmlElementDictionary.cpp
^
|
| @@ -28,54 +28,54 @@
namespace dgml
{
-const char* dgmlTag_nameSpace20 = "http://edu.kde.org/marble/dgml/2.0";
+const char dgmlTag_nameSpace20[] = "http://edu.kde.org/marble/dgml/2.0";
-const char* dgmlTag_Available = "available";
-const char* dgmlTag_Blending = "blending";
-const char* dgmlTag_Brush = "brush";
-const char* dgmlTag_Color = "color";
-const char* dgmlTag_CustomPlugin = "customplugin";
-const char* dgmlTag_Dem = "dem";
-const char* dgmlTag_Description = "description";
-const char* dgmlTag_Dgml = "dgml";
-const char* dgmlTag_Discrete = "discrete";
-const char* dgmlTag_Document = "document";
-const char* dgmlTag_DownloadPolicy = "downloadPolicy";
-const char* dgmlTag_DownloadUrl = "downloadUrl";
-const char* dgmlTag_Filter = "filter";
-const char* dgmlTag_Geodata = "geodata";
-const char* dgmlTag_Group = "group";
-const char* dgmlTag_Head = "head";
-const char* dgmlTag_Heading = "heading";
-const char* dgmlTag_Icon = "icon";
-const char* dgmlTag_InstallMap = "installmap";
-const char* dgmlTag_Item = "item";
-const char* dgmlTag_Layer = "layer";
-const char* dgmlTag_Legend = "legend";
-const char* dgmlTag_License = "license";
-const char* dgmlTag_Map = "map";
-const char* dgmlTag_Maximum = "maximum";
-const char* dgmlTag_Minimum = "minimum";
-const char* dgmlTag_Name = "name";
-const char* dgmlTag_Palette = "palette";
-const char* dgmlTag_Pen = "pen";
-const char* dgmlTag_Projection = "projection";
-const char* dgmlTag_Property = "property";
-const char* dgmlTag_Section = "section";
-const char* dgmlTag_Settings = "settings";
-const char* dgmlTag_SourceDir = "sourcedir";
-const char* dgmlTag_SourceFile = "sourcefile";
-const char* dgmlTag_StorageLayout = "storageLayout";
-const char* dgmlTag_Target = "target";
-const char* dgmlTag_Text = "text";
-const char* dgmlTag_Texture = "texture";
-const char* dgmlTag_Theme = "theme";
-const char* dgmlTag_TileSize = "tileSize";
-const char* dgmlTag_Value = "value";
-const char* dgmlTag_Vector = "vector";
-const char* dgmlTag_Vectortile = "vectortile";
-const char* dgmlTag_Visible = "visible";
-const char* dgmlTag_Zoom = "zoom";
-const char* dgmlTag_RenderOrder = "renderOrder";
+const char dgmlTag_Available[] = "available";
+const char dgmlTag_Blending[] = "blending";
+const char dgmlTag_Brush[] = "brush";
+const char dgmlTag_Color[] = "color";
+const char dgmlTag_CustomPlugin[] = "customplugin";
+const char dgmlTag_Dem[] = "dem";
+const char dgmlTag_Description[] = "description";
+const char dgmlTag_Dgml[] = "dgml";
+const char dgmlTag_Discrete[] = "discrete";
+const char dgmlTag_Document[] = "document";
+const char dgmlTag_DownloadPolicy[] = "downloadPolicy";
+const char dgmlTag_DownloadUrl[] = "downloadUrl";
+const char dgmlTag_Filter[] = "filter";
+const char dgmlTag_Geodata[] = "geodata";
+const char dgmlTag_Group[] = "group";
+const char dgmlTag_Head[] = "head";
+const char dgmlTag_Heading[] = "heading";
+const char dgmlTag_Icon[] = "icon";
+const char dgmlTag_InstallMap[] = "installmap";
+const char dgmlTag_Item[] = "item";
+const char dgmlTag_Layer[] = "layer";
+const char dgmlTag_Legend[] = "legend";
+const char dgmlTag_License[] = "license";
+const char dgmlTag_Map[] = "map";
+const char dgmlTag_Maximum[] = "maximum";
+const char dgmlTag_Minimum[] = "minimum";
+const char dgmlTag_Name[] = "name";
+const char dgmlTag_Palette[] = "palette";
+const char dgmlTag_Pen[] = "pen";
+const char dgmlTag_Projection[] = "projection";
+const char dgmlTag_Property[] = "property";
+const char dgmlTag_Section[] = "section";
+const char dgmlTag_Settings[] = "settings";
+const char dgmlTag_SourceDir[] = "sourcedir";
+const char dgmlTag_SourceFile[] = "sourcefile";
+const char dgmlTag_StorageLayout[] = "storageLayout";
+const char dgmlTag_Target[] = "target";
+const char dgmlTag_Text[] = "text";
+const char dgmlTag_Texture[] = "texture";
+const char dgmlTag_Theme[] = "theme";
+const char dgmlTag_TileSize[] = "tileSize";
+const char dgmlTag_Value[] = "value";
+const char dgmlTag_Vector[] = "vector";
+const char dgmlTag_Vectortile[] = "vectortile";
+const char dgmlTag_Visible[] = "visible";
+const char dgmlTag_Zoom[] = "zoom";
+const char dgmlTag_RenderOrder[] = "renderOrder";
}
}
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/geodata/handlers/dgml/DgmlElementDictionary.h
^
|
| @@ -31,55 +31,55 @@
// http://edu.kde.org/marble/apis/dgml/documentation/dgmltags.html)
namespace dgml
{
- GEODATA_EXPORT extern const char* dgmlTag_nameSpace20;
+ GEODATA_EXPORT extern const char dgmlTag_nameSpace20[];
- extern const char* dgmlTag_Available;
- extern const char* dgmlTag_Blending;
- extern const char* dgmlTag_Brush;
- extern const char* dgmlTag_Color;
- extern const char* dgmlTag_CustomPlugin;
- extern const char* dgmlTag_Dem;
- extern const char* dgmlTag_Description;
- extern const char* dgmlTag_Discrete;
- extern const char* dgmlTag_Dgml;
- extern const char* dgmlTag_Document;
- extern const char* dgmlTag_DownloadPolicy;
- extern const char* dgmlTag_DownloadUrl;
- extern const char* dgmlTag_Filter;
- extern const char* dgmlTag_Geodata;
- extern const char* dgmlTag_Group;
- extern const char* dgmlTag_Head;
- extern const char* dgmlTag_Heading;
- extern const char* dgmlTag_Icon;
- extern const char* dgmlTag_InstallMap;
- extern const char* dgmlTag_Item;
- extern const char* dgmlTag_Layer;
- extern const char* dgmlTag_Legend;
- extern const char* dgmlTag_License;
- extern const char* dgmlTag_Map;
- extern const char* dgmlTag_Maximum;
- extern const char* dgmlTag_Minimum;
- extern const char* dgmlTag_Name;
- extern const char* dgmlTag_Palette;
- extern const char* dgmlTag_Pen;
- extern const char* dgmlTag_Projection;
- extern const char* dgmlTag_Property;
- extern const char* dgmlTag_Section;
- extern const char* dgmlTag_Settings;
- extern const char* dgmlTag_SourceDir;
- extern const char* dgmlTag_SourceFile;
- extern const char* dgmlTag_StorageLayout;
- extern const char* dgmlTag_Target;
- extern const char* dgmlTag_Text;
- extern const char* dgmlTag_Texture;
- extern const char* dgmlTag_TileSize;
- extern const char* dgmlTag_Theme;
- extern const char* dgmlTag_Value;
- extern const char* dgmlTag_Vector;
- extern const char* dgmlTag_Vectortile;
- extern const char* dgmlTag_Visible;
- extern const char* dgmlTag_Zoom;
- extern const char* dgmlTag_RenderOrder;
+ extern const char dgmlTag_Available[];
+ extern const char dgmlTag_Blending[];
+ extern const char dgmlTag_Brush[];
+ extern const char dgmlTag_Color[];
+ extern const char dgmlTag_CustomPlugin[];
+ extern const char dgmlTag_Dem[];
+ extern const char dgmlTag_Description[];
+ extern const char dgmlTag_Discrete[];
+ extern const char dgmlTag_Dgml[];
+ extern const char dgmlTag_Document[];
+ extern const char dgmlTag_DownloadPolicy[];
+ extern const char dgmlTag_DownloadUrl[];
+ extern const char dgmlTag_Filter[];
+ extern const char dgmlTag_Geodata[];
+ extern const char dgmlTag_Group[];
+ extern const char dgmlTag_Head[];
+ extern const char dgmlTag_Heading[];
+ extern const char dgmlTag_Icon[];
+ extern const char dgmlTag_InstallMap[];
+ extern const char dgmlTag_Item[];
+ extern const char dgmlTag_Layer[];
+ extern const char dgmlTag_Legend[];
+ extern const char dgmlTag_License[];
+ extern const char dgmlTag_Map[];
+ extern const char dgmlTag_Maximum[];
+ extern const char dgmlTag_Minimum[];
+ extern const char dgmlTag_Name[];
+ extern const char dgmlTag_Palette[];
+ extern const char dgmlTag_Pen[];
+ extern const char dgmlTag_Projection[];
+ extern const char dgmlTag_Property[];
+ extern const char dgmlTag_Section[];
+ extern const char dgmlTag_Settings[];
+ extern const char dgmlTag_SourceDir[];
+ extern const char dgmlTag_SourceFile[];
+ extern const char dgmlTag_StorageLayout[];
+ extern const char dgmlTag_Target[];
+ extern const char dgmlTag_Text[];
+ extern const char dgmlTag_Texture[];
+ extern const char dgmlTag_TileSize[];
+ extern const char dgmlTag_Theme[];
+ extern const char dgmlTag_Value[];
+ extern const char dgmlTag_Vector[];
+ extern const char dgmlTag_Vectortile[];
+ extern const char dgmlTag_Visible[];
+ extern const char dgmlTag_Zoom[];
+ extern const char dgmlTag_RenderOrder[];
}
// Helper macro
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/geodata/handlers/kml/KmlElementDictionary.cpp
^
|
| @@ -28,208 +28,208 @@
namespace kml
{
-const char* kmlTag_nameSpace20 = "http://earth.google.com/kml/2.0";
-const char* kmlTag_nameSpace21 = "http://earth.google.com/kml/2.1";
-const char* kmlTag_nameSpace22 = "http://earth.google.com/kml/2.2";
-const char* kmlTag_nameSpaceOgc22 = "http://www.opengis.net/kml/2.2";
-const char* kmlTag_nameSpaceGx22 = "http://www.google.com/kml/ext/2.2";
-const char* kmlTag_nameSpaceMx = "http://marble.kde.org";
+const char kmlTag_nameSpace20[] = "http://earth.google.com/kml/2.0";
+const char kmlTag_nameSpace21[] = "http://earth.google.com/kml/2.1";
+const char kmlTag_nameSpace22[] = "http://earth.google.com/kml/2.2";
+const char kmlTag_nameSpaceOgc22[] = "http://www.opengis.net/kml/2.2";
+const char kmlTag_nameSpaceGx22[] = "http://www.google.com/kml/ext/2.2";
+const char kmlTag_nameSpaceMx[] = "http://marble.kde.org";
-const char* kmlTag_address = "address";
-const char* kmlTag_AddressDetails = "AddressDetails";
-const char* kmlTag_Alias = "Alias";
-const char* kmlTag_altitude = "altitude";
-const char* kmlTag_altitudeMode = "altitudeMode";
-const char* kmlTag_BalloonStyle = "BalloonStyle";
-const char* kmlTag_begin = "begin";
-const char* kmlTag_bgColor = "bgColor";
-const char* kmlTag_bottomFov = "bottomFov";
-const char* kmlTag_Camera = "Camera";
-const char* kmlTag_Change = "Change";
-const char* kmlTag_code = "code";
-const char* kmlTag_color = "color";
-const char* kmlTag_colorMode = "colorMode";
-const char* kmlTag_ColorStyle = "ColorStyle";
-const char* kmlTag_Container = "Container";
-const char* kmlTag_cookie = "cookie";
-const char* kmlTag_coordinates = "coordinates";
-const char* kmlTag_Create = "Create";
-const char* kmlTag_Data = "Data";
-const char* kmlTag_Delete = "Delete";
-const char* kmlTag_description = "description";
-const char* kmlTag_displayMode = "displayMode";
-const char* kmlTag_displayName = "displayName";
-const char* kmlTag_Document = "Document";
-const char* kmlTag_drawOrder = "drawOrder";
-const char* kmlTag_duration = "duration";
-const char* kmlTag_east = "east";
-const char* kmlTag_end = "end";
-const char* kmlTag_expires = "expires";
-const char* kmlTag_ExtendedData = "ExtendedData";
-const char* kmlTag_extrude = "extrude";
-const char* kmlTag_Feature = "Feature";
-const char* kmlTag_fill = "fill";
-const char* kmlTag_flyToMode = "flyToMode";
-const char* kmlTag_flyToView = "flyToView";
-const char* kmlTag_Folder = "Folder";
-const char* kmlTag_geomColor = "geomColor";
-const char* kmlTag_Geometry = "Geometry";
-const char* kmlTag_GeometryCollection = "GeometryCollection";
-const char* kmlTag_geomScale = "geomScale";
-const char* kmlTag_gridOrigin = "gridOrigin";
-const char* kmlTag_GroundOverlay = "GroundOverlay";
-const char* kmlTag_h = "h";
-const char* kmlTag_heading = "heading";
-const char* kmlTag_href = "href";
-const char* kmlTag_hotSpot = "hotSpot";
-const char* kmlTag_httpQuery = "httpQuery";
-const char* kmlTag_Icon = "Icon";
-const char* kmlTag_IconStyle = "IconStyle";
-const char* kmlTag_ImagePyramid = "ImagePyramid";
-const char* kmlTag_innerBoundaryIs = "innerBoundaryIs";
-const char* kmlTag_ItemIcon = "ItemIcon";
-const char* kmlTag_key = "key";
-const char* kmlTag_kml = "kml";
-const char* kmlTag_labelColor = "labelColor";
-const char* kmlTag_LabelStyle = "LabelStyle";
-const char* kmlTag_latitude = "latitude";
-const char* kmlTag_LatLonAltBox = "LatLonAltBox";
-const char* kmlTag_LatLonBox = "LatLonBox";
-const char* kmlTag_LatLonQuad = "LatLonQuad";
-const char* kmlTag_leftFov = "leftFov";
-const char* kmlTag_LinearRing = "LinearRing";
-const char* kmlTag_LineString = "LineString";
-const char* kmlTag_LineStyle = "LineStyle";
-const char* kmlTag_Link = "Link";
-const char* kmlTag_linkDescription = "linkDescription";
-const char* kmlTag_linkName = "linkName";
-const char* kmlTag_linkSnippet = "linkSnippet";
-const char* kmlTag_listItemType = "listItemType";
-const char* kmlTag_ListStyle = "ListStyle";
-const char* kmlTag_Location = "Location";
-const char* kmlTag_Lod = "Lod";
-const char* kmlTag_longitude = "longitude";
-const char* kmlTag_LookAt = "LookAt";
-const char* kmlTag_maxAltitude = "maxAltitude";
-const char* kmlTag_maxFadeExtent = "maxFadeExtent";
-const char* kmlTag_maxHeight = "maxHeight";
-const char* kmlTag_maxLodPixels = "maxLodPixels";
-const char* kmlTag_maxSessionLength = "maxSessionLength";
-const char* kmlTag_maxWidth = "maxWidth";
-const char* kmlTag_message = "message";
-const char* kmlTag_Metadata = "Metadata";
-const char* kmlTag_minAltitude = "minAltitude";
-const char* kmlTag_minFadeExtent = "minFadeExtent";
-const char* kmlTag_minLodPixels = "minLodPixels";
-const char* kmlTag_minRefreshPeriod = "minRefreshPeriod";
-const char* kmlTag_Model = "Model";
-const char* kmlTag_MultiGeometry = "MultiGeometry";
-const char* kmlTag_name = "name";
-const char* kmlTag_near = "near";
-const char* kmlTag_NetworkLink = "NetworkLink";
-const char* kmlTag_NetworkLinkControl = "NetworkLinkControl";
-const char* kmlTag_north = "north";
-const char* kmlTag_Object = "Object";
-const char* kmlTag_ObjArrayField = "ObjArrayField";
-const char* kmlTag_ObjField = "ObjField";
-const char* kmlTag_open = "open";
-const char* kmlTag_Orientation = "Orientation";
-const char* kmlTag_OsmPlacemarkData = "OsmPlacemarkData";
-const char* kmlTag_member = "member";
-const char* kmlTag_nd = "nd";
-const char* kmlTag_tag = "tag";
-const char* kmlTag_outerBoundaryIs = "outerBoundaryIs";
-const char* kmlTag_outline = "outline";
-const char* kmlTag_Overlay = "Overlay";
-const char* kmlTag_overlayXY = "overlayXY";
-const char* kmlTag_Pair = "Pair";
-const char* kmlTag_phoneNumber = "phoneNumber";
-const char* kmlTag_PhotoOverlay = "PhotoOverlay";
-const char* kmlTag_Placemark = "Placemark";
-const char* kmlTag_Point = "Point";
-const char* kmlTag_Polygon = "Polygon";
-const char* kmlTag_PolyStyle = "PolyStyle";
-const char* kmlTag_range = "range";
-const char* kmlTag_refreshInterval = "refreshInterval";
-const char* kmlTag_refreshMode = "refreshMode";
-const char* kmlTag_refreshVisibility = "refreshVisibility";
-const char* kmlTag_Region = "Region";
-const char* kmlTag_request = "request";
-const char* kmlTag_ResourceMap = "ResourceMap";
-const char* kmlTag_Response = "Response";
-const char* kmlTag_rightFov = "rightFov";
-const char* kmlTag_roll = "roll";
-const char* kmlTag_rotation = "rotation";
-const char* kmlTag_rotationXY = "rotationXY";
-const char* kmlTag_Scale = "Scale";
-const char* kmlTag_scale = "scale";
-const char* kmlTag_Schema = "Schema";
-const char* kmlTag_SchemaData = "SchemaData";
-const char* kmlTag_SchemaField = "SchemaField";
-const char* kmlTag_ScreenOverlay = "ScreenOverlay";
-const char* kmlTag_screenXY = "screenXY";
-const char* kmlTag_shape = "shape";
-const char* kmlTag_SimpleArrayData = "SimpleArrayData";
-const char* kmlTag_SimpleArrayField = "SimpleArrayField";
-const char* kmlTag_SimpleData = "SimpleData";
-const char* kmlTag_SimpleField = "SimpleField";
-const char* kmlTag_size = "size";
-const char* kmlTag_Snippet = "Snippet";
-const char* kmlTag_sourceHref = "sourceHref";
-const char* kmlTag_south = "south";
-const char* kmlTag_state = "state";
-const char* kmlTag_Status = "Status";
-const char* kmlTag_Style = "Style";
-const char* kmlTag_StyleMap = "StyleMap";
-const char* kmlTag_StyleSelector = "StyleSelector";
-const char* kmlTag_styleUrl = "styleUrl";
-const char* kmlTag_targetHref = "targetHref";
-const char* kmlTag_tessellate = "tessellate";
-const char* kmlTag_text = "text";
-const char* kmlTag_textColor = "textColor";
-const char* kmlTag_tileSize = "tileSize";
-const char* kmlTag_tilt = "tilt";
-const char* kmlTag_TimeSpan = "TimeSpan";
-const char* kmlTag_TimeStamp = "TimeStamp";
-const char* kmlTag_topFov = "topFov";
-const char* kmlTag_Update = "Update";
-const char* kmlTag_Url = "Url";
-const char* kmlTag_value = "value";
-const char* kmlTag_viewBoundScale = "viewBoundScale";
-const char* kmlTag_viewFormat = "viewFormat";
-const char* kmlTag_viewRefreshMode = "viewRefreshMode";
-const char* kmlTag_viewRefreshTime = "viewRefreshTime";
-const char* kmlTag_ViewVolume = "ViewVolume";
-const char* kmlTag_visibility = "visibility";
-const char* kmlTag_w = "w";
-const char* kmlTag_west = "west";
-const char* kmlTag_when = "when";
-const char* kmlTag_width = "width";
-const char* kmlTag_x = "x";
-const char* kmlTag_y = "y";
-const char* kmlTag_z = "z";
+const char kmlTag_address[] = "address";
+const char kmlTag_AddressDetails[] = "AddressDetails";
+const char kmlTag_Alias[] = "Alias";
+const char kmlTag_altitude[] = "altitude";
+const char kmlTag_altitudeMode[] = "altitudeMode";
+const char kmlTag_BalloonStyle[] = "BalloonStyle";
+const char kmlTag_begin[] = "begin";
+const char kmlTag_bgColor[] = "bgColor";
+const char kmlTag_bottomFov[] = "bottomFov";
+const char kmlTag_Camera[] = "Camera";
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/geodata/handlers/kml/KmlElementDictionary.h
^
|
| @@ -30,210 +30,210 @@
// Lists all known KML 2.1 tags (http://code.google.com/apis/kml/documentation/kmlTag_tags_21.html)
namespace kml
{
- GEODATA_EXPORT extern const char* kmlTag_nameSpace20;
- GEODATA_EXPORT extern const char* kmlTag_nameSpace21;
- GEODATA_EXPORT extern const char* kmlTag_nameSpace22;
- GEODATA_EXPORT extern const char* kmlTag_nameSpaceOgc22;
- GEODATA_EXPORT extern const char* kmlTag_nameSpaceGx22;
- GEODATA_EXPORT extern const char* kmlTag_nameSpaceMx;
+ GEODATA_EXPORT extern const char kmlTag_nameSpace20[];
+ GEODATA_EXPORT extern const char kmlTag_nameSpace21[];
+ GEODATA_EXPORT extern const char kmlTag_nameSpace22[];
+ GEODATA_EXPORT extern const char kmlTag_nameSpaceOgc22[];
+ GEODATA_EXPORT extern const char kmlTag_nameSpaceGx22[];
+ GEODATA_EXPORT extern const char kmlTag_nameSpaceMx[];
- GEODATA_EXPORT extern const char* kmlTag_address;
- GEODATA_EXPORT extern const char* kmlTag_AddressDetails;
- GEODATA_EXPORT extern const char* kmlTag_Alias;
- GEODATA_EXPORT extern const char* kmlTag_altitude;
- GEODATA_EXPORT extern const char* kmlTag_altitudeMode;
- GEODATA_EXPORT extern const char* kmlTag_BalloonStyle;
- GEODATA_EXPORT extern const char* kmlTag_begin;
- GEODATA_EXPORT extern const char* kmlTag_bgColor;
- GEODATA_EXPORT extern const char* kmlTag_bottomFov;
- GEODATA_EXPORT extern const char* kmlTag_Camera;
- GEODATA_EXPORT extern const char* kmlTag_Change;
- GEODATA_EXPORT extern const char* kmlTag_code;
- GEODATA_EXPORT extern const char* kmlTag_color;
- GEODATA_EXPORT extern const char* kmlTag_colorMode;
- GEODATA_EXPORT extern const char* kmlTag_ColorStyle;
- GEODATA_EXPORT extern const char* kmlTag_Container;
- GEODATA_EXPORT extern const char* kmlTag_cookie;
- GEODATA_EXPORT extern const char* kmlTag_coordinates;
- GEODATA_EXPORT extern const char* kmlTag_Create;
- GEODATA_EXPORT extern const char* kmlTag_Data;
- GEODATA_EXPORT extern const char* kmlTag_Delete;
- GEODATA_EXPORT extern const char* kmlTag_description;
- GEODATA_EXPORT extern const char* kmlTag_displayMode;
- GEODATA_EXPORT extern const char* kmlTag_displayName;
- GEODATA_EXPORT extern const char* kmlTag_Document;
- GEODATA_EXPORT extern const char* kmlTag_drawOrder;
- GEODATA_EXPORT extern const char* kmlTag_duration;
- GEODATA_EXPORT extern const char* kmlTag_east;
- GEODATA_EXPORT extern const char* kmlTag_end;
- GEODATA_EXPORT extern const char* kmlTag_expires;
- GEODATA_EXPORT extern const char* kmlTag_ExtendedData;
- GEODATA_EXPORT extern const char* kmlTag_extrude;
- GEODATA_EXPORT extern const char* kmlTag_Feature;
- GEODATA_EXPORT extern const char* kmlTag_fill;
- GEODATA_EXPORT extern const char* kmlTag_flyToMode;
- GEODATA_EXPORT extern const char* kmlTag_flyToView;
- GEODATA_EXPORT extern const char* kmlTag_Folder;
- GEODATA_EXPORT extern const char* kmlTag_geomColor;
- GEODATA_EXPORT extern const char* kmlTag_Geometry;
- GEODATA_EXPORT extern const char* kmlTag_GeometryCollection;
- GEODATA_EXPORT extern const char* kmlTag_geomScale;
- GEODATA_EXPORT extern const char* kmlTag_gridOrigin;
- GEODATA_EXPORT extern const char* kmlTag_GroundOverlay;
- GEODATA_EXPORT extern const char* kmlTag_h;
- GEODATA_EXPORT extern const char* kmlTag_heading;
- GEODATA_EXPORT extern const char* kmlTag_href;
- GEODATA_EXPORT extern const char* kmlTag_hotSpot;
- GEODATA_EXPORT extern const char* kmlTag_httpQuery;
- GEODATA_EXPORT extern const char* kmlTag_Icon;
- GEODATA_EXPORT extern const char* kmlTag_IconStyle;
- GEODATA_EXPORT extern const char* kmlTag_ImagePyramid;
- GEODATA_EXPORT extern const char* kmlTag_innerBoundaryIs;
- GEODATA_EXPORT extern const char* kmlTag_ItemIcon;
- GEODATA_EXPORT extern const char* kmlTag_key;
- GEODATA_EXPORT extern const char* kmlTag_kml;
- GEODATA_EXPORT extern const char* kmlTag_labelColor;
- GEODATA_EXPORT extern const char* kmlTag_LabelStyle;
- GEODATA_EXPORT extern const char* kmlTag_latitude;
- GEODATA_EXPORT extern const char* kmlTag_LatLonAltBox;
- GEODATA_EXPORT extern const char* kmlTag_LatLonBox;
- GEODATA_EXPORT extern const char* kmlTag_LatLonQuad;
- GEODATA_EXPORT extern const char* kmlTag_leftFov;
- GEODATA_EXPORT extern const char* kmlTag_LinearRing;
- GEODATA_EXPORT extern const char* kmlTag_LineString;
- GEODATA_EXPORT extern const char* kmlTag_LineStyle;
- GEODATA_EXPORT extern const char* kmlTag_Link;
- GEODATA_EXPORT extern const char* kmlTag_linkDescription;
- GEODATA_EXPORT extern const char* kmlTag_linkName;
- GEODATA_EXPORT extern const char* kmlTag_linkSnippet;
- GEODATA_EXPORT extern const char* kmlTag_listItemType;
- GEODATA_EXPORT extern const char* kmlTag_ListStyle;
- GEODATA_EXPORT extern const char* kmlTag_Location;
- GEODATA_EXPORT extern const char* kmlTag_Lod;
- GEODATA_EXPORT extern const char* kmlTag_longitude;
- GEODATA_EXPORT extern const char* kmlTag_LookAt;
- GEODATA_EXPORT extern const char* kmlTag_maxAltitude;
- GEODATA_EXPORT extern const char* kmlTag_maxFadeExtent;
- GEODATA_EXPORT extern const char* kmlTag_maxHeight;
- GEODATA_EXPORT extern const char* kmlTag_maxLodPixels;
- GEODATA_EXPORT extern const char* kmlTag_maxSessionLength;
- GEODATA_EXPORT extern const char* kmlTag_maxWidth;
- GEODATA_EXPORT extern const char* kmlTag_message;
- GEODATA_EXPORT extern const char* kmlTag_Metadata;
- GEODATA_EXPORT extern const char* kmlTag_minAltitude;
- GEODATA_EXPORT extern const char* kmlTag_minFadeExtent;
- GEODATA_EXPORT extern const char* kmlTag_minLodPixels;
- GEODATA_EXPORT extern const char* kmlTag_minRefreshPeriod;
- GEODATA_EXPORT extern const char* kmlTag_Model;
- GEODATA_EXPORT extern const char* kmlTag_MultiGeometry;
- GEODATA_EXPORT extern const char* kmlTag_name;
- GEODATA_EXPORT extern const char* kmlTag_near;
- GEODATA_EXPORT extern const char* kmlTag_NetworkLink;
- GEODATA_EXPORT extern const char* kmlTag_NetworkLinkControl;
- GEODATA_EXPORT extern const char* kmlTag_north;
- GEODATA_EXPORT extern const char* kmlTag_Object;
- GEODATA_EXPORT extern const char* kmlTag_ObjArrayField;
- GEODATA_EXPORT extern const char* kmlTag_ObjField;
- GEODATA_EXPORT extern const char* kmlTag_open;
- GEODATA_EXPORT extern const char* kmlTag_Orientation;
- GEODATA_EXPORT extern const char* kmlTag_OsmPlacemarkData;
- GEODATA_EXPORT extern const char* kmlTag_member;
- GEODATA_EXPORT extern const char* kmlTag_nd;
- GEODATA_EXPORT extern const char* kmlTag_tag;
- GEODATA_EXPORT extern const char* kmlTag_outerBoundaryIs;
- GEODATA_EXPORT extern const char* kmlTag_outline;
- GEODATA_EXPORT extern const char* kmlTag_Overlay;
- GEODATA_EXPORT extern const char* kmlTag_overlayXY;
- GEODATA_EXPORT extern const char* kmlTag_Pair;
- GEODATA_EXPORT extern const char* kmlTag_phoneNumber;
- GEODATA_EXPORT extern const char* kmlTag_PhotoOverlay;
- GEODATA_EXPORT extern const char* kmlTag_Placemark;
- GEODATA_EXPORT extern const char* kmlTag_Point;
- GEODATA_EXPORT extern const char* kmlTag_Polygon;
- GEODATA_EXPORT extern const char* kmlTag_PolyStyle;
- GEODATA_EXPORT extern const char* kmlTag_range;
- GEODATA_EXPORT extern const char* kmlTag_refreshInterval;
- GEODATA_EXPORT extern const char* kmlTag_refreshMode;
- GEODATA_EXPORT extern const char* kmlTag_refreshVisibility;
- GEODATA_EXPORT extern const char* kmlTag_Region;
- GEODATA_EXPORT extern const char* kmlTag_request;
- GEODATA_EXPORT extern const char* kmlTag_ResourceMap;
- GEODATA_EXPORT extern const char* kmlTag_Response;
- GEODATA_EXPORT extern const char* kmlTag_rightFov;
- GEODATA_EXPORT extern const char* kmlTag_roll;
- GEODATA_EXPORT extern const char* kmlTag_rotation;
- GEODATA_EXPORT extern const char* kmlTag_rotationXY;
- GEODATA_EXPORT extern const char* kmlTag_Scale;
- GEODATA_EXPORT extern const char* kmlTag_scale;
- GEODATA_EXPORT extern const char* kmlTag_Schema;
- GEODATA_EXPORT extern const char* kmlTag_SchemaData;
- GEODATA_EXPORT extern const char* kmlTag_SchemaField;
- GEODATA_EXPORT extern const char* kmlTag_ScreenOverlay;
- GEODATA_EXPORT extern const char* kmlTag_screenXY;
- GEODATA_EXPORT extern const char* kmlTag_shape;
- GEODATA_EXPORT extern const char* kmlTag_SimpleArrayData;
- GEODATA_EXPORT extern const char* kmlTag_SimpleArrayField;
- GEODATA_EXPORT extern const char* kmlTag_SimpleField;
- GEODATA_EXPORT extern const char* kmlTag_SimpleData;
- GEODATA_EXPORT extern const char* kmlTag_size;
- GEODATA_EXPORT extern const char* kmlTag_Snippet;
- GEODATA_EXPORT extern const char* kmlTag_south;
- GEODATA_EXPORT extern const char* kmlTag_sourceHref;
- GEODATA_EXPORT extern const char* kmlTag_state;
- GEODATA_EXPORT extern const char* kmlTag_Status;
- GEODATA_EXPORT extern const char* kmlTag_Style;
- GEODATA_EXPORT extern const char* kmlTag_StyleMap;
- GEODATA_EXPORT extern const char* kmlTag_StyleSelector;
- GEODATA_EXPORT extern const char* kmlTag_styleUrl;
- GEODATA_EXPORT extern const char* kmlTag_targetHref;
- GEODATA_EXPORT extern const char* kmlTag_tessellate;
- GEODATA_EXPORT extern const char* kmlTag_text;
- GEODATA_EXPORT extern const char* kmlTag_textColor;
- GEODATA_EXPORT extern const char* kmlTag_tileSize;
- GEODATA_EXPORT extern const char* kmlTag_tilt;
- GEODATA_EXPORT extern const char* kmlTag_TimeSpan;
- GEODATA_EXPORT extern const char* kmlTag_TimeStamp;
- GEODATA_EXPORT extern const char* kmlTag_topFov;
- GEODATA_EXPORT extern const char* kmlTag_Update;
- GEODATA_EXPORT extern const char* kmlTag_Url;
- GEODATA_EXPORT extern const char* kmlTag_value;
- GEODATA_EXPORT extern const char* kmlTag_viewBoundScale;
- GEODATA_EXPORT extern const char* kmlTag_viewFormat;
- GEODATA_EXPORT extern const char* kmlTag_viewRefreshMode;
- GEODATA_EXPORT extern const char* kmlTag_viewRefreshTime;
- GEODATA_EXPORT extern const char* kmlTag_ViewVolume;
- GEODATA_EXPORT extern const char* kmlTag_visibility;
- GEODATA_EXPORT extern const char* kmlTag_w;
- GEODATA_EXPORT extern const char* kmlTag_west;
- GEODATA_EXPORT extern const char* kmlTag_when;
- GEODATA_EXPORT extern const char* kmlTag_width;
- GEODATA_EXPORT extern const char* kmlTag_x;
- GEODATA_EXPORT extern const char* kmlTag_y;
- GEODATA_EXPORT extern const char* kmlTag_z;
+ GEODATA_EXPORT extern const char kmlTag_address[];
+ GEODATA_EXPORT extern const char kmlTag_AddressDetails[];
+ GEODATA_EXPORT extern const char kmlTag_Alias[];
+ GEODATA_EXPORT extern const char kmlTag_altitude[];
+ GEODATA_EXPORT extern const char kmlTag_altitudeMode[];
+ GEODATA_EXPORT extern const char kmlTag_BalloonStyle[];
+ GEODATA_EXPORT extern const char kmlTag_begin[];
+ GEODATA_EXPORT extern const char kmlTag_bgColor[];
+ GEODATA_EXPORT extern const char kmlTag_bottomFov[];
+ GEODATA_EXPORT extern const char kmlTag_Camera[];
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/geodata/handlers/kml/KmlMaxSessionLengthTagHandler.h
^
|
| @@ -8,8 +8,8 @@
// Copyright 2013 Mohammed Nafees <nafees.technocool@gmail.com>
//
-#ifndef KMLMAXREFRESHPERIODTAGHANDLER_H
-#define KMLMAXREFRESHPERIODTAGHANDLER_H
+#ifndef MARBLE_KMLMAXSESSIONLENGTHTAGHANDLER_H
+#define MARBLE_KMLMAXSESSIONLENGTHTAGHANDLER_H
#include "GeoTagHandler.h"
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/geodata/handlers/kml/KmlSourceHrefTagHandler.h
^
|
| @@ -8,8 +8,8 @@
// Copyright 2013 Sanjiban Bairagya <sanjiban22393@gmail.com>
//
-#ifndef KMLXSOURCEHREFHANDLER_H
-#define KMLXSOURCEHREFHANDLER_H
+#ifndef MARBLE_KMLSOURCEHREFTAGHANDLER_H
+#define MARBLE_KMLSOURCEHREFTAGHANDLER_H
#include "GeoTagHandler.h"
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/geodata/handlers/kml/KmlTargetHrefTagHandler.h
^
|
| @@ -8,8 +8,8 @@
// Copyright 2013 Sanjiban Bairagya <sanjiban22393@gmail.com>
//
-#ifndef KMLXTARGETHREFHANDLER_H
-#define KMLXTARGETHREFHANDLER_H
+#ifndef MARBLE_KMLTARGETHREFTAGHANDLER_H
+#define MARBLE_KMLTARGETHREFTAGHANDLER_H
#include "GeoTagHandler.h"
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/geodata/parser/GeoDataTypes.cpp
^
|
| @@ -26,74 +26,74 @@
namespace GeoDataTypes
{
-const char* GeoDataAnimatedUpdateType = "GeoDataAnimatedUpdate";
-const char* GeoDataAliasType = "GeoDataAlias";
-const char* GeoDataCameraType = "GeoDataCamera";
-const char* GeoDataChangeType = "GeoDataChange";
-const char* GeoDataColorStyleType = "GeoDataColorStyle";
-const char* GeoDataContainerType = "GeoDataContainer";
-const char* GeoDataCreateType = "GeoDataCreate";
-const char* GeoDataDataType = "GeoDataData";
-const char* GeoDataDeleteType = "GeoDataDelete";
-const char* GeoDataDocumentType = "GeoDataDocument";
-const char* GeoDataExtendedDataType = "GeoDataExtendedData";
-const char* GeoDataFeatureType = "GeoDataFeature";
-const char* GeoDataFlyToType = "GeoDataFlyTo";
-const char* GeoDataFolderType = "GeoDataFolder";
-const char* GeoDataGeometryType = "GeoDataGeometry";
-const char* GeoDataGroundOverlayType = "GeoDataGroundOverlay";
-const char* GeoDataHotspotType = "GeoDataHotspot";
-const char* GeoDataIconStyleType = "GeoDataIconStyle";
-const char* GeoDataInnerBoundaryType = "GeoDataInnerBoundary";
-const char* GeoDataLabelStyleType = "GeoDataLabelStyle";
-const char* GeoDataLatLonAltBoxType = "GeoDataLatLonAlt";
-const char* GeoDataLatLonBoxType = "GeoDataLatLonBox";
-const char* GeoDataLatLonQuadType = "GeoDataLatLonQuad";
-const char* GeoDataLinearRingType = "GeoDataLinearRing";
-const char* GeoDataLineStringType = "GeoDataLineString";
-const char* GeoDataLineStyleType = "GeoDataLineStyle";
-const char* GeoDataLinkType = "GeoDataLink";
-const char* GeoDataLocationType = "GeoDataLocation";
-const char* GeoDataLodType = "GeoDataLod";
-const char* GeoDataLookAtType = "GeoDataLookAt";
-const char* GeoDataModelType = "GeoDataModel";
-const char* GeoDataMultiGeometryType = "GeoDataMultiGeometry";
-const char* GeoDataMultiTrackType = "GeoDataMultiTrack";
-const char* GeoDataNetworkLinkType = "GeoDataNetworkLink";
-const char* GeoDataOrientationType = "GeoDataOrientation";
-const char* GeoDataOuterBoundaryType = "GeoDataOuterBoundary";
-const char* GeoDataPhotoOverlayType = "GeoDataPhotoOverlay";
-const char* GeoDataPlacemarkType = "GeoDataPlacemark";
-const char* GeoDataPlaylistType = "GeoDataPlaylist";
-const char* GeoDataPointType = "GeoDataPoint";
-const char* GeoDataPolygonType = "GeoDataPolygon";
-const char* GeoDataPolyStyleType = "GeoDataPolyStyle";
-const char* GeoDataRegionType = "GeoDataRegion";
-const char* GeoDataResourceMapType = "GeoDataResourceMap";
-const char* GeoDataSchemaType = "GeoDataSchema";
-const char* GeoDataSchemaDataType = "GeoDataSchemaData";
-const char* GeoDataSimpleDataType = "GeoDataSimpleData";
-const char* GeoDataSimpleFieldType = "GeoDataSimpleField";
-const char* GeoDataSimpleArrayDataType = "GeoDataSimpleArrayData";
-const char* GeoDataStyleType = "GeoDataStyle";
-const char* GeoDataStyleMapType = "GeoDataStyleMap";
-const char* GeoDataSoundCueType = "GeoDataSoundCue";
-const char* GeoDataTimePrimitiveType = "GeoDataTimePrimitive";
-const char* GeoDataTimeSpanType = "GeoDataTimeSpan";
-const char* GeoDataTimeStampType = "GeoDataTimeStamp";
-const char* GeoDataTourType = "GeoDataTour";
-const char* GeoDataTourControlType = "GeoDataTourControl";
-const char* GeoDataWaitType = "GeoDataWait";
-const char* GeoDataTrackType = "GeoDataTrack";
-const char* GeoDataScaleType = "GeoDataScale";
-const char* GeoDataScreenOverlayType = "GeoDataScreenOverlay";
-const char* GeoDataBalloonStyleType = "GeoDataBalloonStyle";
-const char* GeoDataListStyleType = "GeoDataListStyle";
-const char* GeoDataItemIconType = "GeoDataItemIcon";
-const char* GeoDataImagePyramidType = "GeoDataImagePyramid";
-const char* GeoDataViewVolumeType = "GeoDataViewVolume";
-const char* GeoDataNetworkLinkControlType = "GeoDataNetworkLinkControl";
-const char* GeoDataUpdateType = "GeoDataUpdate";
+const char GeoDataAnimatedUpdateType[] = "GeoDataAnimatedUpdate";
+const char GeoDataAliasType[] = "GeoDataAlias";
+const char GeoDataCameraType[] = "GeoDataCamera";
+const char GeoDataChangeType[] = "GeoDataChange";
+const char GeoDataColorStyleType[] = "GeoDataColorStyle";
+const char GeoDataContainerType[] = "GeoDataContainer";
+const char GeoDataCreateType[] = "GeoDataCreate";
+const char GeoDataDataType[] = "GeoDataData";
+const char GeoDataDeleteType[] = "GeoDataDelete";
+const char GeoDataDocumentType[] = "GeoDataDocument";
+const char GeoDataExtendedDataType[] = "GeoDataExtendedData";
+const char GeoDataFeatureType[] = "GeoDataFeature";
+const char GeoDataFlyToType[] = "GeoDataFlyTo";
+const char GeoDataFolderType[] = "GeoDataFolder";
+const char GeoDataGeometryType[] = "GeoDataGeometry";
+const char GeoDataGroundOverlayType[] = "GeoDataGroundOverlay";
+const char GeoDataHotspotType[] = "GeoDataHotspot";
+const char GeoDataIconStyleType[] = "GeoDataIconStyle";
+const char GeoDataInnerBoundaryType[] = "GeoDataInnerBoundary";
+const char GeoDataLabelStyleType[] = "GeoDataLabelStyle";
+const char GeoDataLatLonAltBoxType[] = "GeoDataLatLonAlt";
+const char GeoDataLatLonBoxType[] = "GeoDataLatLonBox";
+const char GeoDataLatLonQuadType[] = "GeoDataLatLonQuad";
+const char GeoDataLinearRingType[] = "GeoDataLinearRing";
+const char GeoDataLineStringType[] = "GeoDataLineString";
+const char GeoDataLineStyleType[] = "GeoDataLineStyle";
+const char GeoDataLinkType[] = "GeoDataLink";
+const char GeoDataLocationType[] = "GeoDataLocation";
+const char GeoDataLodType[] = "GeoDataLod";
+const char GeoDataLookAtType[] = "GeoDataLookAt";
+const char GeoDataModelType[] = "GeoDataModel";
+const char GeoDataMultiGeometryType[] = "GeoDataMultiGeometry";
+const char GeoDataMultiTrackType[] = "GeoDataMultiTrack";
+const char GeoDataNetworkLinkType[] = "GeoDataNetworkLink";
+const char GeoDataOrientationType[] = "GeoDataOrientation";
+const char GeoDataOuterBoundaryType[] = "GeoDataOuterBoundary";
+const char GeoDataPhotoOverlayType[] = "GeoDataPhotoOverlay";
+const char GeoDataPlacemarkType[] = "GeoDataPlacemark";
+const char GeoDataPlaylistType[] = "GeoDataPlaylist";
+const char GeoDataPointType[] = "GeoDataPoint";
+const char GeoDataPolygonType[] = "GeoDataPolygon";
+const char GeoDataPolyStyleType[] = "GeoDataPolyStyle";
+const char GeoDataRegionType[] = "GeoDataRegion";
+const char GeoDataResourceMapType[] = "GeoDataResourceMap";
+const char GeoDataSchemaType[] = "GeoDataSchema";
+const char GeoDataSchemaDataType[] = "GeoDataSchemaData";
+const char GeoDataSimpleDataType[] = "GeoDataSimpleData";
+const char GeoDataSimpleFieldType[] = "GeoDataSimpleField";
+const char GeoDataSimpleArrayDataType[] = "GeoDataSimpleArrayData";
+const char GeoDataStyleType[] = "GeoDataStyle";
+const char GeoDataStyleMapType[] = "GeoDataStyleMap";
+const char GeoDataSoundCueType[] = "GeoDataSoundCue";
+const char GeoDataTimePrimitiveType[] = "GeoDataTimePrimitive";
+const char GeoDataTimeSpanType[] = "GeoDataTimeSpan";
+const char GeoDataTimeStampType[] = "GeoDataTimeStamp";
+const char GeoDataTourType[] = "GeoDataTour";
+const char GeoDataTourControlType[] = "GeoDataTourControl";
+const char GeoDataWaitType[] = "GeoDataWait";
+const char GeoDataTrackType[] = "GeoDataTrack";
+const char GeoDataScaleType[] = "GeoDataScale";
+const char GeoDataScreenOverlayType[] = "GeoDataScreenOverlay";
+const char GeoDataBalloonStyleType[] = "GeoDataBalloonStyle";
+const char GeoDataListStyleType[] = "GeoDataListStyle";
+const char GeoDataItemIconType[] = "GeoDataItemIcon";
+const char GeoDataImagePyramidType[] = "GeoDataImagePyramid";
+const char GeoDataViewVolumeType[] = "GeoDataViewVolume";
+const char GeoDataNetworkLinkControlType[] = "GeoDataNetworkLinkControl";
+const char GeoDataUpdateType[] = "GeoDataUpdate";
}
}
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/geodata/parser/GeoDataTypes.h
^
|
| @@ -35,74 +35,74 @@
* downcasting to the good object
* please keep alphabetic order to prevent mess
*/
-GEODATA_EXPORT extern const char* GeoDataAliasType;
-GEODATA_EXPORT extern const char* GeoDataAnimatedUpdateType;
-GEODATA_EXPORT extern const char* GeoDataCameraType;
-GEODATA_EXPORT extern const char* GeoDataChangeType;
-GEODATA_EXPORT extern const char* GeoDataColorStyleType;
-GEODATA_EXPORT extern const char* GeoDataContainerType;
-GEODATA_EXPORT extern const char* GeoDataCreateType;
-GEODATA_EXPORT extern const char* GeoDataDataType;
-GEODATA_EXPORT extern const char* GeoDataDeleteType;
-GEODATA_EXPORT extern const char* GeoDataDocumentType;
-GEODATA_EXPORT extern const char* GeoDataExtendedDataType;
-GEODATA_EXPORT extern const char* GeoDataFeatureType;
-GEODATA_EXPORT extern const char* GeoDataFlyToType;
-GEODATA_EXPORT extern const char* GeoDataFolderType;
-GEODATA_EXPORT extern const char* GeoDataGeometryType;
-GEODATA_EXPORT extern const char* GeoDataGroundOverlayType;
-GEODATA_EXPORT extern const char* GeoDataHotspotType;
-GEODATA_EXPORT extern const char* GeoDataIconStyleType;
-GEODATA_EXPORT extern const char* GeoDataInnerBoundaryType;
-GEODATA_EXPORT extern const char* GeoDataLabelStyleType;
-GEODATA_EXPORT extern const char* GeoDataLatLonAltBoxType;
-GEODATA_EXPORT extern const char* GeoDataLatLonBoxType;
-GEODATA_EXPORT extern const char* GeoDataLatLonQuadType;
-GEODATA_EXPORT extern const char* GeoDataLinearRingType;
-GEODATA_EXPORT extern const char* GeoDataLineStringType;
-GEODATA_EXPORT extern const char* GeoDataLineStyleType;
-GEODATA_EXPORT extern const char* GeoDataLinkType;
-GEODATA_EXPORT extern const char* GeoDataLocationType;
-GEODATA_EXPORT extern const char* GeoDataLodType;
-GEODATA_EXPORT extern const char* GeoDataLookAtType;
-GEODATA_EXPORT extern const char* GeoDataModelType;
-GEODATA_EXPORT extern const char* GeoDataMultiGeometryType;
-GEODATA_EXPORT extern const char* GeoDataMultiTrackType;
-GEODATA_EXPORT extern const char* GeoDataNetworkLinkType;
-GEODATA_EXPORT extern const char* GeoDataOrientationType;
-GEODATA_EXPORT extern const char* GeoDataOuterBoundaryType;
-GEODATA_EXPORT extern const char* GeoDataPhotoOverlayType;
-GEODATA_EXPORT extern const char* GeoDataPlacemarkType;
-GEODATA_EXPORT extern const char* GeoDataPlaylistType;
-GEODATA_EXPORT extern const char* GeoDataPointType;
-GEODATA_EXPORT extern const char* GeoDataPolygonType;
-GEODATA_EXPORT extern const char* GeoDataPolyStyleType;
-GEODATA_EXPORT extern const char* GeoDataRegionType;
-GEODATA_EXPORT extern const char* GeoDataResourceMapType;
-GEODATA_EXPORT extern const char* GeoDataSchemaType;
-GEODATA_EXPORT extern const char* GeoDataSchemaDataType;
-GEODATA_EXPORT extern const char* GeoDataSimpleDataType;
-GEODATA_EXPORT extern const char* GeoDataSimpleFieldType;
-GEODATA_EXPORT extern const char* GeoDataSimpleArrayDataType;
-GEODATA_EXPORT extern const char* GeoDataStyleType;
-GEODATA_EXPORT extern const char* GeoDataStyleMapType;
-GEODATA_EXPORT extern const char* GeoDataSoundCueType;
-GEODATA_EXPORT extern const char* GeoDataTimePrimitiveType;
-GEODATA_EXPORT extern const char* GeoDataTimeStampType;
-GEODATA_EXPORT extern const char* GeoDataTimeSpanType;
-GEODATA_EXPORT extern const char* GeoDataTourType;
-GEODATA_EXPORT extern const char* GeoDataTourControlType;
-GEODATA_EXPORT extern const char* GeoDataWaitType;
-GEODATA_EXPORT extern const char* GeoDataTrackType;
-GEODATA_EXPORT extern const char* GeoDataScaleType;
-GEODATA_EXPORT extern const char* GeoDataScreenOverlayType;
-GEODATA_EXPORT extern const char* GeoDataBalloonStyleType;
-GEODATA_EXPORT extern const char* GeoDataListStyleType;
-GEODATA_EXPORT extern const char* GeoDataItemIconType;
-GEODATA_EXPORT extern const char* GeoDataImagePyramidType;
-GEODATA_EXPORT extern const char* GeoDataViewVolumeType;
-GEODATA_EXPORT extern const char* GeoDataNetworkLinkControlType;
-GEODATA_EXPORT extern const char* GeoDataUpdateType;
+GEODATA_EXPORT extern const char GeoDataAliasType[];
+GEODATA_EXPORT extern const char GeoDataAnimatedUpdateType[];
+GEODATA_EXPORT extern const char GeoDataCameraType[];
+GEODATA_EXPORT extern const char GeoDataChangeType[];
+GEODATA_EXPORT extern const char GeoDataColorStyleType[];
+GEODATA_EXPORT extern const char GeoDataContainerType[];
+GEODATA_EXPORT extern const char GeoDataCreateType[];
+GEODATA_EXPORT extern const char GeoDataDataType[];
+GEODATA_EXPORT extern const char GeoDataDeleteType[];
+GEODATA_EXPORT extern const char GeoDataDocumentType[];
+GEODATA_EXPORT extern const char GeoDataExtendedDataType[];
+GEODATA_EXPORT extern const char GeoDataFeatureType[];
+GEODATA_EXPORT extern const char GeoDataFlyToType[];
+GEODATA_EXPORT extern const char GeoDataFolderType[];
+GEODATA_EXPORT extern const char GeoDataGeometryType[];
+GEODATA_EXPORT extern const char GeoDataGroundOverlayType[];
+GEODATA_EXPORT extern const char GeoDataHotspotType[];
+GEODATA_EXPORT extern const char GeoDataIconStyleType[];
+GEODATA_EXPORT extern const char GeoDataInnerBoundaryType[];
+GEODATA_EXPORT extern const char GeoDataLabelStyleType[];
+GEODATA_EXPORT extern const char GeoDataLatLonAltBoxType[];
+GEODATA_EXPORT extern const char GeoDataLatLonBoxType[];
+GEODATA_EXPORT extern const char GeoDataLatLonQuadType[];
+GEODATA_EXPORT extern const char GeoDataLinearRingType[];
+GEODATA_EXPORT extern const char GeoDataLineStringType[];
+GEODATA_EXPORT extern const char GeoDataLineStyleType[];
+GEODATA_EXPORT extern const char GeoDataLinkType[];
+GEODATA_EXPORT extern const char GeoDataLocationType[];
+GEODATA_EXPORT extern const char GeoDataLodType[];
+GEODATA_EXPORT extern const char GeoDataLookAtType[];
+GEODATA_EXPORT extern const char GeoDataModelType[];
+GEODATA_EXPORT extern const char GeoDataMultiGeometryType[];
+GEODATA_EXPORT extern const char GeoDataMultiTrackType[];
+GEODATA_EXPORT extern const char GeoDataNetworkLinkType[];
+GEODATA_EXPORT extern const char GeoDataOrientationType[];
+GEODATA_EXPORT extern const char GeoDataOuterBoundaryType[];
+GEODATA_EXPORT extern const char GeoDataPhotoOverlayType[];
+GEODATA_EXPORT extern const char GeoDataPlacemarkType[];
+GEODATA_EXPORT extern const char GeoDataPlaylistType[];
+GEODATA_EXPORT extern const char GeoDataPointType[];
+GEODATA_EXPORT extern const char GeoDataPolygonType[];
+GEODATA_EXPORT extern const char GeoDataPolyStyleType[];
+GEODATA_EXPORT extern const char GeoDataRegionType[];
+GEODATA_EXPORT extern const char GeoDataResourceMapType[];
+GEODATA_EXPORT extern const char GeoDataSchemaType[];
+GEODATA_EXPORT extern const char GeoDataSchemaDataType[];
+GEODATA_EXPORT extern const char GeoDataSimpleDataType[];
+GEODATA_EXPORT extern const char GeoDataSimpleFieldType[];
+GEODATA_EXPORT extern const char GeoDataSimpleArrayDataType[];
+GEODATA_EXPORT extern const char GeoDataStyleType[];
+GEODATA_EXPORT extern const char GeoDataStyleMapType[];
+GEODATA_EXPORT extern const char GeoDataSoundCueType[];
+GEODATA_EXPORT extern const char GeoDataTimePrimitiveType[];
+GEODATA_EXPORT extern const char GeoDataTimeStampType[];
+GEODATA_EXPORT extern const char GeoDataTimeSpanType[];
+GEODATA_EXPORT extern const char GeoDataTourType[];
+GEODATA_EXPORT extern const char GeoDataTourControlType[];
+GEODATA_EXPORT extern const char GeoDataWaitType[];
+GEODATA_EXPORT extern const char GeoDataTrackType[];
+GEODATA_EXPORT extern const char GeoDataScaleType[];
+GEODATA_EXPORT extern const char GeoDataScreenOverlayType[];
+GEODATA_EXPORT extern const char GeoDataBalloonStyleType[];
+GEODATA_EXPORT extern const char GeoDataListStyleType[];
+GEODATA_EXPORT extern const char GeoDataItemIconType[];
+GEODATA_EXPORT extern const char GeoDataImagePyramidType[];
+GEODATA_EXPORT extern const char GeoDataViewVolumeType[];
+GEODATA_EXPORT extern const char GeoDataNetworkLinkControlType[];
+GEODATA_EXPORT extern const char GeoDataUpdateType[];
}
}
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/geodata/parser/GeoSceneTypes.cpp
^
|
| @@ -15,26 +15,26 @@
namespace GeoSceneTypes
{
-const char* GeoSceneDocumentType = "GeoSceneDocument";
-const char* GeoSceneFilterType = "GeoSceneFilter";
-const char* GeoSceneGeodataType = "GeoSceneGeodata";
-const char* GeoSceneGroupType = "GeoSceneGroup";
-const char* GeoSceneHeadType = "GeoSceneHead";
-const char* GeoSceneIconType = "GeoSceneIcon";
-const char* GeoSceneItemType = "GeoSceneItem";
-const char* GeoSceneLayerType = "GeoSceneLayer";
-const char* GeoSceneLegendType = "GeoSceneLegend";
-const char* GeoSceneMapType = "GoeSceneMap";
-const char* GeoScenePaletteType = "GeoScenePalette";
-const char* GeoScenePropertyType = "GeoSceneProperty";
-const char* GeoSceneSectionType = "GeoSceneSection";
-const char* GeoSceneSettingsType = "GeoSceneSettings";
-const char* GeoSceneTextureTileType = "GeoSceneTextureTileDataset";
-const char* GeoSceneTileDatasetType = "GeoSceneTileDataset";
-const char* GeoSceneVectorType = "GeoSceneVector";
-const char* GeoSceneVectorTileType = "GeoSceneVectorTileDataset";
-const char* GeoSceneXmlDataSourceType = "GeoSceneXmlDataSource";
-const char* GeoSceneZoomType = "GeoSceneZoom";
+const char GeoSceneDocumentType[] = "GeoSceneDocument";
+const char GeoSceneFilterType[] = "GeoSceneFilter";
+const char GeoSceneGeodataType[] = "GeoSceneGeodata";
+const char GeoSceneGroupType[] = "GeoSceneGroup";
+const char GeoSceneHeadType[] = "GeoSceneHead";
+const char GeoSceneIconType[] = "GeoSceneIcon";
+const char GeoSceneItemType[] = "GeoSceneItem";
+const char GeoSceneLayerType[] = "GeoSceneLayer";
+const char GeoSceneLegendType[] = "GeoSceneLegend";
+const char GeoSceneMapType[] = "GoeSceneMap";
+const char GeoScenePaletteType[] = "GeoScenePalette";
+const char GeoScenePropertyType[] = "GeoSceneProperty";
+const char GeoSceneSectionType[] = "GeoSceneSection";
+const char GeoSceneSettingsType[] = "GeoSceneSettings";
+const char GeoSceneTextureTileType[] = "GeoSceneTextureTileDataset";
+const char GeoSceneTileDatasetType[] = "GeoSceneTileDataset";
+const char GeoSceneVectorType[] = "GeoSceneVector";
+const char GeoSceneVectorTileType[] = "GeoSceneVectorTileDataset";
+const char GeoSceneXmlDataSourceType[] = "GeoSceneXmlDataSource";
+const char GeoSceneZoomType[] = "GeoSceneZoom";
}
}
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/geodata/parser/GeoSceneTypes.h
^
|
| @@ -19,26 +19,26 @@
/**
* Please keep alphabetic order to prevent mess
*/
-extern const char* GeoSceneDocumentType;
-extern const char* GeoSceneFilterType;
-extern const char* GeoSceneGeodataType;
-extern const char* GeoSceneGroupType;
-extern const char* GeoSceneHeadType;
-extern const char* GeoSceneIconType;
-extern const char* GeoSceneItemType;
-extern const char* GeoSceneLayerType;
-extern const char* GeoSceneLegendType;
-extern const char* GeoSceneMapType;
-extern const char* GeoScenePaletteType;
-extern const char* GeoScenePropertyType;
-extern const char* GeoSceneSectionType;
-extern const char* GeoSceneSettingsType;
-extern const char* GeoSceneTextureTileType;
-extern const char* GeoSceneTileDatasetType;
-extern const char* GeoSceneVectorType;
-extern const char* GeoSceneVectorTileType;
-extern const char* GeoSceneXmlDataSourceType;
-extern const char* GeoSceneZoomType;
+extern const char GeoSceneDocumentType[];
+extern const char GeoSceneFilterType[];
+extern const char GeoSceneGeodataType[];
+extern const char GeoSceneGroupType[];
+extern const char GeoSceneHeadType[];
+extern const char GeoSceneIconType[];
+extern const char GeoSceneItemType[];
+extern const char GeoSceneLayerType[];
+extern const char GeoSceneLegendType[];
+extern const char GeoSceneMapType[];
+extern const char GeoScenePaletteType[];
+extern const char GeoScenePropertyType[];
+extern const char GeoSceneSectionType[];
+extern const char GeoSceneSettingsType[];
+extern const char GeoSceneTextureTileType[];
+extern const char GeoSceneTileDatasetType[];
+extern const char GeoSceneVectorType[];
+extern const char GeoSceneVectorTileType[];
+extern const char GeoSceneXmlDataSourceType[];
+extern const char GeoSceneZoomType[];
}
}
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/geodata/scene/GeoSceneTextureTileDataset.h
^
|
| @@ -12,8 +12,8 @@
Copyright 2012 Ander Pijoan <ander.pijoan@deusto.es>
*/
-#ifndef MARBLE_GEOSCENETEXTURETILE_H
-#define MARBLE_GEOSCENETEXTURETILE_H
+#ifndef MARBLE_GEOSCENETEXTURETILEDATASET_H
+#define MARBLE_GEOSCENETEXTURETILEDATASET_H
#include "GeoSceneTileDataset.h"
#include "GeoDataLatLonBox.h"
@@ -42,4 +42,4 @@
}
-#endif // MARBLE_GEOSCENETEXTURETILE_H
+#endif // MARBLE_GEOSCENETEXTURETILEDATASET_H
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/geodata/scene/GeoSceneTileDataset.h
^
|
| @@ -12,8 +12,8 @@
Copyright 2012 Ander Pijoan <ander.pijoan@deusto.es>
*/
-#ifndef MARBLE_GEOSCENETILED_H
-#define MARBLE_GEOSCENETILED_H
+#ifndef MARBLE_GEOSCENETILEDATASET_H
+#define MARBLE_GEOSCENETILEDATASET_H
#include <QList>
#include <QStringList>
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/geodata/scene/GeoSceneVectorTileDataset.h
^
|
| @@ -12,8 +12,8 @@
Copyright 2012 Ander Pijoan <ander.pijoan@deusto.es>
*/
-#ifndef MARBLE_GEOSCENEVECTORTILE_H
-#define MARBLE_GEOSCENEVECTORTILE_H
+#ifndef MARBLE_GEOSCENEVECTORTILEDATASET_H
+#define MARBLE_GEOSCENEVECTORTILEDATASET_H
#include "GeoSceneTileDataset.h"
@@ -31,4 +31,4 @@
}
-#endif // MARBLE_GEOSCENEVECTORTILE_H
+#endif // MARBLE_GEOSCENEVECTORTILEDATASET_H
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/geodata/writers/kml/KmlObjectTagWriter.h
^
|
| @@ -8,8 +8,8 @@
// Copyright 2014 Dennis Nienhüser <nienhueser@kde.org>
//
-#ifndef MARBLE_KMLOBJECTTAGHANDLER_H
-#define MARBLE_KMLOBJECTTAGHANDLER_H
+#ifndef MARBLE_KMLOBJECTTAGWRITER_H
+#define MARBLE_KMLOBJECTTAGWRITER_H
#include <GeoWriter.h>
#include <GeoDataObject.h>
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/geodata/writers/kml/KmlTimeSpanWriter.h
^
|
| @@ -8,8 +8,8 @@
// Copyright 2012 Shou Ya <shouyalovelyx@gmail.com>
//
-#ifndef MARBLE_KMLTIMESPANTAGWRITER_H
-#define MARBLE_KMLTIMESPANTAGWRITER_H
+#ifndef MARBLE_KMLTIMESPANWRITER_H
+#define MARBLE_KMLTIMESPANWRITER_H
#include "GeoTagWriter.h"
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/geodata/writers/kml/KmlTrackWriter.h
^
|
| @@ -8,8 +8,8 @@
// Copyright 2011 Guillaume Martres <smarter@ubuntu.com>
//
-#ifndef MARBLE_KMLGXTRACKWRITER_H
-#define MARBLE_KMLGXTRACKWRITER_H
+#ifndef MARBLE_KMLTRACKWRITER_H
+#define MARBLE_KMLTRACKWRITER_H
#include "GeoTagWriter.h"
@@ -24,4 +24,4 @@
}
-#endif // MARBLE_KMLGXTRACKWRITER_H
+#endif // MARBLE_KMLTRACKWRITER_H
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/kbihash_p.h
^
|
| @@ -330,11 +330,11 @@
return _leftToRight.operator[](t);
}
- bool operator==(const KBiAssociativeContainer<LeftContainer, RightContainer> &other) {
+ bool operator==(const KBiAssociativeContainer<LeftContainer, RightContainer> &other) const {
return _leftToRight.operator == (other._leftToRight);
}
- bool operator!=(const KBiAssociativeContainer<LeftContainer, RightContainer> &other) {
+ bool operator!=(const KBiAssociativeContainer<LeftContainer, RightContainer> &other) const {
return _leftToRight.operator != (other._leftToRight);
}
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/kineticmodel.h
^
|
| @@ -52,7 +52,7 @@
int updateInterval() const;
bool hasVelocity() const;
-public slots:
+public Q_SLOTS:
void setDuration(int ms);
void setPosition(QPointF position);
void setPosition(qreal posX, qreal posY);
@@ -62,11 +62,11 @@
void stop();
void start();
-signals:
+Q_SIGNALS:
void positionChanged( qreal lon, qreal lat );
void finished();
-private slots:
+private Q_SLOTS:
void update();
private:
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/osm/OsmPlacemarkData.cpp
^
|
| @@ -22,7 +22,7 @@
{
const QString OsmPlacemarkData::osmDataKey = "osm_data";
-const char* OsmPlacemarkData::osmPlacemarkDataType = "OsmPlacemarkDataType";
+const char OsmPlacemarkData::osmPlacemarkDataType[] = "OsmPlacemarkDataType";
OsmPlacemarkData::OsmPlacemarkData():
m_id( 0 )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/osm/OsmPlacemarkData.h
^
|
| @@ -113,7 +113,7 @@
/**
- * @brief this function returns the osmData assosciated with a nd
+ * @brief this function returns the osmData associated with a nd
*/
OsmPlacemarkData &nodeReference( const GeoDataCoordinates& coordinates );
OsmPlacemarkData nodeReference( const GeoDataCoordinates& coordinates ) const;
@@ -196,7 +196,7 @@
/**
* @brief osmPlacemarkDataType used for identifying OsmPlacemarkData objects as GeoNodes
*/
- static const char* osmPlacemarkDataType;
+ static const char osmPlacemarkDataType[];
private:
qint64 m_id;
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/osm/OsmRelationEditorDialog.h
^
|
| @@ -34,10 +34,10 @@
Q_OBJECT
public:
- OsmRelationEditorDialog( OsmPlacemarkData *relationData, QWidget *parent = 0 );
+ explicit OsmRelationEditorDialog( OsmPlacemarkData *relationData, QWidget *parent = 0 );
~OsmRelationEditorDialog();
-private slots:
+private Q_SLOTS:
void checkFields();
private:
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/lib/marble/routing/RoutingProfileSettingsDialog.h
^
|
| @@ -35,7 +35,7 @@
void editProfile( int profileIndex );
-private slots:
+private Q_SLOTS:
void updateConfigWidget();
void openConfigDialog();
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/plasmoid/worldclock.h
^
|
| @@ -49,16 +49,16 @@
void paintInterface(QPainter *painter,
const QStyleOptionGraphicsItem *option,
const QRect& contentsRect);
- public slots:
+ public Q_SLOTS:
void dataUpdated(const QString &source,
const Plasma::DataEngine::Data &data);
void createConfigurationInterface(KConfigDialog *parent);
void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
void hoverMoveEvent(QGraphicsSceneHoverEvent *event);
- protected slots:
+ protected Q_SLOTS:
void configAccepted();
- private slots:
+ private Q_SLOTS:
//connected to geometryChanged()
void resizeMap(bool changeAspect = false);
void slotRepaint();
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/plugins/positionprovider/geoclue/GeoCluePositionProviderPlugin.h
^
|
| @@ -56,7 +56,7 @@
GeoDataCoordinates m_position;
GeoDataAccuracy m_accuracy;
- private slots:
+ private Q_SLOTS:
void updatePosition(GeoCute::Position newPosition);
void updateStatus(GeoCute::Status newStatus);
};
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/plugins/positionprovider/geoclue/GeoCute/PositionProvider.h
^
|
| @@ -35,7 +35,7 @@
static PositionProvider* detailed();
- signals:
+ Q_SIGNALS:
void positionChanged(GeoCute::Position position);
private:
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/plugins/positionprovider/geoclue/GeoCute/Provider.h
^
|
| @@ -31,7 +31,7 @@
virtual ~Provider();
Status status() const;
- signals:
+ Q_SIGNALS:
void statusChanged(GeoCute::Status status);
private:
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/plugins/positionprovider/geoclue/GeoCute/VelocityProvider.h
^
|
| @@ -31,7 +31,7 @@
~VelocityProvider();
Velocity velocity();
- signals:
+ Q_SIGNALS:
void velocityChanged(GeoCute::Velocity info);
private:
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/plugins/positionprovider/gpsd/GpsdConnection.h
^
|
| @@ -34,7 +34,7 @@
QString error() const;
- signals:
+ Q_SIGNALS:
void gpsdInfo( gps_data_t data );
void statusChanged( PositionProviderStatus status ) const;
@@ -48,7 +48,7 @@
QString m_error;
const char* m_oldLocale;
- private slots:
+ private Q_SLOTS:
void update();
};
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.h
^
|
| @@ -62,7 +62,7 @@
qreal m_track;
QDateTime m_timestamp;
- private slots:
+ private Q_SLOTS:
void update(gps_data_t data);
};
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/plugins/positionprovider/gpsd/GpsdThread.h
^
|
| @@ -43,7 +43,7 @@
private:
GpsdConnection* m_connection;
- signals:
+ Q_SIGNALS:
void gpsdInfo( gps_data_t data );
};
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/plugins/render/annotate/AnnotatePlugin.h
^
|
| @@ -89,13 +89,13 @@
bool render( GeoPainter *painter, ViewportParams *viewport,
const QString &renderPos, GeoSceneLayer *layer = 0 );
-signals:
+Q_SIGNALS:
void placemarkMoved();
void nodeAdded( const GeoDataCoordinates &coordinates );
void itemMoved( GeoDataPlacemark *placemark );
void mouseMoveGeoPosition( const QString& );
-private slots:
+private Q_SLOTS:
void enableModel( bool enabled );
void askToRemoveFocusItem();
void removeFocusItem();
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/plugins/render/annotate/EditGroundOverlayDialog.h
^
|
| @@ -27,12 +27,12 @@
EditGroundOverlayDialog( GeoDataGroundOverlay *overlay, TextureLayer *textureLayer, QWidget *parent = 0 );
~EditGroundOverlayDialog();
-private slots:
+private Q_SLOTS:
void updateGroundOverlay();
void setGroundOverlayUpdated();
void checkFields();
-signals:
+Q_SIGNALS:
void groundOverlayUpdated( GeoDataGroundOverlay* );
private:
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/plugins/render/annotate/EditPolygonDialog.h
^
|
| @@ -35,13 +35,13 @@
QWidget *parent = 0 );
~EditPolygonDialog();
-public slots:
+public Q_SLOTS:
void handleAddingNode( const GeoDataCoordinates &node );
void handleItemMoving( GeoDataPlacemark *item );
void handleChangingStyle();
void updatePolygon();
-signals:
+Q_SIGNALS:
void polygonUpdated( GeoDataFeature *feature );
/**
@@ -51,7 +51,7 @@
*/
void relationCreated( const OsmPlacemarkData &relation );
-private slots:
+private Q_SLOTS:
void updateLinesDialog( const QColor &color );
void updatePolyDialog( const QColor &color );
void checkFields();
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/plugins/render/annotate/EditPolylineDialog.h
^
|
| @@ -30,12 +30,12 @@
QWidget *parent = 0 );
~EditPolylineDialog();
-public slots:
+public Q_SLOTS:
void handleAddingNode( const GeoDataCoordinates &node );
void handleItemMoving( GeoDataPlacemark *item );
void handleChangingStyle();
-signals:
+Q_SIGNALS:
void polylineUpdated( GeoDataFeature *feature );
/**
@@ -45,7 +45,7 @@
*/
void relationCreated( OsmPlacemarkData relation );
-private slots:
+private Q_SLOTS:
void updatePolyline();
void updateLinesDialog( const QColor &color );
void restoreInitial( int result );
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/plugins/render/annotate/MergingPolygonNodesAnimation.h
^
|
| @@ -35,14 +35,14 @@
OuterBoundary
};
-public slots:
+public Q_SLOTS:
void startAnimation();
-signals:
+Q_SIGNALS:
void nodesMoved();
void animationFinished();
-private slots:
+private Q_SLOTS:
void updateNodes();
private:
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/plugins/render/annotate/MergingPolylineNodesAnimation.h
^
|
| @@ -31,14 +31,14 @@
explicit MergingPolylineNodesAnimation( PolylineAnnotation *polyline );
~MergingPolylineNodesAnimation();
-public slots:
+public Q_SLOTS:
void startAnimation();
-signals:
+Q_SIGNALS:
void nodesMoved();
void animationFinished();
-private slots:
+private Q_SLOTS:
void updateNodes();
private:
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/plugins/render/annotate/NodeItemDelegate.h
^
|
| @@ -46,11 +46,11 @@
mutable QModelIndex m_indexBeingEdited;
QTreeView* m_view;
-private slots:
+private Q_SLOTS:
void previewNodeMove( qreal value);
void unsetCurrentEditor( QWidget* widget );
-signals:
+Q_SIGNALS:
void modelChanged( GeoDataPlacemark* placemark ) const;
void geometryChanged() const;
};
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/plugins/render/annotate/NodeModel.h
^
|
| @@ -22,14 +22,14 @@
{
Q_OBJECT
public:
- NodeModel( QObject *parent = 0 );
+ explicit NodeModel( QObject *parent = 0 );
int rowCount( const QModelIndex &parent ) const;
int columnCount( const QModelIndex &parent ) const;
QVariant data( const QModelIndex &index, int role ) const;
QVariant headerData( int section, Qt::Orientation orientation, int role ) const;
void clear();
Qt::ItemFlags flags(const QModelIndex & index) const ;
-public slots:
+public Q_SLOTS:
int addNode( const GeoDataCoordinates &node );
private:
QList<GeoDataCoordinates> m_nodes;
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/plugins/render/annotate/PolylineNode.h
^
|
| @@ -29,7 +29,7 @@
};
Q_DECLARE_FLAGS(PolyNodeFlags, PolyNodeFlag)
- PolylineNode( QRegion region = QRegion() );
+ explicit PolylineNode( QRegion region = QRegion() );
~PolylineNode();
bool isSelected() const;
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/plugins/render/annotate/SceneGraphicsTypes.h
^
|
| @@ -8,8 +8,8 @@
// Copyright 2014 Calin Cruceru <crucerucalincristian@gmail.com
//
-#ifndef SCENEGRAPHICTYPES_H
-#define SCENEGRAPHICTYPES_H
+#ifndef MARBLE_SCENEGRAPHICSTYPES_H
+#define MARBLE_SCENEGRAPHICSTYPES_H
namespace Marble
{
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/plugins/render/aprs/AprsPlugin.cpp
^
|
| @@ -33,7 +33,7 @@
#include <aprsconfig.h>
-#ifdef HAVE_QEXTSERIALPORT
+#ifdef HAVE_QTSERIALPORT
#include "AprsTTY.h"
#endif
@@ -172,7 +172,7 @@
if ( m_tcpipGatherer )
m_tcpipGatherer->shutDown();
-#ifdef HAVE_QEXTSERIALPORT
+#ifdef HAVE_QTSERIALPORT
if ( m_ttyGatherer )
m_ttyGatherer->shutDown();
#endif
@@ -185,7 +185,7 @@
if ( m_tcpipGatherer->wait(2000) )
delete m_tcpipGatherer;
-#ifdef HAVE_QEXTSERIALPORT
+#ifdef HAVE_QTSERIALPORT
if ( m_ttyGatherer )
if ( m_ttyGatherer->wait(2000) )
delete m_ttyGatherer;
@@ -215,7 +215,7 @@
mDebug() << "started TCPIP gatherer";
}
-#ifdef HAVE_QEXTSERIALPORT
+#ifdef HAVE_QTSERIALPORT
if ( m_useTty ) {
m_ttyGatherer =
new AprsGatherer( new AprsTTY( m_tncTty ),
@@ -278,7 +278,7 @@
return;
}
-#ifndef HAVE_QEXTSERIALPORT
+#ifndef HAVE_QTSERIALPORT
ui_configWidget->tabWidget->setTabEnabled( ui_configWidget->tabWidget->indexOf(
ui_configWidget->Device ), false );
#endif
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/plugins/render/aprs/AprsTTY.cpp
^
|
| @@ -10,7 +10,7 @@
#include "AprsTTY.h"
-#include <qextserialport.h>
+#include <QSerialPort>
#include "MarbleDebug.h"
@@ -18,7 +18,7 @@
using namespace Marble;
-AprsTTY::AprsTTY( QString ttyName )
+AprsTTY::AprsTTY( const QString &ttyName )
: m_ttyName( ttyName ),
m_numErrors( 0 )
{
@@ -43,14 +43,13 @@
QIODevice *
AprsTTY::openSocket()
{
- QextSerialPort *m_port =
- new QextSerialPort( m_ttyName, QextSerialPort::Polling );
- m_port->setBaudRate( BAUD9600 );
- m_port->setParity( PAR_NONE );
- m_port->setDataBits( DATA_8 );
- m_port->setStopBits( STOP_1 );
- m_port->setTimeout( 60000 ); // ms
- m_port->open( QIODevice::ReadWrite );
+ QSerialPort *m_port = new QSerialPort( m_ttyName );
+ m_port->setBaudRate( QSerialPort::Baud9600, QSerialPort::Input );
+ m_port->setParity( QSerialPort::NoParity );
+ m_port->setDataBits( QSerialPort::Data8 );
+ m_port->setStopBits( QSerialPort::OneStop );
+// m_port->setTimeout( 60000 ); // ms
+ m_port->open( QIODevice::ReadOnly );
mDebug() << "opened TTY socket";
if ( m_port->isOpen() ) {
mDebug() << "connected to " << m_ttyName.toLocal8Bit().data();
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/plugins/render/aprs/AprsTTY.h
^
|
| @@ -18,7 +18,7 @@
class AprsTTY : public AprsSource
{
public:
- explicit AprsTTY( QString ttyName );
+ explicit AprsTTY( const QString &ttyName );
~AprsTTY();
QString sourceName() const;
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/plugins/render/aprs/CMakeLists.txt
^
|
| @@ -1,20 +1,19 @@
PROJECT(AprsPlugin)
-macro_optional_find_package(QextSerialPort)
-marble_set_package_properties( QextSerialPort PROPERTIES DESCRIPTION "access to serial ports" )
-marble_set_package_properties( QextSerialPort PROPERTIES URL "http://code.google.com/p/qextserialport/" )
-marble_set_package_properties( QextSerialPort PROPERTIES TYPE OPTIONAL PURPOSE "Reading from serial port in APRS plugin" )
+macro_optional_find_package(Qt5SerialPort)
+marble_set_package_properties( Qt5SerialPort PROPERTIES DESCRIPTION "Provides access to hardware and virtual serial ports." )
+marble_set_package_properties( Qt5SerialPort PROPERTIES TYPE OPTIONAL PURPOSE "Reading from serial port in APRS plugin" )
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
)
-if (QEXTSERIALPORT_FOUND)
- include_directories (${QEXTSERIALPORT_INCLUDE_DIR})
+if (Qt5SerialPort_FOUND)
+ include_directories (${Qt5SerialPort_INCLUDE_DIR})
set (serial_src AprsTTY.cpp)
- list (APPEND AprsPlugin_LIBS ${QEXTSERIALPORT_LIBRARIES})
- set (HAVE_QEXTSERIALPORT TRUE)
+ list (APPEND AprsPlugin_LIBS ${Qt5SerialPort_LIBRARIES})
+ set (HAVE_QTSERIALPORT TRUE)
endif ()
set( aprs_SRCS AprsPlugin.cpp
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/plugins/render/aprs/aprsconfig.h.in
^
|
| @@ -1,2 +1,2 @@
-/* Defined when QextSerialPort is available */
-#cmakedefine HAVE_QEXTSERIALPORT 1
+/* Defined when QtSerialPort is available */
+#cmakedefine HAVE_QTSERIALPORT 1
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/plugins/render/atmosphere/AtmospherePlugin.h
^
|
| @@ -62,7 +62,7 @@
bool render( GeoPainter *painter, ViewportParams *viewport, const QString& renderPos, GeoSceneLayer * layer = 0 );
void repaintPixmap(const ViewportParams *viewParams);
-public slots:
+public Q_SLOTS:
void updateTheme();
private:
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/plugins/render/earthquake/EarthquakePlugin.h
^
|
| @@ -69,7 +69,7 @@
*/
virtual void setSettings( const QHash<QString,QVariant> &settings );
-public slots:
+public Q_SLOTS:
void readSettings();
void writeSettings();
void updateModel();
@@ -85,7 +85,7 @@
int m_numResults;
int m_maximumNumberOfItems;
-private slots:
+private Q_SLOTS:
void validateDateRange();
};
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/plugins/render/elevationprofilefloatitem/ElevationProfileDataSource.h
^
|
| @@ -37,7 +37,7 @@
Q_OBJECT
public:
- ElevationProfileDataSource( QObject *parent = 0 );
+ explicit ElevationProfileDataSource( QObject *parent = 0 );
/**
* @brief isDataAvailable
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/plugins/render/foursquare/FoursquareItem.h
^
|
| @@ -92,7 +92,7 @@
static QFont s_font;
-signals:
+Q_SIGNALS:
void nameChanged();
void categoryChanged();
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/plugins/render/gpsinfo/GpsInfo.h
^
|
| @@ -70,7 +70,7 @@
void forceRepaint();
- private slots:
+ private Q_SLOTS:
void updateLocation( GeoDataCoordinates coordinates, qreal speed);
private:
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/plugins/render/license/License.h
^
|
| @@ -52,7 +52,7 @@
void initialize ();
bool isInitialized () const;
-private slots:
+private Q_SLOTS:
void updateLicenseText();
void toggleLicenseSize();
void showAboutDialog();
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/plugins/render/measure/MeasureConfigDialog.h
^
|
| @@ -44,10 +44,10 @@
void setShowCircularArea(bool);
void setPaintMode(MeasureToolPlugin::PaintMode);
-private slots:
+private Q_SLOTS:
void updateTabs();
-signals:
+Q_SIGNALS:
void applied();
private:
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/plugins/render/navigation/ArrowDiscWidget.h
^
|
| @@ -40,7 +40,7 @@
void leaveEvent( QEvent *event );
void repaint();
-private slots:
+private Q_SLOTS:
void startPressRepeat();
void repeatPress();
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/plugins/render/opencaching/OpenCachingItem.h
^
|
| @@ -53,7 +53,7 @@
bool operator<( const AbstractDataPluginItem *other ) const;
-public slots:
+public Q_SLOTS:
void showInfoDialog();
private:
@@ -72,7 +72,7 @@
static QFont s_font;
static QPixmap s_icon;
-private slots:
+private Q_SLOTS:
void updateDescriptionLanguage( QString language );
void nextLogEntry(); ///< Display next log entry.
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/plugins/render/opencaching/OpenCachingPlugin.h
^
|
| @@ -66,7 +66,7 @@
*/
virtual void setSettings( const QHash<QString,QVariant> &settings );
-public slots:
+public Q_SLOTS:
void readSettings();
void writeSettings();
void updateSettings();
@@ -77,7 +77,7 @@
QDialog *m_configDialog;
QHash<QString,QVariant> m_settings;
-private slots:
+private Q_SLOTS:
void validateDateRange();
void validateDifficultyRange();
};
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/plugins/render/opencachingcom/OpenCachingComItem.h
^
|
| @@ -48,10 +48,10 @@
void addDownloadedFile( const QString &url, const QString &type );
-public slots:
+public Q_SLOTS:
void showInfoDialog();
-private slots:
+private Q_SLOTS:
void dialogCloseClicked();
void openWww();
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/plugins/render/opendesktop/OpenDesktopItem.h
^
|
| @@ -64,7 +64,7 @@
void setMarbleWidget(MarbleWidget *widget);
- public slots:
+ public Q_SLOTS:
void openBrowser();
private:
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/plugins/render/overviewmap/OverviewMap.h
^
|
| @@ -86,7 +86,7 @@
*/
virtual void setSettings( const QHash<QString,QVariant> &settings );
- public slots:
+ public Q_SLOTS:
void readSettings();
void writeSettings();
void updateSettings();
@@ -119,7 +119,7 @@
qreal m_centerLon;
bool m_mapChanged;
- private slots:
+ private Q_SLOTS:
void chooseCustomMap();
void synchronizeSpinboxes();
void showCurrentPlanetPreview() const;
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/plugins/render/panoramio/PanoramioPlugin.h
^
|
| @@ -24,7 +24,7 @@
MARBLE_PLUGIN( PanoramioPlugin )
public:
- PanoramioPlugin( const MarbleModel *marbleModel = 0 );
+ explicit PanoramioPlugin( const MarbleModel *marbleModel = 0 );
QString nameId() const;
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/plugins/render/positionmarker/PositionMarker.h
^
|
| @@ -88,7 +88,7 @@
virtual void setSettings( const QHash<QString,QVariant> &settings );
- public slots:
+ public Q_SLOTS:
void readSettings();
void writeSettings();
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/plugins/render/speedometer/Speedometer.h
^
|
| @@ -68,7 +68,7 @@
bool isInitialized () const;
- private slots:
+ private Q_SLOTS:
void updateLocation( GeoDataCoordinates coordinates, qreal speed );
private:
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/plugins/render/speedometer/Speedometer.ui
^
|
| @@ -34,7 +34,7 @@
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
- <property name="numDigits">
+ <property name="digitCount">
<number>3</number>
</property>
</widget>
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/plugins/runner/gpx/handlers/GPXElementDictionary.cpp
^
|
| @@ -28,32 +28,32 @@
namespace gpx
{
-const char* gpxTag_nameSpace10 = "http://www.topografix.com/GPX/1/0";
-const char* gpxTag_nameSpace11 = "http://www.topografix.com/GPX/1/1";
+const char gpxTag_nameSpace10[] = "http://www.topografix.com/GPX/1/0";
+const char gpxTag_nameSpace11[] = "http://www.topografix.com/GPX/1/1";
-const char* gpxTag_ele = "ele";
-const char* gpxTag_extensions = "extensions";
-const char* gpxTag_gpx = "gpx";
-const char* gpxTag_lat = "lat";
-const char* gpxTag_lon = "lon";
-const char* gpxTag_name = "name";
-const char* gpxTag_time = "time";
-const char* gpxTag_desc = "desc";
-const char* gpxTag_type = "type";
-const char* gpxTag_trk = "trk";
-const char* gpxTag_trkpt = "trkpt";
-const char* gpxTag_trkseg = "trkseg";
-const char* gpxTag_wpt = "wpt";
-const char* gpxTag_rte = "rte";
-const char* gpxTag_rtept = "rtept";
-const char* gpxTag_cmt = "cmt";
-const char* gpxTag_link = "link";
-const char* gpxTag_url = "url";
-const char* gpxTag_urlname = "urlname";
+const char gpxTag_ele[] = "ele";
+const char gpxTag_extensions[] = "extensions";
+const char gpxTag_gpx[] = "gpx";
+const char gpxTag_lat[] = "lat";
+const char gpxTag_lon[] = "lon";
+const char gpxTag_name[] = "name";
+const char gpxTag_time[] = "time";
+const char gpxTag_desc[] = "desc";
+const char gpxTag_type[] = "type";
+const char gpxTag_trk[] = "trk";
+const char gpxTag_trkpt[] = "trkpt";
+const char gpxTag_trkseg[] = "trkseg";
+const char gpxTag_wpt[] = "wpt";
+const char gpxTag_rte[] = "rte";
+const char gpxTag_rtept[] = "rtept";
+const char gpxTag_cmt [] = "cmt";
+const char gpxTag_link [] = "link";
+const char gpxTag_url [] = "url";
+const char gpxTag_urlname [] = "urlname";
-const char* gpxTag_nameSpaceGarminTrackPointExt1 = "http://www.garmin.com/xmlschemas/TrackPointExtension/v1";
-const char* gpxTag_TrackPointExtension = "TrackPointExtension";
-const char* gpxTag_hr = "hr";
+const char gpxTag_nameSpaceGarminTrackPointExt1[] = "http://www.garmin.com/xmlschemas/TrackPointExtension/v1";
+const char gpxTag_TrackPointExtension[] = "TrackPointExtension";
+const char gpxTag_hr[] = "hr";
}
}
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/plugins/runner/gpx/handlers/GPXElementDictionary.h
^
|
| @@ -29,33 +29,33 @@
// Lists all known GPX 1.1 tags (http://www.topografix.com/GPX/1/1/)
namespace gpx
{
- extern const char* gpxTag_nameSpace10;
- extern const char* gpxTag_nameSpace11;
+ extern const char gpxTag_nameSpace10[];
+ extern const char gpxTag_nameSpace11[];
- extern const char* gpxTag_ele;
- extern const char* gpxTag_extensions;
- extern const char* gpxTag_gpx;
- extern const char* gpxTag_lat;
- extern const char* gpxTag_lon;
- extern const char* gpxTag_name;
- extern const char* gpxTag_time;
- extern const char* gpxTag_desc;
- extern const char* gpxTag_type;
- extern const char* gpxTag_trk;
- extern const char* gpxTag_trkpt;
- extern const char* gpxTag_trkseg;
- extern const char* gpxTag_wpt;
- extern const char* gpxTag_rte;
- extern const char* gpxTag_rtept;
- extern const char* gpxTag_cmt;
- extern const char* gpxTag_link;
- extern const char* gpxTag_url;
- extern const char* gpxTag_urlname;
+ extern const char gpxTag_ele[];
+ extern const char gpxTag_extensions[];
+ extern const char gpxTag_gpx[];
+ extern const char gpxTag_lat[];
+ extern const char gpxTag_lon[];
+ extern const char gpxTag_name[];
+ extern const char gpxTag_time[];
+ extern const char gpxTag_desc[];
+ extern const char gpxTag_type[];
+ extern const char gpxTag_trk[];
+ extern const char gpxTag_trkpt[];
+ extern const char gpxTag_trkseg[];
+ extern const char gpxTag_wpt[];
+ extern const char gpxTag_rte[];
+ extern const char gpxTag_rtept[];
+ extern const char gpxTag_cmt[];
+ extern const char gpxTag_link[];
+ extern const char gpxTag_url[];
+ extern const char gpxTag_urlname[];
// TODO: add all remaining tags!
- extern const char* gpxTag_nameSpaceGarminTrackPointExt1;
- extern const char* gpxTag_TrackPointExtension;
- extern const char* gpxTag_hr;
+ extern const char gpxTag_nameSpaceGarminTrackPointExt1[];
+ extern const char gpxTag_TrackPointExtension[];
+ extern const char gpxTag_hr[];
}
// Helper macros
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/plugins/runner/gpx/tests/TestTrack.cpp
^
|
| @@ -29,7 +29,7 @@
class TestTrack : public QObject
{
Q_OBJECT
-private slots:
+private Q_SLOTS:
void initTestCase();
void simpleParseTest();
void withoutTimeTest();
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/plugins/runner/json/marble_thumbnail_geojson.desktop
^
|
| @@ -13,6 +13,7 @@
Name[pl]=Dane geograficzne GeoJSON
Name[pt]=Dados Geográficos em GeoJSON
Name[pt_BR]=Dados geográficos em
+Name[sl]=Geografski podatki GeoJSON
Name[sv]=GeoJSON geografisk data
Name[uk]=географічні дані GeoJSON
Name[x-test]=xxGeoJSON Geographic Dataxx
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/plugins/runner/openlocation-code-search/OpenLocationCodeSearchRunner.h
^
|
| @@ -46,7 +46,7 @@
bool isValidOLC( const QString &ocl ) const;
/**
- * Maps each character from the accepted chars to its coresponding index
+ * Maps each character from the accepted chars to its corresponding index
* inside the string.
*/
QHash<QChar, int> charIndex;
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/plugins/runner/osm/OsmElementDictionary.cpp
^
|
| @@ -8,6 +8,8 @@
// Copyright 2011 Konstantin Oblaukhov <oblaukhov.konstantin@gmail.com>
//
+#include "OsmElementDictionary.h"
+
namespace Marble
{
namespace osm
@@ -15,22 +17,22 @@
// OSM data primitives and what they represent
// http://wiki.openstreetmap.org/wiki/Elements
-const char* osmTag_version06 = "0.6";
+const char osmTag_version06[] = "0.6";
// KML to OSM translators
-const char* osmTranslate_document = "document";
-const char* osmTranslate_feature = "feature";
-const char* osmTranslate_placemark = "placemark";
+const char osmTranslate_document[] = "document";
+const char osmTranslate_feature[] = "feature";
+const char osmTranslate_placemark[] = "placemark";
// OSM writers
-const char* osmTag_osm = "osm";
-const char* osmTag_bound = "bound";
-const char* osmTag_bounds = "bounds";
-const char* osmTag_nd = "nd";
-const char* osmTag_node = "node";
-const char* osmTag_way = "way";
-const char* osmTag_relation = "relation";
-const char* osmTag_member = "member";
-const char* osmTag_tag = "tag";
+const char osmTag_osm[] = "osm";
+const char osmTag_bound[] = "bound";
+const char osmTag_bounds[] = "bounds";
+const char osmTag_nd[] = "nd";
+const char osmTag_node[] = "node";
+const char osmTag_way[] = "way";
+const char osmTag_relation[] = "relation";
+const char osmTag_member[] = "member";
+const char osmTag_tag[] = "tag";
}
}
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/plugins/runner/osm/OsmElementDictionary.h
^
|
| @@ -17,21 +17,21 @@
namespace osm
{
-extern const char* osmTag_version06;
+extern const char osmTag_version06[];
-extern const char* osmTranslate_document;
-extern const char* osmTranslate_feature;
-extern const char* osmTranslate_placemark;
+extern const char osmTranslate_document[];
+extern const char osmTranslate_feature[];
+extern const char osmTranslate_placemark[];
-extern const char* osmTag_osm;
-extern const char* osmTag_bound;
-extern const char* osmTag_bounds;
-extern const char* osmTag_nd;
-extern const char* osmTag_node;
-extern const char* osmTag_way;
-extern const char* osmTag_relation;
-extern const char* osmTag_member;
-extern const char* osmTag_tag;
+extern const char osmTag_osm[];
+extern const char osmTag_bound[];
+extern const char osmTag_bounds[];
+extern const char osmTag_nd[];
+extern const char osmTag_node[];
+extern const char osmTag_way[];
+extern const char osmTag_relation[];
+extern const char osmTag_member[];
+extern const char osmTag_tag[];
}
}
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/plugins/runner/osm/translators/OsmDocumentTagTranslator.h
^
|
| @@ -8,8 +8,8 @@
// Copyright 2015 Stanciu Marius-Valeriu <stanciumarius94@gmail.com>
//
-#ifndef MARBLE_OSMDOCUMENTTAGWRITER_H
-#define MARBLE_OSMDOCUMENTTAGWRITER_H
+#ifndef MARBLE_OSMDOCUMENTTAGTRANSLATOR_H
+#define MARBLE_OSMDOCUMENTTAGTRANSLATOR_H
#include "GeoTagWriter.h"
#include "OsmFeatureTagTranslator.h"
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/src/thumbnailer/thumbnailer.h
^
|
| @@ -44,7 +44,7 @@
virtual bool create(const QString &path, int width, int height, QImage &image);
virtual Flags flags() const;
-private slots:
+private Q_SLOTS:
void onGeoDataObjectAdded(GeoDataObject *object);
private:
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/AbstractDataPluginModelTest.cpp
^
|
| @@ -66,7 +66,7 @@
QObject( parent )
{}
- private slots:
+private Q_SLOTS:
void init_testcase();
void defaultConstructor();
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/AbstractDataPluginTest.cpp
^
|
| @@ -25,7 +25,7 @@
{
Q_OBJECT
- private slots:
+private Q_SLOTS:
void initialize_data();
void initialize();
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/AbstractFloatItemTest.cpp
^
|
| @@ -51,7 +51,7 @@
public:
AbstractFloatItemTest();
- private slots:
+ private Q_SLOTS:
void defaultConstructor();
void newInstance_data();
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/BillboardGraphicsItemTest.cpp
^
|
| @@ -26,7 +26,7 @@
{
Q_OBJECT
- private slots:
+private Q_SLOTS:
void defaultConstructorValues();
void paintEvent();
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/BookmarkManagerTest.cpp
^
|
| @@ -22,7 +22,7 @@
{
Q_OBJECT
- private slots:
+private Q_SLOTS:
void construct();
void loadFile_data();
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/FrameGraphicsItemTest.cpp
^
|
| @@ -20,7 +20,7 @@
{
Q_OBJECT
- private slots:
+private Q_SLOTS:
void constructorDefaultValues();
};
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/GeoDataTreeModelTest.cpp
^
|
| @@ -22,7 +22,7 @@
{
Q_OBJECT
- private Q_SLOTS:
+private Q_SLOTS:
void defaultConstructor();
void setRootDocument();
void addDocument();
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/GeoUriParserTest.cpp
^
|
| @@ -19,7 +19,7 @@
{
Q_OBJECT
- private slots:
+private Q_SLOTS:
void testGeoUri_data();
void testGeoUri();
};
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/GnomonicProjectionTest.cpp
^
|
| @@ -19,7 +19,7 @@
{
Q_OBJECT
- private slots:
+private Q_SLOTS:
void screenCoordinatesOfCenter_data();
void screenCoordinatesOfCenter();
};
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/LocaleTest.cpp
^
|
| @@ -22,7 +22,7 @@
{
Q_OBJECT
-private slots:
+private Q_SLOTS:
void initTestCase();
void meterToCustomUnit();
void meterToCustomUnit_data();
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/MapViewWidgetTest.cpp
^
|
| @@ -20,7 +20,7 @@
{
Q_OBJECT
- private slots:
+private Q_SLOTS:
void initTestCase();
void setMapThemeId();
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/MarbleMapTest.cpp
^
|
| @@ -22,7 +22,7 @@
{
Q_OBJECT
- private slots:
+ private Q_SLOTS:
void centerOnSpherical_data();
void centerOnSpherical();
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/MarbleRunnerManagerTest.cpp
^
|
| @@ -34,7 +34,7 @@
{
Q_OBJECT
-private slots:
+private Q_SLOTS:
void initTestCase();// will be called before the first testfunction is executed.
void cleanupTestCase();// will be called after the last testfunction was executed.
void init(){ qDebug() << "start: " << t.elapsed();}// will be called before each testfunction is executed.
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/MarbleWidgetSpeedTest.cpp
^
|
| @@ -25,7 +25,7 @@
class MarbleWidgetSpeedTest: public QObject
{
Q_OBJECT
- private slots:
+ private Q_SLOTS:
void timeTest();
void initTestCase();// will be called before the first testfunction is executed.
void cleanupTestCase();// will be called after the last testfunction was executed.
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/MarbleWidgetTest.cpp
^
|
| @@ -24,7 +24,7 @@
{
Q_OBJECT
-private slots:
+private Q_SLOTS:
void initTestCase();// will be called before the first testfunction is executed.
void cleanupTestCase(){}// will be called after the last testfunction was executed.
void init(){}// will be called before each testfunction is executed.
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/MercatorProjectionTest.cpp
^
|
| @@ -19,7 +19,7 @@
{
Q_OBJECT
- private slots:
+private Q_SLOTS:
void screenCoordinatesValidLat_data();
void screenCoordinatesValidLat();
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/PlacemarkPositionProviderPluginTest.cpp
^
|
| @@ -32,7 +32,7 @@
static PositionProviderPlugin *createUninitializedPlugin( const PluginManager *pluginManager );
static PositionProviderPlugin *createInitializedPlugin( const MarbleModel *model );
- private slots:
+ private Q_SLOTS:
void initialize_data();
void initialize();
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/PluginManagerTest.cpp
^
|
| @@ -20,7 +20,7 @@
class PluginManagerTest : public QObject
{
Q_OBJECT
- private slots:
+ private Q_SLOTS:
void loadPlugins();
};
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/QuaternionTest.cpp
^
|
| @@ -23,7 +23,7 @@
{
Q_OBJECT
- private slots:
+private Q_SLOTS:
void testEuler_data();
void testEuler();
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/RenderPluginModelTest.cpp
^
|
| @@ -25,7 +25,7 @@
m_map( 0 )
{}
- private slots:
+ private Q_SLOTS:
void initTestCase() { m_map = new MarbleMap(); }
void cleanupTestCase() { delete m_map; }
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/RenderPluginTest.cpp
^
|
| @@ -25,7 +25,7 @@
{
Q_OBJECT
- private slots:
+ private Q_SLOTS:
void newInstance_data();
void newInstance();
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/RouteRequestTest.cpp
^
|
| @@ -20,7 +20,7 @@
{
Q_OBJECT
- private Q_SLOTS:
+private Q_SLOTS:
void defaultConstructor();
void reverse();
};
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/ScreenGraphicsItemTest.cpp
^
|
| @@ -21,7 +21,7 @@
{
Q_OBJECT
- private slots:
+private Q_SLOTS:
void defaultConstructorValues();
void constructorValuesScreenParent();
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/StereographicProjectionTest.cpp
^
|
| @@ -20,7 +20,7 @@
{
Q_OBJECT
- private slots:
+private Q_SLOTS:
void screenCoordinatesOfCenter_data();
void screenCoordinatesOfCenter();
};
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/TestBalloonStyle.cpp
^
|
| @@ -24,7 +24,7 @@
class TestBalloonStyle : public QObject
{
Q_OBJECT
-private slots:
+private Q_SLOTS:
void initTestCase();
void simpleParseTest();
};
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/TestCamera.cpp
^
|
| @@ -22,7 +22,7 @@
class TestCamera : public QObject
{
Q_OBJECT
-private slots:
+private Q_SLOTS:
void initTestCase();
void simpleParseTest();
};
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/TestEquality.cpp
^
|
| @@ -77,7 +77,7 @@
class TestEquality : public QObject
{
Q_OBJECT
-private slots:
+private Q_SLOTS:
void initTestCase();
void aliasTest();
void accuracyTest();
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/TestFeatureDetach.cpp
^
|
| @@ -26,7 +26,7 @@
{
Q_OBJECT
-private slots:
+private Q_SLOTS:
/**
* FIXME: Doesn't work for the moment because calling detach() in
* GeoDataFeature::set/abstractView() doesn't help because the object
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/TestGeoData.cpp
^
|
| @@ -28,7 +28,7 @@
class TestGeoData : public QObject
{
Q_OBJECT
- private slots:
+private Q_SLOTS:
void nodeTypeTest();
void parentingTest();
};
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/TestGeoDataCoordinates.cpp
^
|
| @@ -28,7 +28,7 @@
{
Q_OBJECT
-private slots:
+private Q_SLOTS:
void initTestCase();
void testConstruction();
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/TestGeoDataCopy.cpp
^
|
| @@ -51,7 +51,7 @@
Q_OBJECT
private:
void testCoordinate( GeoDataCoordinates coord, qreal alt, int detail, QString coordtest );
- private slots:
+ private Q_SLOTS:
void initTestCase();
// misc.:
void copyCoordinates();
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/TestGeoDataGeometry.cpp
^
|
| @@ -20,7 +20,7 @@
class TestGeoDataGeometry : public QObject
{
Q_OBJECT
-private slots:
+private Q_SLOTS:
void downcastPointTest_data();
void downcastPointTest();
void deleteAndDetachTest1();
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/TestGeoDataLatLonAltBox.cpp
^
|
| @@ -26,7 +26,7 @@
{
Q_OBJECT
-private slots:
+private Q_SLOTS:
void testDefaultConstruction();
void testCopyConstruction_data();
void testCopyConstruction();
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/TestGeoDataPack.cpp
^
|
| @@ -28,7 +28,7 @@
class TestGeoDataPack : public QObject
{
Q_OBJECT
- private slots:
+ private Q_SLOTS:
void initTestCase();
void saveKMLToCache();
void loadKMLFromCache();
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/TestGeoDataTrack.cpp
^
|
| @@ -29,7 +29,7 @@
class TestGeoDataTrack : public QObject
{
Q_OBJECT
-private slots:
+private Q_SLOTS:
void initTestCase();
void defaultConstructor();
void interpolate();
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/TestGeoDataWriter.cpp
^
|
| @@ -27,7 +27,7 @@
class TestGeoDataWriter : public QObject
{
Q_OBJECT
-private slots:
+private Q_SLOTS:
void initTestCase();
void countFeatures_data();
void saveFile_data();
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/TestGeoPainter.cpp
^
|
| @@ -24,7 +24,7 @@
class TestGeoPainter : public QObject
{
Q_OBJECT
- private slots:
+private Q_SLOTS:
void createLinearRingFromGeoRectTest();
};
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/TestGeoSceneWriter.cpp
^
|
| @@ -39,7 +39,7 @@
{
Q_OBJECT
-private slots:
+private Q_SLOTS:
void initTestCase();
void saveFile_data();
void saveFile();
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/TestGeometryDetach.cpp
^
|
| @@ -25,7 +25,7 @@
{
Q_OBJECT
-private slots:
+private Q_SLOTS:
void initTestCase();
/**
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/TestGroundOverlay.cpp
^
|
| @@ -21,7 +21,7 @@
class TestGroundOverlay : public QObject
{
Q_OBJECT
-private slots:
+private Q_SLOTS:
void initTestCase();
void simpleParseTest();
};
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/TestGudermannian.cpp
^
|
| @@ -20,7 +20,7 @@
{
Q_OBJECT
-private slots:
+private Q_SLOTS:
void testGudermannian_data();
void testGudermannian();
};
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/TestGxTimeSpan.cpp
^
|
| @@ -23,7 +23,7 @@
class TestGxTimeSpan : public QObject
{
Q_OBJECT
-private slots:
+private Q_SLOTS:
void initTestCase();
void simpleParseTest();
};
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/TestGxTimeStamp.cpp
^
|
| @@ -23,7 +23,7 @@
class TestGxTimeStamp : public QObject
{
Q_OBJECT
-private slots:
+private Q_SLOTS:
void initTestCase();
void simpleParseTest();
};
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/TestLatLonQuad.cpp
^
|
| @@ -23,7 +23,7 @@
class TestLatLonQuad : public QObject
{
Q_OBJECT
-private slots:
+private Q_SLOTS:
void initTestCase();
void simpleParseTest();
};
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/TestListStyle.cpp
^
|
| @@ -24,7 +24,7 @@
class TestListStyle : public QObject
{
Q_OBJECT
-private slots:
+private Q_SLOTS:
void initTestCase();
void simpleParseTest();
};
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/TestModel.cpp
^
|
| @@ -24,7 +24,7 @@
class TestModel : public QObject
{
Q_OBJECT
-private slots:
+private Q_SLOTS:
void initTestCase();
void simpleParseTest();
};
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/TestNetworkLink.cpp
^
|
| @@ -22,7 +22,7 @@
class TestNetworkLink : public QObject
{
Q_OBJECT
-private slots:
+private Q_SLOTS:
void initTestCase();
void simpleParseTest();
};
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/TestOsmAnnotation.cpp
^
|
| @@ -18,7 +18,7 @@
class TestOsmAnnotation : public QObject
{
Q_OBJECT
-private slots:
+private Q_SLOTS:
void initTestCase();
void saveAnnotations_data();
void saveAnnotations();
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/TestTimeSpan.cpp
^
|
| @@ -23,7 +23,7 @@
class TestTimeStamp : public QObject
{
Q_OBJECT
-private slots:
+private Q_SLOTS:
void initTestCase();
void simpleParseTest();
};
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/TestTimeStamp.cpp
^
|
| @@ -23,7 +23,7 @@
class TestTimeStamp : public QObject
{
Q_OBJECT
-private slots:
+private Q_SLOTS:
void initTestCase();
void simpleParseTest();
};
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/TestToCircumscribedRectangle.cpp
^
|
| @@ -21,7 +21,7 @@
{
Q_OBJECT
-private slots:
+private Q_SLOTS:
void testToCircumscribedRectangle_data();
void testToCircumscribedRectangle();
};
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/TestTour.cpp
^
|
| @@ -27,7 +27,7 @@
class TestTour : public QObject
{
Q_OBJECT
-private slots:
+private Q_SLOTS:
void initTestCase();
void simpleParseTest();
};
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/TileIdTest.cpp
^
|
| @@ -20,7 +20,7 @@
{
Q_OBJECT
- private slots:
+private Q_SLOTS:
void testFromCoordinates_data();
void testFromCoordinates();
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tests/ViewportParamsTest.cpp
^
|
| @@ -30,7 +30,7 @@
{
Q_OBJECT
- private slots:
+private Q_SLOTS:
void constructorDefaultValues();
void constructorValues_data();
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tools/mapreproject/NasaWorldWindToOpenStreetMapConverter.h
^
|
| @@ -36,10 +36,10 @@
void testReprojection();
-signals:
+Q_SIGNALS:
void finished();
-public slots:
+public Q_SLOTS:
void assignNextCluster( OsmTileClusterRenderer * );
private:
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tools/mapreproject/NwwMapImage.h
^
|
| @@ -1,5 +1,5 @@
-#ifndef NWWIMAGE_H
-#define NWWIMAGE_H
+#ifndef NWWMAPIMAGE_H
+#define NWWMAPIMAGE_H
#include "mapreproject.h"
#include "ReadOnlyMapImage.h"
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tools/mapreproject/OsmTileClusterRenderer.h
^
|
| @@ -1,5 +1,5 @@
-#ifndef RENDEROSMTILECLUSTERTHREAD_H
-#define RENDEROSMTILECLUSTERTHREAD_H
+#ifndef OSMTILECLUSTERRENDERER_H
+#define OSMTILECLUSTERRENDERER_H
#include "mapreproject.h"
#include "ReadOnlyMapDefinition.h"
@@ -23,10 +23,10 @@
void setOsmBaseDirectory( QDir const & osmBaseDirectory );
void setOsmTileLevel( int const level );
-signals:
+Q_SIGNALS:
void clusterRendered( OsmTileClusterRenderer * );
-public slots:
+public Q_SLOTS:
void initMapSources();
void renderOsmTileCluster( int const clusterX, int const clusterY );
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tools/mapreproject/Thread.h
^
|
| @@ -58,10 +58,10 @@
void launchWorker( QObject * const worker );
void stop();
-signals:
+Q_SIGNALS:
void aboutToStop();
-private slots:
+private Q_SLOTS:
void stopExecutor();
void setReadyStatus();
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160523.tar.xz/tools/osm-sisyphus/region.h
^
|
| @@ -55,7 +55,7 @@
static QString fileSize(const QFileInfo &file);
-public slots:
+public Q_SLOTS:
private:
QString m_name;
|
|
[-]
[+]
|
Changed |
marble.yaml
^
|
| @@ -1,6 +1,6 @@
Name: marble
Summary: Virtual Globe
-Version: 1.14.21_sfos_160510
+Version: 1.14.21_sfos_160523
Release: 1
Group: Applications/Engineering
License: LGPLv2+
|
