Changeset 67:578192d6fe64 in SMSSender

Timestamp:

Feb 7, 2010 4:11:28 PM (8 years ago)

Author:

Sämy Zehnder <saemy.zehnder@…>

Branch:

3.0

Convert:

svn:3639001d-8e34-449c-bb86-3782b86c4877/branches/3.0@66

Message:

• added synchttp
• backup before removing these diamond interfaces...

Files:

• lib/libdatatypes/datatypes.pro (modified) (2 diffs)
• lib/libdatatypes/src/synchttp.h (added)
• lib/libgateway/gateway.pro (modified) (1 diff)
• lib/libgateway/src/business/AbstractAccount.cpp (modified) (3 diffs)
• lib/libgateway/src/business/AbstractAccount.h (modified) (1 diff)
• lib/libgateway/src/business/HttpHelper.cpp (modified) (1 diff)
• lib/libgateway/src/business/HttpHelper.h (modified) (2 diffs)
• src/business/BCAccountLoadThread.cpp (modified) (5 diffs)
• src/business/BCAccountManager.cpp (modified) (2 diffs)
• src/ui/VCMain/vcmain.cpp (modified) (2 diffs)
• src/ui/models/accounttreemodel.cpp (modified) (4 diffs)
• src/ui/models/accounttreemodel.h (modified) (2 diffs)
• src/ui/models/contactgroupmodel.cpp (modified) (4 diffs)
• src/ui/models/contactgroupmodel.h (modified) (1 diff)
• src/ui/models/grouptablemodel.cpp (modified) (5 diffs)
• src/ui/models/grouptablemodel.h (modified) (2 diffs)
• src/ui/models/loadedaccountmodel.cpp (modified) (1 diff)
• src/ui/models/loadedaccountmodel.h (modified) (1 diff)

lib/libdatatypes/datatypes.pro

@@ -5 +5 @@
 DESTDIR = ../
 TARGET = datatypes
-QT += core 
+QT += core \
+    network
 LIBS += -L../
 LIBS += -linterfaces \
@@ -18 +19 @@
     src/business/BCGroup.h \
     src/snumber.h \
-    src/sshortcut.h
+    src/sshortcut.h \
+    src/synchttp.h
 SOURCES += src/business/BCBinary.cpp \
     src/business/BCContact.cpp \

lib/libgateway/gateway.pro

@@ -11 +11 @@
 LIBS += -L../
 LIBS += -linterfaces \
-    -lutils
+    -lutils \
+    -ldatatypes
 INCLUDEPATH += app \
     ../libinterfaces/src/exceptions/ \
     ../libinterfaces/src/business/ \
     ../libinterfaces/src/ \
-    ../libutils/src/
+    ../libutils/src/ \
+    ../libdatatypes/src \
+    ../libdatatypes/src/business
 HEADERS += src/business/validation/BCLoginAccountValidator.h \
     src/business/AbstractAccount.h \

lib/libgateway/src/business/AbstractAccount.cpp

@@ -105 +105 @@
 
 void AbstractAccount::initialize(){
-    if (initializing_ || initialized_ || !isEnabled()) {
+    if (isInitializing() || isInitialized() || !isEnabled()) {
         return;
     }
@@ -120 +120 @@
 
         if (!stoppingInitialization_)
-            initialized_ = true;
+            setInitialized(true);
     }catch (...) {
         initializing_ = false;
@@ -142 +142 @@
 }
 
+void AbstractAccount::setInitialized(bool initialized) {
+    SET_IF_DIFFERENT(initialized_, initialized);
+    emit accountEvents()->dataChanged();
+}
+
+
 void AbstractAccount::unInitialize() {
     if (isInitializing())
         stopInitializing();
 
-    initialized_ = false;
+    setInitialized(false);
 }
 

lib/libgateway/src/business/AbstractAccount.h

@@ -79 +79 @@
 
     IStorageOfficer* storageOfficer_;
-    IValidator*            validator_;
+    IValidator*      validator_;
+
+    void    setInitialized(bool initialized);
 };
 

lib/libgateway/src/business/HttpHelper.cpp

@@ -146 +146 @@
 }*/
 
