Skip to content
Snippets Groups Projects
Commit b97cd23f authored by Emmanuel Lepage's avatar Emmanuel Lepage
Browse files

[ #10724 ] Refactor data engine and split akonadi support out of the client to...

[ #10724 ] Refactor data engine and split akonadi support out of the client to make the dataengine more future proof
parent 3f9aac67
Branches
Tags
No related merge requests found
......@@ -20,7 +20,7 @@ FIND_PACKAGE ( Qt4 REQUIRED )
INCLUDE ( KDE4Defaults )
set(GENERIC_LIB_VERSION "1.0.2")
set(GENERIC_LIB_VERSION "1.1.0")
INCLUDE_DIRECTORIES ( ${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR})
......
......@@ -625,7 +625,7 @@ void Call::call()
qDebug() << "account = " << m_Account;
if(m_Account.isEmpty()) {
qDebug() << "Account is not set, taking the first registered.";
this->m_Account = CallModelConvenience::getCurrentAccountId();
this->m_Account = CallModel<>::getCurrentAccountId();
}
if(!m_Account.isEmpty()) {
qDebug() << "Calling " << m_CallNumber << " with account " << m_Account << ". callId : " << m_CallId;
......
......@@ -23,6 +23,8 @@
#include <QObject>
#include <QVector>
#include <QWidget>
#include <QModelIndex>
#include <QMap>
#include "typedefs.h"
......@@ -86,7 +88,7 @@ signals:
* solution may be less "clean" than MVC, but is 3 time smaller and easier to improve (in fact, possible to improve).
*/
///@class CallModel Central model/frontend to deal with sflphoned
template <typename CallWidget, typename Index>
template <typename CallWidget = QWidget*, typename Index = QModelIndex*>
class LIB_EXPORT CallModel : public CallModelBase {
public:
enum ModelType {
......@@ -212,11 +214,11 @@ class LIB_EXPORT CallModel : public CallModelBase {
bool updateCommon (Call* call);
};
class CallModelConvenience : public CallModel<QWidget*,QModelIndex*>
/*class CallModelConvenience : public CallModel<QWidget*,QModelIndex*>
{
public:
CallModelConvenience(ModelType type) : CallModel<QWidget*,QModelIndex*>(type) {}
};
};*/
#include "CallModel.hpp"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment