From 3cf7d11a7a893447ab8e45c485344fede2afd7bf Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Wed, 10 Feb 2016 11:28:44 +0100 Subject: Stop using clientapi.h --- examples/client/main.cpp | 2 +- sinksh/sinksh_utils.cpp | 2 +- sinksh/sinksh_utils.h | 2 +- tests/clientapitest.cpp | 2 +- tests/databasepopulationandfacadequerybenchmark.cpp | 2 +- tests/domainadaptortest.cpp | 2 +- tests/dummyresourcebenchmark.cpp | 4 +++- tests/dummyresourcetest.cpp | 3 ++- tests/dummyresourcewritebenchmark.cpp | 2 +- tests/indextest.cpp | 2 +- tests/inspectiontest.cpp | 3 ++- tests/maildirresourcetest.cpp | 3 ++- tests/messagequeuetest.cpp | 2 +- tests/modelinteractivitytest.cpp | 3 ++- tests/pipelinetest.cpp | 2 +- tests/querytest.cpp | 3 ++- 16 files changed, 23 insertions(+), 16 deletions(-) diff --git a/examples/client/main.cpp b/examples/client/main.cpp index 5af38bc..07e780e 100644 --- a/examples/client/main.cpp +++ b/examples/client/main.cpp @@ -22,7 +22,7 @@ #include #include -#include "common/clientapi.h" +#include "common/store.h" #include "common/log.h" #include diff --git a/sinksh/sinksh_utils.cpp b/sinksh/sinksh_utils.cpp index fa06b34..d5b1c22 100644 --- a/sinksh/sinksh_utils.cpp +++ b/sinksh/sinksh_utils.cpp @@ -20,7 +20,7 @@ #include "sinksh_utils.h" -#include "common/clientapi.h" +#include "common/store.h" #include "utils.h" diff --git a/sinksh/sinksh_utils.h b/sinksh/sinksh_utils.h index 3e75e0d..bc4f6e5 100644 --- a/sinksh/sinksh_utils.h +++ b/sinksh/sinksh_utils.h @@ -24,7 +24,7 @@ #include #include "common/query.h" -#include "common/clientapi.h" +#include "common/store.h" #include "state.h" diff --git a/tests/clientapitest.cpp b/tests/clientapitest.cpp index a85b03b..0e21ca6 100644 --- a/tests/clientapitest.cpp +++ b/tests/clientapitest.cpp @@ -2,7 +2,7 @@ #include #include -#include "clientapi.h" +#include "store.h" #include "facade.h" #include "resourceconfig.h" #include "modelresult.h" diff --git a/tests/databasepopulationandfacadequerybenchmark.cpp b/tests/databasepopulationandfacadequerybenchmark.cpp index 93f15cb..63daebc 100644 --- a/tests/databasepopulationandfacadequerybenchmark.cpp +++ b/tests/databasepopulationandfacadequerybenchmark.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include "hawd/dataset.h" #include "hawd/formatter.h" diff --git a/tests/domainadaptortest.cpp b/tests/domainadaptortest.cpp index ff8f639..f523173 100644 --- a/tests/domainadaptortest.cpp +++ b/tests/domainadaptortest.cpp @@ -5,7 +5,7 @@ #include #include "dummyresource/resourcefactory.h" -#include "clientapi.h" +#include "store.h" #include "common/domainadaptor.h" #include "common/entitybuffer.h" diff --git a/tests/dummyresourcebenchmark.cpp b/tests/dummyresourcebenchmark.cpp index 60ebe74..9afc775 100644 --- a/tests/dummyresourcebenchmark.cpp +++ b/tests/dummyresourcebenchmark.cpp @@ -4,7 +4,9 @@ #include "dummyresource/resourcefactory.h" #include "dummyresource/domainadaptor.h" -#include "clientapi.h" +#include "store.h" +#include "notifier.h" +#include "resourcecontrol.h" #include "commands.h" #include "entitybuffer.h" #include "pipeline.h" diff --git a/tests/dummyresourcetest.cpp b/tests/dummyresourcetest.cpp index 1253e6c..7d9ad24 100644 --- a/tests/dummyresourcetest.cpp +++ b/tests/dummyresourcetest.cpp @@ -3,10 +3,11 @@ #include #include "dummyresource/resourcefactory.h" -#include "clientapi.h" +#include "store.h" #include "commands.h" #include "entitybuffer.h" #include "resourceconfig.h" +#include "resourcecontrol.h" #include "modelresult.h" #include "pipeline.h" #include "log.h" diff --git a/tests/dummyresourcewritebenchmark.cpp b/tests/dummyresourcewritebenchmark.cpp index ccbe5ac..6c05a1e 100644 --- a/tests/dummyresourcewritebenchmark.cpp +++ b/tests/dummyresourcewritebenchmark.cpp @@ -6,7 +6,7 @@ #include "dummyresource/resourcefactory.h" #include "dummyresource/domainadaptor.h" -#include "clientapi.h" +#include "store.h" #include "commands.h" #include "entitybuffer.h" #include "pipeline.h" diff --git a/tests/indextest.cpp b/tests/indextest.cpp index 7ec95ce..a435e97 100644 --- a/tests/indextest.cpp +++ b/tests/indextest.cpp @@ -3,7 +3,7 @@ #include #include -#include "clientapi.h" +#include "store.h" #include "storage.h" #include "index.h" diff --git a/tests/inspectiontest.cpp b/tests/inspectiontest.cpp index 0323225..79e5863 100644 --- a/tests/inspectiontest.cpp +++ b/tests/inspectiontest.cpp @@ -3,7 +3,8 @@ #include #include "dummyresource/resourcefactory.h" -#include "clientapi.h" +#include "store.h" +#include "resourcecontrol.h" #include "resourceconfig.h" #include "log.h" diff --git a/tests/maildirresourcetest.cpp b/tests/maildirresourcetest.cpp index 176ab9f..d47a3ac 100644 --- a/tests/maildirresourcetest.cpp +++ b/tests/maildirresourcetest.cpp @@ -3,7 +3,8 @@ #include #include "maildirresource/maildirresource.h" -#include "clientapi.h" +#include "store.h" +#include "resourcecontrol.h" #include "commands.h" #include "entitybuffer.h" #include "resourceconfig.h" diff --git a/tests/messagequeuetest.cpp b/tests/messagequeuetest.cpp index c835b53..454ace2 100644 --- a/tests/messagequeuetest.cpp +++ b/tests/messagequeuetest.cpp @@ -3,7 +3,7 @@ #include #include -#include "clientapi.h" +#include "store.h" #include "storage.h" #include "messagequeue.h" #include "log.h" diff --git a/tests/modelinteractivitytest.cpp b/tests/modelinteractivitytest.cpp index 51a9cd8..3f6e697 100644 --- a/tests/modelinteractivitytest.cpp +++ b/tests/modelinteractivitytest.cpp @@ -4,7 +4,8 @@ #include #include "dummyresource/resourcefactory.h" -#include "clientapi.h" +#include "store.h" +#include "resourcecontrol.h" #include "commands.h" #include "resourceconfig.h" #include "log.h" diff --git a/tests/pipelinetest.cpp b/tests/pipelinetest.cpp index baa67f6..d6073dc 100644 --- a/tests/pipelinetest.cpp +++ b/tests/pipelinetest.cpp @@ -11,7 +11,7 @@ #include "modifyentity_generated.h" #include "deleteentity_generated.h" #include "dummyresource/resourcefactory.h" -#include "clientapi.h" +#include "store.h" #include "commands.h" #include "entitybuffer.h" #include "resourceconfig.h" diff --git a/tests/querytest.cpp b/tests/querytest.cpp index 42064c6..16376b9 100644 --- a/tests/querytest.cpp +++ b/tests/querytest.cpp @@ -3,7 +3,8 @@ #include #include "dummyresource/resourcefactory.h" -#include "clientapi.h" +#include "store.h" +#include "resourcecontrol.h" #include "commands.h" #include "resourceconfig.h" #include "log.h" -- cgit v1.2.3