From cab99041beb6d4938e117c615c8ce8db53372d52 Mon Sep 17 00:00:00 2001 From: Vasily Date: Mon, 11 Mar 2019 11:09:19 +0100 Subject: [PATCH] Rename QML singleton to "ovras.advsettings" This is more generic and in line with the rest of the renames. --- src/overlaycontroller.cpp | 2 +- src/res/qml/ChaperonePage.qml | 2 +- src/res/qml/ChaperoneWarningsPage.qml | 2 +- src/res/qml/FixFloorPage.qml | 2 +- src/res/qml/PlayspacePage.qml | 2 +- src/res/qml/RevivePage.qml | 2 +- src/res/qml/RootPage.qml | 2 +- src/res/qml/SettingsPage.qml | 2 +- src/res/qml/StatisticsPage.qml | 2 +- src/res/qml/SteamVRPage.qml | 2 +- src/res/qml/audio_page/AudioPage.qml | 2 +- src/res/qml/audio_page/device_selector/AudioDeviceSelector.qml | 2 +- src/res/qml/audio_page/device_selector/MicDeviceSelector.qml | 2 +- src/res/qml/audio_page/device_selector/MicVolumeSlider.qml | 2 +- src/res/qml/audio_page/device_selector/MirrorDeviceSelector.qml | 2 +- src/res/qml/audio_page/device_selector/MirrorVolumeSlider.qml | 2 +- .../qml/audio_page/dialog_boxes/AudioDeleteProfileDialog.qml | 2 +- src/res/qml/audio_page/dialog_boxes/AudioMessageDialog.qml | 2 +- src/res/qml/audio_page/dialog_boxes/AudioNewProfileDialog.qml | 2 +- src/res/qml/audio_page/dialog_boxes/PttDeleteProfileDialog.qml | 2 +- src/res/qml/audio_page/dialog_boxes/PttNewProfileDialog.qml | 2 +- src/res/qml/audio_page/profiles/ProfileButtons.qml | 2 +- src/res/qml/audio_page/proximity/ProximityToggle.qml | 2 +- src/res/qml/audio_page/push_to_talk/PttButtons.qml | 2 +- src/res/qml/common/LineSeparator.qml | 2 +- src/res/qml/common/MyResources.qml | 2 +- src/res/qml/common/MyTextField.qml | 2 +- src/res/qml/motion_page/MotionPage.qml | 2 +- src/res/qml/motion_page/universe_drag/UniverseDragGroupBox.qml | 2 +- src/res/qml/motion_page/universe_turn/UniverseTurnGroupBox.qml | 2 +- src/res/qml/utilities_page/UtilitiesPage.qml | 2 +- src/res/qml/utilities_page/alarm_clock/AlarmGroupBox.qml | 2 +- .../qml/utilities_page/desktop_size/SteamDesktopGroupBox.qml | 2 +- src/res/qml/utilities_page/keyboard_utils/KeyboardGroupBox.qml | 2 +- src/res/qml/utilities_page/media_keys/MediaButton.qml | 2 +- src/res/qml/utilities_page/media_keys/MediaControllerKeys.qml | 2 +- 36 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/overlaycontroller.cpp b/src/overlaycontroller.cpp index fd1d8aa..9fc33b1 100644 --- a/src/overlaycontroller.cpp +++ b/src/overlaycontroller.cpp @@ -138,7 +138,7 @@ OverlayController::OverlayController( bool desktopMode, // rewriting all QML to not be singletons, which should probably be done // whenever possible. static OverlayController* const objectAddress = this; - constexpr auto qmlSingletonImportName = "matzman666.advsettings"; + constexpr auto qmlSingletonImportName = "ovras.advsettings"; qmlRegisterSingletonType( qmlSingletonImportName, 1, diff --git a/src/res/qml/ChaperonePage.qml b/src/res/qml/ChaperonePage.qml index a7e60a2..2a70374 100644 --- a/src/res/qml/ChaperonePage.qml +++ b/src/res/qml/ChaperonePage.qml @@ -2,7 +2,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 import QtQuick.Dialogs 1.2 -import matzman666.advsettings 1.0 +import ovras.advsettings 1.0 import "." // QTBUG-34418, singletons require explicit import to load qmldir file import "common" diff --git a/src/res/qml/ChaperoneWarningsPage.qml b/src/res/qml/ChaperoneWarningsPage.qml index 426b45b..32da65f 100644 --- a/src/res/qml/ChaperoneWarningsPage.qml +++ b/src/res/qml/ChaperoneWarningsPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 import QtQuick.Dialogs 1.2 -import matzman666.advsettings 1.0 +import ovras.advsettings 1.0 import "." // QTBUG-34418, singletons require explicit import to load qmldir file import "common" diff --git a/src/res/qml/FixFloorPage.qml b/src/res/qml/FixFloorPage.qml index 17cb3b3..9271fd5 100644 --- a/src/res/qml/FixFloorPage.qml +++ b/src/res/qml/FixFloorPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 -import matzman666.advsettings 1.0 +import ovras.advsettings 1.0 import "common" diff --git a/src/res/qml/PlayspacePage.qml b/src/res/qml/PlayspacePage.qml index 9334dc1..f01d304 100644 --- a/src/res/qml/PlayspacePage.qml +++ b/src/res/qml/PlayspacePage.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 -import matzman666.advsettings 1.0 +import ovras.advsettings 1.0 import "common" diff --git a/src/res/qml/RevivePage.qml b/src/res/qml/RevivePage.qml index b85783b..bb4ee3f 100644 --- a/src/res/qml/RevivePage.qml +++ b/src/res/qml/RevivePage.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 -import matzman666.advsettings 1.0 +import ovras.advsettings 1.0 import "common" MyStackViewPage { diff --git a/src/res/qml/RootPage.qml b/src/res/qml/RootPage.qml index 52099fa..1603d40 100644 --- a/src/res/qml/RootPage.qml +++ b/src/res/qml/RootPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 -import matzman666.advsettings 1.0 +import ovras.advsettings 1.0 import "." // QTBUG-34418, singletons require explicit import to load qmldir file import "common" import "utilities_page" diff --git a/src/res/qml/SettingsPage.qml b/src/res/qml/SettingsPage.qml index 250edf3..79eb375 100644 --- a/src/res/qml/SettingsPage.qml +++ b/src/res/qml/SettingsPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 -import matzman666.advsettings 1.0 +import ovras.advsettings 1.0 import "common" MyStackViewPage { diff --git a/src/res/qml/StatisticsPage.qml b/src/res/qml/StatisticsPage.qml index fb18b40..c74bae9 100644 --- a/src/res/qml/StatisticsPage.qml +++ b/src/res/qml/StatisticsPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 -import matzman666.advsettings 1.0 +import ovras.advsettings 1.0 import "common" diff --git a/src/res/qml/SteamVRPage.qml b/src/res/qml/SteamVRPage.qml index 7230f55..6eda7b7 100644 --- a/src/res/qml/SteamVRPage.qml +++ b/src/res/qml/SteamVRPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 -import matzman666.advsettings 1.0 +import ovras.advsettings 1.0 import "common" MyStackViewPage { diff --git a/src/res/qml/audio_page/AudioPage.qml b/src/res/qml/audio_page/AudioPage.qml index 54c6efa..75ed68f 100644 --- a/src/res/qml/audio_page/AudioPage.qml +++ b/src/res/qml/audio_page/AudioPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 -import matzman666.advsettings 1.0 +import ovras.advsettings 1.0 import "../common" import "device_selector" import "proximity" diff --git a/src/res/qml/audio_page/device_selector/AudioDeviceSelector.qml b/src/res/qml/audio_page/device_selector/AudioDeviceSelector.qml index 34b8861..c2d0f67 100644 --- a/src/res/qml/audio_page/device_selector/AudioDeviceSelector.qml +++ b/src/res/qml/audio_page/device_selector/AudioDeviceSelector.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 -import matzman666.advsettings 1.0 +import ovras.advsettings 1.0 import "../../common" RowLayout { diff --git a/src/res/qml/audio_page/device_selector/MicDeviceSelector.qml b/src/res/qml/audio_page/device_selector/MicDeviceSelector.qml index 53e8613..b2f2aa1 100644 --- a/src/res/qml/audio_page/device_selector/MicDeviceSelector.qml +++ b/src/res/qml/audio_page/device_selector/MicDeviceSelector.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 -import matzman666.advsettings 1.0 +import ovras.advsettings 1.0 import "../../common" RowLayout { diff --git a/src/res/qml/audio_page/device_selector/MicVolumeSlider.qml b/src/res/qml/audio_page/device_selector/MicVolumeSlider.qml index a9971a6..3119135 100644 --- a/src/res/qml/audio_page/device_selector/MicVolumeSlider.qml +++ b/src/res/qml/audio_page/device_selector/MicVolumeSlider.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 -import matzman666.advsettings 1.0 +import ovras.advsettings 1.0 import "../../common" ColumnLayout { diff --git a/src/res/qml/audio_page/device_selector/MirrorDeviceSelector.qml b/src/res/qml/audio_page/device_selector/MirrorDeviceSelector.qml index 72f51c0..96fb36e 100644 --- a/src/res/qml/audio_page/device_selector/MirrorDeviceSelector.qml +++ b/src/res/qml/audio_page/device_selector/MirrorDeviceSelector.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 -import matzman666.advsettings 1.0 +import ovras.advsettings 1.0 import "../../common" RowLayout { diff --git a/src/res/qml/audio_page/device_selector/MirrorVolumeSlider.qml b/src/res/qml/audio_page/device_selector/MirrorVolumeSlider.qml index b90199a..c8ff4ba 100644 --- a/src/res/qml/audio_page/device_selector/MirrorVolumeSlider.qml +++ b/src/res/qml/audio_page/device_selector/MirrorVolumeSlider.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 -import matzman666.advsettings 1.0 +import ovras.advsettings 1.0 import "../../common" import "." diff --git a/src/res/qml/audio_page/dialog_boxes/AudioDeleteProfileDialog.qml b/src/res/qml/audio_page/dialog_boxes/AudioDeleteProfileDialog.qml index 7067252..10f4ffc 100644 --- a/src/res/qml/audio_page/dialog_boxes/AudioDeleteProfileDialog.qml +++ b/src/res/qml/audio_page/dialog_boxes/AudioDeleteProfileDialog.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 -import matzman666.advsettings 1.0 +import ovras.advsettings 1.0 import "../../common" MyDialogOkCancelPopup { diff --git a/src/res/qml/audio_page/dialog_boxes/AudioMessageDialog.qml b/src/res/qml/audio_page/dialog_boxes/AudioMessageDialog.qml index 1753410..067a895 100644 --- a/src/res/qml/audio_page/dialog_boxes/AudioMessageDialog.qml +++ b/src/res/qml/audio_page/dialog_boxes/AudioMessageDialog.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 -import matzman666.advsettings 1.0 +import ovras.advsettings 1.0 import "../../common" MyDialogOkPopup { diff --git a/src/res/qml/audio_page/dialog_boxes/AudioNewProfileDialog.qml b/src/res/qml/audio_page/dialog_boxes/AudioNewProfileDialog.qml index 1b03952..6557b06 100644 --- a/src/res/qml/audio_page/dialog_boxes/AudioNewProfileDialog.qml +++ b/src/res/qml/audio_page/dialog_boxes/AudioNewProfileDialog.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 -import matzman666.advsettings 1.0 +import ovras.advsettings 1.0 import "../../common" MyDialogOkCancelPopup { diff --git a/src/res/qml/audio_page/dialog_boxes/PttDeleteProfileDialog.qml b/src/res/qml/audio_page/dialog_boxes/PttDeleteProfileDialog.qml index ad28477..71d2157 100644 --- a/src/res/qml/audio_page/dialog_boxes/PttDeleteProfileDialog.qml +++ b/src/res/qml/audio_page/dialog_boxes/PttDeleteProfileDialog.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 -import matzman666.advsettings 1.0 +import ovras.advsettings 1.0 import "../../common" MyDialogOkCancelPopup { diff --git a/src/res/qml/audio_page/dialog_boxes/PttNewProfileDialog.qml b/src/res/qml/audio_page/dialog_boxes/PttNewProfileDialog.qml index a2d293f..162ccdf 100644 --- a/src/res/qml/audio_page/dialog_boxes/PttNewProfileDialog.qml +++ b/src/res/qml/audio_page/dialog_boxes/PttNewProfileDialog.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 -import matzman666.advsettings 1.0 +import ovras.advsettings 1.0 import "../../common" MyDialogOkCancelPopup { diff --git a/src/res/qml/audio_page/profiles/ProfileButtons.qml b/src/res/qml/audio_page/profiles/ProfileButtons.qml index ca9c48d..39b2f91 100644 --- a/src/res/qml/audio_page/profiles/ProfileButtons.qml +++ b/src/res/qml/audio_page/profiles/ProfileButtons.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 -import matzman666.advsettings 1.0 +import ovras.advsettings 1.0 import "../../common" import "../dialog_boxes" diff --git a/src/res/qml/audio_page/proximity/ProximityToggle.qml b/src/res/qml/audio_page/proximity/ProximityToggle.qml index d6734c8..45cc3d1 100644 --- a/src/res/qml/audio_page/proximity/ProximityToggle.qml +++ b/src/res/qml/audio_page/proximity/ProximityToggle.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 -import matzman666.advsettings 1.0 +import ovras.advsettings 1.0 import "../../common" MyToggleButton { diff --git a/src/res/qml/audio_page/push_to_talk/PttButtons.qml b/src/res/qml/audio_page/push_to_talk/PttButtons.qml index 2014c51..130b6a0 100644 --- a/src/res/qml/audio_page/push_to_talk/PttButtons.qml +++ b/src/res/qml/audio_page/push_to_talk/PttButtons.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 -import matzman666.advsettings 1.0 +import ovras.advsettings 1.0 import "../../common" ColumnLayout { diff --git a/src/res/qml/common/LineSeparator.qml b/src/res/qml/common/LineSeparator.qml index 695bef5..c10620a 100644 --- a/src/res/qml/common/LineSeparator.qml +++ b/src/res/qml/common/LineSeparator.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 -import matzman666.advsettings 1.0 +import ovras.advsettings 1.0 // Necessary for the project specific Components. import ".." diff --git a/src/res/qml/common/MyResources.qml b/src/res/qml/common/MyResources.qml index ee5aaba..a0e31d3 100644 --- a/src/res/qml/common/MyResources.qml +++ b/src/res/qml/common/MyResources.qml @@ -1,7 +1,7 @@ pragma Singleton import QtQuick 2.7 import QtMultimedia 5.6 -import matzman666.advsettings 1.0 +import ovras.advsettings 1.0 QtObject { function playActivationSound() { diff --git a/src/res/qml/common/MyTextField.qml b/src/res/qml/common/MyTextField.qml index 5075958..d8b8d39 100644 --- a/src/res/qml/common/MyTextField.qml +++ b/src/res/qml/common/MyTextField.qml @@ -1,6 +1,6 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 -import matzman666.advsettings 1.0 +import ovras.advsettings 1.0 TextField { property int keyBoardUID: 0 diff --git a/src/res/qml/motion_page/MotionPage.qml b/src/res/qml/motion_page/MotionPage.qml index 36a0014..18adc12 100644 --- a/src/res/qml/motion_page/MotionPage.qml +++ b/src/res/qml/motion_page/MotionPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 -import matzman666.advsettings 1.0 +import ovras.advsettings 1.0 import "../common" import "universe_drag" import "universe_turn" diff --git a/src/res/qml/motion_page/universe_drag/UniverseDragGroupBox.qml b/src/res/qml/motion_page/universe_drag/UniverseDragGroupBox.qml index c0a4d1f..0752bf0 100644 --- a/src/res/qml/motion_page/universe_drag/UniverseDragGroupBox.qml +++ b/src/res/qml/motion_page/universe_drag/UniverseDragGroupBox.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 -import matzman666.advsettings 1.0 +import ovras.advsettings 1.0 import "../../common" GroupBox { diff --git a/src/res/qml/motion_page/universe_turn/UniverseTurnGroupBox.qml b/src/res/qml/motion_page/universe_turn/UniverseTurnGroupBox.qml index 3570e7d..46bc143 100644 --- a/src/res/qml/motion_page/universe_turn/UniverseTurnGroupBox.qml +++ b/src/res/qml/motion_page/universe_turn/UniverseTurnGroupBox.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 -import matzman666.advsettings 1.0 +import ovras.advsettings 1.0 import "../../common" GroupBox { diff --git a/src/res/qml/utilities_page/UtilitiesPage.qml b/src/res/qml/utilities_page/UtilitiesPage.qml index bbbe178..f7ae438 100644 --- a/src/res/qml/utilities_page/UtilitiesPage.qml +++ b/src/res/qml/utilities_page/UtilitiesPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 -import matzman666.advsettings 1.0 +import ovras.advsettings 1.0 import "media_keys" import "alarm_clock" import "desktop_size" diff --git a/src/res/qml/utilities_page/alarm_clock/AlarmGroupBox.qml b/src/res/qml/utilities_page/alarm_clock/AlarmGroupBox.qml index 0a24306..e0e25dd 100644 --- a/src/res/qml/utilities_page/alarm_clock/AlarmGroupBox.qml +++ b/src/res/qml/utilities_page/alarm_clock/AlarmGroupBox.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 -import matzman666.advsettings 1.0 +import ovras.advsettings 1.0 import "../../common" GroupBox { diff --git a/src/res/qml/utilities_page/desktop_size/SteamDesktopGroupBox.qml b/src/res/qml/utilities_page/desktop_size/SteamDesktopGroupBox.qml index e05cfd7..b811785 100644 --- a/src/res/qml/utilities_page/desktop_size/SteamDesktopGroupBox.qml +++ b/src/res/qml/utilities_page/desktop_size/SteamDesktopGroupBox.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 -import matzman666.advsettings 1.0 +import ovras.advsettings 1.0 import "../../common" GroupBox { diff --git a/src/res/qml/utilities_page/keyboard_utils/KeyboardGroupBox.qml b/src/res/qml/utilities_page/keyboard_utils/KeyboardGroupBox.qml index 6d912af..58271db 100644 --- a/src/res/qml/utilities_page/keyboard_utils/KeyboardGroupBox.qml +++ b/src/res/qml/utilities_page/keyboard_utils/KeyboardGroupBox.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 -import matzman666.advsettings 1.0 +import ovras.advsettings 1.0 import "../../common" GroupBox { diff --git a/src/res/qml/utilities_page/media_keys/MediaButton.qml b/src/res/qml/utilities_page/media_keys/MediaButton.qml index c1f94bc..967d856 100644 --- a/src/res/qml/utilities_page/media_keys/MediaButton.qml +++ b/src/res/qml/utilities_page/media_keys/MediaButton.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 -import matzman666.advsettings 1.0 +import ovras.advsettings 1.0 import "../../common" MyPushButton2 { diff --git a/src/res/qml/utilities_page/media_keys/MediaControllerKeys.qml b/src/res/qml/utilities_page/media_keys/MediaControllerKeys.qml index 14b6ffc..00eb90a 100644 --- a/src/res/qml/utilities_page/media_keys/MediaControllerKeys.qml +++ b/src/res/qml/utilities_page/media_keys/MediaControllerKeys.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 -import matzman666.advsettings 1.0 +import ovras.advsettings 1.0 import "../../common" GroupBox {