From 39b023e36f5d9a5227551d11e196fae78389a479 Mon Sep 17 00:00:00 2001 From: Yimgo Date: Fri, 10 Aug 2012 09:56:13 +0200 Subject: [PATCH] Fixed API preferences missing in tool widgets. --- src/api/UBW3CWidgetAPI.cpp | 15 +++++++-------- src/gui/UBToolWidget.cpp | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/api/UBW3CWidgetAPI.cpp b/src/api/UBW3CWidgetAPI.cpp index fddcafb1..4af72cbe 100644 --- a/src/api/UBW3CWidgetAPI.cpp +++ b/src/api/UBW3CWidgetAPI.cpp @@ -147,17 +147,16 @@ QString UBW3CWidgetPreferenceAPI::getItem(const QString& key) QMap docPref = mGraphicsW3CWidget->UBGraphicsWidgetItem::preferences(); if (docPref.contains(key)) return docPref.value(key); - } + - QMap w3cPrefs = mGraphicsW3CWidget->preferences(); + QMap w3cPrefs = mGraphicsW3CWidget->preferences(); - if (w3cPrefs.contains(key)) { - UBGraphicsW3CWidgetItem::PreferenceValue pref = w3cPrefs.value(key); - return pref.value; + if (w3cPrefs.contains(key)) { + UBGraphicsW3CWidgetItem::PreferenceValue pref = w3cPrefs.value(key); + return pref.value; + } } - - else - return ""; + return QString(); } int UBW3CWidgetPreferenceAPI::length() diff --git a/src/gui/UBToolWidget.cpp b/src/gui/UBToolWidget.cpp index 15f99d47..730a3c39 100644 --- a/src/gui/UBToolWidget.cpp +++ b/src/gui/UBToolWidget.cpp @@ -111,7 +111,7 @@ void UBToolWidget::initialize() void UBToolWidget::javaScriptWindowObjectCleared() { - UBWidgetUniboardAPI *uniboardAPI = new UBWidgetUniboardAPI(UBApplication::boardController->activeScene()); + UBWidgetUniboardAPI *uniboardAPI = new UBWidgetUniboardAPI(UBApplication::boardController->activeScene(), mGraphicsWidgetItem); mGraphicsWebView->page()->mainFrame()->addToJavaScriptWindowObject("sankore", uniboardAPI);