From fd2afec6f56968898f6ed7084b742c8fffb77379 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Tue, 18 Feb 2014 12:41:53 +0100 Subject: [PATCH] Remove some fully outdated code (#pragma, from Henner Zeller's report, and some other things) --- bitmap2component/CMakeLists.txt | 1 - common/msgpanel.cpp | 5 ----- eeschema/menubar.cpp | 3 --- kicad/preferences.cpp | 4 ---- pcbnew/dialogs/dialog_export_vrml.cpp | 2 +- pcbnew/exporters/export_vrml.cpp | 3 ++- scripting/python_scripting.cpp | 3 --- 7 files changed, 3 insertions(+), 18 deletions(-) diff --git a/bitmap2component/CMakeLists.txt b/bitmap2component/CMakeLists.txt index 2c5c85eed9..9488b896be 100644 --- a/bitmap2component/CMakeLists.txt +++ b/bitmap2component/CMakeLists.txt @@ -2,7 +2,6 @@ include_directories(BEFORE ${INC_BEFORE}) include_directories( ../potrace - ../polygon/kbool/include ../common ${INC_AFTER} ) diff --git a/common/msgpanel.cpp b/common/msgpanel.cpp index 29d87cd38e..9004f03d6b 100644 --- a/common/msgpanel.cpp +++ b/common/msgpanel.cpp @@ -28,11 +28,6 @@ * @brief Message panel implementation file. */ -#ifdef __GNUG__ -#pragma implementation -#endif - - #include diff --git a/eeschema/menubar.cpp b/eeschema/menubar.cpp index 32d93a5c35..291f3b5af3 100644 --- a/eeschema/menubar.cpp +++ b/eeschema/menubar.cpp @@ -27,9 +27,6 @@ * @file eeschema/menubar.cpp * @brief (Re)Create the main menubar for the schematic frame */ -#ifdef __GNUG__ -#pragma implementation -#endif #include #include diff --git a/kicad/preferences.cpp b/kicad/preferences.cpp index 3842cea75b..4ee105735d 100644 --- a/kicad/preferences.cpp +++ b/kicad/preferences.cpp @@ -27,10 +27,6 @@ * @file preferences.cpp */ -#ifdef __GNUG__ -#pragma implementation -#endif - #include #include #include diff --git a/pcbnew/dialogs/dialog_export_vrml.cpp b/pcbnew/dialogs/dialog_export_vrml.cpp index 712568e796..bc8e5994e7 100644 --- a/pcbnew/dialogs/dialog_export_vrml.cpp +++ b/pcbnew/dialogs/dialog_export_vrml.cpp @@ -134,7 +134,7 @@ void PCB_EDIT_FRAME::OnExportVRML( wxCommandEvent& event ) wxString fullFilename = dlg.FilePicker()->GetPath(); subDirFor3Dshapes = dlg.GetSubdir(); - if( ! wxDirExists( subDirFor3Dshapes ) ) + if( export3DFiles && !wxDirExists( subDirFor3Dshapes ) ) wxMkdir( subDirFor3Dshapes ); if( ! ExportVRML_File( fullFilename, scale, export3DFiles, subDirFor3Dshapes ) ) diff --git a/pcbnew/exporters/export_vrml.cpp b/pcbnew/exporters/export_vrml.cpp index ba45f83988..53845f1db4 100644 --- a/pcbnew/exporters/export_vrml.cpp +++ b/pcbnew/exporters/export_vrml.cpp @@ -1199,8 +1199,9 @@ static void export_vrml_module( MODEL_VRML& aModel, BOARD* aPcb, MODULE* aModule fname.Replace( wxT( "\\" ), wxT( "/" ) ); wxString source_fname = fname; - if( aExport3DFiles ) // Change illegal characters + if( aExport3DFiles ) { + // Change illegal characters in filenames ChangeIllegalCharacters( fname, true ); fname = a3D_Subdir + wxT( "/" ) + fname; diff --git a/scripting/python_scripting.cpp b/scripting/python_scripting.cpp index 1ec3198de4..31a725d8e8 100644 --- a/scripting/python_scripting.cpp +++ b/scripting/python_scripting.cpp @@ -30,9 +30,6 @@ #include #include #include -#ifdef __GNUG__ -#pragma implementation -#endif #include #include