Minor code cleanup: remove useless include or useless code.

fix also a minor compil warning

3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cbbox.cpp

@@ -30,6 +30,7 @@
 
 #include "cbbox.h"
 #include <cstdio>
+#include <wx/log.h>
 #include <wx/debug.h>   // For the wxASSERT
 
 

3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cbbox.h

@@ -31,7 +31,6 @@
 #define _CBBOX_H_
 
 #include "../ray.h"
-#include <fctsys.h>     // For the DBG(
 
 /**
  * CBBOX

common/richio.cpp

@@ -28,6 +28,9 @@
 
 #include <richio.h>
 
+#include <wx/file.h>
+#include <wx/translation.h>
+
 
 // Fall back to getc() when getc_unlocked() is not available on the target platform.
 #if !defined( HAVE_FGETC_NOLOCK )

common/widgets/gal_options_panel.cpp

@@ -28,6 +28,7 @@
 #include <wx/radiobox.h>
 #include <wx/spinctrl.h>
 #include <wx/stattext.h>
+#include <wx/statbox.h>
 
 #include <widgets/gal_options_panel.h>
 

common/widgets/mathplot.cpp

@@ -631,7 +631,7 @@ void mpFXY::Plot( wxDC& dc, mpWindow& w )
         if( !m_continuous )
         {
             bool first = true;
-            wxCoord ix;
+            wxCoord ix = 0;
             std::set<wxCoord> ys;
 
             while( GetNextXY( x, y ) )

eeschema/sch_plugin.cpp

@@ -23,8 +23,9 @@
 #include <properties.h>
 
 #include <sch_io_mgr.h>
+#include <wx/translation.h>
 
-#define FMT_UNIMPLEMENTED   _( "Plugin \"%s\" does not implement the \"%s\" function." )
+#define FMT_UNIMPLEMENTED   "Plugin \"%s\" does not implement the \"%s\" function."
 
 /**
  * Function not_implemented

include/fctsys.h

@@ -26,14 +26,6 @@
 #define FCTSYS_H_
 
 #include <wx/wx.h>
-
-#ifdef DEBUG
-#define DBG(x)        x
-#else
-#define DBG(x)        // nothing
-#endif
-
-
 #include <config.h>
 
 #endif // FCTSYS_H__

include/richio.h

@@ -35,7 +35,8 @@
 // I really did not want to be dependent on wxWidgets in richio
 // but the errorText needs to be wide char so wxString rules.
 #include <cstdio>
-#include <wx/wx.h>
+#include <wx/string.h>
+#include <wx/stream.h>
 
 #include <ki_exception.h>
 

pcbnew/plugin.cpp

@@ -24,9 +24,10 @@
 
 #include <io_mgr.h>
 #include <properties.h>
+#include <wx/translation.h>
 
 
-#define FMT_UNIMPLEMENTED   _( "Plugin \"%s\" does not implement the \"%s\" function." )
+#define FMT_UNIMPLEMENTED   "Plugin \"%s\" does not implement the \"%s\" function."
 
 /**
  * Function not_implemented
@@ -38,8 +39,8 @@
 static void not_implemented( PLUGIN* aPlugin, const char* aCaller )
 {
     THROW_IO_ERROR( wxString::Format( FMT_UNIMPLEMENTED,
-                                      aPlugin->PluginName().GetData(),
-                                      wxString::FromUTF8( aCaller ).GetData() ) );
+                                      aPlugin->PluginName(),
+                                      wxString::FromUTF8( aCaller ) ) );
 }
 
 

pcbnew/zones_functions_for_undo_redo.cpp

@@ -268,9 +268,11 @@ void UpdateCopyOfZonesList( PICKED_ITEMS_LIST& aPickList,
                 if( notfound )  // happens when the new zone overlaps an existing zone
                                 // and these zones are combined
                 {
-                    DBG( printf(
-                        "UpdateCopyOfZonesList(): item not found in aAuxiliaryList,"
-                        "combined with another zone\n" ) );
+                #if  defined(DEBUG)
+                    printf( "UpdateCopyOfZonesList(): item not found in aAuxiliaryList,"
+                            "combined with another zone\n" );
+                    fflush(0);
+                #endif
                 }
                 break;
             }