From e3977f7e51efdf86bf803ccc38729434e7e76a00 Mon Sep 17 00:00:00 2001 From: orbitcowboy Date: Sat, 31 Mar 2018 13:49:47 +0200 Subject: [PATCH] Formatted test/cfg files and updated 'runastyle' script. The generated test files are exclued, since they are not style-compliant. --- runastyle | 2 +- test/cfg/wxwidgets.cpp | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/runastyle b/runastyle index c455a942c..0a2cfe5c7 100755 --- a/runastyle +++ b/runastyle @@ -29,7 +29,7 @@ $ASTYLE $style $options -r gui/test/*.h $ASTYLE $style $options lib/*.cpp $ASTYLE $style $options lib/*.h $ASTYLE $style $options test/*.cpp -$ASTYLE $style $options test/cfg/*.c +$ASTYLE $style $options test/cfg/{std,qt,windows,wxwidgets,posix,gnu,gtk}.c* # Exclude generated test files $ASTYLE $style $options test/*.h $ASTYLE $style $options --recursive "tools/*.cpp" diff --git a/test/cfg/wxwidgets.cpp b/test/cfg/wxwidgets.cpp index e64ab8f84..e04c57d32 100644 --- a/test/cfg/wxwidgets.cpp +++ b/test/cfg/wxwidgets.cpp @@ -84,19 +84,19 @@ void uninitvar(void) void uninitvar_SetMenuBar(wxFrame * const framePtr, wxMenuBar * const menuBarPtr) { - wxMenuBar *menuBar; - // cppcheck-suppress uninitvar - framePtr->SetMenuBar(menuBar); + wxMenuBar *menuBar; + // cppcheck-suppress uninitvar + framePtr->SetMenuBar(menuBar); framePtr->SetMenuBar(menuBarPtr); } void uninitvar_wxMenuBarAppend(wxMenuBar * const menuBarPtr, wxMenu * const menuPtr, const wxString &title) { - wxMenu *menu; - // cppcheck-suppress uninitvar - menuBarPtr->Append(menu, title); + wxMenu *menu; + // cppcheck-suppress uninitvar + menuBarPtr->Append(menu, title); menuBarPtr->Append(menuPtr, title); -} +} void deprecatedFunctions_wxDataViewCustomRenderer(wxDataViewCustomRenderer &dataViewCustomRenderer, wxPoint cursor, wxRect cell, wxDataViewModel *model, const wxDataViewItem &item, unsigned int col) {