Reformating, adding accounts ui dummy

core/account.cpp

@@ -2,9 +2,11 @@
 
 using namespace Core;
 
-Account::Account(const QString& p_jid, const QString& p_password, QObject* parent):
+Account::Account(const QString& p_login, const QString& p_server, const QString& p_password, const QString& p_name, QObject* parent):
     QObject(parent),
-    jid(p_jid),
+    name(p_name),
+    login(p_login),
+    server(p_server),
     password(p_password),
     client()
 {

core/account.h

@@ -11,11 +11,13 @@ namespace Core
 class Account : public QObject
 {
 public:
-    Account(const QString& p_jid, const QString& p_password, QObject* parent = 0);
+    Account(const QString& p_login, const QString& p_server, const QString& p_password, const QString& p_name, QObject* parent = 0);
     ~Account();
     
 private:
-    QString jid;
+    QString name;
+    QString login;
+    QString server;
     QString password;
     QXmppClient client;
 };

core/squawk.cpp

@@ -1,15 +1,47 @@
 #include "squawk.h"
+#include <QDebug>
 
-using namespace Core;
-
-Squawk::Squawk(QObject* parent):
+Core::Squawk::Squawk(QObject* parent):
     QObject(parent),
     accounts()
 {
 
 }
 
-Squawk::~Squawk()
+Core::Squawk::~Squawk()
 {
-
+    Accounts::const_iterator itr = accounts.begin(); 
+    Accounts::const_iterator end = accounts.end();
+    for (; itr != end; ++itr) {
+        (*itr)->deleteLater();
+    }
+}
+
+void Core::Squawk::start()
+{
+}
+
+void Core::Squawk::newAccountRequest(const QMap<QString, QVariant>& map)
+{
+    QString name = map.value("name").toString();
+    QString login = map.value("login").toString();
+    QString server = map.value("server").toString();
+    QString password = map.value("password").toString();
+    
+    addAccount(login, server, password, name);
+}
+
+void Core::Squawk::addAccount(const QString& login, const QString& server, const QString& password, const QString& name)
+{
+    Account* acc = new Account(login, server, password, name);
+    accounts.push_back(acc);
+    
+    QMap<QString, QVariant> map = {
+        {"login", login},
+        {"server", server},
+        {"name", name},
+        {"password", password},
+        {"state", 0}
+    };
+    emit newAccount(map);
 }

core/squawk.h

@@ -2,6 +2,9 @@
 #define CORE_SQUAWK_H
 
 #include <QtCore/QObject>
+#include <QString>
+#include <QVariant>
+#include <QMap>
 #include <deque>
 
 #include "account.h"
@@ -16,10 +19,20 @@ public:
     Squawk(QObject* parent = 0);
     ~Squawk();
 
+signals:
+    void newAccount(const QMap<QString, QVariant>&);
+    
+public slots:
+    void start();
+    void newAccountRequest(const QMap<QString, QVariant>& map);
+    
 private:
-    typedef std::deque<Account> Accounts;
+    typedef std::deque<Account*> Accounts;
     
     Accounts accounts;
+    
+private:
+    void addAccount(const QString& login, const QString& server, const QString& password, const QString& name);
 };
 
 }