Fix build on qt 6.2, name changes

CMakeLists.txt

@@ -1,5 +1,4 @@
 cmake_minimum_required(VERSION 3.13 FATAL_ERROR)
-
 if(NOT TARGET score_lib_base)
   include("${SCORE_SOURCE_DIR}/cmake/ScoreExternalAddon.cmake")
 endif()

Pico/BasicSourcePrinter.cpp

@@ -230,7 +230,7 @@ QString BasicSourcePrinter::print(
 
   source += fmt::format(
       R"_(
-extern "C" void run_graph(void)
+extern "C" void ossia_run_graph(void)
 {{
   {}
 }}

Pico/ESPSourcePrinter.cpp

@@ -12,20 +12,20 @@
 
 namespace Pico
 {
-static const std::string error_string = ":*:ERROR:*:";
-static const std::string todo_string = ":*:TODO:*:";
+static const std::string error_string_esp = ":*:ERROR:*:";
+static const std::string todo_string_esp = ":*:TODO:*:";
 static std::string address_to_device_read_index(const State::Address& addr)
 {
   if (addr.path.size() < 2)
-    return error_string;
+    return error_string_esp;
 
   // Format:
   // /gpio/1
   // /adc/2
   bool ok{};
   int num = addr.path[1].toInt(&ok);
   if (!ok)
-    return error_string;
+    return error_string_esp;
   if (addr.path.startsWith("gpio"))
   {
     return fmt::format("gpio_get_level(GPIO_NUM_{})", num);
@@ -34,24 +34,24 @@ static std::string address_to_device_read_index(const State::Address& addr)
   {
     return fmt::format("adc1_get_raw(ADC1_CHANNEL_{})", num);
   }
-  return todo_string;
+  return todo_string_esp;
 }
 
 static std::string address_to_network_read_index(const State::Address& addr)
 {
-  return todo_string;
+  return todo_string_esp;
 }
 
 static std::string
 address_to_device_write_index(const State::Address& addr, std::string var)
 {
   if (addr.path.size() < 2)
-    return error_string;
+    return error_string_esp;
 
   bool ok{};
   int num = addr.path[1].toInt(&ok);
   if (!ok)
-    return error_string;
+    return error_string_esp;
   if (addr.path.startsWith("gpio"))
   {
     return fmt::format("gpio_set_level(GPIO_NUM_{}, {})", num, var);
@@ -67,12 +67,12 @@ address_to_device_write_index(const State::Address& addr, std::string var)
         var);
   }
 
-  return todo_string;
+  return todo_string_esp;
 }
 
 static std::string address_to_network_write_index(const State::Address& addr)
 {
-  return todo_string;
+  return todo_string_esp;
 }
 
 QString ESPSourcePrinter::printTask(

Pico/ExportDialog.cpp

@@ -7,6 +7,8 @@
 #include <Scenario/Document/BaseScenario/BaseScenario.hpp>
 #include <Scenario/Document/ScenarioDocument/ScenarioDocumentModel.hpp>
 
+#include <core/document/Document.hpp>
+
 #include <ossia/network/base/device.hpp>
 #include <ossia/network/base/node.hpp>
 
@@ -42,7 +44,7 @@ static void copy_folder_recursively(const QString& src, const QString& dst)
 
   while(it.hasNext())
   {
-    const auto fi = it.nextFileInfo();
+    const auto fi = QFileInfo{it.next()};
     const QString abs_path = dst + fi.absoluteFilePath().mid(absSourcePathLength);
 
     if(fi.isDir())
@@ -62,7 +64,7 @@ ExportDialog::ExportDialog(AppPlug& plug, QWidget* parent)
   lay->addRow(tr("Mode"), m_mode);
 
   m_template = new QLineEdit{this};
-  m_template->setText(PICO_SOURCE_DIR "/templates/totem-tinypico-firmware");
+  m_template->setText(PICO_SOURCE_DIR "/templates/teensy-minimal");
   lay->addRow(tr("Path to template"), m_template);
 
   m_destination = new QLineEdit{this};
@@ -170,34 +172,34 @@ bool ExportDialog::export_scenario(const score::DocumentContext& ctx)
     return false;
 
   QString root = m_destination->text() + QDir::separator();
-
+  //
   ProcessScenario ps{ctx};
   {
     QString scenario = ps.process(baseInterval);
-    QFile f(root + "ossia-scenario.generated.cpp");
+    QFile f(root + "src/ossia-scenario.generated.cpp");
     f.open(QIODevice::WriteOnly);
     f.write(scenario.toUtf8());
   }
-
-  IntervalSplit is{ctx};
-  {
-    auto task_text = is.process(baseInterval);
-
-    QFile f(root + "ossia-tasks.generated.cpp");
-    f.open(QIODevice::WriteOnly);
-    f.write(task_text.toUtf8());
-  }
-
-  ComponentBasedSplit p{ctx};
-  {
-    auto res = p.process(baseInterval);
-    for(const auto& [devname, content] : res)
-    {
-      QFile f(root + "ossia-component." + devname + ".generated.cpp");
-      f.open(QIODevice::WriteOnly);
-      f.write(content.toUtf8());
-    }
-  }
+  //
+  // IntervalSplit is{ctx};
+  // {
+  //   auto task_text = is.process(baseInterval);
+  //
+  //   QFile f(root + "src/ossia-tasks.generated.cpp");
+  //   f.open(QIODevice::WriteOnly);
+  //   f.write(task_text.toUtf8());
+  // }
+
+  // ComponentBasedSplit p{ctx};
+  // {
+  //   auto res = p.process(baseInterval);
+  //   for(const auto& [devname, content] : res)
+  //   {
+  //     QFile f(root + "src/ossia-component." + devname + ".generated.cpp");
+  //     f.open(QIODevice::WriteOnly);
+  //     f.write(content.toUtf8());
+  //   }
+  // }
   return true;
 }
 

Pico/ExportDialog.hpp

@@ -1,4 +1,6 @@
 #pragma once
+#include <score/document/DocumentContext.hpp>
+
 #include <QDialog>
 class QComboBox;
 class QLineEdit;

Pico/OSCQueryGenerator.cpp

@@ -36,7 +36,7 @@ oscquery_generate_namespace_rec(ossia::net::generic_device& odev, const Device::
     oscquery_generate_namespace_rec(odev, child);
 }
 
-QString oscquery_generate_namespace(const Device::Node& root)
+QString oscquery_generate_namespace(const ::Device::Node& root)
 {
   // 1. Load the data model into an ossia device
   ossia::net::generic_device odev;

Pico/OSCQueryGenerator.hpp

@@ -8,5 +8,5 @@
 //}
 namespace Pico
 {
-QString oscquery_generate_namespace(const Device::Node& dev);
+QString oscquery_generate_namespace(const ::Device::Node& dev);
 }

Pico/SourcePrinter.cpp

@@ -21,6 +21,7 @@ std::string defaultIncludesGraph()
 #include <avnd/wrappers/metadatas.hpp>
 #include <avnd/../../examples/Advanced/Utilities/Math.hpp>
 #include <ExprtkMapper.hpp>
+#include <ScoreHelpers.hpp>
 
 
 )_";