[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [akonadi-next/develop] /: Cleanup
From:       Christian Mollekopf <chrigi_1 () fastmail ! fm>
Date:       2015-11-30 17:52:52
Message-ID: E1a3SdA-0003TI-6x () scm ! kde ! org
[Download RAW message or body]

Git commit 887abffb3f712acaa23eae174d5890f337fe43cb by Christian Mollekopf.
Committed on 28/11/2015 at 15:20.
Pushed by cmollekopf into branch 'develop'.

Cleanup

M  +0    -5    common/clientapi.h
M  +1    -0    examples/client/main.cpp
M  +9    -9    tests/dummyresourcetest.cpp
M  +2    -2    tests/querytest.cpp

http://commits.kde.org/akonadi-next/887abffb3f712acaa23eae174d5890f337fe43cb

diff --git a/common/clientapi.h b/common/clientapi.h
index 7fee6ae..04f1305 100644
--- a/common/clientapi.h
+++ b/common/clientapi.h
@@ -26,17 +26,12 @@
 #include <Async/Async>
 
 #include "query.h"
-#include "resultprovider.h"
 #include "applicationdomaintype.h"
 
-Q_DECLARE_METATYPE(std::shared_ptr<void>);
-
 class QAbstractItemModel;
 
 namespace Akonadi2 {
 
-using namespace async;
-
 /**
  * Store interface used in the client API.
  */
diff --git a/examples/client/main.cpp b/examples/client/main.cpp
index 3fa5a4e..7e69c0a 100644
--- a/examples/client/main.cpp
+++ b/examples/client/main.cpp
@@ -27,6 +27,7 @@
 #include "common/domain/event.h"
 #include "common/domain/folder.h"
 #include "common/resourceconfig.h"
+#include "common/log.h"
 #include "console.h"
 
 #include <QWidget>
diff --git a/tests/dummyresourcetest.cpp b/tests/dummyresourcetest.cpp
index d2fcda7..20c725f 100644
--- a/tests/dummyresourcetest.cpp
+++ b/tests/dummyresourcetest.cpp
@@ -70,7 +70,7 @@ private Q_SLOTS:
         query.propertyFilter.insert("uid", "testuid");
         auto model = \
Akonadi2::Store::loadModel<Akonadi2::ApplicationDomain::Event>(query);  \
                QTRY_COMPARE(model->rowCount(QModelIndex()), 1);
-        auto value = model->index(0, 0, \
QModelIndex()).data(ModelResult<Akonadi2::ApplicationDomain::Event, \
Akonadi2::ApplicationDomain::Event::Ptr>::DomainObjectRole).value<Akonadi2::ApplicationDomain::Event::Ptr>();
 +        auto value = model->index(0, 0, \
QModelIndex()).data(Akonadi2::Store::DomainObjectRole).value<Akonadi2::ApplicationDomain::Event::Ptr>();
                
         QCOMPARE(value->getProperty("uid").toByteArray(), QByteArray("testuid"));
     }
 
@@ -97,7 +97,7 @@ private Q_SLOTS:
 
         auto model = \
Akonadi2::Store::loadModel<Akonadi2::ApplicationDomain::Event>(query);  \
                QTRY_COMPARE(model->rowCount(QModelIndex()), 1);
-        auto value = model->index(0, 0, \
QModelIndex()).data(ModelResult<Akonadi2::ApplicationDomain::Event, \
Akonadi2::ApplicationDomain::Event::Ptr>::DomainObjectRole).value<Akonadi2::ApplicationDomain::Event::Ptr>();
 +        auto value = model->index(0, 0, \
QModelIndex()).data(Akonadi2::Store::DomainObjectRole).value<Akonadi2::ApplicationDomain::Event::Ptr>();
  
         qDebug() << value->getProperty("uid").toByteArray();
         QCOMPARE(value->getProperty("uid").toByteArray(), QByteArray("testuid"));
@@ -127,7 +127,7 @@ private Q_SLOTS:
 
         auto model = \
Akonadi2::Store::loadModel<Akonadi2::ApplicationDomain::Event>(query);  \
                QTRY_COMPARE(model->rowCount(QModelIndex()), 1);
-        auto value = model->index(0, 0, \
QModelIndex()).data(ModelResult<Akonadi2::ApplicationDomain::Event, \
Akonadi2::ApplicationDomain::Event::Ptr>::DomainObjectRole).value<Akonadi2::ApplicationDomain::Event::Ptr>();
 +        auto value = model->index(0, 0, \
QModelIndex()).data(Akonadi2::Store::DomainObjectRole).value<Akonadi2::ApplicationDomain::Event::Ptr>();
  
         qDebug() << value->getProperty("uid").toByteArray();
         QCOMPARE(value->getProperty("uid").toByteArray(), QByteArray("testuid2"));
@@ -160,7 +160,7 @@ private Q_SLOTS:
 
         auto model = \
Akonadi2::Store::loadModel<Akonadi2::ApplicationDomain::Event>(query);  \
                QTRY_VERIFY(model->rowCount(QModelIndex()) >= 1);
-        auto value = model->index(0, 0, \
QModelIndex()).data(ModelResult<Akonadi2::ApplicationDomain::Event, \
Akonadi2::ApplicationDomain::Event::Ptr>::DomainObjectRole).value<Akonadi2::ApplicationDomain::Event::Ptr>();
 +        auto value = model->index(0, 0, \
QModelIndex()).data(Akonadi2::Store::DomainObjectRole).value<Akonadi2::ApplicationDomain::Event::Ptr>();
  
         QVERIFY(!value->getProperty("summary").toString().isEmpty());
         qDebug() << value->getProperty("summary").toString();
@@ -178,7 +178,7 @@ private Q_SLOTS:
 
         auto model = \
Akonadi2::Store::loadModel<Akonadi2::ApplicationDomain::Mail>(query);  \
                QTRY_VERIFY(model->rowCount(QModelIndex()) >= 1);
-        auto value = model->index(0, 0, \
QModelIndex()).data(ModelResult<Akonadi2::ApplicationDomain::Mail, \
Akonadi2::ApplicationDomain::Mail::Ptr>::DomainObjectRole).value<Akonadi2::ApplicationDomain::Mail::Ptr>();
 +        auto value = model->index(0, 0, \
QModelIndex()).data(Akonadi2::Store::DomainObjectRole).value<Akonadi2::ApplicationDomain::Mail::Ptr>();
  
         QVERIFY(!value->getProperty("subject").toString().isEmpty());
         qDebug() << value->getProperty("subject").toString();
@@ -206,7 +206,7 @@ private Q_SLOTS:
         {
             auto model = \
Akonadi2::Store::loadModel<Akonadi2::ApplicationDomain::Event>(query);  \
                QTRY_COMPARE(model->rowCount(QModelIndex()), 1);
-            auto value = model->index(0, 0, \
QModelIndex()).data(ModelResult<Akonadi2::ApplicationDomain::Event, \
Akonadi2::ApplicationDomain::Event::Ptr>::DomainObjectRole).value<Akonadi2::ApplicationDomain::Event::Ptr>();
 +            auto value = model->index(0, 0, \
QModelIndex()).data(Akonadi2::Store::DomainObjectRole).value<Akonadi2::ApplicationDomain::Event::Ptr>();
  
             QCOMPARE(value->getProperty("uid").toByteArray(), \
                QByteArray("testuid"));
             QCOMPARE(value->getProperty("summary").toByteArray(), \
QByteArray("summaryValue")); @@ -224,7 +224,7 @@ private Q_SLOTS:
         {
             auto model = \
Akonadi2::Store::loadModel<Akonadi2::ApplicationDomain::Event>(query);  \
                QTRY_COMPARE(model->rowCount(QModelIndex()), 1);
-            auto value = model->index(0, 0, \
QModelIndex()).data(ModelResult<Akonadi2::ApplicationDomain::Event, \
Akonadi2::ApplicationDomain::Event::Ptr>::DomainObjectRole).value<Akonadi2::ApplicationDomain::Event::Ptr>();
 +            auto value = model->index(0, 0, \
QModelIndex()).data(Akonadi2::Store::DomainObjectRole).value<Akonadi2::ApplicationDomain::Event::Ptr>();
  
             QCOMPARE(value->getProperty("uid").toByteArray(), \
                QByteArray("testuid"));
             QCOMPARE(value->getProperty("summary").toByteArray(), \
QByteArray("summaryValue2")); @@ -266,7 +266,7 @@ private Q_SLOTS:
         Akonadi2::ApplicationDomain::Event event2;
         {
             QTRY_COMPARE(model->rowCount(QModelIndex()), 1);
-            auto value = model->index(0, 0, \
QModelIndex()).data(ModelResult<Akonadi2::ApplicationDomain::Event, \
Akonadi2::ApplicationDomain::Event::Ptr>::DomainObjectRole).value<Akonadi2::ApplicationDomain::Event::Ptr>();
 +            auto value = model->index(0, 0, \
QModelIndex()).data(Akonadi2::Store::DomainObjectRole).value<Akonadi2::ApplicationDomain::Event::Ptr>();
                
             QCOMPARE(value->getProperty("uid").toByteArray(), \
                QByteArray("testuid"));
             QCOMPARE(value->getProperty("summary").toByteArray(), \
QByteArray("summaryValue"));  event2 = *value;
@@ -280,7 +280,7 @@ private Q_SLOTS:
         {
             //TODO wait for a change signal
             QTRY_COMPARE(model->rowCount(QModelIndex()), 1);
-            auto value = model->index(0, 0, \
QModelIndex()).data(ModelResult<Akonadi2::ApplicationDomain::Event, \
Akonadi2::ApplicationDomain::Event::Ptr>::DomainObjectRole).value<Akonadi2::ApplicationDomain::Event::Ptr>();
 +            auto value = model->index(0, 0, \
QModelIndex()).data(Akonadi2::Store::DomainObjectRole).value<Akonadi2::ApplicationDomain::Event::Ptr>();
                
             QCOMPARE(value->getProperty("uid").toByteArray(), \
                QByteArray("testuid"));
             QCOMPARE(value->getProperty("summary").toByteArray(), \
QByteArray("summaryValue2"));  }
diff --git a/tests/querytest.cpp b/tests/querytest.cpp
index e354272..669bf58 100644
--- a/tests/querytest.cpp
+++ b/tests/querytest.cpp
@@ -108,7 +108,7 @@ private Q_SLOTS:
         auto model = \
Akonadi2::Store::loadModel<Akonadi2::ApplicationDomain::Folder>(query);  \
model->fetchMore(QModelIndex());  QTRY_COMPARE(model->rowCount(), 1);
-        auto folderEntity = model->index(0, \
0).data(ModelResult<Akonadi2::ApplicationDomain::Folder, \
Akonadi2::ApplicationDomain::Folder::Ptr>::DomainObjectRole).value<Akonadi2::ApplicationDomain::Folder::Ptr>();
 +        auto folderEntity = model->index(0, \
0).data(Akonadi2::Store::DomainObjectRole).value<Akonadi2::ApplicationDomain::Folder::Ptr>();
  QVERIFY(!folderEntity->identifier().isEmpty());
     }
 
@@ -130,7 +130,7 @@ private Q_SLOTS:
             auto model = \
Akonadi2::Store::loadModel<Akonadi2::ApplicationDomain::Folder>(query);  \
QTRY_COMPARE(model->rowCount(), 1);  
-            auto folderEntity = model->index(0, \
0).data(ModelResult<Akonadi2::ApplicationDomain::Folder, \
Akonadi2::ApplicationDomain::Folder::Ptr>::DomainObjectRole).value<Akonadi2::ApplicationDomain::Folder::Ptr>();
 +            auto folderEntity = model->index(0, \
0).data(Akonadi2::Store::DomainObjectRole).value<Akonadi2::ApplicationDomain::Folder::Ptr>();
  QVERIFY(!folderEntity->identifier().isEmpty());
 
             Akonadi2::ApplicationDomain::Folder \
subfolder("org.kde.dummy.instance1");


[prev in list] [next in list] [prev in thread] [next in thread]