diff options
author | Jonatan Pålsson <jonatan.palsson@pelagicore.com> | 2014-02-12 16:52:05 +0100 |
---|---|---|
committer | Jonatan Pålsson <jonatan.palsson@pelagicore.com> | 2014-02-12 16:52:05 +0100 |
commit | 62eb6eebada09736fb465ebd9f9d3caeec2a12a5 (patch) | |
tree | 7210202b41b72e7737e75b11b06658e139544772 | |
parent | 83990dd5a1a2d8ce8f42dcf290e60084cbf556ba (diff) | |
download | browser-poc-62eb6eebada09736fb465ebd9f9d3caeec2a12a5.tar.gz |
Connected IErrorLogger to D-Bus
-rw-r--r-- | browser/browser.pro | 7 | ||||
-rw-r--r-- | browser/browserconfig.h | 5 | ||||
-rw-r--r-- | browser/browserhelper.cpp | 8 | ||||
-rw-r--r-- | browser/errorlogger.h | 1 |
4 files changed, 19 insertions, 2 deletions
diff --git a/browser/browser.pro b/browser/browser.pro index 17665ae..877cb4e 100644 --- a/browser/browser.pro +++ b/browser/browser.pro @@ -5,6 +5,10 @@ my_dbus_cachemanager_adaptors.files += ../common/ICacheManager.xml my_dbus_cachemanager_adaptors.header_flags = -i cachemanager.h -i ../common/browserdefs.h -l cachemanager my_dbus_cachemanager_adaptors.source_flags = -l cachemanager +my_dbus_errorlogger_adaptors.files += ../common/IErrorLogger.xml +my_dbus_errorlogger_adaptors.header_flags = -i errorlogger.h -i ../common/browserdefs.h -l errorlogger +my_dbus_errorlogger_adaptors.source_flags = -l errorlogger + my_dbus_bookmark_adaptors.files += ../common/IBookmarkManager.xml my_dbus_bookmark_adaptors.header_flags = -i bookmarkmanager.h -i ../common/browserdefs.h -l bookmarkmanager my_dbus_bookmark_adaptors.source_flags = -l bookmarkmanager @@ -25,6 +29,7 @@ DBUS_ADAPTORS += my_dbus_bookmark_adaptors \ my_dbus_userinput_adaptors \ my_dbus_webpagewindow_adaptors \ my_dbus_browser_adaptors \ + my_dbus_errorlogger_adaptors SOURCES += main.cpp \ bookmarkmanager.cpp \ @@ -61,5 +66,5 @@ system("$$[QT_INSTALL_PREFIX]/bin/qdbusxml2cpp -i cachemanager.h\ system("$$[QT_INSTALL_PREFIX]/bin/qdbusxml2cpp -i errorlogger.h\ -i ../common/browserdefs.h\ -l errorlogger\ - -a ierrorlogger_adaptor.h:\ + -a ierrorlogger_adaptor\ ../common/IErrorLogger.xml") diff --git a/browser/browserconfig.h b/browser/browserconfig.h index fc53a8b..62ca4be 100644 --- a/browser/browserconfig.h +++ b/browser/browserconfig.h @@ -10,6 +10,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#ifndef BROWSERCONFIG_H +#define BROWSERCONFIG_H + #include <QObject> #include <QSettings> @@ -32,3 +35,5 @@ public: private: QSettings *m_qsettings = NULL; }; + +#endif /*BROWSERCONFIG_H*/ diff --git a/browser/browserhelper.cpp b/browser/browserhelper.cpp index 0760b69..f225065 100644 --- a/browser/browserhelper.cpp +++ b/browser/browserhelper.cpp @@ -19,6 +19,7 @@ #include "iwebpagewindow_adaptor.h" #include "ibrowser_adaptor.h" #include "icachemanager_adaptor.h" +#include "ierrorlogger_adaptor.h" browserhelper::browserhelper(QString instanceId, QObject *parent) : @@ -40,6 +41,13 @@ browserhelper::browserhelper(QString instanceId, QObject *parent) : exit(1); } + errorlogger *err = new errorlogger(); + new IErrorLoggerAdaptor(err); + if(!connection->registerObject("/Browser/IErrorLogger", err)) { + qDebug() << "failed register object IErrorLogger"; + exit(1); + } + cachemanager *cm = new cachemanager(); new ICacheManagerAdaptor(cm); if(!connection->registerObject("/Browser/ICacheManager", cm)) { diff --git a/browser/errorlogger.h b/browser/errorlogger.h index 3d5afc3..ad7fb9a 100644 --- a/browser/errorlogger.h +++ b/browser/errorlogger.h @@ -17,7 +17,6 @@ #include <QObject> #include <QDBusContext> -#include "browserconfig.h" #include "../common/browserdefs.h" class errorlogger : public QObject, protected QDBusContext |