Call base method for deletion of children

30 files changed, 30 insertions, 90 deletions

diff --git a/sigmodr/tree/AbilityGroupModel.cpp b/sigmodr/tree/AbilityGroupModel.cpp
index 19976295..fc3690e1 100644
--- a/sigmodr/tree/AbilityGroupModel.cpp
+++ b/sigmodr/tree/AbilityGroupModel.cpp
@@ -86,8 +86,6 @@ void AbilityGroupModel::deleteObject(BaseModel* model)
     if (0 <= index)
     {
         qobject_cast<Game*>(m_object)->deleteAbility(index);
-        m_objects[index]->deleteLater();
-        m_objects.removeAt(index);
-        childRowChanged(index);
+        removeChild(index);
     }
 }
diff --git a/sigmodr/tree/AuthorGroupModel.cpp b/sigmodr/tree/AuthorGroupModel.cpp
index edf44d64..c17b3551 100644
--- a/sigmodr/tree/AuthorGroupModel.cpp
+++ b/sigmodr/tree/AuthorGroupModel.cpp
@@ -86,8 +86,6 @@ void AuthorGroupModel::deleteObject(BaseModel* model)
     if (0 <= index)
     {
         qobject_cast<Game*>(m_object)->deleteAuthor(index);
-        m_objects[index]->deleteLater();
-        m_objects.removeAt(index);
-        childRowChanged(index);
+        removeChild(index);
     }
 }
diff --git a/sigmodr/tree/BadgeGroupModel.cpp b/sigmodr/tree/BadgeGroupModel.cpp
index 9d473fff..c8cfda02 100644
--- a/sigmodr/tree/BadgeGroupModel.cpp
+++ b/sigmodr/tree/BadgeGroupModel.cpp
@@ -86,8 +86,6 @@ void BadgeGroupModel::deleteObject(BaseModel* model)
     if (0 <= index)
     {
         qobject_cast<Game*>(m_object)->deleteBadge(index);
-        m_objects[index]->deleteLater();
-        m_objects.removeAt(index);
-        childRowChanged(index);
+        removeChild(index);
     }
 }
diff --git a/sigmodr/tree/CoinListGroupModel.cpp b/sigmodr/tree/CoinListGroupModel.cpp
index f93b5c83..4ee1483c 100644
--- a/sigmodr/tree/CoinListGroupModel.cpp
+++ b/sigmodr/tree/CoinListGroupModel.cpp
@@ -86,8 +86,6 @@ void CoinListGroupModel::deleteObject(BaseModel* model)
     if (0 <= index)
     {
         qobject_cast<Game*>(m_object)->deleteCoinList(index);
-        m_objects[index]->deleteLater();
-        m_objects.removeAt(index);
-        childRowChanged(index);
+        removeChild(index);
     }
 }
diff --git a/sigmodr/tree/CoinListModel.cpp b/sigmodr/tree/CoinListModel.cpp
index 3b6172f2..d976ec7f 100644
--- a/sigmodr/tree/CoinListModel.cpp
+++ b/sigmodr/tree/CoinListModel.cpp
@@ -120,9 +120,7 @@ void CoinListModel::deleteObject(BaseModel* model)
     if (0 <= index)
     {
         qobject_cast<CoinList*>(m_object)->deleteItem(index);
-        m_objects[index]->deleteLater();
-        m_objects.removeAt(index);
-        childRowChanged(index);
+        removeChild(index);
     }
 }
 
diff --git a/sigmodr/tree/EggGroupGroupModel.cpp b/sigmodr/tree/EggGroupGroupModel.cpp
index aa1f5b17..7e10f71e 100644
--- a/sigmodr/tree/EggGroupGroupModel.cpp
+++ b/sigmodr/tree/EggGroupGroupModel.cpp
@@ -86,8 +86,6 @@ void EggGroupGroupModel::deleteObject(BaseModel* model)
     if (0 <= index)
     {
         qobject_cast<Game*>(m_object)->deleteEggGroup(index);
-        m_objects[index]->deleteLater();
-        m_objects.removeAt(index);
-        childRowChanged(index);
+        removeChild(index);
     }
 }
