Skip to content

Commit afc8ddd

Browse files
GuillaumeBelzProJamesMBallard
authored andcommitted
add override, change Q_DECL_OVERRIDE by override, fix indentation (#316)
1 parent 5dd1d6f commit afc8ddd

File tree

9 files changed

+14
-14
lines changed

9 files changed

+14
-14
lines changed

Plugin/ArcGISRuntimeToolkitPlugin.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class ArcGISRuntimeToolkitPlugin : public QQmlExtensionPlugin
2626

2727
public:
2828
explicit ArcGISRuntimeToolkitPlugin(QObject* parent = nullptr);
29-
void registerTypes(const char* uri) Q_DECL_OVERRIDE;
29+
void registerTypes(const char* uri) override;
3030
};
3131

3232
#endif // ArcGISRuntimeToolkitPlugin_H

Plugin/CppApi/include/AbstractTool.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class TOOLKIT_EXPORT AbstractTool : public QObject
4343

4444
public:
4545
AbstractTool(QObject* parent = nullptr);
46-
virtual ~AbstractTool();
46+
~AbstractTool() override;
4747

4848
virtual QString toolName() const = 0;
4949
virtual bool handleClick(const Point& pos);

Plugin/CppApi/include/ArcGISCompassController.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class TOOLKIT_EXPORT ArcGISCompassController : public AbstractTool
4646

4747
public:
4848
ArcGISCompassController(QObject *parent = nullptr);
49-
~ArcGISCompassController();
49+
~ArcGISCompassController() override;
5050

5151
bool setView(Esri::ArcGISRuntime::GeoView* geoView);
5252
/*! \internal */

Plugin/CppApi/include/CoordinateConversion/CoordinateConversionController.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ class TOOLKIT_EXPORT CoordinateConversionController : public AbstractTool
109109

110110
public:
111111
CoordinateConversionController(QObject* parent = nullptr);
112-
~CoordinateConversionController();
112+
~CoordinateConversionController() override;
113113

114114
void setSpatialReference(const Esri::ArcGISRuntime::SpatialReference& spatialReference);
115115
void setPointToConvert(const Esri::ArcGISRuntime::Point& point);

Plugin/CppApi/include/CoordinateConversion/CoordinateConversionOptions.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class TOOLKIT_EXPORT CoordinateConversionOptions : public QObject
7575

7676
public:
7777
CoordinateConversionOptions(QObject* parent = nullptr);
78-
~CoordinateConversionOptions();
78+
~CoordinateConversionOptions() override;
7979

8080
QString name() const;
8181
void setName(const QString& name);

Plugin/CppApi/include/CoordinateConversion/CoordinateConversionResults.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ namespace Toolkit
3535
class Result
3636
{
3737
public:
38-
Result(const QString& name, const QString& notation, int type);
39-
~Result() = default;
40-
QString m_name;
41-
QString m_notation;
42-
int m_type; // CoordinateConversionOptions::CoordinateType as int
38+
Result(const QString& name, const QString& notation, int type);
39+
~Result() = default;
40+
QString m_name;
41+
QString m_notation;
42+
int m_type = 0; // CoordinateConversionOptions::CoordinateType as int
4343
};
4444

4545
class TOOLKIT_EXPORT CoordinateConversionResults : public QAbstractListModel
@@ -56,7 +56,7 @@ class TOOLKIT_EXPORT CoordinateConversionResults : public QAbstractListModel
5656

5757
public:
5858
explicit CoordinateConversionResults(QObject* parent = nullptr);
59-
~CoordinateConversionResults();
59+
~CoordinateConversionResults() override;
6060

6161
Qt::ItemFlags flags(const QModelIndex& index) const override;
6262

Plugin/CppApi/include/TimeSliderController.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ class TOOLKIT_EXPORT TimeSliderController : public AbstractTool
6464

6565
public:
6666
TimeSliderController(QObject* parent = nullptr);
67-
~TimeSliderController();
67+
~TimeSliderController() override;
6868

6969
QString toolName() const override;
7070

Plugin/CppApi/include/ToolManager.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class TOOLKIT_EXPORT ToolManager : public QObject
4242

4343
static ToolManager& instance(); // singleton
4444

45-
~ToolManager();
45+
~ToolManager() override;
4646

4747
void addTool(AbstractTool* tool);
4848

Plugin/CppApi/include/ToolResourceProvider.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class TOOLKIT_EXPORT ToolResourceProvider : public QObject
5050

5151
static ToolResourceProvider* instance();
5252

53-
~ToolResourceProvider();
53+
~ToolResourceProvider() override;
5454

5555
Map* map() const;
5656
void setMap(Map* newMap);

0 commit comments

Comments
 (0)