diff options
| -rw-r--r-- | gui/main-window.hpp | 4 | ||||
| -rw-r--r-- | gui/mapping-dialog.cpp (renamed from gui/mapping-window.cpp) | 2 | ||||
| -rw-r--r-- | gui/mapping-dialog.hpp (renamed from gui/mapping-window.hpp) | 2 | ||||
| -rw-r--r-- | gui/mapping-dialog.ui (renamed from gui/mapping-window.ui) | 0 | ||||
| -rw-r--r-- | gui/settings-dialog.ui (renamed from gui/options-dialog.ui) | 0 | ||||
| -rw-r--r-- | gui/settings.cpp (renamed from gui/options-dialog.cpp) | 2 | ||||
| -rw-r--r-- | gui/settings.hpp (renamed from gui/options-dialog.hpp) | 2 |
7 files changed, 6 insertions, 6 deletions
diff --git a/gui/main-window.hpp b/gui/main-window.hpp index b41c1df9..f992b218 100644 --- a/gui/main-window.hpp +++ b/gui/main-window.hpp @@ -9,8 +9,8 @@ #pragma once #include "api/plugin-support.hpp" -#include "mapping-window.hpp" -#include "options-dialog.hpp" +#include "mapping-dialog.hpp" +#include "settings.hpp" #include "process_detector.h" #include "logic/main-settings.hpp" #include "logic/pipeline.hpp" diff --git a/gui/mapping-window.cpp b/gui/mapping-dialog.cpp index 629bcd5b..607563a7 100644 --- a/gui/mapping-window.cpp +++ b/gui/mapping-dialog.cpp @@ -6,7 +6,7 @@ * notice appear in all copies. */ -#include "mapping-window.hpp" +#include "mapping-dialog.hpp" #include "logic/main-settings.hpp" #include "spline/spline-widget.hpp" diff --git a/gui/mapping-window.hpp b/gui/mapping-dialog.hpp index ab0da2cc..ba5d1867 100644 --- a/gui/mapping-window.hpp +++ b/gui/mapping-dialog.hpp @@ -1,7 +1,7 @@ #pragma once #include "logic/mappings.hpp" -#include "ui_mapping-window.h" +#include "ui_mapping-dialog.h" #include <QWidget> #include <QDialog> diff --git a/gui/mapping-window.ui b/gui/mapping-dialog.ui index 7db6f425..7db6f425 100644 --- a/gui/mapping-window.ui +++ b/gui/mapping-dialog.ui diff --git a/gui/options-dialog.ui b/gui/settings-dialog.ui index fe5b8864..fe5b8864 100644 --- a/gui/options-dialog.ui +++ b/gui/settings-dialog.ui diff --git a/gui/options-dialog.cpp b/gui/settings.cpp index c35a6b52..3105bad9 100644 --- a/gui/options-dialog.cpp +++ b/gui/settings.cpp @@ -6,7 +6,7 @@ * notice appear in all copies. */ -#include "options-dialog.hpp" +#include "settings.hpp" #include "keyboard.h" #include "opentrack-library-path.h" #include <QPushButton> diff --git a/gui/options-dialog.hpp b/gui/settings.hpp index dab919ed..67c0ee54 100644 --- a/gui/options-dialog.hpp +++ b/gui/settings.hpp @@ -1,6 +1,6 @@ #pragma once -#include "ui_options-dialog.h" +#include "ui_settings-dialog.h" #include "logic/shortcuts.h" #include <QObject> #include <QDialog> |