Cleanup

Sources/SMSClient/SMSClient.cpp

@@ -45,8 +45,6 @@ int CSMSClient::SetAllMsgsDatabase(QString DID, QList<CSMSMessage> *MessagesList
     if(mSMSDatabase.SetAllMessages(DID,MessagesList) == RET_OK)
     {
         mGuiHandle->FullConversationsUpdate();
-//        mMainPanel->mConversationsWindow->FullConversationsUpdate();
-//        mMainPanel->mConversationWindow->hide();
     }
     return RET_OK;
 }
@@ -70,60 +68,6 @@ int CSMSClient::SetContacts(QList<CContact> *ContactsList)
     return RET_OK;
 }
 
-//unsigned int CSMSClient::QuitApplicationRequest()
-//{
-
-//    QApplication::exit(69);
-//    return RET_OK;
-//}
-
-//unsigned int CSMSClient::ShowSettingsWindowRequest()
-//{
-//    mSettingsWindow->show();
-//    return RET_OK;
-//}
-
-//unsigned int CSMSClient::SaveSettings(CSettings *Settings)
-//{
-//    CSettings toto;
-//    toto = *Settings;
-//    mSMSClientSettings = toto;
-//    mSettingsManager.SaveSettings(&mSMSClientSettings);
-
-//    return RET_OK;
-//}
-
-//unsigned int CSMSClient::SettingsWindowClosed()
-//{
-
-//    return RET_OK;
-//}
-
-//int CSMSClient::AppToggle()
-//{
-////    if(mMainPanel->mConversationWindow->isVisible())
-////    {
-////        mMainPanel->mConversationWindow->hide();
-
-////    }
-////    else if(mMainPanel->mConversationsWindow->isVisible())
-////    {
-////        mMainPanel->mConversationsWindow->hide();
-////    }
-////    else
-////    {
-////        mMainPanel->mConversationsWindow->show();
-////    }
-
-//    return RET_OK;
-//}
-//int CSMSClient::AppPosChanged(int NewPosX, int NewPosY)
-//{
-////    mMainPanel->mConversationsWindow->setPos(50,50);
-////    mMainPanel->mConversationWindow->setPos(50,50);
-//    return RET_OK;
-//}
-
 int CSMSClient::ShowConversation(QString Contact)
 {
     CSMSConversation* Conversation;
@@ -134,30 +78,9 @@ int CSMSClient::ShowConversation(QString Contact)
         return RET_ERROR;
     }
 
-//    mMainPanel->mConversationWindow->SetConversation(Conversation);
-
-//    mMainPanel->mConversationsWindow->hide();
-//    mMainPanel->mConversationWindow->show();
-
     return RET_OK;
 }
 
-//int CSMSClient::CloseConversationsWindow()
-//{
-////    mMainPanel->mConversationsWindow->hide();
-//    return RET_OK;
-//}
-
-//int CSMSClient::CloseConversationWindow(CConversationWindow *Window)
-//{
-//    Q_UNUSED(Window)
-
-////    mMainPanel->mConversationsWindow->FullConversationsUpdate();
-////    mMainPanel->mConversationWindow->hide();
-////    mMainPanel->mConversationsWindow->show();
-
-//    return RET_OK;
-//}
 
 int CSMSClient::SendSMSMessage(CSMSMessage Message)
 {
@@ -167,11 +90,6 @@ int CSMSClient::SendSMSMessage(CSMSMessage Message)
 
 int CSMSClient::NewMessageNotification(CSMSConversation *Conversation, int MessageIndex)
 {
-//    if(mMainPanel->mConversationWindow->NewMessageNotification(Conversation,MessageIndex) == true)
-//    {
-//        mSMSDatabase.SetConversationAsRead(Conversation);
-//    }
-   // mMainPanel->mConversationsWindow->UpdateConversation(Conversation);
     mGuiHandle->NewMessageNotification(Conversation,MessageIndex);
 
     MessageCountChangeNotification(mSMSDatabase.GetNbUnreadMsgs());
@@ -181,18 +99,12 @@ int CSMSClient::NewMessageNotification(CSMSConversation *Conversation, int Messa
 
 int CSMSClient::SyncConversations()
 {
- //   mMainPanel->mConversationsWindow->FullConversationsUpdate();
     return RET_OK;
 }
 
 int CSMSClient::MessageCountChangeNotification(int MsgCount)
 {
- //   mMainPanel->mAppIconWidget->SetNewMsgCount(MsgCount);
     mTrayIconMgr->NewSMSMessagesPendingCount(MsgCount);
     return RET_OK;
 }
 
-//int CSMSClient::NewConversationAddedToDatabase(CSMSConversation *Conversation)
-//{
-
-//}

Sources/SMSClient/SMSClient.h

@@ -22,10 +22,7 @@ public:
     ~CSMSClient();
 
     void Start(void);
- //   CSystemTrayManager *mSystemTrayManager;
-  //  CSettingsWindow *mSettingsWindow;
- //   CProgramSettings mSettingsManager;
-    //Panel *mMainPanel;
+
     CSMSMasterCtrlInterface *mMasterCtrlIF;
     CSMSDatabase mSMSDatabase;
     CContactRepository mContactRepository;
@@ -36,17 +33,6 @@ public:
 
 
 
-//    unsigned int QuitApplicationRequest();
-//    unsigned int ShowSettingsWindowRequest();
-//    unsigned int SaveSettings(CSettings *Settings);
-
-//    unsigned int SettingsWindowClosed();
-
-    //AppIconWidget requests
-//    int AppToggle();
-//    int AppPosChanged(int NewPosX, int NewPosY);
-
-    //MasterCtrlIngerface Requests
     int SetAllMsgsDatabase(QString DID, QList<CSMSMessage> *MessagesList);
     int SetDIDDatabase(QString DID);
     int NewMessagesEvent(QList<CSMSMessage> *MessagesList);
@@ -55,16 +41,13 @@ public:
 
     //ConversationsWindow requests
     int ShowConversation(QString Contact);
-//    int CloseConversationsWindow();
 
 
     //ConversationWindow requests
-    //int CloseConversationWindow(CConversationWindow* Window);
     int SendSMSMessage(CSMSMessage Message);
 
     //SMSDatabase requests
     int NewMessageNotification(CSMSConversation* Conversation, int MessageIndex);
-   // void NewConversationAddedToDatabase(CSMSConversation *Conversation);
     int SyncConversations();
     int MessageCountChangeNotification(int MsgCount);