added columns for tool IDs

apps/opencs/model/world/refidadapterimp.hpp

@@ -362,6 +362,68 @@ namespace CSMWorld
             InventoryRefIdAdapter<RecordT>::setData (column, data, index, value);
     }
 
+    struct ToolColumns : public InventoryColumns
+    {
+        const RefIdColumn *mQuality;
+        const RefIdColumn *mUses;
+
+        ToolColumns (const InventoryColumns& base) : InventoryColumns (base) {}
+    };
+
+    /// \brief Adapter for tools with limited uses IDs (lockpick, repair, probes)
+    template<typename RecordT>
+    class ToolRefIdAdapter : public InventoryRefIdAdapter<RecordT>
+    {
+            ToolColumns mTools;
+
+        public:
+
+            ToolRefIdAdapter (UniversalId::Type type, const ToolColumns& columns);
+
+            virtual QVariant getData (const RefIdColumn *column, const RefIdData& data, int index)
+                const;
+
+            virtual void setData (const RefIdColumn *column, RefIdData& data, int index,
+                const QVariant& value) const;
+            ///< If the data type does not match an exception is thrown.
+    };
+
+    template<typename RecordT>
+    ToolRefIdAdapter<RecordT>::ToolRefIdAdapter (UniversalId::Type type, const ToolColumns& columns)
+    : InventoryRefIdAdapter<RecordT> (type, columns), mTools (columns)
+    {}
+
+    template<typename RecordT>
+    QVariant ToolRefIdAdapter<RecordT>::getData (const RefIdColumn *column, const RefIdData& data,
+        int index) const
+    {
+        const Record<RecordT>& record = static_cast<const Record<RecordT>&> (
+            data.getRecord (RefIdData::LocalIndex (index, BaseRefIdAdapter<RecordT>::getType())));
+
+        if (column==mTools.mQuality)
+            return record.get().mData.mQuality;
+
+        if (column==mTools.mUses)
+            return record.get().mData.mUses;
+
+        return InventoryRefIdAdapter<RecordT>::getData (column, data, index);
+    }
+
+    template<typename RecordT>
+    void ToolRefIdAdapter<RecordT>::setData (const RefIdColumn *column, RefIdData& data,
+        int index, const QVariant& value) const
+    {
+        Record<RecordT>& record = static_cast<Record<RecordT>&> (
+            data.getRecord (RefIdData::LocalIndex (index, BaseRefIdAdapter<RecordT>::getType())));
+
+        if (column==mTools.mQuality)
+            record.get().mData.mQuality = value.toFloat();
+        else if (column==mTools.mUses)
+            record.get().mData.mUses = value.toInt();
+        else
+            InventoryRefIdAdapter<RecordT>::setData (column, data, index, value);
+    }
+
     class ApparatusRefIdAdapter : public InventoryRefIdAdapter<ESM::Apparatus>
     {
             const RefIdColumn *mType;

apps/opencs/model/world/refidcollection.cpp

@@ -74,21 +74,25 @@ CSMWorld::RefIdCollection::RefIdCollection()
     mColumns.push_back (RefIdColumn ("Enchantment Points", ColumnBase::Display_Integer));
     enchantableColumns.mEnchantmentPoints = &mColumns.back();
 
+    ToolColumns toolsColumns (inventoryColumns);
+
+    mColumns.push_back (RefIdColumn ("Quality", ColumnBase::Display_Float));
+    toolsColumns.mQuality = &mColumns.back();
+    mColumns.push_back (RefIdColumn ("Uses", ColumnBase::Display_Integer));
+    toolsColumns.mUses = &mColumns.back();
+
     mColumns.push_back (RefIdColumn ("Auto Calc", ColumnBase::Display_Boolean));
     const RefIdColumn *autoCalc = &mColumns.back();
 
     mColumns.push_back (RefIdColumn ("Apparatus Type", ColumnBase::Display_ApparatusType));
     const RefIdColumn *apparatusType = &mColumns.back();
 
-    mColumns.push_back (RefIdColumn ("Quality", ColumnBase::Display_Float));
-    const RefIdColumn *quality = &mColumns.back();
-
     mAdapters.insert (std::make_pair (UniversalId::Type_Activator,
         new NameRefIdAdapter<ESM::Activator> (UniversalId::Type_Activator, nameColumns)));
     mAdapters.insert (std::make_pair (UniversalId::Type_Potion,
         new PotionRefIdAdapter (inventoryColumns, autoCalc)));
     mAdapters.insert (std::make_pair (UniversalId::Type_Apparatus,
-        new ApparatusRefIdAdapter (inventoryColumns, apparatusType, quality)));
+        new ApparatusRefIdAdapter (inventoryColumns, apparatusType, toolsColumns.mQuality)));
     mAdapters.insert (std::make_pair (UniversalId::Type_Armor,
         new EnchantableRefIdAdapter<ESM::Armor> (UniversalId::Type_Armor, enchantableColumns)));
     mAdapters.insert (std::make_pair (UniversalId::Type_Book,
@@ -111,16 +115,16 @@ CSMWorld::RefIdCollection::RefIdCollection()
     mAdapters.insert (std::make_pair (UniversalId::Type_Light,
         new InventoryRefIdAdapter<ESM::Light> (UniversalId::Type_Light, inventoryColumns)));
     mAdapters.insert (std::make_pair (UniversalId::Type_Lockpick,
-        new InventoryRefIdAdapter<ESM::Lockpick> (UniversalId::Type_Lockpick, inventoryColumns)));
+        new ToolRefIdAdapter<ESM::Lockpick> (UniversalId::Type_Lockpick, toolsColumns)));
     mAdapters.insert (std::make_pair (UniversalId::Type_Miscellaneous,
         new InventoryRefIdAdapter<ESM::Miscellaneous> (UniversalId::Type_Miscellaneous,
         inventoryColumns)));
     mAdapters.insert (std::make_pair (UniversalId::Type_Npc,
         new NameRefIdAdapter<ESM::NPC> (UniversalId::Type_Npc, nameColumns)));
     mAdapters.insert (std::make_pair (UniversalId::Type_Probe,
-        new InventoryRefIdAdapter<ESM::Probe> (UniversalId::Type_Probe, inventoryColumns)));
+        new ToolRefIdAdapter<ESM::Probe> (UniversalId::Type_Probe, toolsColumns)));
     mAdapters.insert (std::make_pair (UniversalId::Type_Repair,
-        new InventoryRefIdAdapter<ESM::Repair> (UniversalId::Type_Repair, inventoryColumns)));
+        new ToolRefIdAdapter<ESM::Repair> (UniversalId::Type_Repair, toolsColumns)));
     mAdapters.insert (std::make_pair (UniversalId::Type_Static,
         new ModelRefIdAdapter<ESM::Static> (UniversalId::Type_Static, modelColumns)));
     mAdapters.insert (std::make_pair (UniversalId::Type_Weapon,