Skip to content
Snippets Groups Projects
Commit 8f72f491 authored by Jérémy Quentin's avatar Jérémy Quentin
Browse files

[#1794] Can't use the interface during a call

Tried with random generated call ids.
parent 371b5ebd
No related branches found
No related tags found
No related merge requests found
...@@ -31,7 +31,6 @@ CallList::CallList() ...@@ -31,7 +31,6 @@ CallList::CallList()
ConfigurationManagerInterface & configurationManager = ConfigurationManagerInterfaceSingleton::getInstance(); ConfigurationManagerInterface & configurationManager = ConfigurationManagerInterfaceSingleton::getInstance();
QStringList callList = callManager.getCallList(); QStringList callList = callManager.getCallList();
qDebug() << "Call List = " << callList; qDebug() << "Call List = " << callList;
callIdCpt = 0;
calls = new QVector<Call *>(); calls = new QVector<Call *>();
for(int i = 0 ; i < callList.size() ; i++) for(int i = 0 ; i < callList.size() ; i++)
{ {
...@@ -49,7 +48,7 @@ CallList::CallList() ...@@ -49,7 +48,7 @@ CallList::CallList()
QString name = param[2]; QString name = param[2];
uint stopTimeStamp = param[3].toUInt(); uint stopTimeStamp = param[3].toUInt();
QString account = param[4]; QString account = param[4];
calls->append(Call::buildHistoryCall(getAndIncCallId(), startTimeStamp, stopTimeStamp, account, name, number, type)); calls->append(Call::buildHistoryCall(generateCallId(), startTimeStamp, stopTimeStamp, account, name, number, type));
} }
} }
...@@ -127,10 +126,11 @@ Call * CallList::operator[](int ind) ...@@ -127,10 +126,11 @@ Call * CallList::operator[](int ind)
return (*calls)[ind]; return (*calls)[ind];
} }
QString CallList::getAndIncCallId()
{
QString res = QString::number(callIdCpt++);
QString CallList::generateCallId()
{
int id = qrand();
QString res = QString::number(id);
return res; return res;
} }
...@@ -141,7 +141,7 @@ int CallList::size() ...@@ -141,7 +141,7 @@ int CallList::size()
Call * CallList::addDialingCall(const QString & peerName, QString account) Call * CallList::addDialingCall(const QString & peerName, QString account)
{ {
Call * call = Call::buildDialingCall(getAndIncCallId(), peerName, account); Call * call = Call::buildDialingCall(generateCallId(), peerName, account);
calls->append(call); calls->append(call);
return call; return call;
} }
......
...@@ -35,7 +35,6 @@ Q_OBJECT ...@@ -35,7 +35,6 @@ Q_OBJECT
private: private:
QVector<Call *> * calls; QVector<Call *> * calls;
int callIdCpt;
public: public:
...@@ -58,7 +57,7 @@ public: ...@@ -58,7 +57,7 @@ public:
Call * addRingingCall(const QString & callId); Call * addRingingCall(const QString & callId);
//GSetter //GSetter
QString getAndIncCallId(); QString generateCallId();
public slots: public slots:
void clearHistory(); void clearHistory();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment