Skip to content

Commit

Permalink
Fix hundreds of whitespace errors
Browse files Browse the repository at this point in the history
If you see this commit using git blame, just use -w option, it
will ignore whitespace changes. It also works for git-diff etc.
To not force maintainers to start another whitespace genocide,
please configure your editor so that it automatically fixes them
of at least warns you about them.

For VS:
https://marketplace.visualstudio.com/items?itemName=MadsKristensen.TrailingWhitespaceVisualizer
For XCode:
https://stackoverflow.com/questions/1390329/trim-trailing-spaces-in-xcode
For Vim:
https://vim.fandom.com/wiki/Highlight_unwanted_spaces
https://vim.fandom.com/wiki/Remove_unwanted_spaces
For Emacs:
https://www.gnu.org/software/emacs/manual/html_node/emacs/Useless-Whitespace.html
  • Loading branch information
Filipp Mikoian authored and KjellMorgenstern committed Jul 13, 2019
1 parent 8945592 commit d4abfc0
Show file tree
Hide file tree
Showing 504 changed files with 4,589 additions and 4,859 deletions.
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ install:
- if not exist build64 mkdir build64
- cd build64
- cmake -DBUILD_CLAR=OFF -DTHREADSAFE=ON -G "Visual Studio 15 2017 Win64" ..
- cmake --build .
- cmake --build .
- cd c:\projects\fritzing-app\src\lib
- curl -fsSL https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.zip -o boost_1_70_0.zip
- 7z x boost_1_70_0.zip
Expand Down
1 change: 0 additions & 1 deletion docker/release-linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@
set -xe

docker run -v "$(pwd):/home/conan/fritzing" -w /home/conan/fritzing fritzing/build:xenial docker/xvfb-release-helper.sh "$1"

2 changes: 1 addition & 1 deletion docker/xvfb-release-helper.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
set -xe

xvfb-run ./tools/linux_release_script/release.sh "$1"
xvfb-run ./tools/linux_release_script/release.sh "$1"
2 changes: 1 addition & 1 deletion pri/autoroute.pri
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ src/autoroute/cmrouter/tileutils.h \
src/autoroute/mazerouter/mazerouter.h \
src/autoroute/zoomcontrols.h \
src/autoroute/drc.h \

SOURCES += \
src/autoroute/autorouter.cpp \
src/autoroute/cmrouter/cmrouter.cpp \
Expand Down
10 changes: 5 additions & 5 deletions pri/connectors.pri
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ src/connectors/connectoritem.h \
src/connectors/nonconnectoritem.h \
src/connectors/connectorshared.h \
src/connectors/ercdata.h \
src/connectors/svgidlayer.h
src/connectors/svgidlayer.h

SOURCES += \
src/connectors/bus.cpp \
src/connectors/busshared.cpp \
src/connectors/connector.cpp \
src/connectors/connectoritem.cpp \
src/connectors/nonconnectoritem.cpp \
src/connectors/connectoritem.cpp \
src/connectors/nonconnectoritem.cpp \
src/connectors/connectorshared.cpp \
src/connectors/ercdata.cpp \
src/connectors/svgidlayer.cpp
src/connectors/svgidlayer.cpp
2 changes: 1 addition & 1 deletion pri/dialogs.pri
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ HEADERS += src/dialogs/prefsdialog.h \
src/dialogs/recoverydialog.h \
src/dialogs/setcolordialog.h \
src/dialogs/translatorlistmodel.h

SOURCES += src/dialogs/prefsdialog.cpp \
src/dialogs/pinlabeldialog.cpp \
src/dialogs/groundfillseeddialog.cpp \
Expand Down
5 changes: 1 addition & 4 deletions pri/dock.pri
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,7 @@
HEADERS += \
src/dock/layerpalette.h \



SOURCES += \
src/dock/layerpalette.cpp \



5 changes: 2 additions & 3 deletions pri/eagle.pri
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
# along with Fritzing. If not, see <http://www.gnu.org/licenses/>.
# ********************************************************************/

HEADERS += src/eagle/fritzing2eagle.h

SOURCES += src/eagle/fritzing2eagle.cpp
HEADERS += src/eagle/fritzing2eagle.h

SOURCES += src/eagle/fritzing2eagle.cpp
2 changes: 1 addition & 1 deletion pri/help.pri
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
HEADERS += src/help/aboutbox.h \
src/help/firsttimehelpdialog.h \
src/help/tipsandtricks.h

SOURCES += src/help/aboutbox.cpp \
src/help/firsttimehelpdialog.cpp \
src/help/tipsandtricks.cpp
6 changes: 2 additions & 4 deletions pri/infoview.pri
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
# along with Fritzing. If not, see <http://www.gnu.org/licenses/>.
# ********************************************************************/

