diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2014-08-29 09:53:57 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2014-08-29 09:53:57 -0700 |
| commit | e6ce9a4df11af8d0ff759a2e8ac2012747355f8f (patch) | |
| tree | 4d2ecab0069f5fc4feb66ae43b8235d7c33b282b /qt-ui | |
| parent | ca3a6c3faf9a58799eb8bc9e1e0dcd7a7785402e (diff) | |
| download | subsurface-e6ce9a4df11af8d0ff759a2e8ac2012747355f8f.tar.gz | |
Revert hacks now that we use Qt5 on Mac
Commits a24eb8ac120bf and 0b0860d24a81b introduced a nasty hack that was
needed back then to make tank and weight selection work on the Mac. But it
caused other unpleasant issues (as mentioned in the commit messages).
I re-tested this with the current Qt5.3 based builds on Mac and this hack
is no longer needed.
Fixes #638
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui')
| -rw-r--r-- | qt-ui/modeldelegates.cpp | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/qt-ui/modeldelegates.cpp b/qt-ui/modeldelegates.cpp index 87846d22b..c0b6522cf 100644 --- a/qt-ui/modeldelegates.cpp +++ b/qt-ui/modeldelegates.cpp @@ -247,11 +247,8 @@ TankInfoDelegate::TankInfoDelegate(QObject *parent) : ComboBoxDelegate(TankInfoM void TankInfoDelegate::revertModelData(QWidget *widget, QAbstractItemDelegate::EndEditHint hint) { - if ( -#if !defined __APPLE__ - hint == QAbstractItemDelegate::NoHint || -#endif - hint == QAbstractItemDelegate::RevertModelCache) { + if (hint == QAbstractItemDelegate::NoHint || + hint == QAbstractItemDelegate::RevertModelCache) { CylindersModel *mymodel = qobject_cast<CylindersModel *>(currCombo.model); mymodel->setData(IDX(CylindersModel::TYPE), currCylinderData.type, Qt::EditRole); mymodel->passInData(IDX(CylindersModel::WORKINGPRESS), currCylinderData.pressure); @@ -279,11 +276,8 @@ struct RevertWeightData { void WSInfoDelegate::revertModelData(QWidget *widget, QAbstractItemDelegate::EndEditHint hint) { - if ( -#if !defined __APPLE__ - hint == QAbstractItemDelegate::NoHint || -#endif - hint == QAbstractItemDelegate::RevertModelCache) { + if (hint == QAbstractItemDelegate::NoHint || + hint == QAbstractItemDelegate::RevertModelCache) { WeightModel *mymodel = qobject_cast<WeightModel *>(currCombo.model); mymodel->setData(IDX(WeightModel::TYPE), currWeight.type, Qt::EditRole); mymodel->passInData(IDX(WeightModel::WEIGHT), currWeight.weight); @@ -438,4 +432,4 @@ QSize HTMLDelegate::sizeHint ( const QStyleOptionViewItem & option, const QModel doc.setHtml(options.text); doc.setTextWidth(options.rect.width()); return QSize(doc.idealWidth(), doc.size().height()); -}
\ No newline at end of file +} |