From 4e59246d2d2ca592a0247796ed8185e8fd7b5f4f Mon Sep 17 00:00:00 2001 From: Dave Corley Date: Tue, 26 Mar 2024 01:53:25 -0500 Subject: [PATCH] Fix(columnimp.hpp): Use QVariant() constructor instead of UserType to hide unused subs from view and make a member variable to tell if the column is used for a door or a regular position --- apps/opencs/model/world/columnimp.hpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/apps/opencs/model/world/columnimp.hpp b/apps/opencs/model/world/columnimp.hpp index 9e376a5ccf..b1c24a0c22 100644 --- a/apps/opencs/model/world/columnimp.hpp +++ b/apps/opencs/model/world/columnimp.hpp @@ -1167,7 +1167,7 @@ namespace CSMWorld QVariant get(const Record& record) const override { if (!record.get().mTeleport) - return QVariant(QVariant::UserType); + return QVariant(); return QString::fromUtf8(record.get().mDestCell.c_str()); } @@ -1312,21 +1312,21 @@ namespace CSMWorld { ESM::Position ESXRecordT::*mPosition; int mIndex; + bool mIsDoor; PosColumn(ESM::Position ESXRecordT::*position, int index, bool door) : Column((door ? Columns::ColumnId_DoorPositionXPos : Columns::ColumnId_PositionXPos) + index, ColumnBase::Display_Float) , mPosition(position) , mIndex(index) + , mIsDoor(door) { } QVariant get(const Record& record) const override { - int column = this->mColumnId; - if (!record.get().mTeleport && column >= Columns::ColumnId_DoorPositionXPos - && column <= Columns::ColumnId_DoorPositionZPos) - return QVariant(QVariant::UserType); + if (!record.get().mTeleport && mIsDoor) + return QVariant(); const ESM::Position& position = record.get().*mPosition; return position.pos[mIndex]; } @@ -1350,21 +1350,21 @@ namespace CSMWorld { ESM::Position ESXRecordT::*mPosition; int mIndex; + bool mIsDoor; RotColumn(ESM::Position ESXRecordT::*position, int index, bool door) : Column((door ? Columns::ColumnId_DoorPositionXRot : Columns::ColumnId_PositionXRot) + index, ColumnBase::Display_Double) , mPosition(position) , mIndex(index) + , mIsDoor(door) { } QVariant get(const Record& record) const override { - int column = this->mColumnId; - if (!record.get().mTeleport && column >= Columns::ColumnId_DoorPositionXRot - && column <= Columns::ColumnId::ColumnId_DoorPositionZRot) - return QVariant(QVariant::UserType); + if (!record.get().mTeleport && mIsDoor) + return QVariant(); const ESM::Position& position = record.get().*mPosition; return osg::RadiansToDegrees(position.rot[mIndex]); }