Code reformatting: add spaces around assignment operators

[r2c2.git] / source / libmarklin / locomotive.cpp

diff --git a/source/libmarklin/locomotive.cpp b/source/libmarklin/locomotive.cpp
index 32f2ecc1a185f2fa1ac387cb4659ad61e1926f01..c7d6227cddb938e5d3acfbbb6cc2c8f564ca771f 100644 (file)
--- a/source/libmarklin/locomotive.cpp
+++ b/source/libmarklin/locomotive.cpp
@@ -33,10 +33,10 @@ Locomotive::Locomotive(const LocoType &t, Control &c, unsigned a):
 
 void Locomotive::set_speed(unsigned spd)
 {
-       spd=min(spd, 14U);
+       spd = min(spd, 14U);
        signal_speed_changing.emit(spd);
 
-       speed=spd;
+       speed = spd;
        send_command(false);
 
        signal_speed_changed.emit(speed);
@@ -54,7 +54,7 @@ void Locomotive::set_reverse(bool rev)
        }
        else
        {
-               reverse=rev;
+               reverse = rev;
                send_command(false);
        }
 }
@@ -62,9 +62,9 @@ void Locomotive::set_reverse(bool rev)
 void Locomotive::set_function(unsigned func, bool state)
 {
        if(state)
-               funcs|=1<<func;
+               funcs |= 1<<func;
        else
-               funcs&=~(1<<func);
+               funcs &= ~(1<<func);
 
        send_command(true);
 
@@ -74,32 +74,32 @@ void Locomotive::set_function(unsigned func, bool state)
 void Locomotive::refresh_status()
 {
        unsigned char data[2];
-       data[0]=addr&0xFF;
-       data[1]=(addr>>8)&0xFF;
+       data[0] = addr&0xFF;
+       data[1] = (addr>>8)&0xFF;
        control.command(CMD_LOK_STATUS, data, 2).signal_done.connect(sigc::mem_fun(this, &Locomotive::status_reply));
 }
 
 void Locomotive::send_command(bool setf)
 {
        unsigned char data[4];
-       data[0]=addr&0xFF;
-       data[1]=(addr>>8)&0xFF;
+       data[0] = addr&0xFF;
+       data[1] = (addr>>8)&0xFF;
 
        if(speed==0)
-               data[2]=0;
+               data[2] = 0;
        else if(speed==1)
-               data[2]=2;
+               data[2] = 2;
        else
-               data[2]=(speed*19-18)/2;
+               data[2] = (speed*19-18)/2;
        
-       data[3]=(reverse ? 0 : 0x20) | ((funcs&1) ? 0x10 : 0);
+       data[3] = (reverse ? 0 : 0x20) | ((funcs&1) ? 0x10 : 0);
 
        if(setf)
        {
-               data[3]|=0x80;
+               data[3] |= 0x80;
                for(unsigned i=0; i<4; ++i)
                        if((funcs>>i)&2)
-                               data[3]|=(1<<i);
+                               data[3] |= (1<<i);
        }
        control.command(CMD_LOK, data, 4);
 }
@@ -108,17 +108,17 @@ void Locomotive::status_reply(const Reply &reply)
 {
        if(reply.get_error()==ERR_NO_ERROR)
        {
-               const unsigned char *data=reply.get_data();
+               const unsigned char *data = reply.get_data();
 
                if(data[0]<=1)
-                       speed=0;
+                       speed = 0;
                else
-                       speed=data[0]*2/19+1;
+                       speed = data[0]*2/19+1;
 
-               reverse=(data[1]&0x20) ? false : true;
-               funcs=(data[1]&0xF)<<1;
+               reverse = (data[1]&0x20) ? false : true;
+               funcs = (data[1]&0xF)<<1;
                if(data[1]&0x10)
-                       funcs|=1;
+                       funcs |= 1;
 
                for(unsigned i=0; i<5; ++i)
                        signal_function_changed.emit(i, (funcs>>i)&1);
@@ -127,7 +127,7 @@ void Locomotive::status_reply(const Reply &reply)
 
 bool Locomotive::reverse_timeout()
 {
-       reverse=!reverse;
+       reverse = !reverse;
        send_command(true);
        return false;
 }