-void HttpHelper::waitForRequest(bool createIfNotExisting /* = true */) {
-    if (!requestLoop_.isRunning() && !createIfNotExisting){
+void HttpHelper::waitForRequest(bool createLoopIfNotExisting) {
+    if (!requestLoop_.isRunning() && !createLoopIfNotExisting){
         return;
     }
 
     qDebug() << "Waiting for the request to finish...";
+    while (!request_.finished && thread()->isRunning()) {
+        thread()->wait(100);
+    }
 /*    while (!request_.finished && thread()->isRunning()) {
         thread()->wait(100);
     }*/
-    requestLoop_.exec(QEventLoop::ExcludeUserInputEvents|QEventLoop::ExcludeSocketNotifiers|QEventLoop::WaitForMoreEvents);
+//    requestLoop_.exec(QEventLoop::ExcludeUserInputEvents|QEventLoop::ExcludeSocketNotifiers|QEventLoop::WaitForMoreEvents);
     qDebug() << "The request finished -> continuing";
 /*    while (!request_.finished) {

lib/libgateway/src/business/HttpHelper.h

@@ -9 +9 @@
 #define HTTPHELPER_H_
 
-#include <iaccount.h>
-
-#include "HttpCookieManager.h"
-
 #include <QBuffer>
 #include <QEventLoop>
@@ -18 +14 @@
 #include <QHttp>
 #include <QHttpResponseHeader>
+
+#include <iaccount.h>
+
+#include "HttpCookieManager.h"
+
 
 class HttpRequest: public QObject {

src/business/BCAccountLoadThread.cpp

@@ -1 +1 @@
 #include "BCAccountLoadThread.h"
 
-/*short const AccountLoadThread::State::Unloaded   = 0;
-short const AccountLoadThread::State::Loading    = 1;
-short const AccountLoadThread::State::Loaded     = 2;
-short const AccountLoadThread::State::Cancelling = 3;
-short const AccountLoadThread::State::Cancelled  = 4;
-short const AccountLoadThread::State::Failed     = 5;*/
-
-BCAccountLoadThread::BCAccountLoadThread(IAccount* account, QObject* parent /* = 0 */)
+BCAccountLoadThread::BCAccountLoadThread(IAccount* account, QObject* parent)
     : QThread(parent)
     , account_(account)
@@ -20 +13 @@
         if (account_->isInitialized()) {
             setLoadState(Loaded);
-            loaded(account()); // Signal
-            loadingFinished(account(), loadState()); // Signal
+            emit loaded(account()); // Signal
+            emit loadingFinished(account(), loadState()); // Signal
 
             return;
@@ -32 +25 @@
         } catch (EException* exception) {
             setLoadState(Failed);
-            loadingFailed(account(), exception); // Signal
+            emit loadingFailed(account(), exception); // Signal
         } catch (...) {
         setLoadState(Failed);
-            loadingFailed(account(), new EException("Unknown error occured while loading an account.")); // Signal
+            emit loadingFailed(account(), new EException("Unknown error occured while loading an account.")); // Signal
         }
 
@@ -47 +40 @@
         default:
             setLoadState(Loaded);
-            loaded(account()); // Signal
+            emit loaded(account()); // Signal
             break;
         }
-        loadingFinished(account(), loadState()); // Signal
+        emit loadingFinished(account(), loadState()); // Signal
 }
 
@@ -63 +56 @@
         loadState_ = loadState;
 
-        loadStateChanged(account(), this->loadState()); // Signal
+        emit loadStateChanged(account(), this->loadState()); // Signal
     }
 }

src/business/BCAccountManager.cpp

@@ -64 +64 @@
 
 QSet<IAccount*> BCAccountManager::getAccountList(){
-    return QSet<IAccount*>::fromList(accountList_.values());
+    return accountList_.values().toSet();
 }
 
