[PATCH 11/17] Switch to having ui as member in MultiFilter

[Anton Lundin]

Signed-off-by: Anton Lundin <gla...@acc.umu.se>
---
 qt-ui/simplewidgets.cpp | 17 ++++++++---------
 qt-ui/simplewidgets.h   |  3 ++-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/qt-ui/simplewidgets.cpp b/qt-ui/simplewidgets.cpp
index ed6e532..8b51789 100644
--- a/qt-ui/simplewidgets.cpp
+++ b/qt-ui/simplewidgets.cpp
@@ -606,8 +606,7 @@ void SuitFilter::hideEvent(QHideEvent *event)
 
 MultiFilter::MultiFilter(QWidget *parent) : QWidget(parent)
 {
-       ui = new Ui::FilterWidget2();
-       ui->setupUi(this);
+       ui.setupUi(this);
 
        QWidget *expandedWidget = new QWidget();
        QHBoxLayout *l = new QHBoxLayout();
@@ -616,9 +615,9 @@ MultiFilter::MultiFilter(QWidget *parent) : QWidget(parent)
        int minimumHeight = tagFilter->ui.filterInternalList->height() +
                        tagFilter->ui.verticalLayout->spacing() * 
tagFilter->ui.verticalLayout->count();
 
-       connect(ui->close, SIGNAL(clicked(bool)), this, SLOT(closeFilter()));
-       connect(ui->clear, SIGNAL(clicked(bool)), 
MultiFilterSortModel::instance(), SLOT(clearFilter()));
-       connect(ui->maximize, SIGNAL(clicked(bool)), this, 
SLOT(adjustHeight()));
+       connect(ui.close, SIGNAL(clicked(bool)), this, SLOT(closeFilter()));
+       connect(ui.clear, SIGNAL(clicked(bool)), 
MultiFilterSortModel::instance(), SLOT(clearFilter()));
+       connect(ui.maximize, SIGNAL(clicked(bool)), this, SLOT(adjustHeight()));
 
        l->addWidget(tagFilter);
        l->addWidget(new BuddyFilter());
@@ -628,21 +627,21 @@ MultiFilter::MultiFilter(QWidget *parent) : 
QWidget(parent)
        l->setSpacing(0);
        expandedWidget->setLayout(l);
 
-       ui->scrollArea->setWidget(expandedWidget);
+       ui.scrollArea->setWidget(expandedWidget);
        expandedWidget->resize(expandedWidget->width(), minimumHeight );
-       ui->scrollArea->setMinimumHeight(expandedWidget->height() + 5);
+       ui.scrollArea->setMinimumHeight(expandedWidget->height() + 5);
 
        connect(MultiFilterSortModel::instance(), SIGNAL(filterFinished()), 
this, SLOT(filterFinished()));
 }
 
 void MultiFilter::filterFinished()
 {
-       ui->filterText->setText(tr("Filter shows %1 (of %2) 
dives").arg(MultiFilterSortModel::instance()->divesDisplayed).arg(dive_table.nr));
+       ui.filterText->setText(tr("Filter shows %1 (of %2) 
dives").arg(MultiFilterSortModel::instance()->divesDisplayed).arg(dive_table.nr));
 }
 
 void MultiFilter::adjustHeight()
 {
-       ui->scrollArea->setVisible(!ui->scrollArea->isVisible());
+       ui.scrollArea->setVisible(!ui.scrollArea->isVisible());
 }
 
 void MultiFilter::closeFilter()
diff --git a/qt-ui/simplewidgets.h b/qt-ui/simplewidgets.h
index c5631fd..b2b08d5 100644
--- a/qt-ui/simplewidgets.h
+++ b/qt-ui/simplewidgets.h
@@ -14,6 +14,7 @@ class QAbstractButton;
 #include "ui_shiftimagetimes.h"
 #include "ui_divecomponentselection.h"
 #include "ui_listfilter.h"
+#include "ui_filterwidget.h"
 #include "exif.h"
 #include <dive.h>
 
@@ -163,7 +164,7 @@ slots:
 
 public:
        MultiFilter(QWidget *parent);
-       Ui::FilterWidget2 *ui;
+       Ui::FilterWidget2 ui;
 };
 
 class TagFilter : public QWidget {
-- 
2.1.0

_______________________________________________
subsurface mailing list
subsurface@subsurface-divelog.org
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface