Merge branch 'feature_errorlogger'

Conflicts:
	.gitignore
	browser/browser.cpp
	browser/browser.h
	browser/browser.pro
	browser/browserconfig.cpp
	browser/browserconfig.h
	browser/browserhelper.cpp
	browser/browserview.cpp
	browser/browserview.h
	browser/cachemanager.cpp
	browser/cachemanager.h
	browser/errorlogger.cpp
	browser/errorlogger.h
	browser/unit-tests/browserdbus/testbrowserdbus.cpp
	browser/unit-tests/browserdbus/testbrowserdbus.h
	common/browserdbus.cpp
	common/browserdbus.h
	common/browserdefs.h
	testapp/main.cpp
	testapp/qml/testapp/main.qml
	testapp/testapp.pro

1 files changed, 46 insertions, 1 deletions

diff --git a/common/browserdefs.h b/common/browserdefs.h
index 167233e..f9c8e84 100644
--- a/common/browserdefs.h
+++ b/common/browserdefs.h
@@ -15,7 +15,6 @@
 #define BROWSERDEFS_H
 
 #include <QDBusArgument>
-#include <QDebug>
 
 namespace conn {
     namespace brw {
@@ -593,6 +592,42 @@ namespace conn {
             EST_DATE_DESCENDING = 1
         };
 
+        //## operation operator>>(QDBusArgument,ERROR_SORT_TYPE)
+        inline const QDBusArgument& operator>>(const QDBusArgument& a_rDbusArg, ERROR_SORT_TYPE& a_rArg) {
+            //#[ operation operator>>(QDBusArgument,ERROR_SORT_TYPE)
+            a_rDbusArg.beginStructure();
+
+            int param = 0;
+            a_rDbusArg >> param;
+
+            switch (param)
+            {
+            case EST_DATE_ASCENDING:
+            {
+                a_rArg = EST_DATE_ASCENDING;
+                break;
+            }
+            case EST_DATE_DESCENDING:
+            {
+                a_rArg = EST_DATE_DESCENDING;
+                break;
+            }
+            }
+            a_rDbusArg.endStructure();
+            return a_rDbusArg;
+            //#]
+        }
+
+        //## operation operator<<(QDBusArgument,ERROR_SORT_TYPE)
+        inline const QDBusArgument& operator<<(QDBusArgument& a_rDbusArg, ERROR_SORT_TYPE a_rArg) {
+            //#[ operation operator<<(QDBusArgument,ERROR_SORT_TYPE)
+            a_rDbusArg.beginStructure();
+            int param = a_rArg;
+            a_rDbusArg << param;
+            a_rDbusArg.endStructure();
+            return a_rDbusArg;
+            //#]
+        }
         struct ErrorItem
         {
             /*!
@@ -621,6 +656,16 @@ namespace conn {
             QString strDescription;		//## attribute strDescription
         };
 
+        inline bool ltError(ErrorItem a, ErrorItem b)
+        {
+            return a.i64DateTime < b.i64DateTime;
+        }
+
+        inline bool gtError( ErrorItem a, ErrorItem b)
+        {
+            return a.i64DateTime > b.i64DateTime;
+        }
+
         //## package connInterfaces::connPublic::conn::brw::def
         //## class ErrorItemList
         /*!