@@ -100 +100 @@
 }
 void BCAccountManager::accountDataChanged() {
-    IAccount* account = static_cast<AccountEventMapper*>(sender())->account();
+    AccountEventMapper* eventMapper = qobject_cast<AccountEventMapper*>(sender());
+    IAccount* account = eventMapper->account();
     Q_ASSERT(account);
     emit accountUpdated(account);

src/ui/VCMain/vcmain.cpp

@@ -28 +28 @@
 #include "../completers/bettercompleter.h"
 #include "../models/aliascompletionmodel.h"
+#include "../models/loadedaccountmodel.h"
 
 #include "../delegates/aligndelegate.h"
@@ -37 +38 @@
         /* Accounts */
         accountModel_       = new AccountTreeModel(this);
-        accountFilterModel_ = new QSortFilterProxyModel(this);
+        accountFilterModel_ = new LoadedAccountModel(this);
         accountFilterModel_->setSourceModel(accountModel_);
         accountFilterModel_->setSortCaseSensitivity(Qt::CaseInsensitive);
         accountFilterModel_->setDynamicSortFilter(true);
-        accountFilterModel_->setFilterKeyColumn(AccountTreeModel::ColEnabled);
-        accountFilterModel_->setFilterRole(Qt::CheckStateRole);
-        accountFilterModel_->setFilterFixedString("1"); // Get only enabled ones
         accountFilterModel_->sort(AccountTreeModel::ColName, Qt::AscendingOrder);
         ui.lstAccounts->setModel(accountFilterModel_);

src/ui/models/accounttreemodel.cpp

@@ -7 +7 @@
 {
     connect(BCAccountManager::instance(), SIGNAL(accountAdded(IAccount*)),
-            this, SLOT(accountUpdated(IAccount*)));
+            this, SLOT(listAltered()));
     connect(BCAccountManager::instance(), SIGNAL(accountUpdated(IAccount*)),
             this, SLOT(accountUpdated(IAccount*)));
     connect(BCAccountManager::instance(), SIGNAL(accountRemoved(IAccount*)),
-            this, SLOT(accountUpdated(IAccount*)));
+            this, SLOT(listAltered()));
+
+    reloadList();
 }
 AccountTreeModel::~AccountTreeModel() {
     disconnect(BCAccountManager::instance(), SIGNAL(accountAdded(IAccount*)),
-               this, SLOT(accountUpdated(IAccount*)));
+               this, SLOT(listAltered()));
     disconnect(BCAccountManager::instance(), SIGNAL(accountUpdated(IAccount*)),
                this, SLOT(accountUpdated(IAccount*)));
     disconnect(BCAccountManager::instance(), SIGNAL(accountRemoved(IAccount*)),
-               this, SLOT(accountUpdated(IAccount*)));
+               this, SLOT(listAltered()));
+}
+
+void AccountTreeModel::listAltered() {
+    reloadList();
 }
 
 void AccountTreeModel::accountUpdated(IAccount* account) {
-    int row = BCAccountManager::instance()->getAccountList().values().indexOf(account);
+    int row = items_.indexOf(account);
 
     QModelIndex idx_start = index(row, 0);
-    QModelIndex idx_end   = index(row, MaxCol);
+    QModelIndex idx_end   = index(row, columnCount());
 
     if (idx_start.isValid() && idx_end.isValid()) {
         emit dataChanged(idx_start, idx_end);
-    } else {
-        reset();
     }
+}
+
+void AccountTreeModel::reloadList() {
+    items_.clear();
+    foreach(IAccount* account, BCAccountManager::instance()->getAccountList()) {
+        items_.append(account);
+    }
+    reset();
 }
 
@@ -52 +64 @@
 
 IAccount* AccountTreeModel::dataObject(const QModelIndex& index) const {
-    return BCAccountManager::instance()->getAccountList().values().at(index.row());
+    return items_.at(index.row());
 }
 
 QVariant AccountTreeModel::data(const QModelIndex& index, int role) const {
-    QList<IAccount*> accounts = BCAccountManager::instance()->getAccountList().values();
-    if (!index.isValid() || index.row() < 0 || index.row() >= accounts.size())
+    if (!index.isValid() || index.row() < 0 || index.row() >= items_.size())
         return QVariant();
 
-    const IAccount* account = accounts.at(index.row());
+    const IAccount* account = items_.at(index.row());
 
     if (role == Qt::DisplayRole) {
@@ -132 +143 @@
 
 int AccountTreeModel::rowCount(const QModelIndex& parent) const {
-    return (parent.isValid()) ? 0 : BCAccountManager::instance()->getAccountList().count();
+    return (parent.isValid()) ? 0 : items_.count();
 }
 
@@ -141 +152 @@
     int lastRow = row + count - 1;
     beginRemoveRows(parent, row, lastRow);
-    QList<IAccount*> accounts = BCAccountManager::instance()->getAccountList().values();
     for (int i = lastRow; i >= row; --i) {
-        BCAccountManager::instance()->removeAccount(accounts.at(i)->id());
+        BCAccountManager::instance()->removeAccount(items_.at(i)->id());
     }
     endRemoveRows();

src/ui/models/accounttreemodel.h

@@ -10 +10 @@
 class AccountTreeModel: public QAbstractTableModel {
     Q_OBJECT
-
-public slots:
-    void accountUpdated(IAccount* account);
 
 public:
@@ -35 +32 @@
 
     IAccount*     dataObject(const QModelIndex& index) const;
+
+public slots:
+    void accountUpdated(IAccount* account);
+    void listAltered();
+
+private:
+    QList<IAccount*> items_;
+
+    void          reloadList();
 };
 

src/ui/models/contactgroupmodel.cpp

@@ -9 +9 @@
 {
     connect(BCContactManager::instance(), SIGNAL(contactAdded(IContact*)),
-            this, SLOT(dataUpdated(IContact*)));
+            this, SLOT(listAltered()));
     connect(BCContactManager::instance(), SIGNAL(contactUpdated(IContact*)),
             this, SLOT(dataUpdated(IContact*)));
     connect(BCContactManager::instance(), SIGNAL(contactRemoved(IContact*)),
-            this, SLOT(dataUpdated(IContact*)));
+            this, SLOT(listAltered()));
 
     connect(BCGroupManager::instance(), SIGNAL(groupAdded(IGroup*)),
-            this, SLOT(dataUpdated(IGroup*)));
+            this, SLOT(listAltered()));
     connect(BCGroupManager::instance(), SIGNAL(groupUpdated(IGroup*)),
             this, SLOT(dataUpdated(IGroup*)));
     connect(BCGroupManager::instance(), SIGNAL(groupRemoved(IGroup*)),
-            this, SLOT(dataUpdated(IGroup*)));
+            this, SLOT(listAltered()));
 
     reloadList();
