haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup compile warnings

This commit is contained in:
Seth Hillbrand 2022-06-21 17:04:56 -07:00
parent d34e896708
commit a852286eb5
9 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/commit.cpp
View File

@ -201,7 +201,10 @@ CHANGE_TYPE COMMIT::convert( UNDO_REDO aType ) const
default: default:
assert( false ); assert( false );
// Can't fall through if the assert fires, so quiet our warning
#ifdef NDEBUG
KI_FALLTHROUGH; KI_FALLTHROUGH;
#endif
case UNDO_REDO::CHANGED: case UNDO_REDO::CHANGED:
return CHT_MODIFY; return CHT_MODIFY;

3
common/settings/app_settings.cpp
View File

@ -28,9 +28,6 @@
#include <settings/parameters.h> #include <settings/parameters.h>
#include <base_units.h> #include <base_units.h>
///! Update the schema version whenever a migration is required
const int appSettingsSchemaVersion = 0;
APP_SETTINGS_BASE::APP_SETTINGS_BASE( const std::string& aFilename, int aSchemaVersion ) : APP_SETTINGS_BASE::APP_SETTINGS_BASE( const std::string& aFilename, int aSchemaVersion ) :
JSON_SETTINGS( aFilename, SETTINGS_LOC::USER, aSchemaVersion ), JSON_SETTINGS( aFilename, SETTINGS_LOC::USER, aSchemaVersion ),

2
eeschema/files-io.cpp
View File

@ -830,8 +830,6 @@ bool SCH_EDIT_FRAME::SaveProject( bool aSaveAs )
return false; return false;
} }
bool createNewProject = false;
#if wxCHECK_VERSION( 3, 1, 7 ) #if wxCHECK_VERSION( 3, 1, 7 )
if( checkHook ) if( checkHook )
createNewProject = newProjectHook.GetCreateNewProject(); createNewProject = newProjectHook.GetCreateNewProject();

4
eeschema/widgets/legacyfiledlg_save_project.h
View File

@ -18,7 +18,7 @@
*/ */
#ifndef LEGACYFILEDLG_SAVE_PROJ_H #ifndef LEGACYFILEDLG_SAVE_PROJ_H
#define LEGACYFILEDLG_SVE_PROJ_H #define LEGACYFILEDLG_SAVE_PROJ_H
#include <wx/checkbox.h> #include <wx/checkbox.h>
#include <wx/panel.h> #include <wx/panel.h>
@ -53,4 +53,4 @@ protected:
wxCheckBox* m_cbCreateProject; wxCheckBox* m_cbCreateProject;
}; };
#endif #endif

6
include/locale_io.h
View File

@ -34,7 +34,7 @@ class wxLocale;
* exceptions to be thrown. * exceptions to be thrown.
* *
* The constructor sets a "C" language locale option, to read/print files with floating * The constructor sets a "C" language locale option, to read/print files with floating
* point numbers. The destructor insures that the default locale is restored if an * point numbers. The destructor insures that the default locale is restored whether an
* exception is thrown or not. * exception is thrown or not.
*/ */
class LOCALE_IO class LOCALE_IO
@ -50,7 +50,7 @@ private:
// The locale in use before switching to the "C" locale // The locale in use before switching to the "C" locale
// (the locale can be set by user, and is not always the system locale) // (the locale can be set by user, and is not always the system locale)
std::string m_user_locale; std::string m_user_locale;
wxLocale* m_wxLocale; [[maybe_unused]] wxLocale* m_wxLocale;
}; };
#endif #endif

2
kicad/pcm/dialogs/dialog_pcm_progress.cpp
View File

