Fixed inconsistent and trailing whitespace

This means that all tabs used in indentation are now 4 spaces and that
there should be no more trailing whitespace.

Ill also look into creating a pre-commit hook that will prevent this
from happening in the future.

Fixes #105

include/internal/catch_commandline.hpp

@@ -65,7 +65,7 @@ namespace Catch {
     }
     inline void setUseColour( ConfigData& config, std::string const& value ) {
         std::string mode = toLower( value );
-        
+
         if( mode == "yes" )
             config.useColour = UseColour::Yes;
         else if( mode == "no" )
@@ -201,7 +201,7 @@ namespace Catch {
         cli["--force-colour"]
             .describe( "force colourised output (deprecated)" )
             .bind( &forceColour );
-        
+
         cli["--use-colour"]
             .describe( "should output be colourised" )
             .bind( &setUseColour, "yes|no" );

include/internal/catch_fatal_condition.hpp

@@ -111,7 +111,7 @@ namespace Catch {
         static struct sigaction oldSigActions [sizeof(signalDefs)/sizeof(SignalDefs)];
         static stack_t oldSigStack;
         static char altStackMem[SIGSTKSZ];
-    
+
         static void handleSignal( int sig ) {
             std::string name = "<unknown signal>";
             for (std::size_t i = 0; i < sizeof(signalDefs) / sizeof(SignalDefs); ++i) {
@@ -141,8 +141,8 @@ namespace Catch {
                 sigaction(signalDefs[i].id, &sa, &oldSigActions[i]);
             }
         }
-                
+
-                
+
         ~FatalConditionHandler() {
             reset();
         }
@@ -158,12 +158,12 @@ namespace Catch {
             }
         }
     };
-    
+
     bool FatalConditionHandler::isSet = false;
     struct sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs)/sizeof(SignalDefs)] = {};
     stack_t FatalConditionHandler::oldSigStack = {};
     char FatalConditionHandler::altStackMem[SIGSTKSZ] = {};
-    
+
 
 } // namespace Catch
 

include/internal/catch_interfaces_config.h

@@ -41,7 +41,7 @@ namespace Catch {
         Auto,
         Yes,
         No
-    }; };    
+    }; };
 
     class TestSpec;
 

include/internal/catch_interfaces_reporter.h

@@ -248,7 +248,7 @@ namespace Catch
         virtual void testRunEnded( TestRunStats const& testRunStats ) = 0;
 
         virtual void skipTest( TestCaseInfo const& testInfo ) = 0;
-        
+
         virtual MultipleReporters* tryAsMulti() { return CATCH_NULL; }
     };
 

include/internal/catch_test_case_tracker.hpp

