From 82d667e30c484f136f6f5093143c4342350dce50 Mon Sep 17 00:00:00 2001 From: Dick Hollenbeck Date: Thu, 13 Jun 2013 06:43:29 -0500 Subject: [PATCH] various --- CMakeModules/cmake_uninstall.cmake.in | 41 ++++++++++++++------------- common/drawframe.cpp | 14 ++++----- common/reporter.cpp | 2 +- include/reporter.h | 13 +++++---- include/xnode.h | 2 +- pcbnew/class_board_item.cpp | 10 +++---- 6 files changed, 43 insertions(+), 39 deletions(-) diff --git a/CMakeModules/cmake_uninstall.cmake.in b/CMakeModules/cmake_uninstall.cmake.in index df95fb9d82..1a2e75c7ae 100644 --- a/CMakeModules/cmake_uninstall.cmake.in +++ b/CMakeModules/cmake_uninstall.cmake.in @@ -1,21 +1,22 @@ -IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt") - MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"") -ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt") +if( NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" ) + message( FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"" ) +endif() -FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files) -STRING(REGEX REPLACE "\n" ";" files "${files}") -FOREACH(file ${files}) - MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"") - IF(EXISTS "$ENV{DESTDIR}${file}") - EXEC_PROGRAM( - "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\"" - OUTPUT_VARIABLE rm_out - RETURN_VALUE rm_retval - ) - IF(NOT "${rm_retval}" STREQUAL 0) - MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"") - ENDIF(NOT "${rm_retval}" STREQUAL 0) - ELSE(EXISTS "$ENV{DESTDIR}${file}") - MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.") - ENDIF(EXISTS "$ENV{DESTDIR}${file}") -ENDFOREACH(file) +file( READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files ) +string( REGEX REPLACE "\n" ";" files "${files}" ) + +foreach( file ${files} ) + message( STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"" ) + if( EXISTS "$ENV{DESTDIR}${file}" ) + EXEC_PROGRAM( + "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\"" + OUTPUT_VARIABLE rm_out + RETURN_VALUE rm_retval + ) + if( NOT "${rm_retval}" STREQUAL 0 ) + message( FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"" ) + endif() + else() + message( STATUS "File \"$ENV{DESTDIR}${file}\" does not exist." ) + endif() +endforeach() diff --git a/common/drawframe.cpp b/common/drawframe.cpp index 361230ff1a..56ac99c931 100644 --- a/common/drawframe.cpp +++ b/common/drawframe.cpp @@ -698,13 +698,13 @@ bool EDA_DRAW_FRAME::HandleBlockBegin( wxDC* aDC, int aKey, const wxPoint& aPosi break; default: - { - wxString msg; - msg << wxT( "EDA_DRAW_FRAME::HandleBlockBegin() error: Unknown command " ) << - Block->GetCommand(); - DisplayError( this, msg ); - } - break; + { + wxString msg; + msg << wxT( "EDA_DRAW_FRAME::HandleBlockBegin() error: Unknown command " ) << + Block->GetCommand(); + DisplayError( this, msg ); + } + break; } Block->SetMessageBlock( this ); diff --git a/common/reporter.cpp b/common/reporter.cpp index 7eade576a9..19fd3a0dac 100644 --- a/common/reporter.cpp +++ b/common/reporter.cpp @@ -29,7 +29,7 @@ #include -REPORTER& REPORTER::Report( const char *aText ) +REPORTER& REPORTER::Report( const char* aText ) { Report( FROM_UTF8( aText ) ); return *this; diff --git a/include/reporter.h b/include/reporter.h index 933f0269dc..efda4c6368 100644 --- a/include/reporter.h +++ b/include/reporter.h @@ -39,11 +39,14 @@ class wxTextCtrl; /** * Class REPORTER - * is a pure virtual class used to derive REPORTOR objects from. + * is a pure virtual class used to derive REPORTER objects from. * - * The purpose of the REPORTER object is to hide an object that take a string as an input - * from other objects. This prevents objects such as wxWidgets UI control internals from - * being exposed to low level KiCad objects dervice from #BOARD_ITEM and #SCH_ITEM. + * The purpose of the REPORTER object is to offer a way for a procedural function + * to report multiple errors without having to: + * */ class REPORTER { @@ -56,7 +59,7 @@ public: */ virtual REPORTER& Report( const wxString& aText ) = 0; - REPORTER& Report( const char *aText ); + REPORTER& Report( const char* aText ); REPORTER& operator <<( const wxString& aText ) { return Report( aText ); } diff --git a/include/xnode.h b/include/xnode.h index 692f2085d6..cdd4d78917 100644 --- a/include/xnode.h +++ b/include/xnode.h @@ -118,7 +118,7 @@ public: } bool DeleteAttribute( const wxString& attrName ) { - DeleteProperty( attrName ); + return DeleteProperty( attrName ); } wxXmlProperty* GetAttributes() const { diff --git a/pcbnew/class_board_item.cpp b/pcbnew/class_board_item.cpp index 0157c283e4..dec5ab8afa 100644 --- a/pcbnew/class_board_item.cpp +++ b/pcbnew/class_board_item.cpp @@ -116,7 +116,7 @@ std::string BOARD_ITEM::FormatInternalUnits( int aValue ) #else // Assume aValue is in nanometers, and that we want the result in millimeters, - // and that int is 32 bit wide. Then perform an alternative algorithm. + // and that int is 32 bits wide. Then perform an alternative algorithm. // Can be used to verify that the above algorithm is correctly generating text. // Convert aValue into an integer string, then insert a decimal point manually. // Results are the same as above general purpose algorithm. @@ -128,13 +128,13 @@ std::string BOARD_ITEM::FormatInternalUnits( int aValue ) else { char buf[50]; - int len = sprintf( buf, aValue > 0 ? "%06d" : "%07d", aValue ); + int len = sprintf( buf, aValue > 0 ? "%06d" : "%07d", aValue ); // optionally pad w/leading zeros std::string ret( buf, len ); std::string::iterator it = ret.end() - 1; // last byte - // insert '.' at 6 positions from end, divides by 10e6 (a million), nm => mm + // insert '.' at 6 positions from end, dividing by 10e6 (a million), nm => mm std::string::iterator decpoint = ret.end() - 6; // truncate trailing zeros, up to decimal point position @@ -147,10 +147,10 @@ std::string BOARD_ITEM::FormatInternalUnits( int aValue ) // decpoint is invalidated here, after insert() -#if 1 // want leading a zero when decimal point is in first position? +#if 1 // want a leading zero when decimal point is in first position? if( ret[0] == '.' ) { - // insert leading zero ahead of decimal. + // insert leading zero ahead of decimal point. ret.insert( ret.begin(), '0' ); } else if( ret[0]=='-' && ret[1]=='.' )