diff --git a/sigmodr/tree/GlobalScriptGroupModel.cpp b/sigmodr/tree/GlobalScriptGroupModel.cpp
index 3f03427a..00068d1f 100644
--- a/sigmodr/tree/GlobalScriptGroupModel.cpp
+++ b/sigmodr/tree/GlobalScriptGroupModel.cpp
@@ -86,8 +86,6 @@ void GlobalScriptGroupModel::deleteObject(BaseModel* model)
     if (0 <= index)
     {
         qobject_cast<Game*>(m_object)->deleteGlobalScript(index);
-        m_objects[index]->deleteLater();
-        m_objects.removeAt(index);
-        childRowChanged(index);
+        removeChild(index);
     }
 }
diff --git a/sigmodr/tree/ItemGroupModel.cpp b/sigmodr/tree/ItemGroupModel.cpp
index 3f0b5197..777718f2 100644
--- a/sigmodr/tree/ItemGroupModel.cpp
+++ b/sigmodr/tree/ItemGroupModel.cpp
@@ -86,8 +86,6 @@ void ItemGroupModel::deleteObject(BaseModel* model)
     if (0 <= index)
     {
         qobject_cast<Game*>(m_object)->deleteItem(index);
-        m_objects[index]->deleteLater();
-        m_objects.removeAt(index);
-        childRowChanged(index);
+        removeChild(index);
     }
 }
diff --git a/sigmodr/tree/ItemTypeGroupModel.cpp b/sigmodr/tree/ItemTypeGroupModel.cpp
index 3d625132..f5c9480e 100644
--- a/sigmodr/tree/ItemTypeGroupModel.cpp
+++ b/sigmodr/tree/ItemTypeGroupModel.cpp
@@ -86,8 +86,6 @@ void ItemTypeGroupModel::deleteObject(BaseModel* model)
     if (0 <= index)
     {
         qobject_cast<Game*>(m_object)->deleteItemType(index);
-        m_objects[index]->deleteLater();
-        m_objects.removeAt(index);
-        childRowChanged(index);
+        removeChild(index);
     }
 }
diff --git a/sigmodr/tree/MapEffectGroupModel.cpp b/sigmodr/tree/MapEffectGroupModel.cpp
index 67d29e5b..25afd0ce 100644
--- a/sigmodr/tree/MapEffectGroupModel.cpp
+++ b/sigmodr/tree/MapEffectGroupModel.cpp
@@ -86,8 +86,6 @@ void MapEffectGroupModel::deleteObject(BaseModel* model)
     if (0 <= index)
     {
         qobject_cast<Map*>(m_object)->deleteEffect(index);
-        m_objects[index]->deleteLater();
-        m_objects.removeAt(index);
-        childRowChanged(index);
+        removeChild(index);
     }
 }
diff --git a/sigmodr/tree/MapGroupModel.cpp b/sigmodr/tree/MapGroupModel.cpp
index 1308ba95..f38ff76c 100644
--- a/sigmodr/tree/MapGroupModel.cpp
+++ b/sigmodr/tree/MapGroupModel.cpp
@@ -86,8 +86,6 @@ void MapGroupModel::deleteObject(BaseModel* model)
     if (0 <= index)
     {
         qobject_cast<Game*>(m_object)->deleteMap(index);
-        m_objects[index]->deleteLater();
-        m_objects.removeAt(index);
-        childRowChanged(index);
+        removeChild(index);
     }
 }
diff --git a/sigmodr/tree/MapTrainerGroupModel.cpp b/sigmodr/tree/MapTrainerGroupModel.cpp
index 0eb95bfe..0028c26a 100644
--- a/sigmodr/tree/MapTrainerGroupModel.cpp
+++ b/sigmodr/tree/MapTrainerGroupModel.cpp
@@ -86,8 +86,6 @@ void MapTrainerGroupModel::deleteObject(BaseModel* model)
     if (0 <= index)
     {
         qobject_cast<Map*>(m_object)->deleteTrainer(index);
-        m_objects[index]->deleteLater();
-        m_objects.removeAt(index);
-        childRowChanged(index);
+        removeChild(index);
     }
 }