@@ -52,7 +52,7 @@ namespace TestCaseTracking {
         virtual void addChild( Ptr<ITracker> const& child ) = 0;
         virtual ITracker* findChild( NameAndLocation const& nameAndLocation ) = 0;
         virtual void openChild() = 0;
-        
+
         // Debug/ checking
         virtual bool isSectionTracker() const = 0;
         virtual bool isIndexTracker() const = 0;
@@ -187,7 +187,7 @@ namespace TestCaseTracking {
 
         virtual bool isSectionTracker() const CATCH_OVERRIDE { return false; }
         virtual bool isIndexTracker() const CATCH_OVERRIDE { return false; }
-        
+
         void open() {
             m_runState = Executing;
             moveToThis();
@@ -261,7 +261,7 @@ namespace TestCaseTracking {
         virtual ~SectionTracker();
 
         virtual bool isSectionTracker() const CATCH_OVERRIDE { return true; }
-        
+
         static SectionTracker& acquire( TrackerContext& ctx, NameAndLocation const& nameAndLocation ) {
             SectionTracker* section = CATCH_NULL;
 
@@ -310,7 +310,7 @@ namespace TestCaseTracking {
         virtual ~IndexTracker();
 
         virtual bool isIndexTracker() const CATCH_OVERRIDE { return true; }
-        
+
         static IndexTracker& acquire( TrackerContext& ctx, NameAndLocation const& nameAndLocation, int size ) {
             IndexTracker* tracker = CATCH_NULL;
 

include/internal/catch_tostring.hpp

@@ -90,12 +90,12 @@ std::string toString( char* const value ) {
 
 std::string toString( const wchar_t* const value )
 {
-	return value ? Catch::toString( std::wstring(value) ) : std::string( "{null string}" );
+    return value ? Catch::toString( std::wstring(value) ) : std::string( "{null string}" );
 }
 
 std::string toString( wchar_t* const value )
 {
-	return Catch::toString( static_cast<const wchar_t*>( value ) );
+    return Catch::toString( static_cast<const wchar_t*>( value ) );
 }
 
 std::string toString( int value ) {

include/reporters/catch_reporter_bases.hpp

@@ -108,12 +108,12 @@ namespace Catch {
 
         struct BySectionInfo {
             BySectionInfo( SectionInfo const& other ) : m_other( other ) {}
-			BySectionInfo( BySectionInfo const& other ) : m_other( other.m_other ) {}
+            BySectionInfo( BySectionInfo const& other ) : m_other( other.m_other ) {}
             bool operator() ( Ptr<SectionNode> const& node ) const {
                 return node->stats.sectionInfo.lineInfo == m_other.lineInfo;
             }
         private:
-			void operator=( BySectionInfo const& );
+            void operator=( BySectionInfo const& );
             SectionInfo const& m_other;
         };
 

include/reporters/catch_reporter_multi.hpp

@@ -118,11 +118,11 @@ public: // IStreamingReporter
                 ++it )
             (*it)->skipTest( testInfo );
     }
-    
+
     virtual MultipleReporters* tryAsMulti() CATCH_OVERRIDE {
         return this;
     }
-    
+
 };
 
 Ptr<IStreamingReporter> addReporter( Ptr<IStreamingReporter> const& existingReporter, Ptr<IStreamingReporter> const& additionalReporter ) {

include/reporters/catch_reporter_xml.hpp

@@ -96,7 +96,7 @@ namespace Catch {
             if( assertionResult.hasExpression() ) {
                 m_xml.startElement( "Expression" )
                     .writeAttribute( "success", assertionResult.succeeded() )
-					.writeAttribute( "type", assertionResult.getTestMacroName() )
+                    .writeAttribute( "type", assertionResult.getTestMacroName() )
                     .writeAttribute( "filename", assertionResult.getSourceInfo().file )
                     .writeAttribute( "line", assertionResult.getSourceInfo().line );
 

projects/SelfTest/ApproxTests.cpp

@@ -170,17 +170,17 @@ TEST_CASE
 
   REQUIRE(td != Approx(11.0));
   REQUIRE(Approx(11.0) != td);
-  
+
   REQUIRE(td <= Approx(10.0));
   REQUIRE(td <= Approx(11.0));
   REQUIRE(Approx(10.0) <= td);
   REQUIRE(Approx(9.0) <= td);
-  
+
   REQUIRE(td >= Approx(9.0));
   REQUIRE(td >= Approx(10.0));
   REQUIRE(Approx(10.0) >= td);
   REQUIRE(Approx(11.0) >= td);
-  
+
 }
 #endif
 

projects/SelfTest/BDDTests.cpp

@@ -88,10 +88,10 @@ struct Fixture
 }
 
 SCENARIO_METHOD(Fixture,
-	"BDD tests requiring Fixtures to provide commonly-accessed data or methods",
+    "BDD tests requiring Fixtures to provide commonly-accessed data or methods",
-	"[bdd][fixtures]") {
+    "[bdd][fixtures]") {
     const int before(counter());
-	GIVEN("No operations precede me") {
+    GIVEN("No operations precede me") {
         REQUIRE(before == 0);
         WHEN("We get the count") {
             const int after(counter());

projects/SelfTest/ConditionTests.cpp

@@ -210,29 +210,29 @@ TEST_CASE( "Comparisons with int literals don't warn when mixing signed/ unsigne
 
 TEST_CASE( "comparisons between int variables", "" )
 {
-	long            long_var = 1L;
+    long            long_var = 1L;
-	unsigned char	unsigned_char_var = 1;
+    unsigned char    unsigned_char_var = 1;
-	unsigned short	unsigned_short_var = 1;
+    unsigned short    unsigned_short_var = 1;
-	unsigned int	unsigned_int_var = 1;
+    unsigned int    unsigned_int_var = 1;
-	unsigned long	unsigned_long_var = 1L;
+    unsigned long    unsigned_long_var = 1L;
 
-	REQUIRE( long_var == unsigned_char_var );
+    REQUIRE( long_var == unsigned_char_var );
-	REQUIRE( long_var == unsigned_short_var );
+    REQUIRE( long_var == unsigned_short_var );
-	REQUIRE( long_var == unsigned_int_var );
+    REQUIRE( long_var == unsigned_int_var );
-	REQUIRE( long_var == unsigned_long_var );
+    REQUIRE( long_var == unsigned_long_var );
 }
 
 TEST_CASE( "comparisons between const int variables", "" )
 {
-	const unsigned char     unsigned_char_var = 1;
+    const unsigned char     unsigned_char_var = 1;
-	const unsigned short    unsigned_short_var = 1;
+    const unsigned short    unsigned_short_var = 1;
-	const unsigned int      unsigned_int_var = 1;
+    const unsigned int      unsigned_int_var = 1;
-	const unsigned long     unsigned_long_var = 1L;
+    const unsigned long     unsigned_long_var = 1L;
 
-	REQUIRE( unsigned_char_var == 1 );
+    REQUIRE( unsigned_char_var == 1 );
-	REQUIRE( unsigned_short_var == 1 );
+    REQUIRE( unsigned_short_var == 1 );
-	REQUIRE( unsigned_int_var == 1 );
+    REQUIRE( unsigned_int_var == 1 );
-	REQUIRE( unsigned_long_var == 1 );
+    REQUIRE( unsigned_long_var == 1 );
 }
 
 TEST_CASE( "Comparisons between unsigned ints and negative signed ints match c++ standard behaviour", "" )

projects/SelfTest/ExceptionTests.cpp

@@ -15,9 +15,9 @@ namespace
 {
     inline int thisThrows()
     {
-		if( Catch::alwaysTrue() )
+        if( Catch::alwaysTrue() )
-		    throw std::domain_error( "expected exception" );
+            throw std::domain_error( "expected exception" );
-		return 1;
+        return 1;
     }
 
     int thisDoesntThrow()
@@ -42,23 +42,23 @@ TEST_CASE( "Expected exceptions that don't throw or unexpected exceptions fail t
 
 TEST_CASE( "When unchecked exceptions are thrown directly they are always failures", "[.][failing][!throws]" )
 {
-	if( Catch::alwaysTrue() )
+    if( Catch::alwaysTrue() )
-	    throw std::domain_error( "unexpected exception" );
+        throw std::domain_error( "unexpected exception" );
 }
 
 TEST_CASE( "An unchecked exception reports the line of the last assertion", "[.][failing][!throws]" )
 {
     CHECK( 1 == 1 );
-	if( Catch::alwaysTrue() )
+    if( Catch::alwaysTrue() )
-	    throw std::domain_error( "unexpected exception" );
+        throw std::domain_error( "unexpected exception" );
 }
 
 TEST_CASE( "When unchecked exceptions are thrown from sections they are always failures", "[.][failing][!throws]" )
 {
     SECTION( "section name", "" )
     {
-		if( Catch::alwaysTrue() )
+        if( Catch::alwaysTrue() )
-			throw std::domain_error( "unexpected exception" );
+            throw std::domain_error( "unexpected exception" );
     }
 }
 
@@ -145,8 +145,8 @@ CATCH_TRANSLATE_EXCEPTION( double& ex )
 
 TEST_CASE("Non-std exceptions can be translated", "[.][failing][!throws]" )
 {
-	if( Catch::alwaysTrue() )
+    if( Catch::alwaysTrue() )
-	    throw CustomException( "custom exception" );
+        throw CustomException( "custom exception" );
 }
 
 TEST_CASE("Custom std-exceptions can be custom translated", "[.][failing][!throws]" )
@@ -156,8 +156,8 @@ TEST_CASE("Custom std-exceptions can be custom translated", "[.][failing][!throw
 }
 
 inline void throwCustom() {
-	if( Catch::alwaysTrue() )
+    if( Catch::alwaysTrue() )
-		throw CustomException( "custom exception - not std" );
+        throw CustomException( "custom exception - not std" );
 }
 
 TEST_CASE( "Custom exceptions can be translated when testing for nothrow", "[.][failing][!throws]" )
@@ -173,8 +173,8 @@ TEST_CASE( "Custom exceptions can be translated when testing for throwing as som
 
 TEST_CASE( "Unexpected exceptions can be translated", "[.][failing][!throws]"  )
 {
-	if( Catch::alwaysTrue() )
+    if( Catch::alwaysTrue() )
-	    throw double( 3.14 );
+        throw double( 3.14 );
 }
 
 inline int thisFunctionNotImplemented( int ) {

projects/SelfTest/TestMain.cpp

@@ -196,13 +196,13 @@ TEST_CASE( "Process can be configured on command line", "[config][command-line]"
     }
 
     SECTION( "use-colour", "") {
-        
+
         using Catch::UseColour;
-        
+
         SECTION( "without option", "" ) {
             const char* argv[] = { "test" };
             CHECK_NOTHROW( parseIntoConfig( argv, config ) );
-            
+
             REQUIRE( config.useColour == UseColour::Auto );
         }
 
@@ -216,14 +216,14 @@ TEST_CASE( "Process can be configured on command line", "[config][command-line]"
         SECTION( "yes", "" ) {
             const char* argv[] = { "test", "--use-colour", "yes" };
             CHECK_NOTHROW( parseIntoConfig( argv, config ) );
-            
+
             REQUIRE( config.useColour == UseColour::Yes );
         }
 
         SECTION( "no", "" ) {
             const char* argv[] = { "test", "--use-colour", "no" };
             CHECK_NOTHROW( parseIntoConfig( argv, config ) );
-            
+
             REQUIRE( config.useColour == UseColour::No );
         }
 

scripts/fixWhitespace.py

@@ -24,6 +24,7 @@ def fixFile( path ):
     changed = 0
     for line in f:
         trimmed = line.rstrip() + "\n"
+        trimmed = trimmed.replace('\t', '    ')
         if trimmed != line:
             changed = changed +1
         lines.append( trimmed )