@ -67,7 +67,7 @@ void DIALOG_PCM_PROGRESS::OnCloseClicked( wxCommandEvent& event )
} }
void DIALOG_PCM_PROGRESS::Report( const wxString& aText, SEVERITY aSeverity ) void DIALOG_PCM_PROGRESS::PCMReport( const wxString& aText, SEVERITY aSeverity )
{ {
std::lock_guard<std::mutex> guard( m_mutex ); std::lock_guard<std::mutex> guard( m_mutex );
m_reports.push_back( std::make_pair( aText, aSeverity ) ); m_reports.push_back( std::make_pair( aText, aSeverity ) );

2
kicad/pcm/dialogs/dialog_pcm_progress.h
View File

@ -49,7 +49,7 @@ public:
DIALOG_PCM_PROGRESS( wxWindow* parent, bool aShowDownloadSection = true ); DIALOG_PCM_PROGRESS( wxWindow* parent, bool aShowDownloadSection = true );
///< Safe to call from non-UI thread. Adds a message to detailed report window. ///< Safe to call from non-UI thread. Adds a message to detailed report window.
void Report( const wxString& aText, SEVERITY aSeverity ); void PCMReport( const wxString& aText, SEVERITY aSeverity );
///< Safe to call from non-UI thread. Sets the download progress of the current zip entry. ///< Safe to call from non-UI thread. Sets the download progress of the current zip entry.
void SetDownloadProgress( uint64_t aDownloaded, uint64_t aTotal ); void SetDownloadProgress( uint64_t aDownloaded, uint64_t aTotal );

28
kicad/pcm/pcm_task_manager.cpp
View File

@ -57,7 +57,7 @@ void PCM_TASK_MANAGER::DownloadAndInstall( const PCM_PACKAGE& aPackage, const wx
if( !wxDirExists( file_path.GetPath() ) if( !wxDirExists( file_path.GetPath() )
&& !wxFileName::Mkdir( file_path.GetPath(), wxS_DIR_DEFAULT, wxPATH_MKDIR_FULL ) ) && !wxFileName::Mkdir( file_path.GetPath(), wxS_DIR_DEFAULT, wxPATH_MKDIR_FULL ) )
{ {
m_reporter->Report( _( "Unable to create download directory!" ), RPT_SEVERITY_ERROR ); m_reporter->PCMReport( _( "Unable to create download directory!" ), RPT_SEVERITY_ERROR );
return; return;
} }
@ -84,7 +84,7 @@ void PCM_TASK_MANAGER::DownloadAndInstall( const PCM_PACKAGE& aPackage, const wx
if( !hash_match ) if( !hash_match )
{ {
m_reporter->Report( wxString::Format( _( "Downloaded archive hash for package " m_reporter->PCMReport( wxString::Format( _( "Downloaded archive hash for package "
"%s does not match repository entry. " "%s does not match repository entry. "
"This may indicate a problem with the " "This may indicate a problem with the "
"package, if the issue persists " "package, if the issue persists "
@ -94,7 +94,7 @@ void PCM_TASK_MANAGER::DownloadAndInstall( const PCM_PACKAGE& aPackage, const wx
} }
else else
{ {
m_reporter->Report( wxString::Format( _( "Extracting package '%s'." ), m_reporter->PCMReport( wxString::Format( _( "Extracting package '%s'." ),
aPackage.identifier ), aPackage.identifier ),
RPT_SEVERITY_INFO ); RPT_SEVERITY_INFO );
@ -110,7 +110,7 @@ void PCM_TASK_MANAGER::DownloadAndInstall( const PCM_PACKAGE& aPackage, const wx
} }
} }
m_reporter->Report( wxString::Format( _( "Removing downloaded archive '%s'." ), m_reporter->PCMReport( wxString::Format( _( "Removing downloaded archive '%s'." ),
file_path.GetFullName() ), file_path.GetFullName() ),
RPT_SEVERITY_INFO ); RPT_SEVERITY_INFO );
wxRemoveFile( file_path.GetFullPath() ); wxRemoveFile( file_path.GetFullPath() );
@ -149,7 +149,7 @@ int PCM_TASK_MANAGER::downloadFile( const wxString& aFilePath, const wxString& u
curl.SetFollowRedirects( true ); curl.SetFollowRedirects( true );
curl.SetTransferCallback( callback, 250000L ); curl.SetTransferCallback( callback, 250000L );
m_reporter->Report( wxString::Format( _( "Downloading package url: '%s'" ), url ), m_reporter->PCMReport( wxString::Format( _( "Downloading package url: '%s'" ), url ),
RPT_SEVERITY_INFO ); RPT_SEVERITY_INFO );
int code = curl.Perform(); int code = curl.Perform();
@ -163,7 +163,7 @@ int PCM_TASK_MANAGER::downloadFile( const wxString& aFilePath, const wxString& u
if( code != CURLE_OK && code != CURLE_ABORTED_BY_CALLBACK ) if( code != CURLE_OK && code != CURLE_ABORTED_BY_CALLBACK )
{ {
m_reporter->Report( wxString::Format( _( "Failed to download url %s\n%s" ), url, m_reporter->PCMReport( wxString::Format( _( "Failed to download url %s\n%s" ), url,
curl.GetErrorText( code ) ), curl.GetErrorText( code ) ),
RPT_SEVERITY_ERROR ); RPT_SEVERITY_ERROR );
} }
@ -187,7 +187,7 @@ bool PCM_TASK_MANAGER::extract( const wxString& aFilePath, const wxString& aPack
if( !zip.IsOk() ) if( !zip.IsOk() )
{ {
m_reporter->Report( _( "Error extracting file!" ), RPT_SEVERITY_ERROR ); m_reporter->PCMReport( _( "Error extracting file!" ), RPT_SEVERITY_ERROR );
return false; return false;
} }
@ -232,7 +232,7 @@ bool PCM_TASK_MANAGER::extract( const wxString& aFilePath, const wxString& aPack
if( !( CopyStreamData( zip, out, entry->GetSize() ) && out.Commit() ) ) if( !( CopyStreamData( zip, out, entry->GetSize() ) && out.Commit() ) )
{ {
m_reporter->Report( _( "Error extracting file!" ), RPT_SEVERITY_ERROR ); m_reporter->PCMReport( _( "Error extracting file!" ), RPT_SEVERITY_ERROR );
return false; return false;
} }
@ -250,11 +250,11 @@ bool PCM_TASK_MANAGER::extract( const wxString& aFilePath, const wxString& aPack
if( m_reporter->IsCancelled() ) if( m_reporter->IsCancelled() )
{ {
m_reporter->Report( _( "Aborting package installation." ), RPT_SEVERITY_INFO ); m_reporter->PCMReport( _( "Aborting package installation." ), RPT_SEVERITY_INFO );
return false; return false;
} }
m_reporter->Report( _( "Extracted package\n" ), RPT_SEVERITY_INFO ); m_reporter->PCMReport( _( "Extracted package\n" ), RPT_SEVERITY_INFO );
m_reporter->SetPackageProgress( entries, entries ); m_reporter->SetPackageProgress( entries, entries );
return true; return true;
@ -360,12 +360,12 @@ void PCM_TASK_MANAGER::deletePackageDirectories( const wxString& aPackageId )
if( d.DirExists() ) if( d.DirExists() )
{ {
m_reporter->Report( wxString::Format( _( "Removing directory %s" ), d.GetPath() ), m_reporter->PCMReport( wxString::Format( _( "Removing directory %s" ), d.GetPath() ),
RPT_SEVERITY_INFO ); RPT_SEVERITY_INFO );
if( !d.Rmdir( wxPATH_RMDIR_RECURSIVE ) ) if( !d.Rmdir( wxPATH_RMDIR_RECURSIVE ) )
{ {
m_reporter->Report( m_reporter->PCMReport(
wxString::Format( _( "Failed to remove directory %s" ), d.GetPath() ), wxString::Format( _( "Failed to remove directory %s" ), d.GetPath() ),
RPT_SEVERITY_ERROR ); RPT_SEVERITY_ERROR );
} }
@ -382,7 +382,7 @@ void PCM_TASK_MANAGER::Uninstall( const PCM_PACKAGE& aPackage )
m_pcm->MarkUninstalled( aPackage ); m_pcm->MarkUninstalled( aPackage );
m_reporter->Report( wxString::Format( _( "Package %s uninstalled" ), aPackage.identifier ), m_reporter->PCMReport( wxString::Format( _( "Package %s uninstalled" ), aPackage.identifier ),
RPT_SEVERITY_INFO ); RPT_SEVERITY_INFO );
}; };
@ -448,7 +448,7 @@ void PCM_TASK_MANAGER::RunQueue( wxWindow* aParent )
} while( ( !m_install_queue.empty() || !download_complete ) } while( ( !m_install_queue.empty() || !download_complete )
&& !m_reporter->IsCancelled() ); && !m_reporter->IsCancelled() );
m_reporter->Report( _( "Done." ), RPT_SEVERITY_INFO ); m_reporter->PCMReport( _( "Done." ), RPT_SEVERITY_INFO );
m_reporter->SetFinished(); m_reporter->SetFinished();
} ); } );

1
pcbnew/drc/drc_test_provider_zone_connections.cpp
View File

@ -179,7 +179,6 @@ void DRC_TEST_PROVIDER_ZONE_CONNECTIONS::testZoneLayer( ZONE* aZone, PCB_LAYER_I
bool DRC_TEST_PROVIDER_ZONE_CONNECTIONS::Run() bool DRC_TEST_PROVIDER_ZONE_CONNECTIONS::Run()
{ {
BOARD* board = m_drcEngine->GetBoard(); BOARD* board = m_drcEngine->GetBoard();
BOARD_DESIGN_SETTINGS& bds = board->GetDesignSettings();
std::shared_ptr<CONNECTIVITY_DATA> connectivity = board->GetConnectivity(); std::shared_ptr<CONNECTIVITY_DATA> connectivity = board->GetConnectivity();
DRC_CONSTRAINT constraint; DRC_CONSTRAINT constraint;