fixed build and applied yet more cleanup

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17741 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/apps/deskcalc/CalcOptionsWindow.h

@@ -14,8 +14,8 @@
 #include <Window.h>
 
 struct CalcOptions {
-	bool mAutoNumLock;		// automatically activate numlock
+	bool auto_num_lock;		// automatically activate numlock
-	bool mAudioFeedback;	// provide audio feedback
+	bool audio_feedback;	// provide audio feedback
 
 	CalcOptions();
 };

src/apps/deskcalc/CalcView.cpp

@@ -233,12 +233,11 @@ CalcView::Draw(BRect updateRect)
 		DrawString(fExpression.String(),
 				   BPoint(fWidth - StringWidth(fExpression.String()),
 						  sizeDisp - baselineOffset));
-		
+	}
-		} // end if
-		
 		
 	// ****** KEYPAD Area
 	if (updateRect.Intersects(keypadRect)) {
+		// TODO: support pressed keys
 
 		// paint keypad b/g
 		SetHighColor(fBaseColor);
@@ -258,7 +257,7 @@ CalcView::Draw(BRect updateRect)
 			AddLine(BPoint(col * sizeCol, sizeDisp),
 					BPoint(col * sizeCol, fHeight),
 					fLightColor);
-			} // end for
+		}
 		AddLine(BPoint(fColums * sizeCol, sizeDisp),
 				BPoint(fColums * sizeCol, fHeight),
 				fDarkColor);
@@ -271,7 +270,7 @@ CalcView::Draw(BRect updateRect)
 			AddLine(BPoint(0.0, sizeDisp + row * sizeRow),
 					BPoint(fWidth, sizeDisp + row * sizeRow),
 					fLightColor);
-			} // end for
+		}
 		AddLine(BPoint(0.0, sizeDisp + fRows * sizeRow),
 				BPoint(fWidth, sizeDisp + fRows * sizeRow),
 				fDarkColor);
@@ -295,11 +294,9 @@ CalcView::Draw(BRect updateRect)
 						   BPoint(col * sizeCol + halfSizeCol - halfSymbolWidth,
 								  sizeDisp + (row + 1) * sizeRow - baselineOffset));
 				key++;
-				} // end for
+			}
-			} // end for
+		}
-
+	}
-		} // end if
-	
 }