From ff7c6983713997d09ef2518f81d41f3ab86c032e Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Sun, 22 Jan 2017 18:17:14 +0100
Subject: [PATCH] [Companion] Files automatically named during XXX => Horus
 conversions

---
 companion/src/radiodata.cpp | 59 +++++++++++++++++++++++++++++++++++++
 companion/src/radiodata.h   | 57 ++++-------------------------------
 2 files changed, 64 insertions(+), 52 deletions(-)

diff --git a/companion/src/radiodata.cpp b/companion/src/radiodata.cpp
index a0d68878d..626e6236f 100644
--- a/companion/src/radiodata.cpp
+++ b/companion/src/radiodata.cpp
@@ -33,6 +33,61 @@ void GeneralSettings::convert(BoardEnum before, BoardEnum after)
   // Here we can add explicit conversions when moving from one board to another
 }
 
+void RadioData::setCurrentModel(unsigned int index)
+{
+  generalSettings.currModelIndex = index;
+  strcpy(generalSettings.currModelFilename, models[index].filename);
+}
+
+void RadioData::fixModelFilename(unsigned int index)
+{
+  ModelData & model = models[index];
+  QString filename(model.filename);
+  bool ok = filename.endsWith(".bin");
+  if (ok) {
+    if (filename.startsWith("model") && filename.mid(5, filename.length()-9).toInt() > 0) {
+      ok = false;
+    }
+  }
+  if (ok) {
+    for (unsigned i=0; i<index; i++) {
+      if (strcmp(models[i].filename, model.filename) == 0) {
+        ok = false;
+        break;
+      }
+    }
+  }
+  if (!ok) {
+    sprintf(model.filename, "model%d.bin", index+1);
+  }
+}
+
+void RadioData::fixModelFilenames()
+{
+  for (unsigned int i=0; i<models.size(); i++) {
+    fixModelFilename(i);
+  }
+  setCurrentModel(generalSettings.currModelIndex);
+}
+
+QString RadioData::getNextModelFilename()
+{
+  char filename[sizeof(ModelData::filename)];
+  int index = 0;
+  bool found = true;
+  while (found) {
+    sprintf(filename, "model%d.bin", ++index);
+    found = false;
+    for (unsigned int i=0; i<models.size(); i++) {
+      if (strcmp(filename, models[i].filename) == 0) {
+        found = true;
+        break;
+      }
+    }
+  }
+  return filename;
+}
+
 void RadioData::convert(BoardEnum before, BoardEnum after)
 {
   generalSettings.convert(before, after);
@@ -46,4 +101,8 @@ void RadioData::convert(BoardEnum before, BoardEnum after)
       models[i].category = 0;
     }
   }
+
+  if (after == BOARD_HORUS) {
+    fixModelFilenames();
+  }
 }
\ No newline at end of file
diff --git a/companion/src/radiodata.h b/companion/src/radiodata.h
index 632bd037e..83123785a 100644
--- a/companion/src/radiodata.h
+++ b/companion/src/radiodata.h
@@ -1277,59 +1277,12 @@ class RadioData {
     
     void convert(BoardEnum before, BoardEnum after);
 
-    void setCurrentModel(unsigned int index)
-    {
-      generalSettings.currModelIndex = index;
-      strcpy(generalSettings.currModelFilename, models[index].filename);
-    }
+    void setCurrentModel(unsigned int index);
+    void fixModelFilenames();
+    QString getNextModelFilename();
 
-    void fixModelFilename(unsigned int index)
-    {
-      ModelData & model = models[index];
-      QString filename(model.filename);
-      bool ok = filename.endsWith(".bin");
-      if (ok) {
-        if (filename.startsWith("model") && filename.mid(5, filename.length()-9).toInt() > 0) {
-          ok = false;
-        }
-      }
-      if (ok) {
-        for (unsigned i=0; i<index; i++) {
-          if (strcmp(models[i].filename, model.filename) == 0) {
-            ok = false;
-            break;
-          }
-        }
-      }
-      if (!ok) {
-        sprintf(model.filename, "model%d.bin", index+1);
-      }
-    }
-
-    void fixModelFilenames()
-    {
-      for (unsigned int i=0; i<models.size(); i++) {
-        fixModelFilename(i);
-      }
-    }
-
-    QString getNextModelFilename()
-    {
-      char filename[sizeof(ModelData::filename)];
-      int index = 0;
-      bool found = true;
-      while (found) {
-        sprintf(filename, "model%d.bin", ++index);
-        found = false;
-        for (unsigned int i=0; i<models.size(); i++) {
-          if (strcmp(filename, models[i].filename) == 0) {
-            found = true;
-            break;
-          }
-        }
-      }
-      return filename;
-    }
+  protected:
+    void fixModelFilename(unsigned int index);
 };
 
 #endif // _RADIODATA_H_