gui: only rename main window files

Adjust usages.

6 files changed, 13 insertions, 12 deletions

diff --git a/gui/ui.cpp b/gui/main-window.cpp
index 6cd2d819..d3f9e96e 100644
--- a/gui/ui.cpp
+++ b/gui/main-window.cpp
@@ -6,7 +6,7 @@
  * notice appear in all copies.
  */
 
-#include "ui.h"
+#include "main-window.hpp"
 #include "opentrack-logic/tracker.h"
 #include "opentrack-compat/options.hpp"
 #include "opentrack-library-path.h"
diff --git a/gui/ui.h b/gui/main-window.hpp
index d6f5e400..35973a15 100644
--- a/gui/ui.h
+++ b/gui/main-window.hpp
@@ -20,7 +20,7 @@
 #include <vector>
 #include <tuple>
 
-#include "ui_main.h"
+#include "ui_main-window.h"
 
 #include "opentrack-compat/options.hpp"
 #include "opentrack-logic/main-settings.hpp"
@@ -39,9 +39,10 @@ class MainWindow : public QMainWindow, private State
 {
     Q_OBJECT
 
+    Ui::ui_main_window ui;
+
     Shortcuts global_shortcuts;
     module_settings m;
-    Ui::OpentrackUI ui;
     mem<QSystemTrayIcon> tray;
     QTimer pose_update_timer;
     QTimer det_timer;
diff --git a/gui/main.ui b/gui/main-window.ui
index 1ef460a4..c977809d 100644
--- a/gui/main.ui
+++ b/gui/main-window.ui
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <author>Lovecraftian Octopus</author>
- <class>OpentrackUI</class>
- <widget class="QMainWindow" name="OpentrackUI">
+ <class>main_window</class>
+ <widget class="QMainWindow" name="main_window">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -12,7 +12,7 @@
    </rect>
   </property>
   <property name="windowIcon">
-   <iconset resource="ui-res.qrc">
+   <iconset resource="opentrack-res.qrc">
     <normaloff>:/images/facetracknoir.png</normaloff>:/images/facetracknoir.png</iconset>
   </property>
   <property name="styleSheet">
@@ -202,7 +202,7 @@
                <string/>
               </property>
               <property name="pixmap">
-               <pixmap resource="ui-res.qrc">:/images/tracking-not-started.png</pixmap>
+               <pixmap resource="opentrack-res.qrc">:/images/tracking-not-started.png</pixmap>
               </property>
               <property name="scaledContents">
                <bool>false</bool>
@@ -994,7 +994,7 @@
                 <string>Options</string>
                </property>
                <property name="icon">
-                <iconset resource="ui-res.qrc">
+                <iconset resource="opentrack-res.qrc">
                  <normaloff>:/images/tools.png</normaloff>:/images/tools.png</iconset>
                </property>
                <property name="iconSize">
@@ -1011,7 +1011,7 @@
                 <string>Mapping</string>
                </property>
                <property name="icon">
-                <iconset resource="ui-res.qrc">
+                <iconset resource="opentrack-res.qrc">
                  <normaloff>:/images/curves.png</normaloff>:/images/curves.png</iconset>
                </property>
                <property name="iconSize">
@@ -1332,7 +1332,7 @@
   <tabstop>iconcomboProfile</tabstop>
  </tabstops>
  <resources>
-  <include location="ui-res.qrc"/>
+  <include location="opentrack-res.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/gui/main.cpp b/gui/main.cpp
index c07a65ac..3220f31d 100644
--- a/gui/main.cpp
+++ b/gui/main.cpp
@@ -8,7 +8,7 @@
 #   include <QString>
 #endif
 
-#include "ui.h"
+#include "main-window.hpp"
 #include "opentrack-compat/options.hpp"
 using namespace options;
 #include <QApplication>
diff --git a/gui/process_detector.cpp b/gui/process_detector.cpp
index 1a5cbb9d..9c12f783 100644
--- a/gui/process_detector.cpp
+++ b/gui/process_detector.cpp
@@ -7,7 +7,7 @@
  */
 
 #include "process_detector.h"
-#include "ui.h"
+#include "main-window.hpp"
 #include "opentrack-compat/process-list.hpp"
 #include <QList>
 #include <QFileDialog>
diff --git a/gui/ui-res.qrc b/gui/res.qrc
index 7b7fee54..7b7fee54 100644
--- a/gui/ui-res.qrc
+++ b/gui/res.qrc