Index: sources/cloudsync/CloudSyncController.cpp =================================================================== diff -u -rabd0e958420f25e5b8dd8ce6e21131f8561b99e0 -r2f0f23635ac0225d2012e3db9d1043ce19c6d715 --- sources/cloudsync/CloudSyncController.cpp (.../CloudSyncController.cpp) (revision abd0e958420f25e5b8dd8ce6e21131f8561b99e0) +++ sources/cloudsync/CloudSyncController.cpp (.../CloudSyncController.cpp) (revision 2f0f23635ac0225d2012e3db9d1043ce19c6d715) @@ -18,7 +18,6 @@ #include // Project -// #include "MessageDispatcher.h" #include "ApplicationController.h" #include "DeviceController.h" #include "FileHandler.h" @@ -112,8 +111,8 @@ this , SLOT( onWatchFileChange (const QString &))); connect(&_DeviceController , SIGNAL(didFactoryReset (bool)), this , SLOT( onFactoryReset (bool))); - connect(&_TreatmentLog , SIGNAL(didTxPending (const QString &)), - this , SLOT( onTxPending (const QString &))); + connect(&_TreatmentLog , SIGNAL(didPendingTxr (const QString &)), + this , SLOT( onPendingTxr (const QString &))); connect(this , SIGNAL(didInitComplete ()), this , SLOT( onInitComplete ()),Qt::QueuedConnection); // it has to be queued connection, don't remove it. } @@ -740,7 +739,7 @@ } } -void CloudSyncController::sendPendingLog(const QString &vFileName) +void CloudSyncController::sendPendingTxr(const QString &vFileName) { bool ok = true; Q_UNUSED(ok) QVariantList args ; @@ -755,9 +754,9 @@ toLog(error, args); } -void CloudSyncController::onTxPending(const QString &vFileName) +void CloudSyncController::onPendingTxr(const QString &vFileName) { - sendPendingLog(vFileName); + sendPendingTxr(vFileName); } /*! Index: sources/cloudsync/CloudSyncController.h =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r2f0f23635ac0225d2012e3db9d1043ce19c6d715 --- sources/cloudsync/CloudSyncController.h (.../CloudSyncController.h) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/cloudsync/CloudSyncController.h (.../CloudSyncController.h) (revision 2f0f23635ac0225d2012e3db9d1043ce19c6d715) @@ -174,8 +174,11 @@ eMessageID_TxReport = 7, // [ UI(1007) -> CS(2007) ] TxReport Notify // Tx Code eMessageID_TxCodeDisplay = 8, // [ CS(2008) -> UI( ) ] Display TxCode Request - + // Factory Reset eMessageID_CSFactoryReset = 9, // [ UI(1009) <-> CS(2009) ] Factory Reset Request + // Log Upload + eMessageID_SendLogUpload = 10, // [ UI(1010) <-> CS(2010) ] Log Upload Request/Response + // // Subject to change so has been commented out for now // @@ -188,10 +191,11 @@ eMessageID_Count }; - QHash paramCount { + QHash paramCount { // Received message length { eMessageID_CredentialsSave , 3 }, { eMessageID_TxCodeDisplay , 1 }, { eMessageID_Error , 2 }, + { eMessageID_SendLogUpload , 1 }, }; enum DeviceInfo_Enum { @@ -215,7 +219,7 @@ private slots: void onWatchFileChange (const QString &vFile); void onActionReceive (GuiActionType vAction, const QVariantList &vData); - void onTxPending (const QString &vFileName ); + void onPendingTxr (const QString &vFileName ); void onInitComplete (); void onPOSTCloudSync (bool vPass ); void onCryptSetupMount (bool vPass ); @@ -300,8 +304,8 @@ void testCheckIn (); bool takeCheckIn (); - // pending log - void sendPendingLog ( const QString &vFileName ); // eMessageID_TxReport + // pending Treatment log + void sendPendingTxr ( const QString &vFileName ); // eMessageID_TxReport bool sendTxCodeDisplay ( const Message &vMessage ); // eMessageID_TxCodeDisplay }; Index: sources/storage/TreatmentLog.cpp =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r2f0f23635ac0225d2012e3db9d1043ce19c6d715 --- sources/storage/TreatmentLog.cpp (.../TreatmentLog.cpp) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/storage/TreatmentLog.cpp (.../TreatmentLog.cpp) (revision 2f0f23635ac0225d2012e3db9d1043ce19c6d715) @@ -620,7 +620,7 @@ * when the _pendingCounter reaches 0 will search for the files * in the _TreatmentLog.logPathPending() * and if there is any will get the recent file in the list - * and asks for the TxCode by emitting the didTxPending signal + * and asks for the TxCode by emitting the didPendingTxr signal */ void TreatmentLog::testPendingTxReports() { @@ -649,6 +649,6 @@ } QString message = pendingTxr + " , " + _pendingTxr + " , " + _gTxCode; LOG_DEBUG(message); - emit didTxPending( _pendingTxr ); + emit didPendingTxr( _pendingTxr ); } } Index: sources/storage/TreatmentLog.h =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r2f0f23635ac0225d2012e3db9d1043ce19c6d715 --- sources/storage/TreatmentLog.h (.../TreatmentLog.h) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/storage/TreatmentLog.h (.../TreatmentLog.h) (revision 2f0f23635ac0225d2012e3db9d1043ce19c6d715) @@ -277,7 +277,7 @@ void doExport (); signals: - void didTxPending ( const QString &vFileName ); + void didPendingTxr ( const QString &vFileName ); void didTxCodeReceive ( const QString &vTxCode ); void didNotification ( const QString &vNotification );