Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix a bunch of compiler warnings #65

Merged
merged 2 commits into from
May 4, 2014
Merged

Fix a bunch of compiler warnings #65

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ee5728
Fix a swathe of compiler warnings
chrisy Apr 27, 2014
9b23426
Minor fixes that clang warns about
chrisy Apr 27, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Minor fixes that clang warns about 
Clang complains about different things to gcc; MacOS defaults to
clang.
  • Loading branch information
@chrisy
chrisy committed May 3, 2014
commit 9b234260080873cf9ba27003fe9e77d98f8c972d
2 changes: 1 addition & 1 deletion gcode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1769,7 +1769,7 @@ void GCode::axisAdj(char axis, float coord, bool inv, bool absoluteAfterAxisAdj,
{
if (inv)
{
coord =- coord;
coord = (-coord);
}

QString cmd = QString("G01 ").append(axis)
Expand Down
4 changes: 2 additions & 2 deletions mainwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1171,7 +1171,7 @@ void MainWindow::receiveListOut(QString msg)

void MainWindow::addToStatusList(bool in, QString msg)
{
msg.trimmed();
msg = msg.trimmed();
msg.remove('\r');
msg.remove('\n');

Expand Down Expand Up @@ -1204,7 +1204,7 @@ void MainWindow::addToStatusList(QStringList& list)
QStringList cleanList;
foreach (QString msg, list)
{
msg.trimmed();
msg = msg.trimmed();
msg.remove('\r');
msg.remove('\n');

Expand Down