Index: leahi.pro =================================================================== diff -u -re2b8925fd32e359b3c440acd61e921f0be825a65 -rfa0bd4432f4726fc0d29de0f93a8d5e725cf0274 --- leahi.pro (.../leahi.pro) (revision e2b8925fd32e359b3c440acd61e921f0be825a65) +++ leahi.pro (.../leahi.pro) (revision fa0bd4432f4726fc0d29de0f93a8d5e725cf0274) @@ -95,15 +95,12 @@ sources/ApplicationController.h \ sources/device/DeviceController.h \ sources/storage/Settings.h \ - sources/bluetooth/BluetoothInterface.h \ - sources/cloudsync/CloudSyncController.h \ \ # ---------- Models ---------- sources/model/MAbstract.h \ sources/model/MAbstractDynamic.h \ sources/device/DeviceModels.h \ sources/model/settings/MSettings.h \ sources/model/settings/MWifiNetwork.h \ - sources/model/settings/MBluetooth.h \ sources/model/hd/adjustment/MAdjustRequestsBase.h \ \ # ---------- Models - Alarm sources/model/hd/alarm/MAlarmActiveList.h \ @@ -128,8 +125,6 @@ sources/view/settings/VDateTime.h \ sources/view/settings/VSettings.h \ sources/view/settings/VLocalization.h \ - sources/view/settings/VBluetooth.h \ - sources/view/settings/VCloudSync.h \ sources/view/VAdjustmentResponseBase.h \ \ # Storage sources/storage/StorageGlobals.h \ @@ -306,15 +301,12 @@ sources/ApplicationController.cpp \ sources/device/DeviceController.cpp \ sources/storage/Settings.cpp \ - sources/bluetooth/BluetoothInterface.cpp \ - sources/cloudsync/CloudSyncController.cpp \ \ # ---------- Models ---------- sources/model/MAbstract.cpp \ sources/model/MAbstractDynamic.cpp \ sources/device/DeviceModels.cpp \ \ # ---------- Models - settings sources/model/settings/MSettings.cpp \ - sources/model/settings/MBluetooth.cpp \ \ # ---------- Models - Alarm sources/model/hd/alarm/MAlarmMapping.cpp \ sources/model/hd/alarm/MAlarmActiveList.cpp \ @@ -338,8 +330,6 @@ sources/view/settings/VSettings.cpp \ sources/view/settings/VLocalization.cpp \ sources/view/settings/VDateTime.cpp \ - sources/view/settings/VBluetooth.cpp \ - sources/view/settings/VCloudSync.cpp \ \ # ---------- Views - HD - Adjustment sources/view/VAdjustmentResponseBase.cpp \ \ # Storage Index: main.cpp =================================================================== diff -u -re2b8925fd32e359b3c440acd61e921f0be825a65 -rfa0bd4432f4726fc0d29de0f93a8d5e725cf0274 --- main.cpp (.../main.cpp) (revision e2b8925fd32e359b3c440acd61e921f0be825a65) +++ main.cpp (.../main.cpp) (revision fa0bd4432f4726fc0d29de0f93a8d5e725cf0274) @@ -50,8 +50,7 @@ #include "GuiController.h" #include "Logger.h" #include "DeviceController.h" -#include "BluetoothInterface.h" -#include "CloudSyncController.h" + //AMIR #include "Settings.h" @@ -629,12 +628,6 @@ //! - Initializing Main Timer _MainTimer.init(); - //! - Initializing Bluetooth Interface - _BluetoothInterface.init(Threads::_Bluetooth_Thread); - - //! - Initializing the CloudSync controller - _CloudSyncController.init(Threads::_CloudSync_Thread); - //! - Initialize the QML Viewer and starts GUI int app_exec = -1; LOG_DEBUG("UI Initializing"); Index: sources/ApplicationController.cpp =================================================================== diff -u -re2b8925fd32e359b3c440acd61e921f0be825a65 -rfa0bd4432f4726fc0d29de0f93a8d5e725cf0274 --- sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision e2b8925fd32e359b3c440acd61e921f0be825a65) +++ sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision fa0bd4432f4726fc0d29de0f93a8d5e725cf0274) @@ -26,7 +26,6 @@ #include "GuiController.h" #include "Settings.h" #include "MSettings.h" -#include "BluetoothInterface.h" /*! * \brief ApplicationController::ApplicationController @@ -90,10 +89,6 @@ this , SLOT(onPOSTEthernet (bool))); connect(&_post , SIGNAL( didWiFi (bool)), this , SLOT(onPOSTWiFi (bool))); - connect(&_post , SIGNAL( didBluetooth(bool)), - this , SLOT(onPOSTBluetooth(bool))); - connect(&_post , SIGNAL( didCloudSync(bool)), - this , SLOT(onPOSTCloudSync(bool))); connect(&_post , SIGNAL( didFail (Gui::GuiAlarmID )), this , SLOT(onPOSTFail (Gui::GuiAlarmID ))); @@ -570,33 +565,6 @@ } /*! - * \brief ApplicationController::onPOSTBluetooth - * \details Starts the Bluetooth Interface - */ -void ApplicationController::onPOSTBluetooth(bool vPass) { - if (vPass) { - _BluetoothInterface.valid(true); - _BluetoothInterface.doStart(); - } - else { - _BluetoothInterface.doNotifyStatePOSTError(); - } - // sending the data first, therefore in the slot for the didPOST we have the vPass and the Data to decide to use the data or not. - emit didPOSTBluetoothData (_post.macBluetooth()); - emit didPOSTBluetooth (vPass); -} - -/*! - * \brief ApplicationController::onPOSTCloudSync - * \details Notifies the CloudSync POST status - */ -void ApplicationController::onPOSTCloudSync(bool vPass) { - // sending the data first, therefore in the slot for the didPOST we have the vPass and the Data to decide to use the data or not. - emit didPOSTCloudSyncData("" /*_post.netCloudSync*/); // not needed and POST is not getting it yet. [ApplicationController => DeviceController] - emit didPOSTCloudSync (vPass); -} - -/*! * \brief ApplicationController::alarmTrigger * \details Queues the alarms, or send the list, or send one alarm * \param vAlarmID - The alarm ID to be triggered or queued. Index: sources/ApplicationController.h =================================================================== diff -u -re2b8925fd32e359b3c440acd61e921f0be825a65 -rfa0bd4432f4726fc0d29de0f93a8d5e725cf0274 --- sources/ApplicationController.h (.../ApplicationController.h) (revision e2b8925fd32e359b3c440acd61e921f0be825a65) +++ sources/ApplicationController.h (.../ApplicationController.h) (revision fa0bd4432f4726fc0d29de0f93a8d5e725cf0274) @@ -117,8 +117,6 @@ void onOSVersion (bool vPass); void onPOSTEthernet (bool vPass); void onPOSTWiFi (bool vPass); - void onPOSTBluetooth (bool vPass); - void onPOSTCloudSync (bool vPass); void onPOSTFail (Gui::GuiAlarmID vAlarmID); void onPOSTDone (bool vPass); Fisheye: Tag fa0bd4432f4726fc0d29de0f93a8d5e725cf0274 refers to a dead (removed) revision in file `sources/bluetooth/BluetoothInterface.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag fa0bd4432f4726fc0d29de0f93a8d5e725cf0274 refers to a dead (removed) revision in file `sources/bluetooth/BluetoothInterface.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag fa0bd4432f4726fc0d29de0f93a8d5e725cf0274 refers to a dead (removed) revision in file `sources/cloudsync/CloudSyncController.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag fa0bd4432f4726fc0d29de0f93a8d5e725cf0274 refers to a dead (removed) revision in file `sources/cloudsync/CloudSyncController.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/device/DeviceController.cpp =================================================================== diff -u -rf2e4eba6e85c5d36537be782926f23cc9dc01037 -rfa0bd4432f4726fc0d29de0f93a8d5e725cf0274 --- sources/device/DeviceController.cpp (.../DeviceController.cpp) (revision f2e4eba6e85c5d36537be782926f23cc9dc01037) +++ sources/device/DeviceController.cpp (.../DeviceController.cpp) (revision fa0bd4432f4726fc0d29de0f93a8d5e725cf0274) @@ -27,7 +27,6 @@ #include "Threads.h" #include "StorageGlobals.h" #include "Logger.h" -#include "CloudSyncController.h" #include "ApplicationController.h" #include "FileHandler.h" #include "Settings.h" @@ -122,8 +121,6 @@ connect(&_Logger , SIGNAL(didLogBackup (const QString &)), this , SLOT( onLogBackup (const QString &))); - connect(&_CloudSyncController , SIGNAL(didLogUpload (const QString &)), - this , SLOT( onLogUpload (const QString &))); DEVICE_DEV_INIT_CONNECTIONS_LIST Index: sources/gui/GuiGlobalsAutoGen.cpp =================================================================== diff -u -re2b8925fd32e359b3c440acd61e921f0be825a65 -rfa0bd4432f4726fc0d29de0f93a8d5e725cf0274 --- sources/gui/GuiGlobalsAutoGen.cpp (.../GuiGlobalsAutoGen.cpp) (revision e2b8925fd32e359b3c440acd61e921f0be825a65) +++ sources/gui/GuiGlobalsAutoGen.cpp (.../GuiGlobalsAutoGen.cpp) (revision fa0bd4432f4726fc0d29de0f93a8d5e725cf0274) @@ -25,8 +25,6 @@ #include "VAlarmStatus.h" #include "VAlarmActiveList.h" #include "VDateTime.h" -#include "VBluetooth.h" -#include "VCloudSync.h" // START OF AUTO GENERATED CODE // #include "VAlarmStatus.h" Index: sources/model/MModelAutoGen.h =================================================================== diff -u -re2b8925fd32e359b3c440acd61e921f0be825a65 -rfa0bd4432f4726fc0d29de0f93a8d5e725cf0274 --- sources/model/MModelAutoGen.h (.../MModelAutoGen.h) (revision e2b8925fd32e359b3c440acd61e921f0be825a65) +++ sources/model/MModelAutoGen.h (.../MModelAutoGen.h) (revision fa0bd4432f4726fc0d29de0f93a8d5e725cf0274) @@ -5,7 +5,6 @@ // device #include "DeviceModels.h" -#include "MBluetooth.h" #include "MSettings.h" // START OF AUTO GENERATED CODE // Fisheye: Tag fa0bd4432f4726fc0d29de0f93a8d5e725cf0274 refers to a dead (removed) revision in file `sources/model/settings/MBluetooth.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag fa0bd4432f4726fc0d29de0f93a8d5e725cf0274 refers to a dead (removed) revision in file `sources/model/settings/MBluetooth.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/view/VEventSpy.cpp =================================================================== diff -u -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 -rfa0bd4432f4726fc0d29de0f93a8d5e725cf0274 --- sources/view/VEventSpy.cpp (.../VEventSpy.cpp) (revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021) +++ sources/view/VEventSpy.cpp (.../VEventSpy.cpp) (revision fa0bd4432f4726fc0d29de0f93a8d5e725cf0274) @@ -23,7 +23,6 @@ #include "GuiGlobalsAutoGen.h" #include "FileHandler.h" #include "DeviceController.h" -#include "BluetoothInterface.h" #undef DEBUG_BCUFF_MIMIC Fisheye: Tag fa0bd4432f4726fc0d29de0f93a8d5e725cf0274 refers to a dead (removed) revision in file `sources/view/settings/VBluetooth.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag fa0bd4432f4726fc0d29de0f93a8d5e725cf0274 refers to a dead (removed) revision in file `sources/view/settings/VBluetooth.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag fa0bd4432f4726fc0d29de0f93a8d5e725cf0274 refers to a dead (removed) revision in file `sources/view/settings/VCloudSync.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag fa0bd4432f4726fc0d29de0f93a8d5e725cf0274 refers to a dead (removed) revision in file `sources/view/settings/VCloudSync.h'. Fisheye: No comparison available. Pass `N' to diff?