From 1420656e08f65f3e5c963f82b10a718b8026d216 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Tue, 12 Jan 2010 14:19:47 -0700 Subject: Standardize header order Also remove some extra new lines and fix eAthena's PartyTab define guards. --- src/gui/buy.h | 4 ++-- src/gui/changeemaildialog.h | 4 ++-- src/gui/changepassworddialog.h | 4 ++-- src/gui/charcreatedialog.h | 4 ++-- src/gui/charselectdialog.h | 4 ++-- src/gui/connectiondialog.h | 4 ++-- src/gui/equipmentwindow.h | 4 ++-- src/gui/focushandler.h | 4 ++-- src/gui/gui.h | 4 ++-- src/gui/guildwindow.cpp | 4 ++-- src/gui/guildwindow.h | 5 +++-- src/gui/help.cpp | 3 ++- src/gui/inventorywindow.h | 4 ++-- src/gui/itempopup.cpp | 1 + src/gui/npcdialog.h | 4 ++-- src/gui/palette.h | 6 +++--- src/gui/quitdialog.h | 4 ++-- src/gui/register.h | 4 ++-- src/gui/setup.h | 4 ++-- src/gui/setup_keyboard.cpp | 4 ++-- src/gui/setup_video.cpp | 1 + src/gui/skilldialog.h | 4 ++-- src/gui/specialswindow.h | 5 ++--- src/gui/speechbubble.cpp | 1 + src/gui/statuswindow.h | 4 ++-- src/gui/storagewindow.h | 4 ++-- src/gui/trade.cpp | 3 +-- src/gui/trade.h | 4 ++-- src/gui/truetypefont.h | 7 ++++--- src/gui/unregisterdialog.h | 4 ++-- src/gui/viewport.h | 4 ++-- src/gui/widgets/browserbox.h | 6 +++--- src/gui/widgets/chattab.h | 3 ++- src/gui/widgets/checkbox.h | 1 - src/gui/widgets/desktop.cpp | 8 ++++---- src/gui/widgets/desktop.h | 4 ++-- src/gui/widgets/emoteshortcutcontainer.h | 4 ++-- src/gui/widgets/guildlistbox.h | 4 ++-- src/gui/widgets/itemlinkhandler.cpp | 3 ++- src/gui/widgets/itemshortcutcontainer.h | 4 ++-- src/gui/widgets/linkhandler.h | 2 -- src/gui/widgets/popup.h | 4 ++-- src/gui/widgets/progressbar.h | 4 ++-- src/gui/widgets/tab.cpp | 2 +- src/gui/worldselectdialog.h | 1 + 45 files changed, 87 insertions(+), 83 deletions(-) (limited to 'src/gui') diff --git a/src/gui/buy.h b/src/gui/buy.h index 7fddaf6c..86a4e320 100644 --- a/src/gui/buy.h +++ b/src/gui/buy.h @@ -22,10 +22,10 @@ #ifndef BUY_H #define BUY_H -#include "gui/widgets/window.h" - #include "guichanfwd.h" +#include "gui/widgets/window.h" + #include #include diff --git a/src/gui/changeemaildialog.h b/src/gui/changeemaildialog.h index 87e99068..e3c38fcf 100644 --- a/src/gui/changeemaildialog.h +++ b/src/gui/changeemaildialog.h @@ -22,10 +22,10 @@ #ifndef GUI_CHANGEEMAIL_H #define GUI_CHANGEEMAIL_H -#include "gui/widgets/window.h" - #include "guichanfwd.h" +#include "gui/widgets/window.h" + #include class LoginData; diff --git a/src/gui/changepassworddialog.h b/src/gui/changepassworddialog.h index d54c0e1a..2bd75ffa 100644 --- a/src/gui/changepassworddialog.h +++ b/src/gui/changepassworddialog.h @@ -22,10 +22,10 @@ #ifndef CHANGEPASSWORDDIALOG_H #define CHANGEPASSWORDDIALOG_H -#include "gui/widgets/window.h" - #include "guichanfwd.h" +#include "gui/widgets/window.h" + #include class LoginData; diff --git a/src/gui/charcreatedialog.h b/src/gui/charcreatedialog.h index 0d8b9856..70c3e3a2 100644 --- a/src/gui/charcreatedialog.h +++ b/src/gui/charcreatedialog.h @@ -26,10 +26,10 @@ #include "guichanfwd.h" #include "lockedarray.h" -#include "gui/widgets/window.h" - #include "gui/charselectdialog.h" +#include "gui/widgets/window.h" + #include #include diff --git a/src/gui/charselectdialog.h b/src/gui/charselectdialog.h index 6144847a..d16453a6 100644 --- a/src/gui/charselectdialog.h +++ b/src/gui/charselectdialog.h @@ -22,13 +22,13 @@ #ifndef CHAR_SELECT_H #define CHAR_SELECT_H -#include "gui/widgets/window.h" - #include "guichanfwd.h" #include "lockedarray.h" #include "main.h" #include "player.h" +#include "gui/widgets/window.h" + #include #include diff --git a/src/gui/connectiondialog.h b/src/gui/connectiondialog.h index d6059c3f..f2fca68d 100644 --- a/src/gui/connectiondialog.h +++ b/src/gui/connectiondialog.h @@ -22,10 +22,10 @@ #ifndef CONNECTION_H #define CONNECTION_H -#include "gui/widgets/window.h" - #include "main.h" +#include "gui/widgets/window.h" + #include class ProgressBar; diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h index a7b2c0d1..dee31f94 100644 --- a/src/gui/equipmentwindow.h +++ b/src/gui/equipmentwindow.h @@ -22,11 +22,11 @@ #ifndef EQUIPMENTWINDOW_H #define EQUIPMENTWINDOW_H -#include "gui/widgets/window.h" - #include "equipment.h" #include "guichanfwd.h" +#include "gui/widgets/window.h" + #include class Inventory; diff --git a/src/gui/focushandler.h b/src/gui/focushandler.h index b0639bd8..0ce12246 100644 --- a/src/gui/focushandler.h +++ b/src/gui/focushandler.h @@ -22,10 +22,10 @@ #ifndef FOCUSHANDLER_H #define FOCUSHANDLER_H -#include - #include +#include + /** * The focus handler. This focus handler does exactly the same as the Guichan * focus handler, but keeps a stack of modal widgets to be able to handle diff --git a/src/gui/gui.h b/src/gui/gui.h index c7b9bbfa..8d9e0225 100644 --- a/src/gui/gui.h +++ b/src/gui/gui.h @@ -22,10 +22,10 @@ #ifndef GUI_H #define GUI_H -#include - #include "guichanfwd.h" +#include + class Graphics; class GuiConfigListener; class ImageSet; diff --git a/src/gui/guildwindow.cpp b/src/gui/guildwindow.cpp index 7a39adb9..0c1eae67 100644 --- a/src/gui/guildwindow.cpp +++ b/src/gui/guildwindow.cpp @@ -45,10 +45,10 @@ #include "utils/gettext.h" #include "utils/stringutils.h" -#include - #include +#include + GuildWindow::GuildWindow(): Window(_("Guild")), mFocus(false) diff --git a/src/gui/guildwindow.h b/src/gui/guildwindow.h index 5afe01dd..2e8ab71c 100644 --- a/src/gui/guildwindow.h +++ b/src/gui/guildwindow.h @@ -22,11 +22,12 @@ #ifndef GUI_GUILDWINDOW_H #define GUI_GUILDWINDOW_H -#include "gui/widgets/window.h" - #include "guichanfwd.h" +#include "gui/widgets/window.h" + #include + #include #include diff --git a/src/gui/help.cpp b/src/gui/help.cpp index e28f64e3..21ec04b1 100644 --- a/src/gui/help.cpp +++ b/src/gui/help.cpp @@ -21,11 +21,12 @@ #include "gui/help.h" +#include "gui/setup.h" + #include "gui/widgets/button.h" #include "gui/widgets/browserbox.h" #include "gui/widgets/layout.h" #include "gui/widgets/scrollarea.h" -#include "gui/setup.h" #include "resources/resourcemanager.h" diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h index e40ac325..5117c23f 100644 --- a/src/gui/inventorywindow.h +++ b/src/gui/inventorywindow.h @@ -22,10 +22,10 @@ #ifndef INVENTORYWINDOW_H #define INVENTORYWINDOW_H -#include "gui/widgets/window.h" - #include "inventory.h" +#include "gui/widgets/window.h" + #include "net/inventoryhandler.h" #include "net/net.h" diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp index aec09c10..324bb071 100644 --- a/src/gui/itempopup.cpp +++ b/src/gui/itempopup.cpp @@ -34,6 +34,7 @@ #include "utils/stringutils.h" #include + #include ItemPopup::ItemPopup(): diff --git a/src/gui/npcdialog.h b/src/gui/npcdialog.h index ecce0c62..7cce0b80 100644 --- a/src/gui/npcdialog.h +++ b/src/gui/npcdialog.h @@ -22,10 +22,10 @@ #ifndef NPCDIALOG_H #define NPCDIALOG_H -#include "gui/widgets/window.h" - #include "npc.h" +#include "gui/widgets/window.h" + #include #include diff --git a/src/gui/palette.h b/src/gui/palette.h index c68a4e1c..e778b2a4 100644 --- a/src/gui/palette.h +++ b/src/gui/palette.h @@ -23,13 +23,13 @@ #ifndef PALETTE_H #define PALETTE_H +#include +#include + #include #include #include -#include -#include - // Generate strings from an enum ... some preprocessor fun. #define EDEF(a) a, #define LASTEDEF(a) a diff --git a/src/gui/quitdialog.h b/src/gui/quitdialog.h index 83c514e6..cd73fd72 100644 --- a/src/gui/quitdialog.h +++ b/src/gui/quitdialog.h @@ -22,10 +22,10 @@ #ifndef QUITDIALOG_H #define QUITDIALOG_H -#include "gui/widgets/window.h" - #include "guichanfwd.h" +#include "gui/widgets/window.h" + #include #include diff --git a/src/gui/register.h b/src/gui/register.h index 418d6dcd..37cda844 100644 --- a/src/gui/register.h +++ b/src/gui/register.h @@ -22,10 +22,10 @@ #ifndef REGISTER_H #define REGISTER_H -#include "gui/widgets/window.h" - #include "player.h" +#include "gui/widgets/window.h" + #include #include diff --git a/src/gui/setup.h b/src/gui/setup.h index 6000adfa..a9cfb8e1 100644 --- a/src/gui/setup.h +++ b/src/gui/setup.h @@ -22,10 +22,10 @@ #ifndef SETUP_H #define SETUP_H -#include "gui/widgets/window.h" - #include "guichanfwd.h" +#include "gui/widgets/window.h" + #include #include diff --git a/src/gui/setup_keyboard.cpp b/src/gui/setup_keyboard.cpp index 6bddbcdd..2ac73621 100644 --- a/src/gui/setup_keyboard.cpp +++ b/src/gui/setup_keyboard.cpp @@ -34,10 +34,10 @@ #include "utils/gettext.h" #include "utils/stringutils.h" -#include - #include +#include + /** * The list model for key function list. * diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp index d9966db5..d7ad3e5f 100644 --- a/src/gui/setup_video.cpp +++ b/src/gui/setup_video.cpp @@ -47,6 +47,7 @@ #include #include + #include #include diff --git a/src/gui/skilldialog.h b/src/gui/skilldialog.h index 12cb3581..861ad07b 100644 --- a/src/gui/skilldialog.h +++ b/src/gui/skilldialog.h @@ -22,10 +22,10 @@ #ifndef SKILL_H #define SKILL_H -#include "gui/widgets/window.h" - #include "guichanfwd.h" +#include "gui/widgets/window.h" + #include #include diff --git a/src/gui/specialswindow.h b/src/gui/specialswindow.h index cd92c065..d5370884 100644 --- a/src/gui/specialswindow.h +++ b/src/gui/specialswindow.h @@ -24,12 +24,11 @@ #include -#include "gui/widgets/window.h" - #include "guichanfwd.h" -#include +#include "gui/widgets/window.h" +#include #include diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp index 4f2df7e4..bbede198 100644 --- a/src/gui/speechbubble.cpp +++ b/src/gui/speechbubble.cpp @@ -29,6 +29,7 @@ #include "gui/widgets/textbox.h" #include + #include SpeechBubble::SpeechBubble(): diff --git a/src/gui/statuswindow.h b/src/gui/statuswindow.h index 84c74ee7..f40be782 100644 --- a/src/gui/statuswindow.h +++ b/src/gui/statuswindow.h @@ -22,10 +22,10 @@ #ifndef STATUS_H #define STATUS_H -#include "gui/widgets/window.h" - #include "guichanfwd.h" +#include "gui/widgets/window.h" + #include #include diff --git a/src/gui/storagewindow.h b/src/gui/storagewindow.h index a67e0617..1ead188d 100644 --- a/src/gui/storagewindow.h +++ b/src/gui/storagewindow.h @@ -22,10 +22,10 @@ #ifndef STORAGEWINDOW_H #define STORAGEWINDOW_H -#include "gui/widgets/window.h" - #include "inventory.h" +#include "gui/widgets/window.h" + #include "net/inventoryhandler.h" #include "net/net.h" diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp index 2a4934f3..bebb4186 100644 --- a/src/gui/trade.cpp +++ b/src/gui/trade.cpp @@ -45,11 +45,10 @@ #include "utils/gettext.h" #include "utils/stringutils.h" +#include #include -#include - #define CAPTION_PROPOSE _("Propose trade") #define CAPTION_CONFIRMED _("Confirmed. Waiting...") #define CAPTION_ACCEPT _("Agree trade") diff --git a/src/gui/trade.h b/src/gui/trade.h index 3c292496..d5b03d70 100644 --- a/src/gui/trade.h +++ b/src/gui/trade.h @@ -22,10 +22,10 @@ #ifndef TRADE_H #define TRADE_H -#include "gui/widgets/window.h" - #include "guichanfwd.h" +#include "gui/widgets/window.h" + #include #include diff --git a/src/gui/truetypefont.h b/src/gui/truetypefont.h index 25dcbe44..eb89697d 100644 --- a/src/gui/truetypefont.h +++ b/src/gui/truetypefont.h @@ -22,10 +22,8 @@ #ifndef TRUETYPEFONT_H #define TRUETYPEFONT_H -#include -#include - #include + #ifdef __APPLE__ #include #else @@ -36,6 +34,9 @@ #endif #endif +#include +#include + class TextChunk; /** diff --git a/src/gui/unregisterdialog.h b/src/gui/unregisterdialog.h index 222dab2f..b31d0e61 100644 --- a/src/gui/unregisterdialog.h +++ b/src/gui/unregisterdialog.h @@ -22,10 +22,10 @@ #ifndef UNREGISTERDIALOG_H #define UNREGISTERDIALOG_H -#include "gui/widgets/window.h" - #include "guichanfwd.h" +#include "gui/widgets/window.h" + #include class LoginData; diff --git a/src/gui/viewport.h b/src/gui/viewport.h index e1030972..d3a86f1d 100644 --- a/src/gui/viewport.h +++ b/src/gui/viewport.h @@ -22,11 +22,11 @@ #ifndef VIEWPORT_H #define VIEWPORT_H -#include "gui/widgets/windowcontainer.h" - #include "configlistener.h" #include "position.h" +#include "gui/widgets/windowcontainer.h" + #include class Being; diff --git a/src/gui/widgets/browserbox.h b/src/gui/widgets/browserbox.h index 2823d308..2cd571c9 100644 --- a/src/gui/widgets/browserbox.h +++ b/src/gui/widgets/browserbox.h @@ -22,12 +22,12 @@ #ifndef BROWSERBOX_H #define BROWSERBOX_H -#include -#include - #include #include +#include +#include + class LinkHandler; struct BROWSER_LINK { diff --git a/src/gui/widgets/chattab.h b/src/gui/widgets/chattab.h index 5d8b594a..2caf2b73 100644 --- a/src/gui/widgets/chattab.h +++ b/src/gui/widgets/chattab.h @@ -22,9 +22,10 @@ #ifndef CHATTAB_H #define CHATTAB_H -#include "gui/widgets/tab.h" #include "gui/chat.h" +#include "gui/widgets/tab.h" + class BrowserBox; class Recorder; class ScrollArea; diff --git a/src/gui/widgets/checkbox.h b/src/gui/widgets/checkbox.h index a65a5196..d971fd66 100644 --- a/src/gui/widgets/checkbox.h +++ b/src/gui/widgets/checkbox.h @@ -24,7 +24,6 @@ #include - class Image; /** diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp index fb807f38..249d083a 100644 --- a/src/gui/widgets/desktop.cpp +++ b/src/gui/widgets/desktop.cpp @@ -21,6 +21,10 @@ #include "gui/widgets/desktop.h" +#include "graphics.h" +#include "log.h" +#include "main.h" + #include "gui/palette.h" #include "gui/widgets/label.h" @@ -29,10 +33,6 @@ #include "resources/resourcemanager.h" #include "resources/wallpaper.h" -#include "graphics.h" -#include "log.h" -#include "main.h" - Desktop::Desktop() : mWallpaper(0) { diff --git a/src/gui/widgets/desktop.h b/src/gui/widgets/desktop.h index da623bbd..bd69019f 100644 --- a/src/gui/widgets/desktop.h +++ b/src/gui/widgets/desktop.h @@ -22,10 +22,10 @@ #ifndef DESKTOP_H #define DESKTOP_H -#include "gui/widgets/container.h" - #include "guichanfwd.h" +#include "gui/widgets/container.h" + #include class Image; diff --git a/src/gui/widgets/emoteshortcutcontainer.h b/src/gui/widgets/emoteshortcutcontainer.h index 8860927e..a75fe968 100644 --- a/src/gui/widgets/emoteshortcutcontainer.h +++ b/src/gui/widgets/emoteshortcutcontainer.h @@ -22,10 +22,10 @@ #ifndef EMOTESHORTCUTCONTAINER_H #define EMOTESHORTCUTCONTAINER_H -#include - #include "gui/widgets/shortcutcontainer.h" +#include + class AnimatedSprite; class Image; diff --git a/src/gui/widgets/guildlistbox.h b/src/gui/widgets/guildlistbox.h index d266fe46..959e3bd0 100644 --- a/src/gui/widgets/guildlistbox.h +++ b/src/gui/widgets/guildlistbox.h @@ -22,12 +22,12 @@ #ifndef GUI_GUILDLISTBOX_H #define GUI_GUILDLISTBOX_H +#include "gui/widgets/listbox.h" + #include #include #include -#include "gui/widgets/listbox.h" - class Image; class GuildListBox : public ListBox diff --git a/src/gui/widgets/itemlinkhandler.cpp b/src/gui/widgets/itemlinkhandler.cpp index 1a7011ab..d284658d 100644 --- a/src/gui/widgets/itemlinkhandler.cpp +++ b/src/gui/widgets/itemlinkhandler.cpp @@ -22,10 +22,11 @@ #include #include -#include "gui/widgets/itemlinkhandler.h" #include "gui/itempopup.h" #include "gui/viewport.h" +#include "gui/widgets/itemlinkhandler.h" + #include "resources/iteminfo.h" #include "resources/itemdb.h" diff --git a/src/gui/widgets/itemshortcutcontainer.h b/src/gui/widgets/itemshortcutcontainer.h index 03d57b8d..411ad2d1 100644 --- a/src/gui/widgets/itemshortcutcontainer.h +++ b/src/gui/widgets/itemshortcutcontainer.h @@ -22,10 +22,10 @@ #ifndef ITEMSHORTCUTCONTAINER_H #define ITEMSHORTCUTCONTAINER_H -#include - #include "gui/widgets/shortcutcontainer.h" +#include + class Image; class Item; class ItemPopup; diff --git a/src/gui/widgets/linkhandler.h b/src/gui/widgets/linkhandler.h index 30267f87..03fcc491 100644 --- a/src/gui/widgets/linkhandler.h +++ b/src/gui/widgets/linkhandler.h @@ -24,8 +24,6 @@ #include -#include - /** * A simple interface to windows that need to handle links from BrowserBox * widget. diff --git a/src/gui/widgets/popup.h b/src/gui/widgets/popup.h index 119ed841..7d45841b 100644 --- a/src/gui/widgets/popup.h +++ b/src/gui/widgets/popup.h @@ -23,11 +23,11 @@ #ifndef POPUP_H #define POPUP_H -#include "gui/widgets/container.h" - #include "configuration.h" #include "guichanfwd.h" +#include "gui/widgets/container.h" + class Skin; class WindowContainer; diff --git a/src/gui/widgets/progressbar.h b/src/gui/widgets/progressbar.h index a0a8f951..20e0d169 100644 --- a/src/gui/widgets/progressbar.h +++ b/src/gui/widgets/progressbar.h @@ -22,10 +22,10 @@ #ifndef PROGRESSBAR_H #define PROGRESSBAR_H -#include - #include +#include + class ImageRect; /** diff --git a/src/gui/widgets/tab.cpp b/src/gui/widgets/tab.cpp index 9abe1f58..6ad25125 100644 --- a/src/gui/widgets/tab.cpp +++ b/src/gui/widgets/tab.cpp @@ -25,12 +25,12 @@ #include "graphics.h" #include "gui/palette.h" +#include "gui/skin.h" #include "gui/widgets/tabbedarea.h" #include "resources/image.h" #include "resources/resourcemanager.h" -#include "gui/skin.h" #include "utils/dtor.h" diff --git a/src/gui/worldselectdialog.h b/src/gui/worldselectdialog.h index acd00898..fc622071 100644 --- a/src/gui/worldselectdialog.h +++ b/src/gui/worldselectdialog.h @@ -29,6 +29,7 @@ #include #include #include + #include class LoginData; -- cgit v1.2.3-70-g09d2