diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-15 18:29:15 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-15 18:29:15 +0100 |
| commit | 83bbc5cc3afeea0f0b248cd755e1011f4760a298 (patch) | |
| tree | 1207131c234ad7c5ae6a5849d1d5d53de45b1b0b /src/gui/color.h | |
| parent | 7b3b60f86c545e0c5b6b8cb1ab7b1cbbf22d5e02 (diff) | |
| parent | 38708de52f00689088eda29f9b6ee257ce7038ad (diff) | |
| download | mana-client-83bbc5cc3afeea0f0b248cd755e1011f4760a298.tar.gz mana-client-83bbc5cc3afeea0f0b248cd755e1011f4760a298.tar.bz2 mana-client-83bbc5cc3afeea0f0b248cd755e1011f4760a298.tar.xz mana-client-83bbc5cc3afeea0f0b248cd755e1011f4760a298.zip | |
Merge commit 'aethyra/master'
Conflicts:
CMakeLists.txt
configure.ac
data/help/header.txt
packaging/windows/setup.nsi
po/POTFILES.in
src/being.cpp
src/being.h
src/game.cpp
src/gui/color.cpp
src/gui/color.h
src/gui/equipmentwindow.h
src/gui/popupmenu.cpp
src/gui/recorder.cpp
src/gui/setup_colors.h
src/gui/setup_keyboard.cpp
src/gui/setup_keyboard.h
src/gui/skill.cpp
src/gui/speechbubble.cpp
src/gui/speechbubble.h
src/gui/table.cpp
src/keyboardconfig.cpp
src/keyboardconfig.h
src/localplayer.cpp
src/main.cpp
src/main.h
src/map.cpp
src/resources/colordb.cpp
src/resources/colordb.h
src/resources/emotedb.cpp
src/resources/emotedb.h
src/text.cpp
src/text.h
src/tmw.rc
src/winver.h
Diffstat (limited to 'src/gui/color.h')
| -rw-r--r-- | src/gui/color.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/color.h b/src/gui/color.h index 509448e7..8684a1a7 100644 --- a/src/gui/color.h +++ b/src/gui/color.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef COLOUR_H -#define COLOUR_H +#ifndef COLOR_H +#define COLOR_H #include <string> #include <vector> @@ -109,16 +109,16 @@ class Color : public gcn::ListModel void rollback(); private: - struct colorElem + struct ColorElem { - colorElem(const char c, const int rgb, const std::string &text) : + ColorElem(const char c, const int rgb, const std::string &text) : ch(c), rgb(rgb), text(text) {} char ch; int rgb; int committedRgb; std::string text; }; - typedef std::vector<colorElem> ColVector; + typedef std::vector<ColorElem> ColVector; ColVector mColVector; /** |