diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2011-04-09 01:24:21 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2011-04-09 17:54:13 +0200 |
| commit | c1d1f57158dd4cf0baf52313fb9d538b87940c67 (patch) | |
| tree | 4bfd822f5bc341818684e607454e3096c89ab64f | |
| parent | 72d83cf5ae523f16fd5313c20f711f6030350d05 (diff) | |
| download | mana-c1d1f57158dd4cf0baf52313fb9d538b87940c67.tar.gz mana-c1d1f57158dd4cf0baf52313fb9d538b87940c67.tar.bz2 mana-c1d1f57158dd4cf0baf52313fb9d538b87940c67.tar.xz mana-c1d1f57158dd4cf0baf52313fb9d538b87940c67.zip | |
Removed a lot of useless "documentation"
I have to admit I contributed a large part of these. Sorry for that.
Less empty space, more attention to the code.
Acked-by: Jared Adams
98 files changed, 25 insertions, 488 deletions
diff --git a/src/chatlog.h b/src/chatlog.h index c359e953..a21408d3 100644 --- a/src/chatlog.h +++ b/src/chatlog.h @@ -27,9 +27,6 @@ class ChatLogger { public: - /** - * Constructor. - */ ChatLogger(); /** diff --git a/src/commandhandler.h b/src/commandhandler.h index c14305e1..97055318 100644 --- a/src/commandhandler.h +++ b/src/commandhandler.h @@ -37,14 +37,8 @@ extern ChatTab *localChatTab; class CommandHandler { public: - /** - * Constructor - */ CommandHandler(); - /** - * Destructor - */ ~CommandHandler() {} /** diff --git a/src/emoteshortcut.h b/src/emoteshortcut.h index a95bb264..ea1b73c8 100644 --- a/src/emoteshortcut.h +++ b/src/emoteshortcut.h @@ -29,14 +29,8 @@ class EmoteShortcut { public: - /** - * Constructor. - */ EmoteShortcut(); - /** - * Destructor. - */ ~EmoteShortcut(); /** diff --git a/src/equipment.h b/src/equipment.h index 0aa10fb0..2ef970ea 100644 --- a/src/equipment.h +++ b/src/equipment.h @@ -29,14 +29,8 @@ class Item; class Equipment { public: - /** - * Constructor. - */ Equipment(): mBackend(0) {} - /** - * Destructor. - */ ~Equipment() { mBackend = 0; } class Backend { diff --git a/src/flooritem.h b/src/flooritem.h index e599c939..ad052461 100644 --- a/src/flooritem.h +++ b/src/flooritem.h @@ -72,4 +72,4 @@ class FloorItem : public ActorSprite int mX, mY; }; -#endif +#endif // FLOORITEM_H diff --git a/src/graphics.h b/src/graphics.h index 344c31c3..4fec02f8 100644 --- a/src/graphics.h +++ b/src/graphics.h @@ -78,14 +78,8 @@ class Graphics : public gcn::SDLGraphics BLIT_GFX }; - /** - * Constructor. - */ Graphics(); - /** - * Destructor. - */ virtual ~Graphics(); /** diff --git a/src/gui/beingpopup.h b/src/gui/beingpopup.h index 514a6e7e..7058d783 100644 --- a/src/gui/beingpopup.h +++ b/src/gui/beingpopup.h @@ -32,14 +32,8 @@ class Label; class BeingPopup : public Popup { public: - /** - * Constructor. Initializes the being popup. - */ BeingPopup(); - /** - * Destructor. Cleans up the being popup on deletion. - */ ~BeingPopup(); /** diff --git a/src/gui/buy.h b/src/gui/buy.h index c3cb3229..68d318eb 100644 --- a/src/gui/buy.h +++ b/src/gui/buy.h @@ -42,16 +42,8 @@ class BuyDialog : public Window, public gcn::ActionListener, public gcn::SelectionListener { public: - /** - * Constructor. - * - * @see Window::Window - */ BuyDialog(int npcId); - /** - * Destructor - */ ~BuyDialog(); /** diff --git a/src/gui/changeemaildialog.h b/src/gui/changeemaildialog.h index 84838d15..04fca908 100644 --- a/src/gui/changeemaildialog.h +++ b/src/gui/changeemaildialog.h @@ -38,16 +38,8 @@ class WrongDataNoticeListener; class ChangeEmailDialog : public Window, public gcn::ActionListener { public: - /** - * Constructor. - * - * @see Window::Window - */ ChangeEmailDialog(LoginData *loginData); - /** - * Destructor. - */ ~ChangeEmailDialog(); /** diff --git a/src/gui/changepassworddialog.h b/src/gui/changepassworddialog.h index d356a5df..0b28a11d 100644 --- a/src/gui/changepassworddialog.h +++ b/src/gui/changepassworddialog.h @@ -38,16 +38,8 @@ class WrongDataNoticeListener; class ChangePasswordDialog : public Window, public gcn::ActionListener { public: - /** - * Constructor - * - * @see Window::Window - */ ChangePasswordDialog(LoginData *loginData); - /** - * Destructor - */ ~ChangePasswordDialog(); /** diff --git a/src/gui/charcreatedialog.h b/src/gui/charcreatedialog.h index d6b6d390..ff59b30a 100644 --- a/src/gui/charcreatedialog.h +++ b/src/gui/charcreatedialog.h @@ -45,14 +45,8 @@ class PlayerBox; class CharCreateDialog : public Window, public gcn::ActionListener { public: - /** - * Constructor. - */ CharCreateDialog(CharSelectDialog *parent, int slot); - /** - * Destructor. - */ ~CharCreateDialog(); void action(const gcn::ActionEvent &event); diff --git a/src/gui/charselectdialog.h b/src/gui/charselectdialog.h index 455ec2df..e180b2c2 100644 --- a/src/gui/charselectdialog.h +++ b/src/gui/charselectdialog.h @@ -50,9 +50,6 @@ class CharSelectDialog : public Window, public gcn::ActionListener, friend class CharDeleteConfirm; friend class Net::CharHandler; - /** - * Constructor. - */ CharSelectDialog(LoginData *loginData); ~CharSelectDialog(); diff --git a/src/gui/chat.h b/src/gui/chat.h index b0d2bfa8..c6acf532 100644 --- a/src/gui/chat.h +++ b/src/gui/chat.h @@ -80,9 +80,6 @@ class ChatWindow : public Window, public EventListener { public: - /** - * Constructor. - */ ChatWindow(); /** diff --git a/src/gui/confirmdialog.h b/src/gui/confirmdialog.h index 074b970d..49e9c127 100644 --- a/src/gui/confirmdialog.h +++ b/src/gui/confirmdialog.h @@ -36,11 +36,6 @@ class TextBox; class ConfirmDialog : public Window, public gcn::ActionListener { public: - /** - * Constructor. - * - * @see Window::Window - */ ConfirmDialog(const std::string &title, const std::string &msg, Window *parent = NULL); diff --git a/src/gui/debugwindow.h b/src/gui/debugwindow.h index 53828422..6fd34420 100644 --- a/src/gui/debugwindow.h +++ b/src/gui/debugwindow.h @@ -34,9 +34,6 @@ class Label; class DebugWindow : public Window { public: - /** - * Constructor. - */ DebugWindow(); /** diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h index a0fa6acb..5ba15ae3 100644 --- a/src/gui/equipmentwindow.h +++ b/src/gui/equipmentwindow.h @@ -40,14 +40,8 @@ class ItemPopup; class EquipmentWindow : public Window, public gcn::ActionListener { public: - /** - * Constructor. - */ EquipmentWindow(Equipment *equipment); - /** - * Destructor. - */ ~EquipmentWindow(); /** @@ -91,25 +85,17 @@ namespace TmwAthena { class TaEquipmentWindow : public EquipmentWindow { public: - /** - * Constructor. - */ TaEquipmentWindow(Equipment *equipment); - - /** - * Destructor. - */ ~TaEquipmentWindow(); /** * Draws the equipment window using TmwAthena routine. */ void draw(gcn::Graphics *graphics); - }; -}; // namespace TmwAthena +} // namespace TmwAthena extern EquipmentWindow *equipmentWindow; -#endif +#endif // EQUIPMENTWINDOW_H diff --git a/src/gui/gui.h b/src/gui/gui.h index 112abcee..fa7102fe 100644 --- a/src/gui/gui.h +++ b/src/gui/gui.h @@ -47,14 +47,8 @@ class SDLInput; class Gui : public gcn::Gui { public: - /** - * Constructor. - */ Gui(Graphics *screen); - /** - * Destructor. - */ ~Gui(); /** diff --git a/src/gui/help.h b/src/gui/help.h index 581a971e..add49ced 100644 --- a/src/gui/help.h +++ b/src/gui/help.h @@ -37,9 +37,6 @@ class HelpWindow : public Window, public LinkHandler, public gcn::ActionListener { public: - /** - * Constructor. - */ HelpWindow(); /** diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h index 0cdb1dbd..ebd2be22 100644 --- a/src/gui/inventorywindow.h +++ b/src/gui/inventorywindow.h @@ -52,14 +52,8 @@ class InventoryWindow : public Window, public EventListener { public: - /** - * Constructor. - */ InventoryWindow(Inventory *inventory); - /** - * Destructor. - */ ~InventoryWindow(); /** diff --git a/src/gui/login.h b/src/gui/login.h index 93bae338..38e858f6 100644 --- a/src/gui/login.h +++ b/src/gui/login.h @@ -42,11 +42,6 @@ class LoginDialog : public Window, public gcn::ActionListener, public gcn::KeyListener { public: - /** - * Constructor - * - * @see Window::Window - */ LoginDialog(LoginData *loginData); ~LoginDialog(); diff --git a/src/gui/npcdialog.h b/src/gui/npcdialog.h index 976e0d14..433c045e 100644 --- a/src/gui/npcdialog.h +++ b/src/gui/npcdialog.h @@ -48,11 +48,6 @@ class NpcDialog : public Window, public gcn::ActionListener, public gcn::ListModel, public EventListener { public: - /** - * Constructor. - * - * @see Window::Window - */ NpcDialog(int npcId); ~NpcDialog(); diff --git a/src/gui/npcpostdialog.h b/src/gui/npcpostdialog.h index 248e4515..db8d1a68 100644 --- a/src/gui/npcpostdialog.h +++ b/src/gui/npcpostdialog.h @@ -32,9 +32,6 @@ class TextField; class NpcPostDialog : public Window, public gcn::ActionListener { public: - /** - * Constructor - */ NpcPostDialog(int npcId); ~NpcPostDialog(); diff --git a/src/gui/okdialog.h b/src/gui/okdialog.h index 9974e235..68841566 100644 --- a/src/gui/okdialog.h +++ b/src/gui/okdialog.h @@ -36,11 +36,6 @@ class TextBox; class OkDialog : public Window, public gcn::ActionListener { public: - /** - * Constructor. - * - * @see Window::Window - */ OkDialog(const std::string &title, const std::string &msg, bool modal = true, Window *parent = NULL); diff --git a/src/gui/outfitwindow.h b/src/gui/outfitwindow.h index a6051ecb..21cf6940 100644 --- a/src/gui/outfitwindow.h +++ b/src/gui/outfitwindow.h @@ -37,14 +37,8 @@ class Label; class OutfitWindow : public Window, gcn::ActionListener { public: - /** - * Constructor. - */ OutfitWindow(); - /** - * Destructor. - */ ~OutfitWindow(); void action(const gcn::ActionEvent &event); diff --git a/src/gui/palette.h b/src/gui/palette.h index ee748e74..51cf7d5f 100644 --- a/src/gui/palette.h +++ b/src/gui/palette.h @@ -127,14 +127,8 @@ class Palette typedef std::set<Palette*> Palettes; static Palettes mInstances; - /** - * Constructor - */ Palette(int size); - /** - * Destructor - */ ~Palette(); void advanceGradient(); diff --git a/src/gui/popupmenu.h b/src/gui/popupmenu.h index 3bb49967..969c5c20 100644 --- a/src/gui/popupmenu.h +++ b/src/gui/popupmenu.h @@ -37,9 +37,6 @@ class Window; class PopupMenu : public Popup, public LinkHandler { public: - /** - * Constructor. - */ PopupMenu(); /** diff --git a/src/gui/quitdialog.h b/src/gui/quitdialog.h index d0dc2c69..65a325b8 100644 --- a/src/gui/quitdialog.h +++ b/src/gui/quitdialog.h @@ -45,9 +45,6 @@ class QuitDialog : public Window, public gcn::ActionListener, */ QuitDialog(QuitDialog **pointerToMe); - /** - * Destructor - */ ~QuitDialog(); /** diff --git a/src/gui/register.h b/src/gui/register.h index 3c65695b..fe54812b 100644 --- a/src/gui/register.h +++ b/src/gui/register.h @@ -63,9 +63,6 @@ class RegisterDialog : public Window, public gcn::ActionListener, */ RegisterDialog(LoginData *loginData); - /** - * Destructor - */ ~RegisterDialog(); /** diff --git a/src/gui/sell.h b/src/gui/sell.h index c286dcc2..8db0b573 100644 --- a/src/gui/sell.h +++ b/src/gui/sell.h @@ -41,16 +41,8 @@ class ShopListBox; class SellDialog : public Window, gcn::ActionListener, gcn::SelectionListener { public: - /** - * Constructor. - * - * @see Window::Window - */ SellDialog(int npcId); - /** - * Destructor - */ virtual ~SellDialog(); /** diff --git a/src/gui/serverdialog.h b/src/gui/serverdialog.h index a222912d..d34fbb9f 100644 --- a/src/gui/serverdialog.h +++ b/src/gui/serverdialog.h @@ -111,16 +111,8 @@ class ServerDialog : public Window, public gcn::SelectionListener { public: - /** - * Constructor - * - * @see Window::Window - */ ServerDialog(ServerInfo *serverInfo, const std::string &dir); - /** - * Destructor - */ ~ServerDialog(); /** diff --git a/src/gui/setup_keyboard.h b/src/gui/setup_keyboard.h index 4c916705..5a455adb 100644 --- a/src/gui/setup_keyboard.h +++ b/src/gui/setup_keyboard.h @@ -32,14 +32,8 @@ class Setup_Keyboard : public SetupTab, public gcn::ActionListener { public: - /** - * Constructor - */ Setup_Keyboard(); - /** - * Destructor - */ ~Setup_Keyboard(); void apply(); diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp index 2ef7ce6c..0c2ebf83 100644 --- a/src/gui/setup_video.cpp +++ b/src/gui/setup_video.cpp @@ -61,14 +61,8 @@ extern Graphics *graphics; class ModeListModel : public gcn::ListModel { public: - /** - * Constructor. - */ ModeListModel(); - /** - * Destructor. - */ virtual ~ModeListModel() { } /** diff --git a/src/gui/shortcutwindow.h b/src/gui/shortcutwindow.h index a0f82541..f5905e31 100644 --- a/src/gui/shortcutwindow.h +++ b/src/gui/shortcutwindow.h @@ -35,14 +35,8 @@ class ShortcutContainer; class ShortcutWindow : public Window { public: - /** - * Constructor. - */ ShortcutWindow(const std::string &title, ShortcutContainer *content); - /** - * Destructor. - */ ~ShortcutWindow(); private: diff --git a/src/gui/speechbubble.h b/src/gui/speechbubble.h index 6017398a..7316cf96 100644 --- a/src/gui/speechbubble.h +++ b/src/gui/speechbubble.h @@ -32,9 +32,6 @@ class TextBox; class SpeechBubble : public Popup { public: - /** - * Constructor. Initializes the speech bubble. - */ SpeechBubble(); /** diff --git a/src/gui/statuswindow.h b/src/gui/statuswindow.h index 53bc05cf..9120d978 100644 --- a/src/gui/statuswindow.h +++ b/src/gui/statuswindow.h @@ -43,9 +43,6 @@ class VertContainer; class StatusWindow : public Window, public EventListener { public: - /** - * Constructor. - */ StatusWindow(); void event(Event::Channel channel, const Event &event); diff --git a/src/gui/textdialog.h b/src/gui/textdialog.h index aa8fcf8f..ccaa69ce 100644 --- a/src/gui/textdialog.h +++ b/src/gui/textdialog.h @@ -36,11 +36,6 @@ class TextField; class TextDialog : public Window, public gcn::ActionListener { public: - /** - * Constructor. - * - * @see Window::Window - */ TextDialog(const std::string &title, const std::string &msg, Window *parent = NULL, bool autoCompleteEnabled = false); diff --git a/src/gui/textpopup.h b/src/gui/textpopup.h index 51646590..04911d37 100644 --- a/src/gui/textpopup.h +++ b/src/gui/textpopup.h @@ -36,21 +36,15 @@ class TextBox; class TextPopup : public Popup { public: - /** - * Constructor. Initializes the item popup. - */ TextPopup(); - /** - * Destructor. Cleans up the item popup on deletion. - */ ~TextPopup(); /** * Sets the text to be displayed. */ void show(int x, int y, const std::string &str1) - { show(x, y, str1, (const char*)""); }; + { show(x, y, str1, (const char*)""); } /** * Sets the text to be displayed. diff --git a/src/gui/trade.h b/src/gui/trade.h index e22f8863..f854d698 100644 --- a/src/gui/trade.h +++ b/src/gui/trade.h @@ -42,14 +42,8 @@ class ScrollArea; class TradeWindow : public Window, gcn::ActionListener, gcn::SelectionListener { public: - /** - * Constructor. - */ TradeWindow(); - /** - * Destructor. - */ ~TradeWindow(); /** diff --git a/src/gui/truetypefont.h b/src/gui/truetypefont.h index 689f45bf..41db3f86 100644 --- a/src/gui/truetypefont.h +++ b/src/gui/truetypefont.h @@ -56,9 +56,6 @@ class TrueTypeFont : public gcn::Font */ TrueTypeFont(const std::string &filename, int size, int style = 0); - /** - * Destructor. - */ ~TrueTypeFont(); virtual int getWidth(const std::string &text) const; diff --git a/src/gui/unregisterdialog.h b/src/gui/unregisterdialog.h index 87999d5d..503e0258 100644 --- a/src/gui/unregisterdialog.h +++ b/src/gui/unregisterdialog.h @@ -38,11 +38,6 @@ class WrongDataNoticeListener; class UnRegisterDialog : public Window, public gcn::ActionListener { public: - /** - * Constructor - * - * @see Window::Window - */ UnRegisterDialog(LoginData *loginData); ~UnRegisterDialog(); diff --git a/src/gui/updatewindow.h b/src/gui/updatewindow.h index a62a2ad7..4f6d428a 100644 --- a/src/gui/updatewindow.h +++ b/src/gui/updatewindow.h @@ -71,9 +71,6 @@ class UpdaterWindow : public Window, public gcn::ActionListener, const std::string &updatesDir, bool applyUpdates); - /** - * Destructor - */ ~UpdaterWindow(); /** diff --git a/src/gui/viewport.h b/src/gui/viewport.h index ce535a64..d8687219 100644 --- a/src/gui/viewport.h +++ b/src/gui/viewport.h @@ -57,14 +57,8 @@ class Viewport : public WindowContainer, public gcn::MouseListener, public EventListener { public: - /** - * Constructor. - */ Viewport(); - /** - * Destructor. - */ ~Viewport(); /** diff --git a/src/gui/widgets/browserbox.h b/src/gui/widgets/browserbox.h index 54a2a8cc..28ec734a 100644 --- a/src/gui/widgets/browserbox.h +++ b/src/gui/widgets/browserbox.h @@ -72,14 +72,8 @@ class BrowserBox : public gcn::Widget, public gcn::MouseListener { public: - /** - * Constructor. - */ BrowserBox(unsigned int mode = AUTO_SIZE, bool opaque = true); - /** - * Destructor. - */ ~BrowserBox(); /** diff --git a/src/gui/widgets/button.h b/src/gui/widgets/button.h index aa37261e..b750d9bb 100644 --- a/src/gui/widgets/button.h +++ b/src/gui/widgets/button.h @@ -46,9 +46,6 @@ class Button : public gcn::Button Button(const std::string &caption, const std::string &actionEventId, gcn::ActionListener *listener); - /** - * Destructor. - */ ~Button(); /** diff --git a/src/gui/widgets/channeltab.h b/src/gui/widgets/channeltab.h index 842b80f7..0272655b 100644 --- a/src/gui/widgets/channeltab.h +++ b/src/gui/widgets/channeltab.h @@ -43,14 +43,8 @@ class ChannelTab : public ChatTab protected: friend class Channel; - /** - * Constructor. - */ ChannelTab(Channel *channel); - /** - * Destructor. - */ ~ChannelTab(); void handleInput(const std::string &msg); diff --git a/src/gui/widgets/chattab.h b/src/gui/widgets/chattab.h index 1e187f23..6d262e11 100644 --- a/src/gui/widgets/chattab.h +++ b/src/gui/widgets/chattab.h @@ -37,9 +37,6 @@ class ScrollArea; class ChatTab : public Tab, public AutoCompleteLister { public: - /** - * Constructor. - */ ChatTab(const std::string &name); ~ChatTab(); diff --git a/src/gui/widgets/checkbox.h b/src/gui/widgets/checkbox.h index a7daa52d..27962f72 100644 --- a/src/gui/widgets/checkbox.h +++ b/src/gui/widgets/checkbox.h @@ -34,14 +34,8 @@ class Image; class CheckBox : public gcn::CheckBox { public: - /** - * Constructor. - */ CheckBox(const std::string &caption, bool selected = false); - /** - * Destructor. - */ ~CheckBox(); /** diff --git a/src/gui/widgets/emoteshortcutcontainer.h b/src/gui/widgets/emoteshortcutcontainer.h index c3fb9d14..0021d838 100644 --- a/src/gui/widgets/emoteshortcutcontainer.h +++ b/src/gui/widgets/emoteshortcutcontainer.h @@ -35,14 +35,8 @@ class ImageSprite; class EmoteShortcutContainer : public ShortcutContainer { public: - /** - * Constructor. Initializes the graphic. - */ EmoteShortcutContainer(); - /** - * Destructor. - */ virtual ~EmoteShortcutContainer(); /** diff --git a/src/gui/widgets/flowcontainer.h b/src/gui/widgets/flowcontainer.h index a0e8dbf5..ee9f634b 100644 --- a/src/gui/widgets/flowcontainer.h +++ b/src/gui/widgets/flowcontainer.h @@ -34,17 +34,9 @@ class FlowContainer : public Container, public gcn::WidgetListener { public: - /** - * Constructor. Initializes the shortcut container. - */ FlowContainer(int boxWidth, int boxHeight); /** - * Destructor. - */ - ~FlowContainer() {} - - /** * Invoked when a widget changes its size. This is used to determine * the new height of the container. */ diff --git a/src/gui/widgets/icon.h b/src/gui/widgets/icon.h index 27ed0db8..7b297756 100644 --- a/src/gui/widgets/icon.h +++ b/src/gui/widgets/icon.h @@ -36,6 +36,8 @@ class Icon : public gcn::Widget public: /** * Constructor. + * + * @param filename The file name of the image to display */ Icon(const std::string &filename); @@ -44,7 +46,7 @@ class Icon : public gcn::Widget */ Icon(Image *image); - /** + /** * Gets the current Image. */ Image *getImage() const { return mImage; } diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h index 89012a37..ca21ad3f 100644 --- a/src/gui/widgets/itemcontainer.h +++ b/src/gui/widgets/itemcontainer.h @@ -60,9 +60,6 @@ class ItemContainer : public gcn::Widget, */ ItemContainer(Inventory *inventory, bool forceQuantity = false); - /** - * Destructor. - */ virtual ~ItemContainer(); /** diff --git a/src/gui/widgets/itemshortcutcontainer.h b/src/gui/widgets/itemshortcutcontainer.h index 9ec3f4c1..80f29c7b 100644 --- a/src/gui/widgets/itemshortcutcontainer.h +++ b/src/gui/widgets/itemshortcutcontainer.h @@ -38,14 +38,8 @@ class ItemPopup; class ItemShortcutContainer : public ShortcutContainer { public: - /** - * Constructor. Initializes the graphic. - */ ItemShortcutContainer(); - /** - * Destructor. - */ virtual ~ItemShortcutContainer(); /** diff --git a/src/gui/widgets/label.h b/src/gui/widgets/label.h index 2dfa254c..6b9cd2a8 100644 --- a/src/gui/widgets/label.h +++ b/src/gui/widgets/label.h @@ -1,6 +1,6 @@ /* * The Mana Client - * Copyright (c) 2009 Aethyra Development Team + * Copyright (c) 2009 Aethyra Development Team * * This file is part of The Mana Client. * @@ -32,9 +32,6 @@ class Label : public gcn::Label { public: - /** - * Constructor. - */ Label(); /** diff --git a/src/gui/widgets/layouthelper.h b/src/gui/widgets/layouthelper.h index cf966029..0aeabb0d 100644 --- a/src/gui/widgets/layouthelper.h +++ b/src/gui/widgets/layouthelper.h @@ -34,14 +34,8 @@ class LayoutHelper : public gcn::WidgetListener { public: - /** - * Constructor. - */ LayoutHelper(gcn::Container *container); - /** - * Destructor. - */ ~LayoutHelper(); /** diff --git a/src/gui/widgets/listbox.h b/src/gui/widgets/listbox.h index 8b8c8b54..92505c15 100644 --- a/src/gui/widgets/listbox.h +++ b/src/gui/widgets/listbox.h @@ -36,9 +36,6 @@ class SelectionListener; class ListBox : public gcn::ListBox { public: - /** - * Constructor. - */ ListBox(gcn::ListModel *listModel); ~ListBox(); diff --git a/src/gui/widgets/passwordfield.h b/src/gui/widgets/passwordfield.h index 619cd842..0058233c 100644 --- a/src/gui/widgets/passwordfield.h +++ b/src/gui/widgets/passwordfield.h @@ -35,7 +35,7 @@ class PasswordField : public TextField /** * Constructor, initializes the password field with the given string. */ - PasswordField(const std::string &text = ""); + PasswordField(const std::string &text = std::string()); /** * Draws the password field. diff --git a/src/gui/widgets/playerbox.h b/src/gui/widgets/playerbox.h index 4ce6782d..f6e70ef7 100644 --- a/src/gui/widgets/playerbox.h +++ b/src/gui/widgets/playerbox.h @@ -41,9 +41,6 @@ class PlayerBox : public gcn::ScrollArea */ PlayerBox(const Being *being = 0); - /** - * Destructor. - */ ~PlayerBox(); /** diff --git a/src/gui/widgets/radiobutton.h b/src/gui/widgets/radiobutton.h index 7f839ea5..f8aa40f1 100644 --- a/src/gui/widgets/radiobutton.h +++ b/src/gui/widgets/radiobutton.h @@ -32,15 +32,9 @@ class Image; class RadioButton : public gcn::RadioButton { public: - /** - * Constructor. - */ RadioButton(const std::string &caption,const std::string &group, bool marked = false); - /** - * Destructor. - */ ~RadioButton(); /** diff --git a/src/gui/widgets/resizegrip.h b/src/gui/widgets/resizegrip.h index 5ef93f29..319b574f 100644 --- a/src/gui/widgets/resizegrip.h +++ b/src/gui/widgets/resizegrip.h @@ -36,14 +36,8 @@ class Image; class ResizeGrip : public gcn::Widget { public: - /** - * Constructor. - */ ResizeGrip(const std::string &image = "resize.png"); - /** - * Destructor. - */ ~ResizeGrip(); /** diff --git a/src/gui/widgets/shoplistbox.h b/src/gui/widgets/shoplistbox.h index 087bdd53..325cb562 100644 --- a/src/gui/widgets/shoplistbox.h +++ b/src/gui/widgets/shoplistbox.h @@ -37,9 +37,6 @@ class ItemPopup; class ShopListBox : public ListBox { public: - /** - * Constructor. - */ ShopListBox(gcn::ListModel *listModel); /** @@ -47,9 +44,6 @@ class ShopListBox : public ListBox */ ShopListBox(gcn::ListModel *listModel, ShopItems *shopListModel); - /** - * Destructor - */ ~ShopListBox(); /** diff --git a/src/gui/widgets/shortcutcontainer.h b/src/gui/widgets/shortcutcontainer.h index 9404ffd2..e511d7f9 100644 --- a/src/gui/widgets/shortcutcontainer.h +++ b/src/gui/widgets/shortcutcontainer.h @@ -38,14 +38,8 @@ class ShortcutContainer : public gcn::Widget, public gcn::MouseListener { public: - /** - * Constructor. Initializes the shortcut container. - */ ShortcutContainer(); - /** - * Destructor. - */ ~ShortcutContainer() {} /** diff --git a/src/gui/widgets/slider.h b/src/gui/widgets/slider.h index 9b26e404..408210ac 100644 --- a/src/gui/widgets/slider.h +++ b/src/gui/widgets/slider.h @@ -31,7 +31,8 @@ class Image; * * \ingroup GUI */ -class Slider : public gcn::Slider { +class Slider : public gcn::Slider +{ public: /** * Constructor with scale start equal to 0. @@ -40,12 +41,12 @@ class Slider : public gcn::Slider { /** * Constructor. + * + * @param scaleStart The minimum value of the slider + * @param scaleEnd The maximum value of the slider */ Slider(double scaleStart, double scaleEnd); - /** - * Destructor. - */ ~Slider(); /** diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h index 19393f8b..d364eac5 100644 --- a/src/gui/widgets/tabbedarea.h +++ b/src/gui/widgets/tabbedarea.h @@ -39,9 +39,6 @@ class Tab; class TabbedArea : public gcn::TabbedArea, public gcn::WidgetListener { public: - /** - * Constructor. - */ TabbedArea(); /** diff --git a/src/gui/widgets/textbox.h b/src/gui/widgets/textbox.h index 3b6778d2..6b947e0b 100644 --- a/src/gui/widgets/textbox.h +++ b/src/gui/widgets/textbox.h @@ -34,9 +34,6 @@ class TextBox : public gcn::TextBox { public: - /** - * Constructor. - */ TextBox(); inline void setTextColor(const gcn::Color *color) diff --git a/src/gui/worldselectdialog.h b/src/gui/worldselectdialog.h index b51110b4..624560c3 100644 --- a/src/gui/worldselectdialog.h +++ b/src/gui/worldselectdialog.h @@ -43,16 +43,8 @@ class WorldListModel; class WorldSelectDialog : public Window, public gcn::ActionListener, public gcn::KeyListener { public: - /** - * Constructor - * - * @see Window::Window - */ WorldSelectDialog(Worlds worlds); - /** - * Destructor. - */ ~WorldSelectDialog(); /** diff --git a/src/imageparticle.h b/src/imageparticle.h index 23909fa3..5c4e4bf1 100644 --- a/src/imageparticle.h +++ b/src/imageparticle.h @@ -41,9 +41,6 @@ class ImageParticle : public Particle */ ImageParticle(Map *map, Image *image); - /** - * Destructor. - */ ~ImageParticle(); /** diff --git a/src/inventory.h b/src/inventory.h index 7af9f160..5a1d2c0a 100644 --- a/src/inventory.h +++ b/src/inventory.h @@ -58,9 +58,6 @@ class Inventory */ Inventory(Type type, int size = -1); - /** - * Destructor. - */ ~Inventory(); /** @@ -34,14 +34,8 @@ class Image; class Item { public: - /** - * Constructor. - */ Item(int id = -1, int quantity = 0, bool equipped = false); - /** - * Destructor. - */ virtual ~Item(); /** @@ -131,7 +125,6 @@ class Item bool mEquipped; /**< Item is equipped. */ bool mInEquipment; /**< Item is in equipment */ int mInvIndex; /**< Inventory index. */ - }; -#endif +#endif // ITEM_H diff --git a/src/itemshortcut.h b/src/itemshortcut.h index 619d4054..b1566a61 100644 --- a/src/itemshortcut.h +++ b/src/itemshortcut.h @@ -32,14 +32,8 @@ class Item; class ItemShortcut { public: - /** - * Constructor. - */ ItemShortcut(); - /** - * Destructor. - */ ~ItemShortcut(); /** diff --git a/src/localplayer.h b/src/localplayer.h index 54c1a2e7..e7fd78f6 100644 --- a/src/localplayer.h +++ b/src/localplayer.h @@ -55,7 +55,7 @@ enum PICKUP_TOO_FAR, PICKUP_INV_FULL, PICKUP_STACK_FULL, - PICKUP_DROP_STEAL, + PICKUP_DROP_STEAL }; @@ -65,14 +65,8 @@ enum class LocalPlayer : public Being { public: - /** - * Constructor. - */ LocalPlayer(int id= 65535, int subtype = 0); - /** - * Destructor. - */ ~LocalPlayer(); virtual void logic(); @@ -267,4 +261,4 @@ class LocalPlayer : public Being extern LocalPlayer *player_node; -#endif +#endif // LOCALPLAYER_H @@ -30,9 +30,6 @@ class Logger { public: - /** - * Constructor. - */ Logger(); /** diff --git a/src/map.cpp b/src/map.cpp index 87c902f6..151cbf53 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -46,9 +46,6 @@ */ struct Location { - /** - * Constructor. - */ Location(int px, int py, MetaTile *ptile): x(px), y(py), tile(ptile) {} @@ -47,9 +47,6 @@ typedef std::vector<MapLayer*> Layers; */ struct MetaTile { - /** - * Constructor. - */ MetaTile() : whichList(0), blockmask(0) {} // Pathfinding members @@ -93,9 +90,6 @@ class MapLayer */ MapLayer(int x, int y, int width, int height, bool isFringeLayer); - /** - * Destructor. - */ ~MapLayer(); /** @@ -176,9 +170,6 @@ class Map : public Properties */ Map(int width, int height, int tileWidth, int tileHeight); - /** - * Destructor. - */ ~Map(); /** diff --git a/src/net/logindata.h b/src/net/logindata.h index 4a1c1a9f..dc2ef52b 100644 --- a/src/net/logindata.h +++ b/src/net/logindata.h @@ -29,9 +29,6 @@ class LoginData { public: - /** - * Constructor - */ LoginData() { resetCharacterSlots(); @@ -57,7 +54,7 @@ public: */ void resetCharacterSlots() { - characterSlots = 3; // Default value, used for TmwAthena. + characterSlots = 3; // Default value, used for TmwAthena. } void clear() diff --git a/src/net/manaserv/messagein.h b/src/net/manaserv/messagein.h index fe77c436..6d0a4035 100644 --- a/src/net/manaserv/messagein.h +++ b/src/net/manaserv/messagein.h @@ -34,9 +34,6 @@ namespace ManaServ { class MessageIn : public Net::MessageIn { public: - /** - * Constructor. - */ MessageIn(const char *data, unsigned int length); int readInt16(); /**< Reads a short. */ diff --git a/src/net/manaserv/messageout.h b/src/net/manaserv/messageout.h index 7c474cda..451bc0aa 100644 --- a/src/net/manaserv/messageout.h +++ b/src/net/manaserv/messageout.h @@ -29,14 +29,8 @@ namespace ManaServ { class MessageOut : public Net::MessageOut { public: - /** - * Constructor. - */ MessageOut(short id); - /** - * Destructor. - */ ~MessageOut(); void writeInt16(Sint16 value); /**< Writes a short. */ diff --git a/src/net/messagein.h b/src/net/messagein.h index e6118a04..29f5e930 100644 --- a/src/net/messagein.h +++ b/src/net/messagein.h @@ -89,9 +89,6 @@ class MessageIn virtual ~MessageIn() {} protected: - /** - * Constructor. - */ MessageIn(const char *data, unsigned int length); const char *mData; /**< The message data. */ diff --git a/src/net/messageout.h b/src/net/messageout.h index 7fd6fbc5..05a55422 100644 --- a/src/net/messageout.h +++ b/src/net/messageout.h @@ -59,9 +59,6 @@ class MessageOut virtual ~MessageOut() {} protected: - /** - * Constructor. - */ MessageOut(short id); /** diff --git a/src/net/tmwa/inventoryhandler.h b/src/net/tmwa/inventoryhandler.h index 783b225d..315be16c 100644 --- a/src/net/tmwa/inventoryhandler.h +++ b/src/net/tmwa/inventoryhandler.h @@ -38,7 +38,8 @@ namespace TmwAthena { -class EquipBackend : public Equipment::Backend { +class EquipBackend : public Equipment::Backend +{ public: EquipBackend() { diff --git a/src/net/tmwa/messagein.h b/src/net/tmwa/messagein.h index aa94bba1..13d6adf5 100644 --- a/src/net/tmwa/messagein.h +++ b/src/net/tmwa/messagein.h @@ -37,9 +37,6 @@ namespace TmwAthena { class MessageIn : public Net::MessageIn { public: - /** - * Constructor. - */ MessageIn(const char *data, unsigned int length); int readInt16(); /**< Reads a short. */ diff --git a/src/net/tmwa/messageout.h b/src/net/tmwa/messageout.h index c9d87a1b..34958e82 100644 --- a/src/net/tmwa/messageout.h +++ b/src/net/tmwa/messageout.h @@ -39,9 +39,6 @@ class Network; class MessageOut : public Net::MessageOut { public: - /** - * Constructor. - */ MessageOut(short id); void writeInt16(Sint16 value); /**< Writes a short. */ diff --git a/src/particle.h b/src/particle.h index 0e39883b..bb8b17fe 100644 --- a/src/particle.h +++ b/src/particle.h @@ -68,9 +68,6 @@ class Particle : public Actor */ Particle(Map *map); - /** - * Destructor. - */ ~Particle(); /** diff --git a/src/particleemitter.h b/src/particleemitter.h index 9baaa73c..2dd6665e 100644 --- a/src/particleemitter.h +++ b/src/particleemitter.h @@ -41,9 +41,6 @@ class Particle; class ParticleEmitter { public: - /** - * Constructor. - */ ParticleEmitter(xmlNodePtr emitterNode, Particle *target, Map *map, int rotation = 0); /** @@ -56,9 +53,6 @@ class ParticleEmitter */ ParticleEmitter & operator=(const ParticleEmitter &o); - /** - * Destructor. - */ ~ParticleEmitter(); /** diff --git a/src/properties.h b/src/properties.h index 1320b0c9..ce4904bf 100644 --- a/src/properties.h +++ b/src/properties.h @@ -32,9 +32,6 @@ class Properties { public: - /** - * Destructor. - */ virtual ~Properties() {} /** diff --git a/src/resources/image.h b/src/resources/image.h index 9fdc0997..5b361e1a 100644 --- a/src/resources/image.h +++ b/src/resources/image.h @@ -53,9 +53,6 @@ class Image : public Resource #endif public: - /** - * Destructor. - */ virtual ~Image(); /** @@ -274,9 +271,6 @@ class Image : public Resource class SubImage : public Image { public: - /** - * Constructor. - */ SubImage(Image *parent, SDL_Surface *image, int x, int y, int width, int height); #ifdef USE_OPENGL @@ -284,9 +278,6 @@ class SubImage : public Image int width, int height, int texWidth, int textHeight); #endif - /** - * Destructor. - */ ~SubImage(); /** diff --git a/src/resources/imageset.h b/src/resources/imageset.h index 3289788f..7d2ce1f2 100644 --- a/src/resources/imageset.h +++ b/src/resources/imageset.h @@ -39,9 +39,6 @@ class ImageSet : public Resource */ ImageSet(Image *img, int w, int h, int margin = 0, int spacing = 0); - /** - * Destructor. - */ ~ImageSet(); /** diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h index 50633f71..7b9e7287 100644 --- a/src/resources/iteminfo.h +++ b/src/resources/iteminfo.h @@ -76,9 +76,6 @@ class ItemInfo friend class ManaServ::ManaServItemDB; public: - /** - * Constructor. - */ ItemInfo(): mType(ITEM_UNUSABLE), mWeight(0), @@ -219,16 +216,13 @@ class TaItemInfo: public ItemInfo friend class TaItemDB; public: - /** - * Constructor. - */ - TaItemInfo():ItemInfo() + TaItemInfo() : ItemInfo() {} // Declare TmwAthena Specific item info here }; -}; // namespace TmwAthena +} // namespace TmwAthena namespace ManaServ { @@ -239,16 +233,13 @@ namespace ManaServ { class ManaServItemInfo: public ItemInfo { public: - /** - * Constructor. - */ - ManaServItemInfo():ItemInfo() + ManaServItemInfo() : ItemInfo() {} // Declare Manaserv Specific item info here }; -}; // namespace ManaServ +} // namespace ManaServ #endif diff --git a/src/resources/music.h b/src/resources/music.h index c0cf5abe..2556c1ee 100644 --- a/src/resources/music.h +++ b/src/resources/music.h @@ -36,9 +36,6 @@ class Music : public Resource { public: - /** - * Destructor. - */ virtual ~Music(); /** @@ -68,9 +65,6 @@ class Music : public Resource virtual void stop(); protected: - /** - * Constructor. - */ Music(Mix_Chunk *music); //Mix_Music *music; diff --git a/src/resources/resource.h b/src/resources/resource.h index 28f390b5..69fa5dc9 100644 --- a/src/resources/resource.h +++ b/src/resources/resource.h @@ -33,9 +33,6 @@ class Resource friend class ResourceManager; public: - /** - * Constructor - */ Resource(): mRefCount(0) {} /** @@ -59,9 +56,6 @@ class Resource { return mIdPath; } protected: - /** - * Destructor. - */ virtual ~Resource(); private: diff --git a/src/resources/soundeffect.h b/src/resources/soundeffect.h index e7c832f4..bc499a96 100644 --- a/src/resources/soundeffect.h +++ b/src/resources/soundeffect.h @@ -36,9 +36,6 @@ class SoundEffect : public Resource { public: - /** - * Destructor. - */ virtual ~SoundEffect(); /** @@ -64,9 +61,6 @@ class SoundEffect : public Resource virtual bool play(int loops, int volume); protected: - /** - * Constructor. - */ SoundEffect(Mix_Chunk *soundEffect): mChunk(soundEffect) {} Mix_Chunk *mChunk; diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h index 18a70c9b..cef158fa 100644 --- a/src/resources/spritedef.h +++ b/src/resources/spritedef.h @@ -113,14 +113,8 @@ class SpriteDef : public Resource makeSpriteDirection(const std::string &direction); private: - /** - * Constructor. - */ SpriteDef() {} - /** - * Destructor. - */ ~SpriteDef(); /** diff --git a/src/resources/userpalette.h b/src/resources/userpalette.h index be02db10..01f66ca7 100644 --- a/src/resources/userpalette.h +++ b/src/resources/userpalette.h @@ -56,14 +56,8 @@ class UserPalette : public Palette, public gcn::ListModel USER_COLOR_LAST }; - /** - * Constructor - */ UserPalette(); - /** - * Destructor - */ ~UserPalette(); /** diff --git a/src/shopitem.h b/src/shopitem.h index 7a86fedc..9b3b9ec9 100644 --- a/src/shopitem.h +++ b/src/shopitem.h @@ -52,9 +52,6 @@ class ShopItem : public Item */ ShopItem(int id, int price); - /** - * Destructor. - */ ~ShopItem(); /** diff --git a/src/textmanager.h b/src/textmanager.h index 07aed2d5..13c30b14 100644 --- a/src/textmanager.h +++ b/src/textmanager.h @@ -30,9 +30,6 @@ class Text; class TextManager { public: - /** - * Constructor - */ TextManager(); /** diff --git a/src/textparticle.h b/src/textparticle.h index 79af7406..2791cb03 100644 --- a/src/textparticle.h +++ b/src/textparticle.h @@ -27,9 +27,6 @@ class TextParticle : public Particle { public: - /** - * Constructor. - */ TextParticle(Map *map, const std::string &text, const gcn::Color* color, gcn::Font *font, bool outline = false); diff --git a/src/tileset.h b/src/tileset.h index 6c2ee394..387222b3 100644 --- a/src/tileset.h +++ b/src/tileset.h @@ -30,9 +30,6 @@ class Tileset : public ImageSet { public: - /** - * Constructor. - */ Tileset(Image *img, int w, int h, int firstGid, int margin, int spacing): ImageSet(img, w, h, margin, spacing), mFirstGid(firstGid) diff --git a/src/variabledata.h b/src/variabledata.h index 9bdb9db5..0855a1d0 100644 --- a/src/variabledata.h +++ b/src/variabledata.h @@ -40,7 +40,7 @@ class VariableData DATA_ACTOR }; - virtual ~VariableData() {}; + virtual ~VariableData() {} virtual int getType() const = 0; }; diff --git a/src/vector.h b/src/vector.h index 163dcdbd..3360c20b 100644 --- a/src/vector.h +++ b/src/vector.h @@ -33,27 +33,18 @@ class Vector { public: - /** - * Constructor. - */ Vector(): x(0.0f), y(0.0f), z(0.0f) {} - /** - * Constructor. - */ Vector(float x, float y, float z = 0.0f): x(x), y(y), z(z) {} - /** - * Copy constructor. - */ Vector(const Vector &v): x(v.x), y(v.y), |