Refactor: move RiaOsduConnector to Tools/Cloud.

ApplicationLibCode/Application/RiaApplication.cpp

@@ -17,9 +17,9 @@
 /////////////////////////////////////////////////////////////////////////////////
 #include "RiaApplication.h"
 
+#include "Cloud/RiaOsduConnector.h"
 #include "Cloud/RiaSumoConnector.h"
 #include "Cloud/RiaSumoDefines.h"
-#include "OsduImportCommands/RiaOsduConnector.h"
 
 #include "RiaArgumentParser.h"
 #include "RiaBaseDefs.h"

ApplicationLibCode/Application/Tools/Cloud/CMakeLists_files.cmake

@@ -2,15 +2,22 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RiaSumoConnector.h
     ${CMAKE_CURRENT_LIST_DIR}/RiaSumoDefines.h
     ${CMAKE_CURRENT_LIST_DIR}/RiaConnectorTools.h
+    ${CMAKE_CURRENT_LIST_DIR}/RiaOsduConnector.h
+    ${CMAKE_CURRENT_LIST_DIR}/RiaOsduOAuthHttpServerReplyHandler.h
 )
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RiaSumoConnector.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RiaSumoDefines.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RiaConnectorTools.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RiaOsduConnector.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RiaOsduOAuthHttpServerReplyHandler.cpp
 )
 
-list(APPEND QT_MOC_HEADERS ${CMAKE_CURRENT_LIST_DIR}/RiaSumoConnector.h)
+list(APPEND QT_MOC_HEADERS ${CMAKE_CURRENT_LIST_DIR}/RiaSumoConnector.h
+     ${CMAKE_CURRENT_LIST_DIR}/RiaOsduConnector.h
+     ${CMAKE_CURRENT_LIST_DIR}/RiaOsduOAuthHttpServerReplyHandler.h
+)
 
 list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 

ApplicationLibCode/Application/Tools/Cloud/RiaSumoConnector.cpp

@@ -22,8 +22,7 @@
 #include "RiaFileDownloader.h"
 #include "RiaLogging.h"
 #include "RiaOsduDefines.h"
-
-#include "OsduImportCommands/RiaOsduOAuthHttpServerReplyHandler.h"
+#include "RiaOsduOAuthHttpServerReplyHandler.h"
 
 #include <QAbstractOAuth>
 #include <QDesktopServices>

ApplicationLibCode/Commands/OsduImportCommands/CMakeLists_files.cmake

@@ -6,8 +6,6 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimWellsEntry.h
     ${CMAKE_CURRENT_LIST_DIR}/RiuWellImportWizard.h
     ${CMAKE_CURRENT_LIST_DIR}/RiuWellLogImportWizard.h
-    ${CMAKE_CURRENT_LIST_DIR}/RiaOsduOAuthHttpServerReplyHandler.h
-    ${CMAKE_CURRENT_LIST_DIR}/RiaOsduConnector.h
 )
 
 set(SOURCE_GROUP_SOURCE_FILES
@@ -18,21 +16,15 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimWellsEntry.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RiuWellImportWizard.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RiuWellLogImportWizard.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RiaOsduOAuthHttpServerReplyHandler.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RiaOsduConnector.cpp
 )
 
 list(APPEND COMMAND_CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
 list(APPEND COMMAND_CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 
-list(
-  APPEND
-  COMMAND_QT_MOC_HEADERS
-  ${CMAKE_CURRENT_LIST_DIR}/RiaOsduConnector.h
+list(APPEND COMMAND_QT_MOC_HEADERS
      ${CMAKE_CURRENT_LIST_DIR}/RiuWellImportWizard.h
      ${CMAKE_CURRENT_LIST_DIR}/RiuWellLogImportWizard.h
-  ${CMAKE_CURRENT_LIST_DIR}/RiaOsduOAuthHttpServerReplyHandler.h
 )
 
 source_group(

ApplicationLibCode/Commands/OsduImportCommands/RicWellPathsImportOsduFeature.cpp

@@ -18,10 +18,10 @@
 
 #include "RicWellPathsImportOsduFeature.h"
 
+#include "Cloud/RiaOsduConnector.h"
 #include "RiaApplication.h"
 #include "RiaGuiApplication.h"
 #include "RiaLogging.h"
-#include "RiaOsduConnector.h"
 #include "RiaPreferences.h"
 #include "RiaPreferencesOsdu.h"
 

ApplicationLibCode/Commands/OsduImportCommands/RiuWellImportWizard.cpp

@@ -19,7 +19,6 @@
 #include "RiuWellImportWizard.h"
 
 #include "RiaFeatureCommandContext.h"
-#include "RiaOsduConnector.h"
 
 #include "RimWellPathImport.h"
 

ApplicationLibCode/Commands/OsduImportCommands/RiuWellImportWizard.h

@@ -26,7 +26,7 @@
 #include <QUrl>
 #include <QWizard>
 
-#include "RiaOsduConnector.h"
+#include "Cloud/RiaOsduConnector.h"
 
 #include <set>
 

ApplicationLibCode/Commands/OsduImportCommands/RiuWellLogImportWizard.cpp

@@ -19,7 +19,6 @@
 #include "RiuWellLogImportWizard.h"
 
 #include "RiaFeatureCommandContext.h"
-#include "RiaOsduConnector.h"
 
 #include <QAbstractTableModel>
 #include <QObject>

ApplicationLibCode/Commands/OsduImportCommands/RiuWellLogImportWizard.h

@@ -18,6 +18,8 @@
 
 #pragma once
 
+#include "Cloud/RiaOsduConnector.h"
+
 #include <QItemSelection>
 #include <QLineEdit>
 #include <QNetworkAccessManager>
@@ -26,8 +28,6 @@
 #include <QUrl>
 #include <QWizard>
 
-#include "RiaOsduConnector.h"
-
 #include <set>
 
 class QFile;

ApplicationLibCode/Commands/RicImportWellLogOsduFeature.cpp

@@ -18,8 +18,10 @@
 
 #include "RicImportWellLogOsduFeature.h"
 
+#include "Cloud/RiaOsduConnector.h"
 #include "RiaGuiApplication.h"
 #include "RiaLogging.h"
+#include "RiaPreferences.h"
 
 #include "RimOilField.h"
 #include "RimOsduWellLog.h"
@@ -28,12 +30,8 @@
 #include "RimProject.h"
 #include "RimWellPathCollection.h"
 
-#include "RiuMainWindow.h"
-
-#include "OsduImportCommands/RiaOsduConnector.h"
 #include "OsduImportCommands/RiuWellLogImportWizard.h"
-#include "RiaLogging.h"
-#include "RiaPreferences.h"
+#include "RiuMainWindow.h"
 
 #include "cafSelectionManager.h"
 

ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathCollection.cpp

@@ -20,7 +20,7 @@
 
 #include "RimWellPathCollection.h"
 
-#include "OsduImportCommands/RiaOsduConnector.h"
+#include "Cloud/RiaOsduConnector.h"
 #include "RiaColorTables.h"
 #include "RiaGuiApplication.h"
 #include "RiaLogging.h"