Skip to content

Commit

Permalink
Convert stray leading tabs to spaces
Browse files Browse the repository at this point in the history
  • Loading branch information
PeterBowman committed Apr 10, 2017
1 parent a649cef commit 9762e0d
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion src/libraries/ImageLib/ProcessorImageEventListener.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ bool rd::ProcessorImageEventListener::onImageArrived( ImageManager * manager )
coords.push_back(coord);
}
int qrWidth = fabs(float(coords[2].getX() - coords[1].getX()));
int qrHeight = fabs(float(coords[1].getY() - coords[0].getY()));
int qrHeight = fabs(float(coords[1].getY() - coords[0].getY()));
Vector2d qrCenter(coords[0].getX() + (qrWidth / 2), coords[0].getY() + (qrHeight / 2) );

Target target( identifier_int,
Expand Down
12 changes: 6 additions & 6 deletions src/libraries/ImageLib/YarpLocalImageManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ bool rd::YarpLocalImageManager::start()
if(! yarp::os::Network::connect( remote_port_name.c_str(), local_port_name.c_str(), "mjpeg" ) )
{
RD_WARNING("Could not connect to robot camera via mjpeg.\n");
if (!yarp::os::Network::connect(remote_port_name.c_str(), local_port_name.c_str()))
{
RD_WARNING("Could not connect to robot camera.\n");
return false;
}
}
if (!yarp::os::Network::connect(remote_port_name.c_str(), local_port_name.c_str()))
{
RD_WARNING("Could not connect to robot camera.\n");
return false;
}
}

RD_SUCCESS("Connected to robot camera.\n");

Expand Down
4 changes: 2 additions & 2 deletions src/libraries/RobotLib/MockRobotManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ bool rd::MockRobotManager::connect()
{
if (!connected)
{
connected = true;
connected = true;
return true;
}
else
Expand All @@ -262,7 +262,7 @@ bool rd::MockRobotManager::disconnect()
{
if (connected)
{
connected = false;
connected = false;
return true;
}
else
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/ServerLib/RpcResponder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ bool rd::RpcResponder::read(yarp::os::ConnectionReader& connection)
}
else
{
RD_ERROR("Unkown command: %s.\n", in.toString().c_str());
RD_ERROR("Unkown command: %s.\n", in.toString().c_str());
out.addVocab(VOCAB_RD_FAIL);
}
return out.write(*returnToSender);
Expand Down
4 changes: 2 additions & 2 deletions test/testMockAudioManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ using namespace rd;

class MockAudioManagerTest : public testing::Test
{
public:
public:
virtual void SetUp()
{
MockAudioManager::RegisterManager();
Expand All @@ -34,7 +34,7 @@ class MockAudioManagerTest : public testing::Test
}


protected:
protected:
MockAudioManager * mockManager;
AudioManager * audioManager;
static const std::string sound_bso;
Expand Down
4 changes: 2 additions & 2 deletions test/testSDLAudioManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ using namespace rd;

class MockAudioManagerTest : public testing::Test
{
public:
public:
virtual void SetUp()
{
SDLAudioManager::RegisterManager();
Expand All @@ -31,7 +31,7 @@ class MockAudioManagerTest : public testing::Test
}


protected:
protected:
AudioManager * audioManager;
static const std::string sound_bso;
static const std::string sound_shoot;
Expand Down

0 comments on commit 9762e0d

Please sign in to comment.