From 7c890c51d81aff18f2ee218ca9ecc6a7b8387ce7 Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Sun, 27 Apr 2014 18:42:38 +0200 Subject: [PATCH] Remove class CSimConnectException refs #224 --- .../simulator/fsx/simconnect_exception.cpp | 106 ------------------ .../simulator/fsx/simconnect_exception.h | 30 ----- src/plugins/simulator/fsx/simulator_fsx.cpp | 4 +- 3 files changed, 2 insertions(+), 138 deletions(-) delete mode 100644 src/plugins/simulator/fsx/simconnect_exception.cpp delete mode 100644 src/plugins/simulator/fsx/simconnect_exception.h diff --git a/src/plugins/simulator/fsx/simconnect_exception.cpp b/src/plugins/simulator/fsx/simconnect_exception.cpp deleted file mode 100644 index 6d746ad46..000000000 --- a/src/plugins/simulator/fsx/simconnect_exception.cpp +++ /dev/null @@ -1,106 +0,0 @@ -/* Copyright (C) 2013 VATSIM Community / contributors - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#include "simconnect_exception.h" -#include - -namespace BlackSimPlugin -{ - namespace Fsx - { - CSimConnectException::CSimConnectException() - { - } - - void CSimConnectException::handleException(SIMCONNECT_EXCEPTION exception) - { - switch(exception) - { - case SIMCONNECT_EXCEPTION_ERROR: - break; - case SIMCONNECT_EXCEPTION_SIZE_MISMATCH: - break; - case SIMCONNECT_EXCEPTION_UNRECOGNIZED_ID: - break; - case SIMCONNECT_EXCEPTION_UNOPENED: - break; - case SIMCONNECT_EXCEPTION_VERSION_MISMATCH: - break; - case SIMCONNECT_EXCEPTION_TOO_MANY_GROUPS: - break; - case SIMCONNECT_EXCEPTION_NAME_UNRECOGNIZED: - break; - case SIMCONNECT_EXCEPTION_TOO_MANY_EVENT_NAMES: - break; - case SIMCONNECT_EXCEPTION_EVENT_ID_DUPLICATE: - break; - case SIMCONNECT_EXCEPTION_TOO_MANY_MAPS: - break; - case SIMCONNECT_EXCEPTION_TOO_MANY_OBJECTS: - break; - case SIMCONNECT_EXCEPTION_TOO_MANY_REQUESTS: - break; - case SIMCONNECT_EXCEPTION_WEATHER_INVALID_PORT: - break; - case SIMCONNECT_EXCEPTION_WEATHER_INVALID_METAR: - break; - case SIMCONNECT_EXCEPTION_WEATHER_UNABLE_TO_GET_OBSERVATION: - break; - case SIMCONNECT_EXCEPTION_WEATHER_UNABLE_TO_CREATE_STATION: - break; - case SIMCONNECT_EXCEPTION_WEATHER_UNABLE_TO_REMOVE_STATION: - break; - case SIMCONNECT_EXCEPTION_INVALID_DATA_TYPE: - break; - case SIMCONNECT_EXCEPTION_INVALID_DATA_SIZE: - { - qDebug() << "Invalid data size!"; - break; - } - case SIMCONNECT_EXCEPTION_DATA_ERROR: - break; - case SIMCONNECT_EXCEPTION_INVALID_ARRAY: - break; - case SIMCONNECT_EXCEPTION_CREATE_OBJECT_FAILED: - { - qDebug() << "Failed to create object!"; - break; - } - case SIMCONNECT_EXCEPTION_LOAD_FLIGHTPLAN_FAILED: - break; - case SIMCONNECT_EXCEPTION_OPERATION_INVALID_FOR_OBJECT_TYPE: - break; - case SIMCONNECT_EXCEPTION_ILLEGAL_OPERATION: - break; - case SIMCONNECT_EXCEPTION_ALREADY_SUBSCRIBED: - break; - case SIMCONNECT_EXCEPTION_INVALID_ENUM: - break; - case SIMCONNECT_EXCEPTION_DEFINITION_ERROR: - break; - case SIMCONNECT_EXCEPTION_DUPLICATE_ID: - break; - case SIMCONNECT_EXCEPTION_DATUM_ID: - break; - case SIMCONNECT_EXCEPTION_OUT_OF_BOUNDS: - break; - case SIMCONNECT_EXCEPTION_ALREADY_CREATED: - break; - case SIMCONNECT_EXCEPTION_OBJECT_OUTSIDE_REALITY_BUBBLE: - break; - case SIMCONNECT_EXCEPTION_OBJECT_CONTAINER: - break; - case SIMCONNECT_EXCEPTION_OBJECT_AI: - break; - case SIMCONNECT_EXCEPTION_OBJECT_ATC: - break; - case SIMCONNECT_EXCEPTION_OBJECT_SCHEDULE: - break; - default: - break; - } - } - } -} diff --git a/src/plugins/simulator/fsx/simconnect_exception.h b/src/plugins/simulator/fsx/simconnect_exception.h deleted file mode 100644 index ab13472cb..000000000 --- a/src/plugins/simulator/fsx/simconnect_exception.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright (C) 2013 VATSIM Community / contributors - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#ifndef BLACKSIMPLUGIN_FSX_SIMCONNECT_EXCEPTION_H -#define BLACKSIMPLUGIN_FSX_SIMCONNECT_EXCEPTION_H - -#include "simconnect/SimConnect.h" - -namespace BlackSimPlugin -{ - namespace Fsx - { - //! \brief Handles SimConnect exceptions - class CSimConnectException - { - public: - CSimConnectException(); - - /*! - * \brief Handle exception - * \param exception - */ - static void handleException(SIMCONNECT_EXCEPTION exception); - }; - } -} - -#endif // BLACKSIMPLUGIN_FSX_SIMCONNECT_EXCEPTION_H diff --git a/src/plugins/simulator/fsx/simulator_fsx.cpp b/src/plugins/simulator/fsx/simulator_fsx.cpp index e1c774b86..6c93fc83c 100644 --- a/src/plugins/simulator/fsx/simulator_fsx.cpp +++ b/src/plugins/simulator/fsx/simulator_fsx.cpp @@ -5,7 +5,7 @@ #include "simulator_fsx.h" #include "simconnect_datadefinition.h" -#include "simconnect_exception.h" +#include "blacksim/fsx/simconnectutilities.h" #include "blacksim/fsx/fsxsimulatorsetup.h" #include "blacksim/simulatorinfo.h" #include @@ -165,7 +165,7 @@ namespace BlackSimPlugin case SIMCONNECT_RECV_ID_EXCEPTION: { SIMCONNECT_RECV_EXCEPTION *event = (SIMCONNECT_RECV_EXCEPTION *)pData; - CSimConnectException::handleException((SIMCONNECT_EXCEPTION)event->dwException); + qDebug() << "Caught simConnect exception: " << CSimConnectUtilities::simConnectExceptionToString((SIMCONNECT_EXCEPTION)event->dwException); break; } case SIMCONNECT_RECV_ID_QUIT: