mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-01 20:06:40 +00:00
Code Issues Releases Wiki Activity

Move TableEditModes enum inside a class scope.

Browse source
This commit is contained in:
cc9cii 2015-10-28 23:33:24 +11:00
parent 77471d1592
commit 107ccd84d4
3 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
apps/opencs/model/world/columnbase.hpp
View file

@ -12,15 +12,15 @@
namespace CSMWorld namespace CSMWorld
{ {
enum TableEditModes
{
TableEdit_None, // no editing
TableEdit_Full, // edit cells and add/remove rows
TableEdit_FixedRows // edit cells only
};
struct ColumnBase struct ColumnBase
{ {
enum TableEditModes
{
TableEdit_None, // no editing
TableEdit_Full, // edit cells and add/remove rows
TableEdit_FixedRows // edit cells only
};
enum Roles enum Roles
{ {
Role_Flags = Qt::UserRole, Role_Flags = Qt::UserRole,
@ -211,9 +211,9 @@ namespace CSMWorld
{ {
// by default editable; also see IdTree::hasChildren() // by default editable; also see IdTree::hasChildren()
if (mFixedRows) if (mFixedRows)
return QVariant::fromValue(TableEditModes::TableEdit_FixedRows); return QVariant::fromValue(ColumnBase::TableEdit_FixedRows);
else else
return QVariant::fromValue(TableEditModes::TableEdit_Full); return QVariant::fromValue(ColumnBase::TableEdit_Full);
} }
virtual bool isEditable() const virtual bool isEditable() const
@ -237,6 +237,6 @@ namespace CSMWorld
}; };
} }
Q_DECLARE_METATYPE(CSMWorld::TableEditModes) Q_DECLARE_METATYPE(CSMWorld::ColumnBase::TableEditModes)
#endif #endif

28
apps/opencs/model/world/refidadapterimp.cpp
View file

@ -5,6 +5,9 @@
#include <utility> #include <utility>
#include <components/esm/loadcont.hpp> #include <components/esm/loadcont.hpp>
#include <components/esm/loadmgef.hpp>
#include "columnbase.hpp"
#include "nestedtablewrapper.hpp" #include "nestedtablewrapper.hpp"
CSMWorld::PotionColumns::PotionColumns (const InventoryColumns& columns) CSMWorld::PotionColumns::PotionColumns (const InventoryColumns& columns)
@ -27,7 +30,7 @@ QVariant CSMWorld::PotionRefIdAdapter::getData (const RefIdColumn *column, const
// to show nested tables in dialogue subview, see IdTree::hasChildren() // to show nested tables in dialogue subview, see IdTree::hasChildren()
if (column==mColumns.mEffects) if (column==mColumns.mEffects)
return QVariant::fromValue(TableEditModes::TableEdit_Full); return QVariant::fromValue(ColumnBase::TableEdit_Full);
return InventoryRefIdAdapter<ESM::Potion>::getData (column, data, index); return InventoryRefIdAdapter<ESM::Potion>::getData (column, data, index);
} }
@ -64,11 +67,8 @@ CSMWorld::IngredientRefIdAdapter::IngredientRefIdAdapter (const IngredientColumn
QVariant CSMWorld::IngredientRefIdAdapter::getData (const RefIdColumn *column, const RefIdData& data, QVariant CSMWorld::IngredientRefIdAdapter::getData (const RefIdColumn *column, const RefIdData& data,
int index) const int index) const
{ {
const Record<ESM::Ingredient>& record = static_cast<const Record<ESM::Ingredient>&> (
data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Ingredient)));
if (column==mColumns.mEffects) if (column==mColumns.mEffects)
return QVariant::fromValue(TableEditModes::TableEdit_FixedRows); return QVariant::fromValue(ColumnBase::TableEdit_FixedRows);
return InventoryRefIdAdapter<ESM::Ingredient>::getData (column, data, index); return InventoryRefIdAdapter<ESM::Ingredient>::getData (column, data, index);
} }
@ -272,7 +272,7 @@ QVariant CSMWorld::ArmorRefIdAdapter::getData (const RefIdColumn *column,
return record.get().mData.mArmor; return record.get().mData.mArmor;
if (column==mPartRef) if (column==mPartRef)
return QVariant::fromValue(TableEditModes::TableEdit_Full); return QVariant::fromValue(ColumnBase::TableEdit_Full);
return EnchantableRefIdAdapter<ESM::Armor>::getData (column, data, index); return EnchantableRefIdAdapter<ESM::Armor>::getData (column, data, index);
} }
@ -360,7 +360,7 @@ QVariant CSMWorld::ClothingRefIdAdapter::getData (const RefIdColumn *column,
return record.get().mData.mType; return record.get().mData.mType;
if (column==mPartRef) if (column==mPartRef)
return QVariant::fromValue(TableEditModes::TableEdit_Full); return QVariant::fromValue(ColumnBase::TableEdit_Full);
return EnchantableRefIdAdapter<ESM::Clothing>::getData (column, data, index); return EnchantableRefIdAdapter<ESM::Clothing>::getData (column, data, index);
} }
@ -408,7 +408,7 @@ QVariant CSMWorld::ContainerRefIdAdapter::getData (const RefIdColumn *column,
return (record.get().mFlags & ESM::Container::Respawn)!=0; return (record.get().mFlags & ESM::Container::Respawn)!=0;
if (column==mContent) if (column==mContent)
return QVariant::fromValue(TableEditModes::TableEdit_Full); return QVariant::fromValue(ColumnBase::TableEdit_Full);
return NameRefIdAdapter<ESM::Container>::getData (column, data, index); return NameRefIdAdapter<ESM::Container>::getData (column, data, index);
} }
@ -477,13 +477,13 @@ QVariant CSMWorld::CreatureRefIdAdapter::getData (const RefIdColumn *column, con
return QString::fromUtf8 (record.get().mOriginal.c_str()); return QString::fromUtf8 (record.get().mOriginal.c_str());
if (column==mColumns.mAttributes) if (column==mColumns.mAttributes)
return QVariant::fromValue(TableEditModes::TableEdit_FixedRows); return QVariant::fromValue(ColumnBase::TableEdit_FixedRows);
if (column==mColumns.mAttacks) if (column==mColumns.mAttacks)
return QVariant::fromValue(TableEditModes::TableEdit_FixedRows); return QVariant::fromValue(ColumnBase::TableEdit_FixedRows);
if (column==mColumns.mMisc) if (column==mColumns.mMisc)
return QVariant::fromValue(TableEditModes::TableEdit_Full); return QVariant::fromValue(ColumnBase::TableEdit_Full);
std::map<const RefIdColumn *, unsigned int>::const_iterator iter = std::map<const RefIdColumn *, unsigned int>::const_iterator iter =
mColumns.mFlags.find (column); mColumns.mFlags.find (column);
@ -723,13 +723,13 @@ QVariant CSMWorld::NpcRefIdAdapter::getData (const RefIdColumn *column, const Re
if (column==mColumns.mAttributes || column==mColumns.mSkills) if (column==mColumns.mAttributes || column==mColumns.mSkills)
{ {
if ((record.get().mFlags & ESM::NPC::Autocalc) != 0) if ((record.get().mFlags & ESM::NPC::Autocalc) != 0)
return QVariant::fromValue(TableEditModes::TableEdit_None); return QVariant::fromValue(ColumnBase::TableEdit_None);
else else
return QVariant::fromValue(TableEditModes::TableEdit_FixedRows); return QVariant::fromValue(ColumnBase::TableEdit_FixedRows);
} }
if (column==mColumns.mMisc) if (column==mColumns.mMisc)
return QVariant::fromValue(TableEditModes::TableEdit_Full); return QVariant::fromValue(ColumnBase::TableEdit_Full);
std::map<const RefIdColumn *, unsigned int>::const_iterator iter = std::map<const RefIdColumn *, unsigned int>::const_iterator iter =
mColumns.mFlags.find (column); mColumns.mFlags.find (column);

8
apps/opencs/view/world/dialoguesubview.cpp
View file

@ -567,13 +567,13 @@ void CSVWorld::EditWidget::remake(int row)
bool editable = true; bool editable = true;
bool fixedRows = false; bool fixedRows = false;
QVariant v = mTable->index(row, i).data(); QVariant v = mTable->index(row, i).data();
if (v.canConvert<CSMWorld::TableEditModes>()) if (v.canConvert<CSMWorld::ColumnBase::TableEditModes>())
{ {
assert (QString(v.typeName()) == "CSMWorld::TableEditModes"); assert (QString(v.typeName()) == "CSMWorld::ColumnBase::TableEditModes");
if (v.value<CSMWorld::TableEditModes>() == CSMWorld::TableEditModes::TableEdit_None) if (v.value<CSMWorld::ColumnBase::TableEditModes>() == CSMWorld::ColumnBase::TableEdit_None)
editable = false; editable = false;
else if (v.value<CSMWorld::TableEditModes>() == CSMWorld::TableEditModes::TableEdit_FixedRows) else if (v.value<CSMWorld::ColumnBase::TableEditModes>() == CSMWorld::ColumnBase::TableEdit_FixedRows)
fixedRows = true; fixedRows = true;
} }