summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHugo Parente Lima <hugo.pl@gmail.com>2011-05-12 18:56:53 -0300
committerHugo Parente Lima <hugo.pl@gmail.com>2011-05-12 18:56:53 -0300
commit0c4fbcf5aded6780508084604a7f5059d8e7ea72 (patch)
tree9154f77a02131f7c5e26045a33be859ece80e557
parent4d90463624d27fd80b59d68d69ef17e7b1b2e869 (diff)
downloadpyside-0c4fbcf5aded6780508084604a7f5059d8e7ea72.tar.gz
pyside-0c4fbcf5aded6780508084604a7f5059d8e7ea72.tar.xz
pyside-0c4fbcf5aded6780508084604a7f5059d8e7ea72.zip
Be compatible with Qt4.5, i.e. no QScopedPointer.
-rw-r--r--plugins/customwidget.cpp1
-rw-r--r--plugins/customwidget.h2
-rw-r--r--plugins/customwidgets.cpp1
-rw-r--r--plugins/customwidgets.h2
4 files changed, 4 insertions, 2 deletions
diff --git a/plugins/customwidget.cpp b/plugins/customwidget.cpp
index 9a3e6f2..c752de5 100644
--- a/plugins/customwidget.cpp
+++ b/plugins/customwidget.cpp
@@ -40,6 +40,7 @@ PyCustomWidget::PyCustomWidget(PyObject* objectType)
PyCustomWidget::~PyCustomWidget()
{
+ delete m_data;
}
bool PyCustomWidget::isContainer() const
diff --git a/plugins/customwidget.h b/plugins/customwidget.h
index 00393a1..2f26363 100644
--- a/plugins/customwidget.h
+++ b/plugins/customwidget.h
@@ -51,7 +51,7 @@ public:
void initialize(QDesignerFormEditorInterface *core);
private:
- QScopedPointer<PyCustomWidgetPrivate> m_data;
+ PyCustomWidgetPrivate* m_data;
QString m_name;
};
diff --git a/plugins/customwidgets.cpp b/plugins/customwidgets.cpp
index c92b95c..0c43c5b 100644
--- a/plugins/customwidgets.cpp
+++ b/plugins/customwidgets.cpp
@@ -52,6 +52,7 @@ PyCustomWidgets::PyCustomWidgets(QObject *parent)
PyCustomWidgets::~PyCustomWidgets()
{
+ delete m_data;
}
void PyCustomWidgets::registerWidgetType(PyObject* widget)
diff --git a/plugins/customwidgets.h b/plugins/customwidgets.h
index 3cb0d2a..b1c4d70 100644
--- a/plugins/customwidgets.h
+++ b/plugins/customwidgets.h
@@ -44,7 +44,7 @@ public:
void registerWidgetType(PyObject* widget);
private:
- QScopedPointer<PyCustomWidgetsPrivate> m_data;
+ PyCustomWidgetsPrivate* m_data;
};
#endif