diff --git a/limereport/lrreportdesignwindow.cpp b/limereport/lrreportdesignwindow.cpp index 517628a..5eba0e7 100644 --- a/limereport/lrreportdesignwindow.cpp +++ b/limereport/lrreportdesignwindow.cpp @@ -934,7 +934,7 @@ void ReportDesignWindow::slotNewBand(int bandType) void ReportDesignWindow::slotItemSelected(LimeReport::BaseDesignIntf *item) { - if (m_objectInspector->currentObject()!=item){ + if (m_objectInspector->object()!=item){ m_newSubDetail->setEnabled(false); m_newSubDetailHeader->setEnabled(false); @@ -989,7 +989,7 @@ void ReportDesignWindow::slotItemPropertyChanged(const QString &objectName, cons Q_UNUSED(oldValue) Q_UNUSED(newValue) - if (m_objectInspector->currentObject()&&(m_objectInspector->currentObject()->objectName()==objectName)){ + if (m_objectInspector->object()&&(m_objectInspector->object()->objectName()==objectName)){ m_objectInspector->updateProperty(propertyName); } } diff --git a/limereport/lrreportdesignwindow.h b/limereport/lrreportdesignwindow.h index 18df464..d5dc790 100644 --- a/limereport/lrreportdesignwindow.h +++ b/limereport/lrreportdesignwindow.h @@ -238,8 +238,6 @@ private: QSignalMapper* m_recentFilesSignalMap; ObjectInspectorWidget* m_objectInspector; - //QObjectPropertyModel* m_propertyModel; - ReportDesignWidget* m_reportDesignWidget; DataBrowser * m_dataBrowser; ScriptBrowser* m_scriptBrowser; diff --git a/limereport/objectinspector/lrobjectinspectorwidget.cpp b/limereport/objectinspector/lrobjectinspectorwidget.cpp index 4ca3fff..cfc528a 100644 --- a/limereport/objectinspector/lrobjectinspectorwidget.cpp +++ b/limereport/objectinspector/lrobjectinspectorwidget.cpp @@ -244,7 +244,7 @@ void ObjectInspectorWidget::setSubclassesAsLevel(bool value) m_propertyModel->setSubclassesAsLevel(value); } -const QObject *ObjectInspectorWidget::currentObject(){ +const QObject *ObjectInspectorWidget::object(){ return m_propertyModel->currentObject(); } diff --git a/limereport/objectinspector/lrobjectinspectorwidget.h b/limereport/objectinspector/lrobjectinspectorwidget.h index fcb0c48..88ef97a 100644 --- a/limereport/objectinspector/lrobjectinspectorwidget.h +++ b/limereport/objectinspector/lrobjectinspectorwidget.h @@ -83,8 +83,8 @@ public: void setValidator(ValidatorIntf *validator); bool subclassesAsLevel(); void setSubclassesAsLevel(bool value); - void setObject(QObject* object); - const QObject* currentObject(); + void setObject(QObject* setObject); + const QObject* object(); void setMultiObjects(QList* list); void clearObjectsList(); void updateProperty(const QString &propertyName);