diff options
| author | Philipp Sehmisch <crush@themanaworld.org> | 2009-03-29 18:33:44 +0200 |
|---|---|---|
| committer | Philipp Sehmisch <crush@themanaworld.org> | 2009-03-29 18:33:44 +0200 |
| commit | 9587fb9b86ee4081ba14d23c1133bf1a09ee4578 (patch) | |
| tree | 7682df3ec17534be553caae85ffa9e5a68c9a815 /src/gui/skilldialog.h | |
| parent | 63b41440a0555c6b39141eab94ef4627f712b476 (diff) | |
| parent | 8748f26234bba1e71bbe059147fb02256f8cec2a (diff) | |
| download | mana-client-9587fb9b86ee4081ba14d23c1133bf1a09ee4578.tar.gz mana-client-9587fb9b86ee4081ba14d23c1133bf1a09ee4578.tar.bz2 mana-client-9587fb9b86ee4081ba14d23c1133bf1a09ee4578.tar.xz mana-client-9587fb9b86ee4081ba14d23c1133bf1a09ee4578.zip | |
Merge branch 'master' of git@gitorious.org:tmw/mainline
Diffstat (limited to 'src/gui/skilldialog.h')
| -rw-r--r-- | src/gui/skilldialog.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/gui/skilldialog.h b/src/gui/skilldialog.h index b79be800..8d1f6a88 100644 --- a/src/gui/skilldialog.h +++ b/src/gui/skilldialog.h @@ -22,20 +22,19 @@ #ifndef SKILL_H #define SKILL_H -#include <vector> -#include <list> +#include "gui/window.h" +#include "gui/gccontainer.h" + +#include "guichanfwd.h" #include <guichan/listmodel.hpp> #include <guichan/actionlistener.hpp> -#include "window.h" -#include "gccontainer.h" - -#include "../guichanfwd.h" +#include <list> class ProgressBar; class Icon; -class Skill_Tab; +class SkillTab; /** * The skill dialog. @@ -71,7 +70,7 @@ class SkillDialog : public Window, public gcn::ActionListener void draw(gcn::Graphics *g); private: - std::list<Skill_Tab*> mTabs; + std::list<SkillTab*> mTabs; }; extern SkillDialog *skillDialog; |