# HG changeset patch # User Florian Pose # Date 1268998892 -3600 # Node ID f46bec1b5f214078ae6b2c17162eb0ac24723fa6 # Parent 7539329b5cf629139b6d8c32a8dba7909b36611c Removed tabs. diff -r 7539329b5cf6 -r f46bec1b5f21 tool/Command.cpp --- a/tool/Command.cpp Fri Mar 19 12:40:08 2010 +0100 +++ b/tool/Command.cpp Fri Mar 19 12:41:32 2010 +0100 @@ -25,6 +25,8 @@ * EtherCAT technology and brand is only permitted in compliance with the * industrial property and similar rights of Beckhoff Automation GmbH. * + * vim: expandtab + * ****************************************************************************/ #include "Command.h" @@ -189,35 +191,35 @@ Command::MasterIndexList Command::getMasterIndices() const { - MasterIndexList indices; + MasterIndexList indices; try { MasterIndexParser p; indices = p.parse(masters.c_str()); } catch (MasterDeviceException &e) { - stringstream err; - err << "Failed to obtain number of masters: " << e.what(); - throwCommandException(err); + stringstream err; + err << "Failed to obtain number of masters: " << e.what(); + throwCommandException(err); } catch (runtime_error &e) { - stringstream err; + stringstream err; err << "Invalid master argument '" << masters << "': " << e.what(); - throwInvalidUsageException(err); - } - - return indices; + throwInvalidUsageException(err); + } + + return indices; } /*****************************************************************************/ unsigned int Command::getSingleMasterIndex() const { - MasterIndexList masterIndices = getMasterIndices(); + MasterIndexList masterIndices = getMasterIndices(); if (masterIndices.size() != 1) { - stringstream err; + stringstream err; err << getName() << " requires to select a single master!"; throwInvalidUsageException(err); } - return masterIndices.front(); + return masterIndices.front(); } /*****************************************************************************/ diff -r 7539329b5cf6 -r f46bec1b5f21 tool/CommandConfig.cpp --- a/tool/CommandConfig.cpp Fri Mar 19 12:40:08 2010 +0100 +++ b/tool/CommandConfig.cpp Fri Mar 19 12:41:32 2010 +0100 @@ -25,6 +25,8 @@ * EtherCAT technology and brand is only permitted in compliance with the * industrial property and similar rights of Beckhoff Automation GmbH. * + * vim: expandtab + * ****************************************************************************/ #include @@ -104,7 +106,7 @@ */ void CommandConfig::execute(const StringVector &args) { - MasterIndexList masterIndices; + MasterIndexList masterIndices; bool doIndent; ConfigList configs; @@ -114,7 +116,7 @@ throwInvalidUsageException(err); } - masterIndices = getMasterIndices(); + masterIndices = getMasterIndices(); doIndent = masterIndices.size() > 1; MasterIndexList::const_iterator mi; for (mi = masterIndices.begin(); diff -r 7539329b5cf6 -r f46bec1b5f21 tool/CommandData.cpp --- a/tool/CommandData.cpp Fri Mar 19 12:40:08 2010 +0100 +++ b/tool/CommandData.cpp Fri Mar 19 12:41:32 2010 +0100 @@ -25,6 +25,8 @@ * EtherCAT technology and brand is only permitted in compliance with the * industrial property and similar rights of Beckhoff Automation GmbH. * + * vim: expandtab + * ****************************************************************************/ #include @@ -66,7 +68,7 @@ void CommandData::execute(const StringVector &args) { - MasterIndexList masterIndices; + MasterIndexList masterIndices; DomainList domains; DomainList::const_iterator di; @@ -76,7 +78,7 @@ throwInvalidUsageException(err); } - masterIndices = getMasterIndices(); + masterIndices = getMasterIndices(); MasterIndexList::const_iterator mi; for (mi = masterIndices.begin(); mi != masterIndices.end(); mi++) { diff -r 7539329b5cf6 -r f46bec1b5f21 tool/CommandDebug.cpp --- a/tool/CommandDebug.cpp Fri Mar 19 12:40:08 2010 +0100 +++ b/tool/CommandDebug.cpp Fri Mar 19 12:41:32 2010 +0100 @@ -25,6 +25,8 @@ * EtherCAT technology and brand is only permitted in compliance with the * industrial property and similar rights of Beckhoff Automation GmbH. * + * vim: expandtab + * ****************************************************************************/ #include