HEADERS += src/infoview/htmlinfoview.h

SOURCES += src/infoview/htmlinfoview.cpp

HEADERS += src/infoview/htmlinfoview.h

SOURCES += src/infoview/htmlinfoview.cpp
8 changes: 4 additions & 4 deletions pri/items.pri
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
# ********************************************************************/

HEADERS += \
src/items/breadboard.h \
src/items/capacitor.h \
src/items/breadboard.h \
src/items/capacitor.h \
src/items/clipablewire.h \
src/items/dip.h \
src/items/groundplane.h \
Expand Down Expand Up @@ -51,7 +51,7 @@ HEADERS += \


SOURCES += \
src/items/breadboard.cpp \
src/items/breadboard.cpp \
src/items/capacitor.cpp \
src/items/clipablewire.cpp \
src/items/dip.cpp \
Expand Down Expand Up @@ -81,7 +81,7 @@ SOURCES += \
src/items/screwterminal.cpp \
src/items/stripboard.cpp \
src/items/symbolpaletteitem.cpp \
src/items/tracewire.cpp \
src/items/tracewire.cpp \
src/items/via.cpp \
src/items/virtualwire.cpp \
src/items/wire.cpp \
8 changes: 3 additions & 5 deletions pri/kitchensink.pri
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ HEADERS += \
src/sketchtoolbutton.h \
src/viewgeometry.h \
src/viewlayer.h \
src/waitpushundostack.h
src/waitpushundostack.h

SOURCES += \
src/commands.cpp \
src/debugdialog.cpp \
Expand All @@ -41,6 +41,4 @@ SOURCES += \
src/sketchtoolbutton.cpp \
src/viewgeometry.cpp \
src/viewlayer.cpp \
src/waitpushundostack.cpp


src/waitpushundostack.cpp
6 changes: 2 additions & 4 deletions pri/mainwindow.pri
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,12 @@ HEADERS += \
src/mainwindow/fritzingwindow.h \
src/mainwindow/mainwindow.h \
src/mainwindow/sketchareawidget.h \

SOURCES += \
src/mainwindow/fdockwidget.cpp \
src/mainwindow/fritzingwindow.cpp \
src/mainwindow/mainwindow.cpp \
src/mainwindow/mainwindow_export.cpp \
src/mainwindow/mainwindow_export.cpp \
src/mainwindow/mainwindow_menu.cpp \
src/mainwindow/mainwindow_dock.cpp \
src/mainwindow/sketchareawidget.cpp \


6 changes: 3 additions & 3 deletions pri/model.pri
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ HEADERS += \
src/model/modelpart.h \
src/model/modelpartshared.h \
src/model/palettemodel.h \
src/model/sketchmodel.h
src/model/sketchmodel.h

SOURCES += \
src/model/modelbase.cpp \
src/model/modelpart.cpp \
src/model/modelpartshared.cpp \
src/model/palettemodel.cpp \
src/model/sketchmodel.cpp
src/model/sketchmodel.cpp
2 changes: 1 addition & 1 deletion pri/partseditor.pri
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ HEADERS += \
src/partseditor/kicadmoduledialog.h \
src/partseditor/hashpopulatewidget.h \
src/partseditor/baseremovebutton.h \


SOURCES += \
# src/partseditor/editabledatewidget.cpp \
Expand Down
4 changes: 2 additions & 2 deletions pri/program.pri
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ HEADERS += \
src/program/programtab.h \
src/program/programwindow.h \
src/program/syntaxer.h \
src/program/trienode.h \
src/program/trienode.h \
src/program/console.h \
src/program/consolewindow.h \
src/program/consolesettings.h \
src/program/platform.h \
src/program/platformarduino.h \
src/program/platformpicaxe.h \
src/program/platformlaunchpad.h

SOURCES += \
src/program/highlighter.cpp \
src/program/programtab.cpp \
Expand Down
3 changes: 1 addition & 2 deletions pri/quazip.pri
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,4 @@ SOURCES += \
src/lib/quazip/quazipfile.cpp \
src/lib/quazip/quazipnewinfo.cpp \
src/lib/quazip/unzip.c \
src/lib/quazip/zip.c

src/lib/quazip/zip.c
6 changes: 3 additions & 3 deletions pri/sketch.pri
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ HEADERS += \
src/sketch/sketchwidget.h \
src/sketch/welcomeview.h \
src/sketch/zoomablegraphicsview.h \


