Branch 'kolab/integration/4.13.0' - 2 commits - akonadi/resourcebase.h includes/Akonadi

[Aaron Seigo]

 akonadi/resourcebase.h             |    6 +++++-
 includes/Akonadi/Relation          |    1 +
 includes/Akonadi/RelationCreateJob |    1 +
 includes/Akonadi/RelationDeleteJob |    1 +
 includes/Akonadi/RelationFetchJob  |    1 +
 5 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 8dfab97b900a6518cbc35fb7ffb43fce13cd45a5
Author: Aaron Seigo <aseigo at kde.org>
Date:   Mon Oct 6 16:30:10 2014 +0200

    CamelCaseHeaders for the relation classes

diff --git a/includes/Akonadi/Relation b/includes/Akonadi/Relation
new file mode 100644
index 0000000..d14c1f8
--- /dev/null
+++ b/includes/Akonadi/Relation
@@ -0,0 +1 @@
+#include "../../akonadi/relation.h"
diff --git a/includes/Akonadi/RelationCreateJob b/includes/Akonadi/RelationCreateJob
new file mode 100644
index 0000000..cd2db40
--- /dev/null
+++ b/includes/Akonadi/RelationCreateJob
@@ -0,0 +1 @@
+#include "../../akonadi/relationcreatejob.h"
diff --git a/includes/Akonadi/RelationDeleteJob b/includes/Akonadi/RelationDeleteJob
new file mode 100644
index 0000000..241b4e5
--- /dev/null
+++ b/includes/Akonadi/RelationDeleteJob
@@ -0,0 +1 @@
+#include "../../akonadi/relationdeletejob.h"
diff --git a/includes/Akonadi/RelationFetchJob b/includes/Akonadi/RelationFetchJob
new file mode 100644
index 0000000..7191804
--- /dev/null
+++ b/includes/Akonadi/RelationFetchJob
@@ -0,0 +1 @@
+#include "../../akonadi/relationfetchjob.h"


commit 28d56a8a34ba495395c7e010daccb4c66c2a89e6
Author: Aaron Seigo <aseigo at kde.org>
Date:   Mon Oct 6 16:30:05 2014 +0200

    docs++

diff --git a/akonadi/resourcebase.h b/akonadi/resourcebase.h
index a66e85a..9e56afc 100644
--- a/akonadi/resourcebase.h
+++ b/akonadi/resourcebase.h
@@ -264,12 +264,16 @@ Q_SIGNALS:
 
 protected Q_SLOTS:
     /**
-     * Retrieve the collection tree from the remote server and supply it via
+     * Retrieve the collection tree from the backend and supply it via
      * collectionsRetrieved() or collectionsRetrievedIncremental().
      * @see collectionsRetrieved(), collectionsRetrievedIncremental()
      */
     virtual void retrieveCollections() = 0;
 
+    /**
+     * Retreive all tags from the backend
+     * @see tagsRetrieved()
+     */
     virtual void retrieveTags();
 
     /**