Revert "Bri12415/v.next merged with main (#1767)" (#1768)

This reverts commit cc20a8f.

.gitignore

@@ -141,10 +141,8 @@ Thumbs.db
 
 # ignore all build directories
 
-*build-*
+*build*
 .qmake.stash
 *Makefile*
 .qtc_clangd
 mocinclude.opt
-build/
-

CppSamples/AR/DisplayScenesInTabletopAR/DisplayScenesInTabletopAR.cpp

@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayScenesInTabletopAR, Category=AR]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,20 +18,17 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "DisplayScenesInTabletopAR.h"
 
-// ArcGIS Maps SDK headers
 #include "Error.h"
 #include "MobileScenePackage.h"
 #include "Scene.h"
 #include "SceneQuickView.h"
 #include "SceneViewTypes.h"
 #include "Surface.h"
 
-// Qt headers
-#include <QStandardPaths>
 #include <QtCore/qglobal.h>
+#include <QStandardPaths>
 
 using namespace Esri::ArcGISRuntime;
 

CppSamples/AR/DisplayScenesInTabletopAR/DisplayScenesInTabletopAR.h

@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayScenesInTabletopAR, Category=AR]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,12 +17,6 @@
 #ifndef DISPLAYSCENESINTABLETOPAR_H
 #define DISPLAYSCENESINTABLETOPAR_H
 
-// toolkit headers
-#include "ArcGISArView.h"
-
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class ArcGISSceneLayer;
@@ -32,6 +26,9 @@ class Scene;
 class SceneQuickView;
 }
 
+#include <QObject>
+#include "ArcGISArView.h"
+
 class DisplayScenesInTabletopAR : public QObject
 {
   Q_OBJECT

CppSamples/AR/DisplayScenesInTabletopAR/DisplayScenesInTabletopAR.pro

@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = DisplayScenesInTabletopAR
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------

CppSamples/AR/DisplayScenesInTabletopAR/DisplayScenesInTabletopAR.qml

@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayScenesInTabletopAR, Category=AR]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

CppSamples/AR/DisplayScenesInTabletopAR/main.cpp

@@ -1,35 +1,26 @@
-// [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
-
-// sample headers
-#include "DisplayScenesInTabletopAR.h"
 
-// toolkit headers
 #include "ArcGISArView.h"
-
-// ArcGIS Maps SDK headers
+#include "DisplayScenesInTabletopAR.h"
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
-#include <QQuickWindow>
 #include <QSurfaceFormat>
+#include <QQuickWindow>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif

CppSamples/AR/DisplayScenesInTabletopAR/main.qml

@@ -1,12 +1,12 @@
 // [WriteFile Name=DisplayScenesInTabletopAR, Category=AR]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

CppSamples/AR/ExploreScenesInFlyoverAR/ExploreScenesInFlyoverAR.cpp

@@ -1,12 +1,12 @@
 // [WriteFile Name=ExploreScenesInFlyoverAR, Category=AR]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,10 +18,8 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "ExploreScenesInFlyoverAR.h"
 
-// ArcGIS Maps SDK headers
 #include "ArcGISTiledElevationSource.h"
 #include "ElevationSourceListModel.h"
 #include "Envelope.h"

CppSamples/AR/ExploreScenesInFlyoverAR/ExploreScenesInFlyoverAR.h

@@ -1,12 +1,12 @@
 // [WriteFile Name=ExploreScenesInFlyoverAR, Category=AR]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,19 +17,16 @@
 #ifndef EXPLORESCENESINFLYOVERAR_H
 #define EXPLORESCENESINFLYOVERAR_H
 
-// toolkit headers
-#include "ArcGISArView.h"
-
-// Qt headers
-#include <QObject>
-
 namespace Esri::ArcGISRuntime
 {
 class Scene;
 class SceneQuickView;
 class IntegratedMeshLayer;
 }
 
+#include <QObject>
+#include "ArcGISArView.h"
+
 class ExploreScenesInFlyoverAR : public QObject
 {
   Q_OBJECT

CppSamples/AR/ExploreScenesInFlyoverAR/ExploreScenesInFlyoverAR.pro

@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = ExploreScenesInFlyoverAR
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------

CppSamples/AR/ExploreScenesInFlyoverAR/ExploreScenesInFlyoverAR.qml

@@ -1,12 +1,12 @@
 // [WriteFile Name=ExploreScenesInFlyoverAR, Category=AR]
 // [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

CppSamples/AR/ExploreScenesInFlyoverAR/main.cpp

@@ -1,32 +1,25 @@
-// [Legal]
 // Copyright 2020 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// [Legal]
 
-// sample headers
 #include "ExploreScenesInFlyoverAR.h"
-
-// ArcGIS Maps SDK headers
 #include "ArcGISRuntimeEnvironment.h"
 
-// Qt headers
 #include <QDir>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
-#include <QQuickWindow>
 #include <QSurfaceFormat>
+#include <QQuickWindow>
 
-// Platform specific headers
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #endif

CppSamples/Analysis/AnalyzeHotspots/AnalyzeHotspots.cpp

@@ -1,12 +1,12 @@
 // [WriteFile Name=AnalyzeHotspots, Category=Analysis]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,25 +18,22 @@
 #include "pch.hpp"
 #endif // PCH_BUILD
 
-// sample headers
 #include "AnalyzeHotspots.h"
 
-// ArcGIS Maps SDK headers
-#include "ArcGISMapImageLayer.h"
-#include "Envelope.h"
-#include "Error.h"
-#include "GeoprocessingJob.h"
-#include "GeoprocessingResult.h"
-#include "GeoprocessingString.h"
-#include "GeoprocessingTask.h"
-#include "GeoprocessingTypes.h"
-#include "LayerListModel.h"
 #include "Map.h"
 #include "MapQuickView.h"
 #include "MapTypes.h"
+#include "GeoprocessingTask.h"
+#include "GeoprocessingJob.h"
+#include "GeoprocessingString.h"
+#include "GeoprocessingTypes.h"
+#include "ArcGISMapImageLayer.h"
+#include "Error.h"
 #include "TaskTypes.h"
+#include "LayerListModel.h"
+#include "GeoprocessingResult.h"
+#include "Envelope.h"
 
-// Qt headers
 #include <QFuture>
 
 using namespace Esri::ArcGISRuntime;
@@ -77,6 +74,7 @@ void AnalyzeHotspots::componentComplete()
   });
 }
 
+
 void AnalyzeHotspots::executeTaskWithDates(const QString& fromDate, const QString& toDate)
 {
   // Create the GP Parameters

CppSamples/Analysis/AnalyzeHotspots/AnalyzeHotspots.h

@@ -1,12 +1,12 @@
 // [WriteFile Name=AnalyzeHotspots, Category=Analysis]
 // [Legal]
 // Copyright 2017 Esri.
-//
+
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-//
+
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,12 +17,6 @@
 #ifndef ANALYZEHOTSPOTS_H
 #define ANALYZEHOTSPOTS_H
 
-// ArcGIS Maps SDK headers
-#include "GeoprocessingParameters.h"
-
-// Qt headers
-#include <QQuickItem>
-
 namespace Esri::ArcGISRuntime
 {
     class Map;
@@ -32,6 +26,9 @@ namespace Esri::ArcGISRuntime
     class ArcGISMapImageLayer;
 }
 
+#include "GeoprocessingParameters.h"
+#include <QQuickItem>
+
 class AnalyzeHotspots : public QQuickItem
 {
   Q_OBJECT

CppSamples/Analysis/AnalyzeHotspots/AnalyzeHotspots.pro

@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.6.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app