diff --git a/sigmodr/tree/MapTrainerModel.cpp b/sigmodr/tree/MapTrainerModel.cpp
index d833b3af..ce1f4622 100644
--- a/sigmodr/tree/MapTrainerModel.cpp
+++ b/sigmodr/tree/MapTrainerModel.cpp
@@ -121,9 +121,7 @@ void MapTrainerModel::deleteObject(BaseModel* model)
     if (0 <= index)
     {
         qobject_cast<MapTrainer*>(m_object)->deleteTeamMember(index);
-        m_objects[index]->deleteLater();
-        m_objects.removeAt(index);
-        childRowChanged(index);
+        removeChild(index);
     }
 }
 
diff --git a/sigmodr/tree/MapWarpGroupModel.cpp b/sigmodr/tree/MapWarpGroupModel.cpp
index 4a380f15..7189702c 100644
--- a/sigmodr/tree/MapWarpGroupModel.cpp
+++ b/sigmodr/tree/MapWarpGroupModel.cpp
@@ -86,8 +86,6 @@ void MapWarpGroupModel::deleteObject(BaseModel* model)
     if (0 <= index)
     {
         qobject_cast<Map*>(m_object)->deleteWarp(index);
-        m_objects[index]->deleteLater();
-        m_objects.removeAt(index);
-        childRowChanged(index);
+        removeChild(index);
     }
 }
diff --git a/sigmodr/tree/MapWildListGroupModel.cpp b/sigmodr/tree/MapWildListGroupModel.cpp
index ba0ca26a..7d8389c7 100644
--- a/sigmodr/tree/MapWildListGroupModel.cpp
+++ b/sigmodr/tree/MapWildListGroupModel.cpp
@@ -86,8 +86,6 @@ void MapWildListGroupModel::deleteObject(BaseModel* model)
     if (0 <= index)
     {
         qobject_cast<Map*>(m_object)->deleteWildList(index);
-        m_objects[index]->deleteLater();
-        m_objects.removeAt(index);
-        childRowChanged(index);
+        removeChild(index);
     }
 }
diff --git a/sigmodr/tree/MapWildListModel.cpp b/sigmodr/tree/MapWildListModel.cpp
index adf4c23e..cfc1fa0c 100644
--- a/sigmodr/tree/MapWildListModel.cpp
+++ b/sigmodr/tree/MapWildListModel.cpp
@@ -123,9 +123,7 @@ void MapWildListModel::deleteObject(BaseModel* model)
     if (0 <= index)
     {
         qobject_cast<MapWildList*>(m_object)->deleteEncounter(index);
-        m_objects[index]->deleteLater();
-        m_objects.removeAt(index);
-        childRowChanged(index);
+        removeChild(index);
     }
 }
 
diff --git a/sigmodr/tree/MoveGroupModel.cpp b/sigmodr/tree/MoveGroupModel.cpp
index d8487df7..4da83981 100644
--- a/sigmodr/tree/MoveGroupModel.cpp
+++ b/sigmodr/tree/MoveGroupModel.cpp
@@ -86,8 +86,6 @@ void MoveGroupModel::deleteObject(BaseModel* model)
     if (0 <= index)
     {
         qobject_cast<Game*>(m_object)->deleteMove(index);
-        m_objects[index]->deleteLater();
-        m_objects.removeAt(index);
-        childRowChanged(index);
+        removeChild(index);
     }
 }
diff --git a/sigmodr/tree/NatureGroupModel.cpp b/sigmodr/tree/NatureGroupModel.cpp
index 7382410b..6eba5fea 100644
--- a/sigmodr/tree/NatureGroupModel.cpp
+++ b/sigmodr/tree/NatureGroupModel.cpp
@@ -86,8 +86,6 @@ void NatureGroupModel::deleteObject(BaseModel* model)
     if (0 <= index)
     {
         qobject_cast<Game*>(m_object)->deleteNature(index);
-        m_objects[index]->deleteLater();
-        m_objects.removeAt(index);
-        childRowChanged(index);
+        removeChild(index);
     }
 }
