rename exposed to QML "Audio" context object to "AudioScriptingInteface" to avoid naming conflict

Alexander Ivash committed 8 years ago

Commit bd3a0561 parent 15fcf667 files · +41 −36Browse files

Showing the changes to interface/src/Application.cpp (1 of 7 files). Show all

Unified · Split

interface/src/Application.cpp+4−3

@@ -2320,9 +2320,10 @@ void Application::initializeUi() { · 2319 unmodified lines
2320		2320
2321	setupPreferences();	2321	setupPreferences();
2322		2322
2323	// For some reason there is already an "Application" object in the QML context,	2323	// in Qt 5.10.0 there is already an "Audio" object in the QML context
2324	// though I can't find it. Hence, "ApplicationInterface"	2324	// though I failed to find it (from QtMultimedia??). So.. let it be "AudioScriptingInterface"
2325	surfaceContext->setContextProperty("Audio", DependencyManager::get<AudioScriptingInterface>().data());	2325	surfaceContext->setContextProperty("AudioScriptingInterface", DependencyManager::get<AudioScriptingInterface>().data());
		2326
2326	surfaceContext->setContextProperty("AudioStats", DependencyManager::get<AudioClient>()->getStats().data());	2327	surfaceContext->setContextProperty("AudioStats", DependencyManager::get<AudioClient>()->getStats().data());
2327	surfaceContext->setContextProperty("AudioScope", DependencyManager::get<AudioScope>().data());	2328	surfaceContext->setContextProperty("AudioScope", DependencyManager::get<AudioScope>().data());
2328		2329