From dac10256acf57658dce9c1a2b7c21a92a7a0eb2f Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Wed, 4 Mar 2009 14:59:35 -0500 Subject: Fix connections within the Private classes of the widgets (cherry picked from commit 9983184dd6b159c396bfe89252bc7304ff0ee43c) --- sigmodr/widgets/ObjectUIPrivate.cpp | 11 ++++++++++- sigmodr/widgets/ObjectUIPrivate.h | 4 +++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/sigmodr/widgets/ObjectUIPrivate.cpp b/sigmodr/widgets/ObjectUIPrivate.cpp index d9975149..4398ac8a 100644 --- a/sigmodr/widgets/ObjectUIPrivate.cpp +++ b/sigmodr/widgets/ObjectUIPrivate.cpp @@ -18,6 +18,9 @@ // Header include #include "ObjectUIPrivate.h" +// Sigmodr widget includes +#include "ObjectUI.h" + // Sigmod includes #include @@ -50,8 +53,9 @@ void ObjectUIPrivate::refreshGui() resetGui(); } -QWidget* ObjectUIPrivate::openUiFile(const QString& filename, QWidget* parent) +QWidget* ObjectUIPrivate::openUiFile(const QString& filename, ObjectUI* parent) { + makeConnections(parent); QFile file(filename); file.open(QFile::ReadOnly); QWidget *formWidget = QUiLoader().load(&file, parent); @@ -68,3 +72,8 @@ void ObjectUIPrivate::warningMessage(const QString& message) { KMessageBox::warningContinueCancel(NULL, message, "Warning"); } + +void ObjectUIPrivate::makeConnections(ObjectUI* widget) +{ + connect(this, SIGNAL(changed()), widget, SIGNAL(changed())); +} diff --git a/sigmodr/widgets/ObjectUIPrivate.h b/sigmodr/widgets/ObjectUIPrivate.h index 2c28de38..6fc94a56 100644 --- a/sigmodr/widgets/ObjectUIPrivate.h +++ b/sigmodr/widgets/ObjectUIPrivate.h @@ -51,10 +51,12 @@ class SIGMODRWIDGETS_NO_EXPORT ObjectUIPrivate : public QObject signals: bool changed(); protected: - QWidget* openUiFile(const QString& filename, QWidget* parent); + QWidget* openUiFile(const QString& filename, ObjectUI* parent); protected slots: void errorMessage(const QString& message); void warningMessage(const QString& message); + private: + void makeConnections(ObjectUI* widget); }; } } -- cgit