SteamFrame/OpenVR-AdvancedSettings-frame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move singleton name into variable

Browse Source
This commit is contained in:
Vasily
2019-03-11 10:49:26 +01:00
parent 9b701688fd
commit f23b1bd7ad
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlaycontroller.cpp
+11 -10
View File
@@ -138,8 +138,9 @@ OverlayController::OverlayController( bool desktopMode,
// rewriting all QML to not be singletons, which should probably be done // rewriting all QML to not be singletons, which should probably be done
// whenever possible. // whenever possible.
static OverlayController* const objectAddress = this; static OverlayController* const objectAddress = this;
constexpr auto qmlSingletonImportName = "matzman666.advsettings";
qmlRegisterSingletonType<OverlayController>( qmlRegisterSingletonType<OverlayController>(
"matzman666.advsettings", qmlSingletonImportName,
1, 1,
0, 0,
"OverlayController", "OverlayController",
@@ -153,7 +154,7 @@ OverlayController::OverlayController( bool desktopMode,
// remaining function calls, or if it's just a copy paste accident that // remaining function calls, or if it's just a copy paste accident that
// happens to work. // happens to work.
qmlRegisterSingletonType<SteamVRTabController>( qmlRegisterSingletonType<SteamVRTabController>(
"matzman666.advsettings", qmlSingletonImportName,
1, 1,
0, 0,
"SteamVRTabController", "SteamVRTabController",
@@ -163,7 +164,7 @@ OverlayController::OverlayController( bool desktopMode,
return obj; return obj;
} ); } );
qmlRegisterSingletonType<SteamVRTabController>( qmlRegisterSingletonType<SteamVRTabController>(
"matzman666.advsettings", qmlSingletonImportName,
1, 1,
0, 0,
"ChaperoneTabController", "ChaperoneTabController",
@@ -173,7 +174,7 @@ OverlayController::OverlayController( bool desktopMode,
return obj; return obj;
} ); } );
qmlRegisterSingletonType<SteamVRTabController>( qmlRegisterSingletonType<SteamVRTabController>(
"matzman666.advsettings", qmlSingletonImportName,
1, 1,
0, 0,
"MoveCenterTabController", "MoveCenterTabController",
@@ -183,7 +184,7 @@ OverlayController::OverlayController( bool desktopMode,
return obj; return obj;
} ); } );
qmlRegisterSingletonType<SteamVRTabController>( qmlRegisterSingletonType<SteamVRTabController>(
"matzman666.advsettings", qmlSingletonImportName,
1, 1,
0, 0,
"FixFloorTabController", "FixFloorTabController",
@@ -193,7 +194,7 @@ OverlayController::OverlayController( bool desktopMode,
return obj; return obj;
} ); } );
qmlRegisterSingletonType<SteamVRTabController>( qmlRegisterSingletonType<SteamVRTabController>(
"matzman666.advsettings", qmlSingletonImportName,
1, 1,
0, 0,
"AudioTabController", "AudioTabController",
@@ -203,7 +204,7 @@ OverlayController::OverlayController( bool desktopMode,
return obj; return obj;
} ); } );
qmlRegisterSingletonType<SteamVRTabController>( qmlRegisterSingletonType<SteamVRTabController>(
"matzman666.advsettings", qmlSingletonImportName,
1, 1,
0, 0,
"StatisticsTabController", "StatisticsTabController",
@@ -213,7 +214,7 @@ OverlayController::OverlayController( bool desktopMode,
return obj; return obj;
} ); } );
qmlRegisterSingletonType<SteamVRTabController>( qmlRegisterSingletonType<SteamVRTabController>(
"matzman666.advsettings", qmlSingletonImportName,
1, 1,
0, 0,
"SettingsTabController", "SettingsTabController",
@@ -223,7 +224,7 @@ OverlayController::OverlayController( bool desktopMode,
return obj; return obj;
} ); } );
qmlRegisterSingletonType<SteamVRTabController>( qmlRegisterSingletonType<SteamVRTabController>(
"matzman666.advsettings", qmlSingletonImportName,
1, 1,
0, 0,
"ReviveTabController", "ReviveTabController",
@@ -233,7 +234,7 @@ OverlayController::OverlayController( bool desktopMode,
return obj; return obj;
} ); } );
qmlRegisterSingletonType<SteamVRTabController>( qmlRegisterSingletonType<SteamVRTabController>(
"matzman666.advsettings", qmlSingletonImportName,
1, 1,
0, 0,
"UtilitiesTabController", "UtilitiesTabController",