Rename engine to Engine

This commit is contained in:
Lukas W committed 2014-11-26 00:49:55 +01:00
1 parent 84d9215880
commit 968909c07c
148 files changed
+1058 -1058

No files matched your search

+6 -6
View File
@@ -30,7 +30,7 @@
#include "Song.h"
#include "engine.h"
#include "Engine.h"
#include "Mixer.h"
#include "ControllerConnection.h"
@@ -160,9 +160,9 @@ void ControllerConnection::finalizeConnections()
{
ControllerConnection * c = s_connections[i];
if ( !c->isFinalized() && c->m_controllerId <
engine::getSong()->controllers().size() )
Engine::getSong()->controllers().size() )
{
c->setController( engine::getSong()->
c->setController( Engine::getSong()->
controllers().at( c->m_controllerId ) );
}
}
@@ -173,7 +173,7 @@ void ControllerConnection::finalizeConnections()
void ControllerConnection::saveSettings( QDomDocument & _doc, QDomElement & _this )
{
if( engine::getSong() )
if( Engine::getSong() )
{
if( m_ownsController )
{
@@ -181,7 +181,7 @@ void ControllerConnection::saveSettings( QDomDocument & _doc, QDomElement & _thi
}
else
{
int id = engine::getSong()->controllers().indexOf( m_controller );
int id = Engine::getSong()->controllers().indexOf( m_controller );
if( id >= 0 )
{
_this.setAttribute( "id", id );
@@ -198,7 +198,7 @@ void ControllerConnection::loadSettings( const QDomElement & _this )
QDomNode node = _this.firstChild();
if( !node.isNull() )
{
setController( Controller::create( node.toElement(), engine::getSong() ) );
setController( Controller::create( node.toElement(), Engine::getSong() ) );
}
else
{