SOURCES += \
src/sketch/fgraphicsscene.cpp \
src/sketch/breadboardsketchwidget.cpp \
src/sketch/infographicsview.cpp \
src/sketch/pcbsketchwidget.cpp \
src/sketch/schematicsketchwidget.cpp \
src/sketch/sketchwidget.cpp \
src/sketch/welcomeview.cpp \
src/sketch/welcomeview.cpp \
src/sketch/zoomablegraphicsview.cpp \
2 changes: 1 addition & 1 deletion pri/svg.pri
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ HEADERS += src/svg/svgfilesplitter.h \
src/svg/gedaelementparser.h \
src/svg/gedaelementgrammar_p.h \
src/svg/gedaelementlexer.h

SOURCES += src/svg/svgfilesplitter.cpp \
src/svg/svgpathparser.cpp \
src/svg/svgpathgrammar.cpp \
Expand Down
3 changes: 0 additions & 3 deletions pri/translations.pri
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,3 @@ TRANSLATIONS += translations/fritzing_de.ts \
translations/fritzing_vi.ts \
translations/fritzing_zh_cn.ts \
translations/fritzing_zh_tw.ts \



5 changes: 2 additions & 3 deletions pri/version.pri
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,9 @@ HEADERS += \
SOURCES += \
src/version/modfiledialog.cpp \
src/version/updatedialog.cpp \
src/version/version.cpp \
src/version/versionchecker.cpp \
src/version/version.cpp \
src/version/versionchecker.cpp \
src/version/partschecker.cpp

FORMS += \
src/version/modfiledialog.ui

6 changes: 3 additions & 3 deletions resources/bins/pe.fzb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<module fritzingVersion="0.4.3b.0.0" icon="Core.png">
<title>Parts Editor Parts</title>
<instances>

<instance moduleIdRef="__spacer__" modelIndex="3" path="Breadboard View">
<views>
<iconView layer="icon">
Expand All @@ -24,8 +24,8 @@
<geometry z="-1" x="-1" y="-1"/>
</iconView>
</views>
</instance>
</instance>

<instance moduleIdRef="__spacer__" modelIndex="3" path="Schematic View">
<views>
<iconView layer="icon">
Expand Down
1 change: 0 additions & 1 deletion resources/fonts/NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -187,4 +187,3 @@
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

2 changes: 1 addition & 1 deletion resources/images/splash/splash.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<splash sliceDelaySeconds="0" >
<item id="progress" x="0" y="224" />
<item id="fritzingText" x="5" y="222" width="516" height="20" color="#eaf4ed" />
<item id="versionText" x="0" y="222" width="549" height="20" color="#eaf4ed" />
<item id="versionText" x="0" y="222" width="549" height="20" color="#eaf4ed" />
<item id="logoBar" x="0" y="157" />
<item id="slice" x="0" y="0" />
</splash>
2 changes: 1 addition & 1 deletion resources/parts/core/boardlogoimage.fzp
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
</schematicView>
<pcbView>
<layers image="pcb/circle_pcb.svg" >
<layer layerId="board" sticky="true"/>
<layer layerId="board" sticky="true"/>
<layer layerId="silkscreen" sticky="true"/>
<layer layerId="silkscreen0" sticky="true"/>
</layers>
Expand Down
2 changes: 1 addition & 1 deletion resources/parts/core/boardlogoimage_one_layer.fzp
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
</schematicView>
<pcbView>
<layers image="pcb/circle_pcb.svg" >
<layer layerId="board" sticky="true"/>
<layer layerId="board" sticky="true"/>
<layer layerId="silkscreen" sticky="true"/>
<layer layerId="silkscreen0" sticky="true"/>
</layers>
Expand Down
2 changes: 1 addition & 1 deletion resources/parts/core/pad.fzp
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<p svgId="connector0pad" terminalId="connector0terminal" layer="copper1" />
</pcbView>
</views>
</connector>
</connector>
</connectors>
<buses/>
</module>
2 changes: 1 addition & 1 deletion resources/parts/core/pad0.fzp
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<p svgId="connector0pad" terminalId="connector0terminal" layer="copper0" />
</pcbView>
</views>
</connector>
</connector>
</connectors>
<buses/>
</module>
2 changes: 1 addition & 1 deletion resources/parts/core/via.fzp
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<p svgId="connector0pin" layer="copper1" />
</pcbView>
</views>
</connector>
</connector>
</connectors>
<buses/>
</module>
2 changes: 1 addition & 1 deletion resources/parts/core/wire.fzp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<tag>fritzing core</tag>
</tags>
<properties>
<property name="family" >wire</property>
<property name="family" >wire</property>
<property name="color" ></property>
<property name="width" ></property>
</properties>
Expand Down
4 changes: 2 additions & 2 deletions resources/parts/svg/core/breadboard/30.20perfboard.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion resources/parts/svg/core/breadboard/wire.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion resources/parts/svg/core/icon/breadboard_text.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion resources/parts/svg/core/icon/copper0_text.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion resources/parts/svg/core/icon/copper1_text.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit d4abfc0

Please sign in to comment.