Skip to content

Commit c005475

Browse files
rominfrominf
committed
Revert "Q_DISABLE_COPY_AND_MOVE(*); -> Q_DISABLE_COPY_AND_MOVE(*)"
This reverts commit 8cd7006.
1 parent 8cd7006 commit c005475

File tree

186 files changed

+300
-300
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

186 files changed

+300
-300
lines changed

‎include/OsmAndCore/ArchiveReader.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace OsmAnd
1717
class ArchiveReader_P;
1818
class OSMAND_CORE_API ArchiveReader
1919
{
20-
Q_DISABLE_COPY_AND_MOVE(ArchiveReader)
20+
Q_DISABLE_COPY_AND_MOVE(ArchiveReader);
2121
public:
2222
class OSMAND_CORE_API Item
2323
{

‎include/OsmAndCore/CachingFontFinder.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ namespace OsmAnd
1616
{
1717
class OSMAND_CORE_API CachingFontFinder Q_DECL_FINAL : public IFontFinder
1818
{
19-
Q_DISABLE_COPY_AND_MOVE(CachingFontFinder)
19+
Q_DISABLE_COPY_AND_MOVE(CachingFontFinder);
2020

2121
private:
2222
static_assert(sizeof(SkFontStyle) == 4, "Check size of SkFontStyle");

‎include/OsmAndCore/CachingRoadLocator.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ namespace OsmAnd
2020
class CachingRoadLocator_P;
2121
class OSMAND_CORE_API CachingRoadLocator : public IRoadLocator
2222
{
23-
Q_DISABLE_COPY_AND_MOVE(CachingRoadLocator)
23+
Q_DISABLE_COPY_AND_MOVE(CachingRoadLocator);
2424

2525
public:
2626
typedef std::function<bool(const std::shared_ptr<const ObfRoutingSectionReader::DataBlock>& dataBlock)>

‎include/OsmAndCore/ChainedFontFinder.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace OsmAnd
1515
{
1616
class OSMAND_CORE_API ChainedFontFinder Q_DECL_FINAL : public IFontFinder
1717
{
18-
Q_DISABLE_COPY_AND_MOVE(ChainedFontFinder)
18+
Q_DISABLE_COPY_AND_MOVE(ChainedFontFinder);
1919

2020
private:
2121
protected:

‎include/OsmAndCore/Concurrent/Dispatcher.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ namespace OsmAnd
1818
{
1919
class OSMAND_CORE_API Dispatcher
2020
{
21-
Q_DISABLE_COPY_AND_MOVE(Dispatcher)
21+
Q_DISABLE_COPY_AND_MOVE(Dispatcher);
2222
public:
2323
typedef std::function<void()> Delegate;
2424
private:

‎include/OsmAndCore/Concurrent/HostedTask.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ namespace OsmAnd
1616
{
1717
class OSMAND_CORE_API HostedTask : public Task
1818
{
19-
Q_DISABLE_COPY_AND_MOVE(HostedTask)
19+
Q_DISABLE_COPY_AND_MOVE(HostedTask);
2020
private:
2121
protected:
2222
std::shared_ptr<TaskHost> _host;

‎include/OsmAndCore/Concurrent/Task.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ namespace OsmAnd
1919
{
2020
class OSMAND_CORE_API Task : public QRunnable
2121
{
22-
Q_DISABLE_COPY_AND_MOVE(Task)
22+
Q_DISABLE_COPY_AND_MOVE(Task);
2323
public:
2424
typedef std::function<void(Task* const task, bool& requestCancellation)> PreExecuteSignature;
2525
typedef std::function<void(Task* const task)> ExecuteSignature;
2626
typedef std::function<void(Task* const task, const bool wasCancelled)> PostExecuteSignature;
2727

2828
class OSMAND_CORE_API Cancellator Q_DECL_FINAL
2929
{
30-
Q_DISABLE_COPY_AND_MOVE(Cancellator)
30+
Q_DISABLE_COPY_AND_MOVE(Cancellator);
3131
private:
3232
mutable QReadWriteLock _taskRefLock;
3333
Task* _taskRef;

‎include/OsmAndCore/Concurrent/WorkerPool.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace OsmAnd
2121
class WorkerPool_P;
2222
class OSMAND_CORE_API WorkerPool Q_DECL_FINAL
2323
{
24-
Q_DISABLE_COPY_AND_MOVE(WorkerPool)
24+
Q_DISABLE_COPY_AND_MOVE(WorkerPool);
2525

2626
public:
2727
enum class Order

‎include/OsmAndCore/CoreResourcesEmbeddedBundle.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ namespace OsmAnd
1919
class CoreResourcesEmbeddedBundle_P;
2020
class OSMAND_CORE_API CoreResourcesEmbeddedBundle : public ICoreResourcesProvider
2121
{
22-
Q_DISABLE_COPY_AND_MOVE(CoreResourcesEmbeddedBundle)
22+
Q_DISABLE_COPY_AND_MOVE(CoreResourcesEmbeddedBundle);
2323

2424
private:
2525
PrivateImplementation<CoreResourcesEmbeddedBundle_P> _p;

‎include/OsmAndCore/Data/Address.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ namespace OsmAnd
3535

3636
class OSMAND_CORE_API Address
3737
{
38-
Q_DISABLE_COPY_AND_MOVE(Address)
38+
Q_DISABLE_COPY_AND_MOVE(Address);
3939

4040
private:
4141
protected:

‎include/OsmAndCore/Data/Amenity.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace OsmAnd
2424

2525
class OSMAND_CORE_API Amenity Q_DECL_FINAL
2626
{
27-
Q_DISABLE_COPY_AND_MOVE(Amenity)
27+
Q_DISABLE_COPY_AND_MOVE(Amenity);
2828
OSMAND_USE_MEMORY_MANAGER(Amenity);
2929
public:
3030
struct OSMAND_CORE_API DecodedCategory Q_DECL_FINAL

‎include/OsmAndCore/Data/BinaryMapObject.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ namespace OsmAnd
2020

2121
class OSMAND_CORE_API BinaryMapObject Q_DECL_FINAL : public ObfMapObject
2222
{
23-
Q_DISABLE_COPY_AND_MOVE(BinaryMapObject)
23+
Q_DISABLE_COPY_AND_MOVE(BinaryMapObject);
2424
private:
2525
protected:
2626
BinaryMapObject(

‎include/OsmAndCore/Data/Building.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ namespace OsmAnd
2020

2121
class OSMAND_CORE_API Building Q_DECL_FINAL: public Address
2222
{
23-
Q_DISABLE_COPY_AND_MOVE(Building)
23+
Q_DISABLE_COPY_AND_MOVE(Building);
2424

2525
public:
2626
enum class Interpolation : int32_t

‎include/OsmAndCore/Data/MapObject.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ namespace OsmAnd
2121
{
2222
class OSMAND_CORE_API MapObject
2323
{
24-
Q_DISABLE_COPY_AND_MOVE(MapObject)
24+
Q_DISABLE_COPY_AND_MOVE(MapObject);
2525
public:
2626
class OSMAND_CORE_API AttributeMapping
2727
{
28-
Q_DISABLE_COPY_AND_MOVE(AttributeMapping)
28+
Q_DISABLE_COPY_AND_MOVE(AttributeMapping);
2929
public:
3030
struct OSMAND_CORE_API TagValue Q_DECL_FINAL
3131
{

‎include/OsmAndCore/Data/ObfMapObject.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ namespace OsmAnd
1818

1919
class OSMAND_CORE_API ObfMapObject : public MapObject
2020
{
21-
Q_DISABLE_COPY_AND_MOVE(ObfMapObject)
21+
Q_DISABLE_COPY_AND_MOVE(ObfMapObject);
2222
private:
2323
protected:
2424
ObfMapObject(const std::shared_ptr<const ObfSectionInfo>& obfSection);

‎include/OsmAndCore/Data/ObfMapSectionInfo.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ namespace OsmAnd
2525
class ObfMapSectionLevel_P;
2626
class OSMAND_CORE_API ObfMapSectionLevel
2727
{
28-
Q_DISABLE_COPY_AND_MOVE(ObfMapSectionLevel)
28+
Q_DISABLE_COPY_AND_MOVE(ObfMapSectionLevel);
2929
public:
3030
enum {
3131
MaxBasemapZoomLevel = ZoomLevel11
@@ -52,7 +52,7 @@ namespace OsmAnd
5252

5353
class OSMAND_CORE_API ObfMapSectionAttributeMapping : public MapObject::AttributeMapping
5454
{
55-
Q_DISABLE_COPY_AND_MOVE(ObfMapSectionAttributeMapping)
55+
Q_DISABLE_COPY_AND_MOVE(ObfMapSectionAttributeMapping);
5656
private:
5757
protected:
5858
virtual void registerRequiredMapping(uint32_t& lastUsedEntryId);
@@ -73,7 +73,7 @@ namespace OsmAnd
7373
class ObfMapSectionInfo_P;
7474
class OSMAND_CORE_API ObfMapSectionInfo : public ObfSectionInfo
7575
{
76-
Q_DISABLE_COPY_AND_MOVE(ObfMapSectionInfo)
76+
Q_DISABLE_COPY_AND_MOVE(ObfMapSectionInfo);
7777
private:
7878
PrivateImplementation<ObfMapSectionInfo_P> _p;
7979
protected:

‎include/OsmAndCore/Data/ObfMapSectionReader.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ namespace OsmAnd
4141

4242
class OSMAND_CORE_API DataBlock Q_DECL_FINAL
4343
{
44-
Q_DISABLE_COPY_AND_MOVE(DataBlock)
44+
Q_DISABLE_COPY_AND_MOVE(DataBlock);
4545
private:
4646
protected:
4747
DataBlock(

‎include/OsmAndCore/Data/ObfPoiSectionInfo.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ namespace OsmAnd
1818

1919
class OSMAND_CORE_API ObfPoiSectionCategories Q_DECL_FINAL
2020
{
21-
Q_DISABLE_COPY_AND_MOVE(ObfPoiSectionCategories)
21+
Q_DISABLE_COPY_AND_MOVE(ObfPoiSectionCategories);
2222

2323
private:
2424
protected:
@@ -46,7 +46,7 @@ namespace OsmAnd
4646

4747
class OSMAND_CORE_API ObfPoiSectionSubtypes Q_DECL_FINAL
4848
{
49-
Q_DISABLE_COPY_AND_MOVE(ObfPoiSectionSubtypes)
49+
Q_DISABLE_COPY_AND_MOVE(ObfPoiSectionSubtypes);
5050

5151
private:
5252
protected:
@@ -78,7 +78,7 @@ namespace OsmAnd
7878
class ObfPoiSectionInfo_P;
7979
class OSMAND_CORE_API ObfPoiSectionInfo : public ObfSectionInfo
8080
{
81-
Q_DISABLE_COPY_AND_MOVE(ObfPoiSectionInfo)
81+
Q_DISABLE_COPY_AND_MOVE(ObfPoiSectionInfo);
8282
private:
8383
PrivateImplementation<ObfPoiSectionInfo_P> _p;
8484
protected:

‎include/OsmAndCore/Data/ObfRoutingSectionInfo.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ namespace OsmAnd
2626
class ObfRoutingSectionLevel_P;
2727
class OSMAND_CORE_API ObfRoutingSectionLevel
2828
{
29-
Q_DISABLE_COPY_AND_MOVE(ObfRoutingSectionLevel)
29+
Q_DISABLE_COPY_AND_MOVE(ObfRoutingSectionLevel);
3030
private:
3131
PrivateImplementation<ObfRoutingSectionLevel_P> _p;
3232
protected:
@@ -42,7 +42,7 @@ namespace OsmAnd
4242

4343
class OSMAND_CORE_API ObfRoutingSectionLevelTreeNode Q_DECL_FINAL
4444
{
45-
Q_DISABLE_COPY_AND_MOVE(ObfRoutingSectionLevelTreeNode)
45+
Q_DISABLE_COPY_AND_MOVE(ObfRoutingSectionLevelTreeNode);
4646
private:
4747
protected:
4848
public:

‎include/OsmAndCore/Data/ObfRoutingSectionReader.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ namespace OsmAnd
3333

3434
class OSMAND_CORE_API DataBlock Q_DECL_FINAL
3535
{
36-
Q_DISABLE_COPY_AND_MOVE(DataBlock)
36+
Q_DISABLE_COPY_AND_MOVE(DataBlock);
3737
private:
3838
protected:
3939
DataBlock(

‎include/OsmAndCore/Data/ObfSectionInfo.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ namespace OsmAnd
1616

1717
class ObfSectionInfo
1818
{
19-
Q_DISABLE_COPY_AND_MOVE(ObfSectionInfo)
19+
Q_DISABLE_COPY_AND_MOVE(ObfSectionInfo);
2020
private:
2121
static QAtomicInt _nextRuntimeGeneratedId;
2222
protected:

‎include/OsmAndCore/Data/Road.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ namespace OsmAnd
4242

4343
class OSMAND_CORE_API Road Q_DECL_FINAL : public ObfMapObject
4444
{
45-
Q_DISABLE_COPY_AND_MOVE(Road)
45+
Q_DISABLE_COPY_AND_MOVE(Road);
4646
private:
4747
protected:
4848
Road(const std::shared_ptr<const ObfRoutingSectionInfo>& section);

‎include/OsmAndCore/Data/Street.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ namespace OsmAnd
1919

2020
class OSMAND_CORE_API Street Q_DECL_FINAL : public Address
2121
{
22-
Q_DISABLE_COPY_AND_MOVE(Street)
22+
Q_DISABLE_COPY_AND_MOVE(Street);
2323

2424
private:
2525
protected:

‎include/OsmAndCore/Data/StreetGroup.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ namespace OsmAnd
1919

2020
class OSMAND_CORE_API StreetGroup Q_DECL_FINAL : public Address
2121
{
22-
Q_DISABLE_COPY_AND_MOVE(StreetGroup)
22+
Q_DISABLE_COPY_AND_MOVE(StreetGroup);
2323

2424
private:
2525
protected:

‎include/OsmAndCore/Data/StreetIntersection.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ namespace OsmAnd
1616

1717
class OSMAND_CORE_API StreetIntersection Q_DECL_FINAL : public Address
1818
{
19-
Q_DISABLE_COPY_AND_MOVE(StreetIntersection)
19+
Q_DISABLE_COPY_AND_MOVE(StreetIntersection);
2020

2121
private:
2222
protected:

‎include/OsmAndCore/DefaultLogSink.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace OsmAnd
1212
{
1313
class OSMAND_CORE_API DefaultLogSink : public ILogSink
1414
{
15-
Q_DISABLE_COPY_AND_MOVE(DefaultLogSink)
15+
Q_DISABLE_COPY_AND_MOVE(DefaultLogSink);
1616
private:
1717
protected:
1818
public:

‎include/OsmAndCore/EmbeddedFontFinder.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace OsmAnd
1515
{
1616
class OSMAND_CORE_API EmbeddedFontFinder Q_DECL_FINAL : public IFontFinder
1717
{
18-
Q_DISABLE_COPY_AND_MOVE(EmbeddedFontFinder)
18+
Q_DISABLE_COPY_AND_MOVE(EmbeddedFontFinder);
1919

2020
private:
2121
QList<SkTypeface*> _fonts;

‎include/OsmAndCore/FavoriteLocationsCollection.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ namespace OsmAnd
2020
class FavoriteLocationsCollection_P;
2121
class OSMAND_CORE_API FavoriteLocationsCollection : public IFavoriteLocationsCollection
2222
{
23-
Q_DISABLE_COPY_AND_MOVE(FavoriteLocationsCollection)
23+
Q_DISABLE_COPY_AND_MOVE(FavoriteLocationsCollection);
2424

2525
private:
2626
PrivateImplementation<FavoriteLocationsCollection_P> _p;

‎include/OsmAndCore/FavoriteLocationsGpxCollection.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ namespace OsmAnd
1818
class FavoriteLocationsGpxCollection_P;
1919
class OSMAND_CORE_API FavoriteLocationsGpxCollection : public FavoriteLocationsCollection
2020
{
21-
Q_DISABLE_COPY_AND_MOVE(FavoriteLocationsGpxCollection)
21+
Q_DISABLE_COPY_AND_MOVE(FavoriteLocationsGpxCollection);
2222

2323
private:
2424
FavoriteLocationsGpxCollection_P* _p;

‎include/OsmAndCore/FunctorLogSink.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace OsmAnd
1313
{
1414
class OSMAND_CORE_API FunctorLogSink : public ILogSink
1515
{
16-
Q_DISABLE_COPY_AND_MOVE(FunctorLogSink)
16+
Q_DISABLE_COPY_AND_MOVE(FunctorLogSink);
1717

1818
public:
1919
OSMAND_CALLABLE(WriteCallback, void, FunctorLogSink* const sink, const LogSeverityLevel level, const char* format, va_list args);

‎include/OsmAndCore/FunctorQueryController.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace OsmAnd
1414
{
1515
class OSMAND_CORE_API FunctorQueryController : public IQueryController
1616
{
17-
Q_DISABLE_COPY_AND_MOVE(FunctorQueryController)
17+
Q_DISABLE_COPY_AND_MOVE(FunctorQueryController);
1818

1919
public:
2020
OSMAND_CALLABLE(Callback, bool, const FunctorQueryController* const queryController);

‎include/OsmAndCore/GeoInfoDocument.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ namespace OsmAnd
2323
{
2424
class OSMAND_CORE_API GeoInfoDocument
2525
{
26-
Q_DISABLE_COPY_AND_MOVE(GeoInfoDocument)
26+
Q_DISABLE_COPY_AND_MOVE(GeoInfoDocument);
2727
public:
2828
struct OSMAND_CORE_API ExtraData
2929
{

‎include/OsmAndCore/GpxDocument.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ namespace OsmAnd
2020
{
2121
class OSMAND_CORE_API GpxDocument : public GeoInfoDocument
2222
{
23-
Q_DISABLE_COPY_AND_MOVE(GpxDocument)
23+
Q_DISABLE_COPY_AND_MOVE(GpxDocument);
2424
public:
2525
struct OSMAND_CORE_API GpxExtension : public ExtraData
2626
{

‎include/OsmAndCore/ICoreResourcesProvider.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ namespace OsmAnd
2020
{
2121
class OSMAND_CORE_API ICoreResourcesProvider
2222
{
23-
Q_DISABLE_COPY_AND_MOVE(ICoreResourcesProvider)
23+
Q_DISABLE_COPY_AND_MOVE(ICoreResourcesProvider);
2424

2525
protected:
2626
ICoreResourcesProvider();

‎include/OsmAndCore/IFavoriteLocation.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace OsmAnd
1717
{
1818
class OSMAND_CORE_API IFavoriteLocation
1919
{
20-
Q_DISABLE_COPY_AND_MOVE(IFavoriteLocation)
20+
Q_DISABLE_COPY_AND_MOVE(IFavoriteLocation);
2121
public:
2222
enum class LocationSource
2323
{

‎include/OsmAndCore/IFavoriteLocationsCollection.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ namespace OsmAnd
2222

2323
class OSMAND_CORE_API IFavoriteLocationsCollection
2424
{
25-
Q_DISABLE_COPY_AND_MOVE(IFavoriteLocationsCollection)
25+
Q_DISABLE_COPY_AND_MOVE(IFavoriteLocationsCollection);
2626

2727
private:
2828
protected:

‎include/OsmAndCore/IFontFinder.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ namespace OsmAnd
1818
{
1919
class OSMAND_CORE_API IFontFinder
2020
{
21-
Q_DISABLE_COPY_AND_MOVE(IFontFinder)
21+
Q_DISABLE_COPY_AND_MOVE(IFontFinder);
2222

2323
private:
2424
protected:

0 commit comments

Comments
 (0)