diff options
| author | jacob1 <jfu614@gmail.com> | 2013-03-06 17:05:59 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2013-03-06 17:05:59 (GMT) |
| commit | 037618e6f8e6a37574f7ef8ffd90e490fb0ea137 (patch) | |
| tree | d80246d31a26aee7735a566bccc8ce9e8e4e305d /src/interface | |
| parent | ad951eb9af20cd1a784fab39c41ade1c19dff2ca (diff) | |
| download | powder-037618e6f8e6a37574f7ef8ffd90e490fb0ea137.zip powder-037618e6f8e6a37574f7ef8ffd90e490fb0ea137.tar.gz | |
remove auto generated comments from all files, fix some missing tabs, remove unused variables from config.h
Diffstat (limited to 'src/interface')
| -rw-r--r-- | src/interface/Appearance.cpp | 7 | ||||
| -rw-r--r-- | src/interface/Appearance.h | 11 | ||||
| -rw-r--r-- | src/interface/Button.cpp | 43 | ||||
| -rw-r--r-- | src/interface/Button.h | 7 | ||||
| -rw-r--r-- | src/interface/Checkbox.cpp | 8 | ||||
| -rw-r--r-- | src/interface/Checkbox.h | 7 | ||||
| -rw-r--r-- | src/interface/DropDown.cpp | 7 | ||||
| -rw-r--r-- | src/interface/DropDown.h | 7 | ||||
| -rw-r--r-- | src/interface/Slider.cpp | 8 | ||||
| -rw-r--r-- | src/interface/Slider.h | 7 | ||||
| -rw-r--r-- | src/interface/Spinner.cpp | 8 | ||||
| -rw-r--r-- | src/interface/Spinner.h | 7 |
12 files changed, 20 insertions, 107 deletions
diff --git a/src/interface/Appearance.cpp b/src/interface/Appearance.cpp index f2f562c..a4c21d0 100644 --- a/src/interface/Appearance.cpp +++ b/src/interface/Appearance.cpp @@ -1,10 +1,3 @@ -// -// Appearance.cpp -// The Powder Toy -// -// Created by Simon Robertshaw on 15/05/2012. -// - #include <iostream> #include "Appearance.h" diff --git a/src/interface/Appearance.h b/src/interface/Appearance.h index b876269..1c1bb5a 100644 --- a/src/interface/Appearance.h +++ b/src/interface/Appearance.h @@ -1,12 +1,5 @@ -// -// Appearance.h -// The Powder Toy -// -// Created by Simon Robertshaw on 15/05/2012. -// - -#ifndef The_Powder_Toy_Appearance_h -#define The_Powder_Toy_Appearance_h +#ifndef APPEARANCE_H_ +#define APPEARANCE_H_ #include "Border.h" #include "Colour.h" diff --git a/src/interface/Button.cpp b/src/interface/Button.cpp index 95de0e8..a2ecf8f 100644 --- a/src/interface/Button.cpp +++ b/src/interface/Button.cpp @@ -1,10 +1,3 @@ -/* - * Button.cpp - * - * Created on: Jan 8, 2012 - * Author: Simon - */ - #include <iostream> #include "interface/Button.h" #include "graphics/Graphics.h" @@ -156,21 +149,21 @@ void Button::Draw(const Point& screenPos) void Button::OnMouseUnclick(int x, int y, unsigned int button) { - if(button == 1) - { - if(isButtonDown) + if(button == 1) + { + if(isButtonDown) { - isButtonDown = false; + isButtonDown = false; DoAction(); } - } - else if(button == 3) - { - if(isAltButtonDown) - { - isAltButtonDown = false; - DoAltAction(); - } + } + else if(button == 3) + { + if(isAltButtonDown) + { + isAltButtonDown = false; + DoAltAction(); + } } } @@ -178,8 +171,8 @@ void Button::OnMouseClick(int x, int y, unsigned int button) { if(!Enabled) return; - if(button == 1) - { + if(button == 1) + { if(isTogglable) { toggle = !toggle; @@ -187,14 +180,14 @@ void Button::OnMouseClick(int x, int y, unsigned int button) isButtonDown = true; } else if(button == 3) - { + { isAltButtonDown = true; } } void Button::OnMouseEnter(int x, int y) { - isMouseInside = true; + isMouseInside = true; if(!Enabled) return; if(actionCallback) @@ -208,8 +201,8 @@ void Button::OnMouseEnter(int x, int y) void Button::OnMouseLeave(int x, int y) { - isMouseInside = false; - isButtonDown = false; + isMouseInside = false; + isButtonDown = false; } void Button::DoAction() diff --git a/src/interface/Button.h b/src/interface/Button.h index dff15b4..05f466d 100644 --- a/src/interface/Button.h +++ b/src/interface/Button.h @@ -1,10 +1,3 @@ -/* - * Button.h - * - * Created on: Jan 8, 2012 - * Author: Simon - */ - #ifndef BUTTON_H_ #define BUTTON_H_ diff --git a/src/interface/Checkbox.cpp b/src/interface/Checkbox.cpp index 22c6a42..7caf18b 100644 --- a/src/interface/Checkbox.cpp +++ b/src/interface/Checkbox.cpp @@ -1,10 +1,3 @@ -/* - * Checkbox.cpp - * - * Created on: Jan 26, 2012 - * Author: Simon - */ - #include "Checkbox.h" using namespace ui; @@ -17,7 +10,6 @@ Checkbox::Checkbox(ui::Point position, ui::Point size, std::string text, std::st checked(false), actionCallback(NULL) { - // TODO Auto-generated constructor stub } diff --git a/src/interface/Checkbox.h b/src/interface/Checkbox.h index 1323831..f82cef7 100644 --- a/src/interface/Checkbox.h +++ b/src/interface/Checkbox.h @@ -1,10 +1,3 @@ -/* - * Checkbox.h - * - * Created on: Jan 26, 2012 - * Author: Simon - */ - #ifndef CHECKBOX_H_ #define CHECKBOX_H_ diff --git a/src/interface/DropDown.cpp b/src/interface/DropDown.cpp index 0b05aac..4c1d761 100644 --- a/src/interface/DropDown.cpp +++ b/src/interface/DropDown.cpp @@ -1,10 +1,3 @@ -/* - * DropDown.cpp - * - * Created on: Apr 16, 2012 - * Author: Simon - */ - #include <iostream> #include "Style.h" #include "Button.h" diff --git a/src/interface/DropDown.h b/src/interface/DropDown.h index 3aba971..c13fdf6 100644 --- a/src/interface/DropDown.h +++ b/src/interface/DropDown.h @@ -1,10 +1,3 @@ -/* - * DropDown.h - * - * Created on: Apr 16, 2012 - * Author: Simon - */ - #ifndef DROPDOWN_H_ #define DROPDOWN_H_ diff --git a/src/interface/Slider.cpp b/src/interface/Slider.cpp index d5639cb..3ada74f 100644 --- a/src/interface/Slider.cpp +++ b/src/interface/Slider.cpp @@ -1,10 +1,3 @@ -/* - * Slider.cpp - * - * Created on: Mar 3, 2012 - * Author: Simon - */ - #include <iostream> #include "Slider.h" #include "Colour.h" @@ -20,7 +13,6 @@ Slider::Slider(Point position, Point size, int steps): col1(0, 0, 0, 0), col2(0, 0, 0, 0) { - // TODO Auto-generated constructor stub } diff --git a/src/interface/Slider.h b/src/interface/Slider.h index 65ca0ba..b02366e 100644 --- a/src/interface/Slider.h +++ b/src/interface/Slider.h @@ -1,10 +1,3 @@ -/* - * Slider.h - * - * Created on: Mar 3, 2012 - * Author: Simon - */ - #ifndef SLIDER_H_ #define SLIDER_H_ diff --git a/src/interface/Spinner.cpp b/src/interface/Spinner.cpp index ea3d1fa..fd3a61d 100644 --- a/src/interface/Spinner.cpp +++ b/src/interface/Spinner.cpp @@ -1,11 +1,3 @@ -/* - * Spinner.cpp - * - * Created on: Feb 11, 2012 - * Author: Simon - */ - - #include <cmath> #include <iostream> #include "Spinner.h" diff --git a/src/interface/Spinner.h b/src/interface/Spinner.h index 23d4141..deabb3c 100644 --- a/src/interface/Spinner.h +++ b/src/interface/Spinner.h @@ -1,10 +1,3 @@ -/* - * Spinner.h - * - * Created on: Feb 11, 2012 - * Author: Simon - */ - #ifndef SPINNER_H_ #define SPINNER_H_ |
