diff options
author | Jonatan Pålsson <jonatan.palsson@pelagicore.com> | 2014-02-04 14:14:52 +0100 |
---|---|---|
committer | Jonatan Pålsson <jonatan.palsson@pelagicore.com> | 2014-02-04 14:14:52 +0100 |
commit | 072f182b498f8244a949005102faf5015e74b69a (patch) | |
tree | d4cd3a1cd26996885f0fdad9b1c5dfca8e17a5cd | |
parent | 0af8fb73d88ccb5479869caa7d84835e81ff0e2c (diff) | |
download | browser-poc-072f182b498f8244a949005102faf5015e74b69a.tar.gz |
Updated supporting headers for generated dbus interfaces
-rw-r--r-- | browser/webpagewindow.cpp | 2 | ||||
-rw-r--r-- | browser/webpagewindow.h | 2 | ||||
-rw-r--r-- | common/browserdefs.h | 64 |
3 files changed, 68 insertions, 0 deletions
diff --git a/browser/webpagewindow.cpp b/browser/webpagewindow.cpp index b37fef6..b57d198 100644 --- a/browser/webpagewindow.cpp +++ b/browser/webpagewindow.cpp @@ -232,3 +232,5 @@ conn::brw::ERROR_IDS webpagewindow::setScrollPosition(uint &x, uint &y) { webitem->setScrollPosition(x,y); return conn::brw::EID_NO_ERROR; } + +conn::brw::ERROR_IDS webpagewindow::getFavicon(const QString&, QString&) {} diff --git a/browser/webpagewindow.h b/browser/webpagewindow.h index 82abfdd..f7a6f01 100644 --- a/browser/webpagewindow.h +++ b/browser/webpagewindow.h @@ -71,6 +71,8 @@ public Q_SLOTS: conn::brw::ERROR_IDS select(); conn::brw::ERROR_IDS setScrollPosition(uint &posX, uint &posY); conn::brw::ERROR_IDS setZoomFactor(double &zoomFactor); + conn::brw::ERROR_IDS getFavicon(const QString&, QString&); + void browserStartLoading(); void reportprogress(); diff --git a/common/browserdefs.h b/common/browserdefs.h index d5a8a50..0f1fa84 100644 --- a/common/browserdefs.h +++ b/common/browserdefs.h @@ -161,6 +161,69 @@ namespace conn { //## class BookmarkItemList typedef QList<conn::brw::BookmarkItem> BookmarkItemList; + /*! + * + */ + //## type SelectableOption + struct SelectableOption { + /*! + * True - option can be selected; False - not - probably optgroup + */ + bool bIsSelectableOption; + /*! + * + */ + QString strValue; //## attribute strValue + /*! + * + */ + bool bSelected; //## attribute bSelected + + SelectableOption() : bIsSelectableOption(true), strValue(), bSelected(false) {} + }; + + //## package connImports::Interfaces::conn::brw::def + + //## class SelectableOptionList + /*! + * + */ + typedef QList<conn::brw::SelectableOption> SelectableOptionList; + + //## operation operator>>(QDBusArgument,SelectableOption) + inline const QDBusArgument& operator>>(const QDBusArgument& args, SelectableOption& selectableOption) { + //#[ operation operator>>(QDBusArgument,SelectableOption) + + args.beginStructure(); + + args >> selectableOption.bIsSelectableOption + >> selectableOption.strValue + >> selectableOption.bSelected; + + args.endStructure(); + return args; + + //#] + } + + + //## operation operator<<(QDBusArgument,SelectableOption) + inline QDBusArgument& operator<<(QDBusArgument& args, const SelectableOption& selectableOption) { + //#[ operation operator<<(QDBusArgument,SelectableOption) + + args.beginStructure(); + + args << selectableOption.bIsSelectableOption + << selectableOption.strValue + << selectableOption.bSelected; + + args.endStructure(); + + return args; + + //#] + } + /*! * Result of dialog. @@ -477,5 +540,6 @@ Q_DECLARE_METATYPE(conn::brw::BrowserScrollDirections) Q_DECLARE_METATYPE(conn::brw::BrowserActions) Q_DECLARE_METATYPE(conn::brw::OBJECT_HANDLE) Q_DECLARE_METATYPE(conn::brw::ObjectHandleList) +Q_DECLARE_METATYPE(conn::brw::SelectableOption); #endif // BROWSERDEFS_H |