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

Minor and very minors fixes: move -DKICAD_USE_WEBKIT definition to the main CMakeLists.txt. Remove duplicate semi-colon at end of some lines.

This commit is contained in:
jean-pierre charras 2015-01-17 09:01:16 +01:00
parent 77fb1897b7
commit ac539b9578
21 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -421,6 +421,7 @@ set( wxWidgets_CONFIG_OPTIONS --static=no )
if( KICAD_USE_WEBKIT AND BUILD_GITHUB_PLUGIN )
set( webkitlib "webview" )
add_definitions( -DKICAD_USE_WEBKIT )
else()
set( webkitlib "" )
endif()

2
common/base_units.cpp
View File

@ -83,7 +83,7 @@ std::string Double2Str( double aValue )
len = sprintf( buf, "%.16g", aValue );
}
return std::string( buf, len );;
return std::string( buf, len );
}

6
common/dialog_shim.cpp
View File

@ -411,14 +411,14 @@ public:
// wxModalEventLoop depends on this (so we can't just use ON_BLOCK_EXIT or
// something similar here)
#if wxUSE_EXCEPTIONS
for ( ;; )
for( ; ; )
{
try
{
#endif // wxUSE_EXCEPTIONS
// this is the event loop itself
for ( ;; )
for( ; ; )
{
// generate and process idle events for as long as we don't
// have anything else to do
@ -446,7 +446,7 @@ public:
// handlers endlessly generate new events but they shouldn't do
// this in a well-behaved program and we shouldn't just discard the
// events we already have, they might be important.
for ( ;; )
for( ; ; )
{
bool hasMoreEvents = false;
if ( wxTheApp && wxTheApp->HasPendingEvents() )

2
common/dialogs/dialog_image_editor.cpp
View File

@ -41,7 +41,7 @@ DIALOG_IMAGE_EDITOR::DIALOG_IMAGE_EDITOR( wxWindow* aParent, BITMAP_BASE* aItem
m_buttonUndoLast->Enable( false );
wxString msg;
msg.Printf( wxT("%f"), m_workingImage->m_Scale );
m_textCtrlScale->SetValue( msg );;
m_textCtrlScale->SetValue( msg );
GetSizer()->SetSizeHints( this );
Layout();

4
common/single_top.cpp
View File

@ -125,7 +125,7 @@ struct APP_SINGLE_TOP : public wxApp
{
wxLogError( wxT( "Unhandled exception class: %s what: %s" ),
GetChars( FROM_UTF8( typeid(e).name() )),
GetChars( FROM_UTF8( e.what() ) ) );;
GetChars( FROM_UTF8( e.what() ) ) );
}
catch( const IO_ERROR& ioe )
{
@ -158,7 +158,7 @@ struct APP_SINGLE_TOP : public wxApp
{
wxLogError( wxT( "Unhandled exception class: %s what: %s" ),
GetChars( FROM_UTF8( typeid(e).name() )),
GetChars( FROM_UTF8( e.what() ) ) );;
GetChars( FROM_UTF8( e.what() ) ) );
}
catch( const IO_ERROR& ioe )
{

1
cvpcb/CMakeLists.txt
View File

@ -10,7 +10,6 @@ add_definitions( -DCVPCB )
if( KICAD_USE_WEBKIT AND BUILD_GITHUB_PLUGIN )
set( WEBVIEWER_WXLIB "webviewer" )
add_definitions( -DKICAD_USE_WEBKIT )
endif()

2
cvpcb/readwrite_dlgs.cpp
View File

@ -306,7 +306,7 @@ bool CVPCB_MAINFRAME::ReadNetListAndLinkFiles()
if( component->GetFPID().IsLegacy() || component->GetAltFPID().IsLegacy())
continue;
m_indexes.push_back( ii );;
m_indexes.push_back( ii );
}
// If a n assignment conflict is found,

2
eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp
View File

@ -550,7 +550,7 @@ void DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB::initBuffers()
if( !it->m_Visible )
fld.SetVisible( false );
else
fld.SetVisible( true );;
fld.SetVisible( true );
}
else
{

2
gerbview/class_gerbview_layer_widget.cpp
View File

@ -172,7 +172,7 @@ void GERBER_LAYER_WIDGET::onPopupSelection( wxCommandEvent& event )
{
int rowCount;
int menuId = event.GetId();
bool visible = (menuId == ID_SHOW_ALL_LAYERS) ? true : false;;
bool visible = (menuId == ID_SHOW_ALL_LAYERS) ? true : false;
long visibleLayers = 0;
bool force_active_layer_visible;

2
gerbview/export_to_pcbnew.cpp
View File

@ -172,7 +172,7 @@ void GERBVIEW_FRAME::ExportDataInPcbnewFormat( wxCommandEvent& event )
}
wxString fileName;
wxString path = wxGetCwd();;
wxString path = wxGetCwd();
wxFileDialog filedlg( this, _( "Board file name:" ),
path, fileName, PcbFileWildcard,

2
include/class_title_block.h
View File

@ -64,7 +64,7 @@ public:
const wxString& GetTitle() const
{
return getTbText( titleIdx );;
return getTbText( titleIdx );
}
/**

2
kicad/kicad.cpp
View File

@ -271,7 +271,7 @@ struct APP_KICAD : public wxApp
{
wxLogError( wxT( "Unhandled exception class: %s what: %s" ),
GetChars( FROM_UTF8( typeid(e).name() )),
GetChars( FROM_UTF8( e.what() ) ) );;
GetChars( FROM_UTF8( e.what() ) ) );
}
catch( const IO_ERROR& ioe )
{

2
pagelayout_editor/properties_frame.cpp
View File

@ -198,7 +198,7 @@ void PROPERTIES_FRAME::CopyPrmsFromItemToPanel( WORKSHEET_DATAITEM* aItem )
WORKSHEET_DATAITEM_TEXT* item = (WORKSHEET_DATAITEM_TEXT*) aItem;
item->m_FullText = item->m_TextBase;
// Replace our '\' 'n' sequence by the EOL char
item->ReplaceAntiSlashSequence();;
item->ReplaceAntiSlashSequence();
m_textCtrlText->SetValue( item->m_FullText );
msg.Printf( wxT("%d"), item->m_IncrementLabel );

6
pcb_calculator/attenuators.cpp
View File

@ -5,7 +5,7 @@
/*
* This program source code file is part of KICAD, a free EDA CAD application.
*
* Copyright (C) 12011 jean-pierre.charras
* Copyright (C) 2011 jean-pierre.charras
* Copyright (C) 2011 Kicad Developers, see change_log.txt for contributors.
*
* This program is free software; you can redistribute it and/or
@ -83,10 +83,12 @@ void PCB_CALCULATOR_FRAME::TransfAttenuatorDataToPanel()
m_AttValueCtrl->Enable( m_currAttenuator->m_Attenuation_Enable );
m_ZinValueCtrl->Enable( m_currAttenuator->m_Zin_Enable );
if( m_currAttenuator->m_Zin_Enable )
msg.Printf( wxT( "%g" ), m_currAttenuator->m_Zin );
else
msg.Clear();;
msg.Clear();
m_ZinValueCtrl->SetValue( msg );
msg.Printf( wxT( "%g" ), m_currAttenuator->m_Zout );

1
pcbnew/CMakeLists.txt
View File

@ -373,7 +373,6 @@ endif()
if( KICAD_USE_WEBKIT AND BUILD_GITHUB_PLUGIN )
set( WEBVIEWER_WXLIB "webviewer" )
add_definitions( -DKICAD_USE_WEBKIT )
endif()

2
pcbnew/class_pad.cpp
View File

@ -678,7 +678,7 @@ void D_PAD::GetOblongDrillGeometry( wxPoint& aStartPoint,
// of an equivalent segment which have the same position and width as the hole
int delta_cx, delta_cy;
wxSize halfsize = GetDrillSize();;
wxSize halfsize = GetDrillSize();
halfsize.x /= 2;
halfsize.y /= 2;

2
pcbnew/class_pad.h
View File

@ -207,7 +207,7 @@ public:
void TransformShapeWithClearanceToPolygon( CPOLYGONS_LIST& aCornerBuffer,
int aClearanceValue,
int aCircleToSegmentsCount,
double aCorrectionFactor ) const;;
double aCorrectionFactor ) const;
/**
* Function GetClearance

4
pcbnew/dialogs/dialog_design_rules.cpp
View File

@ -431,7 +431,7 @@ void DIALOG_DESIGN_RULES::InitializeRulesSelectionBoxes()
m_leftClassChoice->Select( 0 );
m_buttonRightToLeft->Enable( false );
m_buttonLeftToRight->Enable( false );;
m_buttonLeftToRight->Enable( false );
FillListBoxWithNetNames( m_leftListCtrl, m_leftClassChoice->GetStringSelection() );
FillListBoxWithNetNames( m_rightListCtrl, m_rightClassChoice->GetStringSelection() );
@ -821,7 +821,7 @@ void DIALOG_DESIGN_RULES::OnRightCBSelection( wxCommandEvent& event )
if( m_leftClassChoice->GetStringSelection() == m_rightClassChoice->GetStringSelection() )
{
m_buttonRightToLeft->Enable( false );
m_buttonLeftToRight->Enable( false );;
m_buttonLeftToRight->Enable( false );
}
else
{

2
pcbnew/dialogs/dialog_freeroute_exchange.cpp
View File

@ -188,7 +188,7 @@ void DIALOG_FREEROUTE::OnLaunchButtonClick( wxCommandEvent& event )
command = value + wxFileName::GetPathSeparator();
command << wxT("bin\\java");
#else // __WINDOWS__
command = wxT( "java" );;
command = wxT( "java" );
#endif
command << wxT(" -jar ");

2
pcbnew/github/github_getliblist.cpp
View File

@ -101,7 +101,7 @@ bool GITHUB_GETLIBLIST::GetLibraryList( wxArrayString& aList )
// The URL lib names are relative to the server name.
// so add the server name to them.
wxURI repo( m_repoURL );
wxString urlPrefix = wxT( "https://" ) + repo.GetServer() + wxT( "/" );;
wxString urlPrefix = wxT( "https://" ) + repo.GetServer() + wxT( "/" );
wxString errorMsg;
const char sep = ','; // Separator fields, in json returned file

2
pcbnew/ratsnest.cpp
View File

@ -883,7 +883,7 @@ void PCB_BASE_FRAME::BuildAirWiresTargetsList( BOARD_CONNECTED_ITEM* aItemRef,
if( track->GetNetCode() < net_code )
continue;
if( track->GetNetCode() > net_code )
break;;
break;
if( !track->GetSubNet() || (track->GetSubNet() != subnet) )
{