commit 248671e8200ff0883877b6d0e56700ef99ff3b51
Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
Date:   Sat Jan 7 14:38:17 2017 +0100

    Rename exception.h to exceptionbase.h
    
    REVIEW: 129788

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 6ac851e..fa996b9 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -95,7 +95,7 @@ ecm_generate_headers(AkonadiCore_base_HEADERS
     EntityDeletedAttribute
     EntityDisplayAttribute
     EntityHiddenAttribute
-    Exception
+    ExceptionBase
     GidExtractorInterface
     IndexPolicyAttribute
     Item
diff --git a/src/core/exception.cpp b/src/core/exception.cpp
index f229c1a..14f7330 100644
--- a/src/core/exception.cpp
+++ b/src/core/exception.cpp
@@ -17,7 +17,7 @@
     02110-1301, USA.
 */
 
-#include "exception.h"
+#include "exceptionbase.h"
 
 #include <QString>
 
diff --git a/src/core/exception.h b/src/core/exceptionbase.h
similarity index 100%
rename from src/core/exception.h
rename to src/core/exceptionbase.h
diff --git a/src/core/item.h b/src/core/item.h
index de71cad..5ec62c8 100644
--- a/src/core/item.h
+++ b/src/core/item.h
@@ -23,7 +23,7 @@
 
 #include "akonadicore_export.h"
 #include "attribute.h"
-#include "exception.h"
+#include "exceptionbase.h"
 #include "tag.h"
 #include "collection.h"
 #include "relation.h"
diff --git a/src/core/itempayloadinternals_p.h b/src/core/itempayloadinternals_p.h
index 0a4de3c..1626f10 100644
--- a/src/core/itempayloadinternals_p.h
+++ b/src/core/itempayloadinternals_p.h
@@ -32,7 +32,7 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include "exception.h"
+#include "exceptionbase.h"
 
 //@cond PRIVATE Doxygen 1.7.1 hangs processing this file. so skip it.
 //for more info, see https://bugzilla.gnome.org/show_bug.cgi?id=531637
diff --git a/src/core/protocolhelper.cpp b/src/core/protocolhelper.cpp
index f740e9d..c218f0c 100644
--- a/src/core/protocolhelper.cpp
+++ b/src/core/protocolhelper.cpp
@@ -23,7 +23,7 @@
 #include "collectionstatistics.h"
 #include "item_p.h"
 #include "collection_p.h"
-#include "exception.h"
+#include "exceptionbase.h"
 #include "itemserializer_p.h"
 #include "itemserializerplugin.h"
 #include "servermanager.h"