summaryrefslogtreecommitdiffstats
path: root/qt-ui/profile
diff options
context:
space:
mode:
authorGravatar Tomaz Canabrava <tomaz.canabrava@intel.com>2014-03-07 12:42:13 -0300
committerGravatar Dirk Hohndel <dirk@hohndel.org>2014-03-07 08:54:20 -0800
commitac9a23ef3b6942093bc33a5ee4fac89bec665581 (patch)
tree853eb19996b1edb321fc9d7836cf473866fa3368 /qt-ui/profile
parent6dec4b055601526a0c8bf9e45dfe0ff648d80489 (diff)
downloadsubsurface-ac9a23ef3b6942093bc33a5ee4fac89bec665581.tar.gz
Remove the old profile from the main screen of Subsurface
This patch partially removes the code for the old profile from Subsurface. It removes the use of the old profile on the mainwindow, but keeping the code in the tree for now. A bit of code-cleanup also entered this commit because I had to change every instance of the code that used the old profile. Now to the real code-cleanup Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui/profile')
-rw-r--r--qt-ui/profile/profilewidget2.cpp4
-rw-r--r--qt-ui/profile/profilewidget2.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/qt-ui/profile/profilewidget2.cpp b/qt-ui/profile/profilewidget2.cpp
index 67d857ce2..3b8a3d18a 100644
--- a/qt-ui/profile/profilewidget2.cpp
+++ b/qt-ui/profile/profilewidget2.cpp
@@ -94,7 +94,7 @@ ProfileWidget2::ProfileWidget2(QWidget *parent) : QGraphicsView(parent),
#ifndef QT_NO_DEBUG
QTableView *diveDepthTableView = new QTableView();
diveDepthTableView->setModel(dataModel);
- MainWindow::instance()->tabWidget()->addTab(diveDepthTableView, "Depth Model");
+ diveDepthTableView->show();
#endif
}
@@ -634,7 +634,7 @@ void ProfileWidget2::contextMenuEvent(QContextMenuEvent *event)
action->setData(event->globalPos());
QList<QGraphicsItem *> itemsAtPos = scene()->items(mapToScene(mapFromGlobal(event->globalPos())));
Q_FOREACH(QGraphicsItem * i, itemsAtPos) {
- EventItem *item = dynamic_cast<EventItem *>(i);
+ DiveEventItem *item = dynamic_cast<DiveEventItem *>(i);
if (!item)
continue;
action = new QAction(&m);
diff --git a/qt-ui/profile/profilewidget2.h b/qt-ui/profile/profilewidget2.h
index 9393f4f03..c22d2b151 100644
--- a/qt-ui/profile/profilewidget2.h
+++ b/qt-ui/profile/profilewidget2.h
@@ -62,7 +62,7 @@ public:
COLUMNS
};
- ProfileWidget2(QWidget *parent);
+ ProfileWidget2(QWidget *parent = 0);
void plotDives(QList<dive *> dives);
virtual bool eventFilter(QObject *, QEvent *);
void setupItem(AbstractProfilePolygonItem *item, DiveCartesianAxis *hAxis, DiveCartesianAxis *vAxis, DivePlotDataModel *model, int vData, int hData, int zValue);