@@ -26 +26 @@
 ContactGroupListModel::~ContactGroupListModel() {
     disconnect(BCContactManager::instance(), SIGNAL(contactAdded(IContact*)),
-               this, SLOT(dataUpdated(IContact*)));
+               this, SLOT(listAltered()));
     disconnect(BCContactManager::instance(), SIGNAL(contactUpdated(IContact*)),
                this, SLOT(dataUpdated(IContact*)));
     disconnect(BCContactManager::instance(), SIGNAL(contactRemoved(IContact*)),
-               this, SLOT(dataUpdated(IContact*)));
+               this, SLOT(listAltered()));
 
     disconnect(BCGroupManager::instance(), SIGNAL(groupAdded(IGroup*)),
-               this, SLOT(dataUpdated(IGroup*)));
+               this, SLOT(listAltered()));
     disconnect(BCGroupManager::instance(), SIGNAL(groupUpdated(IGroup*)),
                this, SLOT(dataUpdated(IGroup*)));
     disconnect(BCGroupManager::instance(), SIGNAL(groupRemoved(IGroup*)),
-               this, SLOT(dataUpdated(IGroup*)));
+               this, SLOT(listAltered()));
+}
+
+void ContactGroupListModel::listAltered() {
+    reloadList();
 }
 
@@ -48 +52 @@
 void ContactGroupListModel::dataUpdated(IInterface* contactOrGroup) {
     int row = items_.indexOf(contactOrGroup);
+
     QModelIndex idx1 = index(row, 0);
-
-    row = items_.indexOf(contactOrGroup);
-
-    reloadList();
-
-    if (row < 0) { // New contact/group added
-        reset();
-    } else {
-        row = items_.indexOf(contactOrGroup);
-
-        if (row < 0) { // Contact/group removed
-            reset();
-        } else {
-            QModelIndex idx2 = index(row, 0);
-
-            emit dataChanged(idx1, idx1);
-            if (idx1 != idx2) {
-                emit dataChanged(idx2, idx2);
-            }
-        }
+    QModelIndex idx2 = index(row, columnCount());
+
+    if (idx1.isValid() && idx2.isValid()) { // Contact/group in list
+        emit dataChanged(idx1, idx2);
     }
 }
@@ -80 +69 @@
         items_.append(group);
     }
+
+    reset();
 }
 

src/ui/models/contactgroupmodel.h

@@ -31 +31 @@
     void dataUpdated(IContact* contact);
     void dataUpdated(IGroup* group);
+    void listAltered();
 
 private:

src/ui/models/grouptablemodel.cpp

@@ -9 +9 @@
 {
     connect(BCGroupManager::instance(), SIGNAL(groupAdded(IGroup*)),
-            this, SLOT(groupUpdated(IGroup*)));
+            this, SLOT(listAltered()));
     connect(BCGroupManager::instance(), SIGNAL(groupUpdated(IGroup*)),
             this, SLOT(groupUpdated(IGroup*)));
     connect(BCGroupManager::instance(), SIGNAL(groupRemoved(IGroup*)),
-            this, SLOT(groupUpdated(IGroup*)));
+            this, SLOT(listAltered()));
 }
 GroupTableModel::~GroupTableModel() {
     disconnect(BCGroupManager::instance(), SIGNAL(groupAdded(IGroup*)),
-               this, SLOT(groupUpdated(IGroup*)));
+               this, SLOT(listAltered()));
     disconnect(BCGroupManager::instance(), SIGNAL(groupUpdated(IGroup*)),
                this, SLOT(groupUpdated(IGroup*)));
     disconnect(BCGroupManager::instance(), SIGNAL(groupRemoved(IGroup*)),
-               this, SLOT(groupUpdated(IGroup*)));
+               this, SLOT(listAltered()));
+}
+
+void GroupTableModel::listAltered() {
+    reloadList();
 }
 
 void GroupTableModel::groupUpdated(IGroup* group) {
-    int row = BCGroupManager::instance()->getGroupList().values().indexOf(group);
+    int row = items_.indexOf(group);
 
     QModelIndex idx_start = index(row, 0);
@@ -35 +39 @@
         reset();
     }
+}
+
+void GroupTableModel::reloadList() {
+    items_.clear();
+    foreach(IGroup* group, BCGroupManager::instance()->getGroupList()) {
+        items_.append(group);
+    }
+    reset();
 }
 
@@ -54 +66 @@
 
 IGroup* GroupTableModel::dataObject(const QModelIndex& index) const {
-    return BCGroupManager::instance()->getGroupList().values().at(index.row());
+    return items_.at(index.row());
 }
 
 QVariant GroupTableModel::data(const QModelIndex& index, int role) const {
-    QList<IGroup*> groups = BCGroupManager::instance()->getGroupList().values();
-    if (!index.isValid() || index.row() < 0 || index.row() >= groups.size())
+    if (!index.isValid() || index.row() < 0 || index.row() >= items_.size())
         return QVariant();
 
-    const IGroup* group = groups.at(index.row());
+    const IGroup* group = dataObject(index);
 
     if (role == Qt::DisplayRole) {
@@ -89 +100 @@
 
 int GroupTableModel::rowCount(const QModelIndex& parent) const {
-    return (parent.isValid()) ? 0 : BCGroupManager::instance()->getGroupList().count();
+    return (parent.isValid()) ? 0 : items_.count();
 }
 
@@ -98 +109 @@
     int lastRow = row + count - 1;
     beginRemoveRows(parent, row, lastRow);
-    QList<IGroup*> groups = BCGroupManager::instance()->getGroupList().values();
     for (int i = lastRow; i >= row; --i) {
-        BCGroupManager::instance()->removeGroup(groups.at(i)->id());
+        BCGroupManager::instance()->removeGroup(items_.at(i)->id());
     }
     endRemoveRows();

src/ui/models/grouptablemodel.h

@@ -9 +9 @@
 class GroupTableModel: public QAbstractTableModel {
     Q_OBJECT
-
-public slots:
-    void groupUpdated(IGroup* contact);
 
 public:
@@ -33 +30 @@
     IGroup*       dataObject(const QModelIndex& index) const;
 
+public slots:
+    void groupUpdated(IGroup* contact);
+    void listAltered();
+
 private:
-    QString       getMembersStr(const IGroup* group) const;
+    QList<IGroup*> items_;
+
+    QString        getMembersStr(const IGroup* group) const;
+    void           reloadList();
 };
 

src/ui/models/loadedaccountmodel.cpp

@@ -8 +8 @@
 #include "loadedaccountmodel.h"
 
-LoadedAccountModel::LoadedAccountModel() {
-    // TODO Auto-generated constructor stub
+#include "accounttreemodel.h"
 
+bool LoadedAccountModel::filterAcceptsRow(int source_row, const QModelIndex& source_parent) const {
+    AccountTreeModel* srcModel = static_cast<AccountTreeModel*>(sourceModel());
+    const QModelIndex& idx     = srcModel->index(source_row, 0, source_parent);
+    if (idx.isValid()) {
+        IAccount* account          = srcModel->dataObject(idx);
+
+        return (account != NULL) && account->isInitialized() && account->isEnabled();
+    } else
+        return false;
 }
-
-LoadedAccountModel::~LoadedAccountModel() {
-    // TODO Auto-generated destructor stub
-}

src/ui/models/loadedaccountmodel.h

@@ -9 +9 @@
 #define LOADEDACCOUNTMODEL_H_
 
-class LoadedAccountModel {
+#include <QSortFilterProxyModel>
+
+class LoadedAccountModel: public QSortFilterProxyModel {
 public:
-    LoadedAccountModel();
-    virtual ~LoadedAccountModel();
+    LoadedAccountModel(QObject* parent = NULL)
+      : QSortFilterProxyModel(parent)
+    {};
+
+
+protected:
+    bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const;
 };