diff --git a/sigmodr/tree/SkinGroupModel.cpp b/sigmodr/tree/SkinGroupModel.cpp
index 9794a4da..48330a92 100644
--- a/sigmodr/tree/SkinGroupModel.cpp
+++ b/sigmodr/tree/SkinGroupModel.cpp
@@ -86,8 +86,6 @@ void SkinGroupModel::deleteObject(BaseModel* model)
     if (0 <= index)
     {
         qobject_cast<Game*>(m_object)->deleteSkin(index);
-        m_objects[index]->deleteLater();
-        m_objects.removeAt(index);
-        childRowChanged(index);
+        removeChild(index);
     }
 }
diff --git a/sigmodr/tree/SoundGroupModel.cpp b/sigmodr/tree/SoundGroupModel.cpp
index bfad7f03..96e8bba6 100644
--- a/sigmodr/tree/SoundGroupModel.cpp
+++ b/sigmodr/tree/SoundGroupModel.cpp
@@ -86,8 +86,6 @@ void SoundGroupModel::deleteObject(BaseModel* model)
     if (0 <= index)
     {
         qobject_cast<Game*>(m_object)->deleteSound(index);
-        m_objects[index]->deleteLater();
-        m_objects.removeAt(index);
-        childRowChanged(index);
+        removeChild(index);
     }
 }
diff --git a/sigmodr/tree/SpeciesGroupModel.cpp b/sigmodr/tree/SpeciesGroupModel.cpp
index caa46ead..98201822 100644
--- a/sigmodr/tree/SpeciesGroupModel.cpp
+++ b/sigmodr/tree/SpeciesGroupModel.cpp
@@ -86,8 +86,6 @@ void SpeciesGroupModel::deleteObject(BaseModel* model)
     if (0 <= index)
     {
         qobject_cast<Game*>(m_object)->deleteSpecies(index);
-        m_objects[index]->deleteLater();
-        m_objects.removeAt(index);
-        childRowChanged(index);
+        removeChild(index);
     }
 }
diff --git a/sigmodr/tree/SpeciesModel.cpp b/sigmodr/tree/SpeciesModel.cpp
index f49126c9..0a45e9a0 100644
--- a/sigmodr/tree/SpeciesModel.cpp
+++ b/sigmodr/tree/SpeciesModel.cpp
@@ -121,9 +121,7 @@ void SpeciesModel::deleteObject(BaseModel* model)
     if (0 <= index)
     {
         qobject_cast<Species*>(m_object)->deleteMove(index);
-        m_objects[index]->deleteLater();
-        m_objects.removeAt(index);
-        childRowChanged(index);
+        removeChild(index);
     }
 }
 
diff --git a/sigmodr/tree/SpriteGroupModel.cpp b/sigmodr/tree/SpriteGroupModel.cpp
index 7e2917dd..7226acb7 100644
--- a/sigmodr/tree/SpriteGroupModel.cpp
+++ b/sigmodr/tree/SpriteGroupModel.cpp
@@ -86,8 +86,6 @@ void SpriteGroupModel::deleteObject(BaseModel* model)
     if (0 <= index)
     {
         qobject_cast<Game*>(m_object)->deleteSprite(index);
-        m_objects[index]->deleteLater();
-        m_objects.removeAt(index);
-        childRowChanged(index);
+        removeChild(index);
     }
 }
diff --git a/sigmodr/tree/StatusGroupModel.cpp b/sigmodr/tree/StatusGroupModel.cpp
index 284ce483..712f3db3 100644
--- a/sigmodr/tree/StatusGroupModel.cpp
+++ b/sigmodr/tree/StatusGroupModel.cpp
@@ -86,8 +86,6 @@ void StatusGroupModel::deleteObject(BaseModel* model)
     if (0 <= index)
     {
         qobject_cast<Game*>(m_object)->deleteStatus(index);
-        m_objects[index]->deleteLater();
-        m_objects.removeAt(index);
-        childRowChanged(index);
+        removeChild(index);
     }
 }
