summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/gui/widgets/avatar.cpp10
-rw-r--r--src/gui/widgets/avatar.h6
-rw-r--r--src/gui/widgets/dropdown.cpp20
-rw-r--r--src/gui/widgets/dropdown.h26
-rw-r--r--src/gui/widgets/layout.cpp4
-rw-r--r--src/gui/widgets/layout.h4
-rw-r--r--src/gui/widgets/layouthelper.cpp2
-rw-r--r--src/gui/widgets/layouthelper.h2
-rw-r--r--src/gui/widgets/resizegrip.cpp12
-rw-r--r--src/gui/widgets/tab.cpp19
-rw-r--r--src/gui/widgets/tabbedarea.cpp4
-rw-r--r--src/gui/widgets/tabbedarea.h2
-rw-r--r--src/gui/widgets/textpreview.cpp14
13 files changed, 64 insertions, 61 deletions
diff --git a/src/gui/widgets/avatar.cpp b/src/gui/widgets/avatar.cpp
index 4eb94c53..a36c0302 100644
--- a/src/gui/widgets/avatar.cpp
+++ b/src/gui/widgets/avatar.cpp
@@ -19,12 +19,14 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "avatar.h"
+#include "gui/widgets/avatar.h"
-#include "../icon.h"
+#include "gui/icon.h"
-#include "../../resources/image.h"
-#include "../../resources/resourcemanager.h"
+#include "resources/image.h"
+#include "resources/resourcemanager.h"
+
+#include <guichan/widgets/label.hpp>
Avatar::Avatar(const std::string &name):
mName(name)
diff --git a/src/gui/widgets/avatar.h b/src/gui/widgets/avatar.h
index cb719148..16972104 100644
--- a/src/gui/widgets/avatar.h
+++ b/src/gui/widgets/avatar.h
@@ -22,9 +22,11 @@
#ifndef AVATAR_H
#define AVATAR_H
-#include <string>
+#include "guichanfwd.h"
+
#include <guichan/widget.hpp>
-#include <guichan/widgets/label.hpp>
+
+#include <string>
class Image;
class Icon;
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index aa1638b6..21378772 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -19,21 +19,21 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <algorithm>
+#include "gui/widgets/dropdown.h"
-#include "dropdown.h"
+#include "gui/listbox.h"
+#include "gui/palette.h"
+#include "gui/scrollarea.h"
-#include "../listbox.h"
-#include "../palette.h"
-#include "../scrollarea.h"
+#include "configuration.h"
+#include "graphics.h"
-#include "../../configuration.h"
-#include "../../graphics.h"
+#include "resources/image.h"
+#include "resources/resourcemanager.h"
-#include "../../resources/image.h"
-#include "../../resources/resourcemanager.h"
+#include "utils/dtor.h"
-#include "../../utils/dtor.h"
+#include <algorithm>
int DropDown::instances = 0;
Image *DropDown::buttons[2][2];
diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h
index 1e6dc821..601d55c8 100644
--- a/src/gui/widgets/dropdown.h
+++ b/src/gui/widgets/dropdown.h
@@ -27,15 +27,15 @@
class Image;
class ImageRect;
- /**
- * A drop down box from which you can select different values. It is one of
- * the most complicated Widgets you will find in Guichan. For drawing the
- * DroppedDown box it uses one ScrollArea and one ListBox. It also uses an
- * internal FocusHandler to handle the focus of the internal ScollArea and
- * ListBox. DropDown uses a ListModel to handle the list. To be able to use
- * DropDown you must give DropDown an implemented ListModel which represents
- * your list.
- */
+/**
+ * A drop down box from which you can select different values. It is one of
+ * the most complicated Widgets you will find in Guichan. For drawing the
+ * DroppedDown box it uses one ScrollArea and one ListBox. It also uses an
+ * internal FocusHandler to handle the focus of the internal ScollArea and
+ * ListBox. DropDown uses a ListModel to handle the list. To be able to use
+ * DropDown you must give DropDown an implemented ListModel which represents
+ * your list.
+ */
class DropDown : public gcn::DropDown
{
public:
@@ -57,9 +57,9 @@ class DropDown : public gcn::DropDown
*/
~DropDown();
- void draw(gcn::Graphics* graphics);
+ void draw(gcn::Graphics *graphics);
- void drawFrame(gcn::Graphics* graphics);
+ void drawFrame(gcn::Graphics *graphics);
/**
* Sets the widget to be opaque, that is sets the widget to display its
@@ -67,7 +67,7 @@ class DropDown : public gcn::DropDown
*
* @param opaque True if the widget should be opaque, false otherwise.
*/
- void setOpaque(bool opaque) {mOpaque = opaque;}
+ void setOpaque(bool opaque) { mOpaque = opaque; }
/**
* Checks if the widget is opaque, that is if the widget area displays
@@ -75,7 +75,7 @@ class DropDown : public gcn::DropDown
*
* @return True if the widget is opaque, false otherwise.
*/
- bool isOpaque() const {return mOpaque;}
+ bool isOpaque() const { return mOpaque; }
protected:
diff --git a/src/gui/widgets/layout.cpp b/src/gui/widgets/layout.cpp
index 4ffdda36..9ca82fa3 100644
--- a/src/gui/widgets/layout.cpp
+++ b/src/gui/widgets/layout.cpp
@@ -19,9 +19,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <cassert>
+#include "gui/widgets/layout.h"
-#include "layout.h"
+#include <cassert>
ContainerPlacer ContainerPlacer::at(int x, int y)
{
diff --git a/src/gui/widgets/layout.h b/src/gui/widgets/layout.h
index 20a4222d..b9359e91 100644
--- a/src/gui/widgets/layout.h
+++ b/src/gui/widgets/layout.h
@@ -22,10 +22,10 @@
#ifndef WIDGET_LAYOUT_H
#define WIDGET_LAYOUT_H
-#include <vector>
-
#include <guichan/widgets/container.hpp>
+#include <vector>
+
class LayoutCell;
/**
diff --git a/src/gui/widgets/layouthelper.cpp b/src/gui/widgets/layouthelper.cpp
index 410de98a..820d2d82 100644
--- a/src/gui/widgets/layouthelper.cpp
+++ b/src/gui/widgets/layouthelper.cpp
@@ -19,7 +19,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "layouthelper.h"
+#include "gui/widgets/layouthelper.h"
LayoutHelper::LayoutHelper(gcn::Container *container):
mContainer(container)
diff --git a/src/gui/widgets/layouthelper.h b/src/gui/widgets/layouthelper.h
index afa92a18..ddcc6b26 100644
--- a/src/gui/widgets/layouthelper.h
+++ b/src/gui/widgets/layouthelper.h
@@ -22,7 +22,7 @@
#ifndef LAYOUTHELPER_H
#define LAYOUTHELPER_H
-#include "layout.h"
+#include "gui/widgets/layout.h"
#include <guichan/widgetlistener.hpp>
diff --git a/src/gui/widgets/resizegrip.cpp b/src/gui/widgets/resizegrip.cpp
index 172d4d7e..1bb33e15 100644
--- a/src/gui/widgets/resizegrip.cpp
+++ b/src/gui/widgets/resizegrip.cpp
@@ -19,15 +19,15 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <guichan/graphics.hpp>
+#include "gui/widgets/resizegrip.h"
-#include "resizegrip.h"
+#include "configuration.h"
+#include "graphics.h"
-#include "../../configuration.h"
-#include "../../graphics.h"
+#include "resources/image.h"
+#include "resources/resourcemanager.h"
-#include "../../resources/image.h"
-#include "../../resources/resourcemanager.h"
+#include <guichan/graphics.hpp>
Image *ResizeGrip::gripImage = 0;
int ResizeGrip::mInstances = 0;
diff --git a/src/gui/widgets/tab.cpp b/src/gui/widgets/tab.cpp
index 7a2d9ee8..af31822e 100644
--- a/src/gui/widgets/tab.cpp
+++ b/src/gui/widgets/tab.cpp
@@ -19,20 +19,21 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <guichan/widgets/label.hpp>
+#include "gui/widgets/tab.h"
+
+#include "gui/widgets/tabbedarea.h"
-#include "tab.h"
-#include "tabbedarea.h"
+#include "gui/palette.h"
-#include "../palette.h"
+#include "configuration.h"
+#include "graphics.h"
-#include "../../configuration.h"
-#include "../../graphics.h"
+#include "resources/image.h"
+#include "resources/resourcemanager.h"
-#include "../../resources/image.h"
-#include "../../resources/resourcemanager.h"
+#include "utils/dtor.h"
-#include "../../utils/dtor.h"
+#include <guichan/widgets/label.hpp>
int Tab::mInstances = 0;
float Tab::mAlpha = config.getValue("guialpha", 0.8);
diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp
index a8f2b6f0..8e93d394 100644
--- a/src/gui/widgets/tabbedarea.cpp
+++ b/src/gui/widgets/tabbedarea.cpp
@@ -19,8 +19,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "tabbedarea.h"
-#include "tab.h"
+#include "gui/widgets/tabbedarea.h"
+#include "gui/widgets/tab.h"
#include <guichan/widgets/container.hpp>
diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h
index 01d70380..6e96a1c4 100644
--- a/src/gui/widgets/tabbedarea.h
+++ b/src/gui/widgets/tabbedarea.h
@@ -22,7 +22,6 @@
#ifndef TABBEDAREA_H
#define TABBEDAREA_H
-#include <guichan/widget.hpp>
#include <guichan/widgets/tabbedarea.hpp>
#include <string>
@@ -89,4 +88,3 @@ class TabbedArea : public gcn::TabbedArea
};
#endif
-
diff --git a/src/gui/widgets/textpreview.cpp b/src/gui/widgets/textpreview.cpp
index 7d4fbd80..d0bba285 100644
--- a/src/gui/widgets/textpreview.cpp
+++ b/src/gui/widgets/textpreview.cpp
@@ -19,16 +19,16 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <typeinfo>
+#include "gui/widgets/textpreview.h"
-#include "textpreview.h"
+#include "gui/gui.h"
+#include "gui/palette.h"
+#include "gui/textrenderer.h"
+#include "gui/truetypefont.h"
-#include "../gui.h"
-#include "../palette.h"
-#include "../textrenderer.h"
-#include "../truetypefont.h"
+#include "configuration.h"
-#include "../../configuration.h"
+#include <typeinfo>
float TextPreview::mAlpha = config.getValue("guialpha", 0.8);
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-05 01:46:05 +0000