diff --git a/sigmodr/tree/StoreGroupModel.cpp b/sigmodr/tree/StoreGroupModel.cpp
index b7963fee..7a262142 100644
--- a/sigmodr/tree/StoreGroupModel.cpp
+++ b/sigmodr/tree/StoreGroupModel.cpp
@@ -86,8 +86,6 @@ void StoreGroupModel::deleteObject(BaseModel* model)
     if (0 <= index)
     {
         qobject_cast<Game*>(m_object)->deleteStore(index);
-        m_objects[index]->deleteLater();
-        m_objects.removeAt(index);
-        childRowChanged(index);
+        removeChild(index);
     }
 }
diff --git a/sigmodr/tree/TileGroupModel.cpp b/sigmodr/tree/TileGroupModel.cpp
index 805f48ee..2d5cc192 100644
--- a/sigmodr/tree/TileGroupModel.cpp
+++ b/sigmodr/tree/TileGroupModel.cpp
@@ -86,8 +86,6 @@ void TileGroupModel::deleteObject(BaseModel* model)
     if (0 <= index)
     {
         qobject_cast<Game*>(m_object)->deleteTile(index);
-        m_objects[index]->deleteLater();
-        m_objects.removeAt(index);
-        childRowChanged(index);
+        removeChild(index);
     }
 }
diff --git a/sigmodr/tree/TimeGroupModel.cpp b/sigmodr/tree/TimeGroupModel.cpp
index da8c58e5..6e26b086 100644
--- a/sigmodr/tree/TimeGroupModel.cpp
+++ b/sigmodr/tree/TimeGroupModel.cpp
@@ -86,8 +86,6 @@ void TimeGroupModel::deleteObject(BaseModel* model)
     if (0 <= index)
     {
         qobject_cast<Game*>(m_object)->deleteTime(index);
-        m_objects[index]->deleteLater();
-        m_objects.removeAt(index);
-        childRowChanged(index);
+        removeChild(index);
     }
 }
diff --git a/sigmodr/tree/TrainerGroupModel.cpp b/sigmodr/tree/TrainerGroupModel.cpp
index c8cd73e3..5171480c 100644
--- a/sigmodr/tree/TrainerGroupModel.cpp
+++ b/sigmodr/tree/TrainerGroupModel.cpp
@@ -86,8 +86,6 @@ void TrainerGroupModel::deleteObject(BaseModel* model)
     if (0 <= index)
     {
         qobject_cast<Game*>(m_object)->deleteTrainer(index);
-        m_objects[index]->deleteLater();
-        m_objects.removeAt(index);
-        childRowChanged(index);
+        removeChild(index);
     }
 }
diff --git a/sigmodr/tree/TypeGroupModel.cpp b/sigmodr/tree/TypeGroupModel.cpp
index d3968593..d248ff62 100644
--- a/sigmodr/tree/TypeGroupModel.cpp
+++ b/sigmodr/tree/TypeGroupModel.cpp
@@ -86,8 +86,6 @@ void TypeGroupModel::deleteObject(BaseModel* model)
     if (0 <= index)
     {
         qobject_cast<Game*>(m_object)->deleteType(index);
-        m_objects[index]->deleteLater();
-        m_objects.removeAt(index);
-        childRowChanged(index);
+        removeChild(index);
     }
 }
diff --git a/sigmodr/tree/WeatherGroupModel.cpp b/sigmodr/tree/WeatherGroupModel.cpp
index 27d3b076..eaa021a8 100644
--- a/sigmodr/tree/WeatherGroupModel.cpp
+++ b/sigmodr/tree/WeatherGroupModel.cpp
@@ -86,8 +86,6 @@ void WeatherGroupModel::deleteObject(BaseModel* model)
     if (0 <= index)
     {
         qobject_cast<Game*>(m_object)->deleteWeather(index);
-        m_objects[index]->deleteLater();
-        m_objects.removeAt(index);
-        childRowChanged(index);
+        removeChild(index);
     }
 }