summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-04-14 17:06:02 +0300
committerAndrei Karas <akaras@inbox.ru>2013-04-14 17:06:02 +0300
commit6b5c7e7a5ed32abfc98d9acdebacc50c68a91a1d (patch)
treef1acb027394af1aec49790354df97da4665488b7 /src/gui
parenta7d7346b9eb3fa62a8912e31d5c00f8e05390425 (diff)
downloadmv-6b5c7e7a5ed32abfc98d9acdebacc50c68a91a1d.tar.gz
mv-6b5c7e7a5ed32abfc98d9acdebacc50c68a91a1d.tar.bz2
mv-6b5c7e7a5ed32abfc98d9acdebacc50c68a91a1d.tar.xz
mv-6b5c7e7a5ed32abfc98d9acdebacc50c68a91a1d.zip
another fixes from cpplint.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/beingpopup.h2
-rw-r--r--src/gui/buydialog.h4
-rw-r--r--src/gui/changeemaildialog.h4
-rw-r--r--src/gui/changepassworddialog.h2
-rw-r--r--src/gui/charcreatedialog.h2
-rw-r--r--src/gui/charselectdialog.h2
-rw-r--r--src/gui/chatwindow.h10
-rw-r--r--src/gui/didyouknowwindow.cpp2
-rw-r--r--src/gui/editserverdialog.h2
-rw-r--r--src/gui/gui.h4
-rw-r--r--src/gui/inventorywindow.cpp2
-rw-r--r--src/gui/itemamountwindow.h2
-rw-r--r--src/gui/itempopup.h2
-rw-r--r--src/gui/ministatuswindow.h2
-rw-r--r--src/gui/npcdialog.h5
-rw-r--r--src/gui/npcpostdialog.h2
-rw-r--r--src/gui/palette.h2
-rw-r--r--src/gui/questswindow.h6
-rw-r--r--src/gui/quitdialog.h2
-rw-r--r--src/gui/registerdialog.h2
-rw-r--r--src/gui/sdlinput.h3
-rw-r--r--src/gui/selldialog.h4
-rw-r--r--src/gui/setup.cpp2
-rw-r--r--src/gui/setup_audio.h2
-rw-r--r--src/gui/setup_chat.h2
-rw-r--r--src/gui/setup_colors.h4
-rw-r--r--src/gui/setup_input.h2
-rw-r--r--src/gui/setup_joystick.h2
-rw-r--r--src/gui/setup_other.h2
-rw-r--r--src/gui/setup_perfomance.h2
-rw-r--r--src/gui/setup_players.h2
-rw-r--r--src/gui/setup_relations.h2
-rw-r--r--src/gui/setup_theme.h2
-rw-r--r--src/gui/setup_touch.h2
-rw-r--r--src/gui/setup_video.h2
-rw-r--r--src/gui/setup_visual.h2
-rw-r--r--src/gui/setupactiondata.h2
-rw-r--r--src/gui/socialwindow.cpp3
-rw-r--r--src/gui/socialwindow.h2
-rw-r--r--src/gui/spellpopup.h2
-rw-r--r--src/gui/statuspopup.h2
-rw-r--r--src/gui/textcommandeditor.h2
-rw-r--r--src/gui/textpopup.h2
-rw-r--r--src/gui/unregisterdialog.h2
-rw-r--r--src/gui/updaterwindow.h3
-rw-r--r--src/gui/userpalette.cpp2
-rw-r--r--src/gui/userpalette.h2
-rw-r--r--src/gui/whoisonline.cpp2
-rw-r--r--src/gui/widgets/battletab.h2
-rw-r--r--src/gui/widgets/browserbox.h2
-rw-r--r--src/gui/widgets/button.h2
-rw-r--r--src/gui/widgets/chattab.h2
-rw-r--r--src/gui/widgets/container.h2
-rw-r--r--src/gui/widgets/desktop.h4
-rw-r--r--src/gui/widgets/dropdown.h3
-rw-r--r--src/gui/widgets/flowcontainer.cpp2
-rw-r--r--src/gui/widgets/gmtab.h4
-rw-r--r--src/gui/widgets/guitable.h7
-rw-r--r--src/gui/widgets/icon.h2
-rw-r--r--src/gui/widgets/itemshortcutcontainer.h2
-rw-r--r--src/gui/widgets/label.h2
-rw-r--r--src/gui/widgets/layout.h8
-rw-r--r--src/gui/widgets/layouthelper.h4
-rw-r--r--src/gui/widgets/playerbox.h2
-rw-r--r--src/gui/widgets/progressindicator.h2
-rw-r--r--src/gui/widgets/radiobutton.h2
-rw-r--r--src/gui/widgets/setuptab.h2
-rw-r--r--src/gui/widgets/setuptabscroll.h2
-rw-r--r--src/gui/widgets/shopitems.h4
-rw-r--r--src/gui/widgets/shoplistbox.h2
-rw-r--r--src/gui/widgets/slider.h2
-rw-r--r--src/gui/widgets/sliderlist.h2
-rw-r--r--src/gui/widgets/spellshortcutcontainer.h2
-rw-r--r--src/gui/widgets/tab.h2
-rw-r--r--src/gui/widgets/tabbedarea.cpp4
-rw-r--r--src/gui/widgets/tabbedarea.h2
-rw-r--r--src/gui/widgets/tablemodel.h2
-rw-r--r--src/gui/widgets/textbox.h2
-rw-r--r--src/gui/widgets/tradetab.h2
-rw-r--r--src/gui/widgets/whispertab.h2
-rw-r--r--src/gui/widgets/widget2.h2
-rw-r--r--src/gui/widgets/windowcontainer.h2
-rw-r--r--src/gui/windowmenu.h2
-rw-r--r--src/gui/worldselectdialog.h4
84 files changed, 106 insertions, 114 deletions
diff --git a/src/gui/beingpopup.h b/src/gui/beingpopup.h
index b18abe4e2..82b04ca85 100644
--- a/src/gui/beingpopup.h
+++ b/src/gui/beingpopup.h
@@ -60,4 +60,4 @@ class BeingPopup final : public Popup
Label *mBeingComment;
};
-#endif // BEINGPOPUP_H
+#endif // BEINGPOPUP_H
diff --git a/src/gui/buydialog.h b/src/gui/buydialog.h
index 9d6bf447c..1dd552c80 100644
--- a/src/gui/buydialog.h
+++ b/src/gui/buydialog.h
@@ -54,12 +54,12 @@ class BuyDialog final : public Window,
*
* @see Window::Window
*/
- BuyDialog(const int npcId);
+ explicit BuyDialog(const int npcId);
/**
* Constructor.
*/
- BuyDialog(std::string nick);
+ explicit BuyDialog(std::string nick);
A_DELETE_COPY(BuyDialog)
diff --git a/src/gui/changeemaildialog.h b/src/gui/changeemaildialog.h
index 36c06fcbc..b6b2c5285 100644
--- a/src/gui/changeemaildialog.h
+++ b/src/gui/changeemaildialog.h
@@ -46,7 +46,7 @@ class ChangeEmailDialog final : public Window, public gcn::ActionListener
*
* @see Window::Window
*/
- ChangeEmailDialog(LoginData *const data);
+ explicit ChangeEmailDialog(LoginData *const data);
A_DELETE_COPY(ChangeEmailDialog)
@@ -78,4 +78,4 @@ class ChangeEmailDialog final : public Window, public gcn::ActionListener
LoginData *mLoginData;
};
-#endif // GUI_CHANGEEMAIL_H
+#endif // GUI_CHANGEEMAIL_H
diff --git a/src/gui/changepassworddialog.h b/src/gui/changepassworddialog.h
index 6eb6bd48b..a7563ce52 100644
--- a/src/gui/changepassworddialog.h
+++ b/src/gui/changepassworddialog.h
@@ -46,7 +46,7 @@ class ChangePasswordDialog final : public Window, public gcn::ActionListener
*
* @see Window::Window
*/
- ChangePasswordDialog(LoginData *const data);
+ explicit ChangePasswordDialog(LoginData *const data);
A_DELETE_COPY(ChangePasswordDialog)
diff --git a/src/gui/charcreatedialog.h b/src/gui/charcreatedialog.h
index 6b12ea569..0cfe03ebd 100644
--- a/src/gui/charcreatedialog.h
+++ b/src/gui/charcreatedialog.h
@@ -154,4 +154,4 @@ class CharCreateDialog final : public Window,
unsigned mDirection;
};
-#endif // CHAR_CREATE_DIALOG_H
+#endif // CHAR_CREATE_DIALOG_H
diff --git a/src/gui/charselectdialog.h b/src/gui/charselectdialog.h
index 8c1b92522..5b4ba47af 100644
--- a/src/gui/charselectdialog.h
+++ b/src/gui/charselectdialog.h
@@ -63,7 +63,7 @@ class CharSelectDialog final : public Window,
/**
* Constructor.
*/
- CharSelectDialog(LoginData *const data);
+ explicit CharSelectDialog(LoginData *const data);
A_DELETE_COPY(CharSelectDialog)
diff --git a/src/gui/chatwindow.h b/src/gui/chatwindow.h
index 1798ac63c..f8d9ae7da 100644
--- a/src/gui/chatwindow.h
+++ b/src/gui/chatwindow.h
@@ -337,16 +337,16 @@ class ChatWindow final : public Window,
TabMap mWhispers;
typedef History::iterator HistoryIterator;
- History mHistory; /**< Command history. */
- HistoryIterator mCurHist; /**< History iterator. */
+ History mHistory; /**< Command history. */
+ HistoryIterator mCurHist; /**< History iterator. */
typedef std::list<std::string> Commands;
typedef Commands::iterator CommandsIterator;
- History mCommands; /**< Command list. */
+ History mCommands; /**< Command list. */
History mCustomWords;
- bool mReturnToggles; /**< Marks whether <Return> toggles the chat log
- or not */
+ bool mReturnToggles; // Marks whether <Return> toggles the chat log
+ // or not
StringVect mTradeFilter;
diff --git a/src/gui/didyouknowwindow.cpp b/src/gui/didyouknowwindow.cpp
index 58a07dff4..6227afd7f 100644
--- a/src/gui/didyouknowwindow.cpp
+++ b/src/gui/didyouknowwindow.cpp
@@ -88,7 +88,7 @@ DidYouKnowWindow::DidYouKnowWindow():
loadWindowState();
enableVisibleSound(true);
- widgetResized(nullptr);
+ widgetResized(gcn::Event(nullptr));
}
void DidYouKnowWindow::action(const gcn::ActionEvent &event)
diff --git a/src/gui/editserverdialog.h b/src/gui/editserverdialog.h
index 7f611136b..f481fa789 100644
--- a/src/gui/editserverdialog.h
+++ b/src/gui/editserverdialog.h
@@ -113,4 +113,4 @@ class EditServerDialog final : public Window,
int mIndex;
};
-#endif // EDITSERVERDIALOG_H
+#endif // EDITSERVERDIALOG_H
diff --git a/src/gui/gui.h b/src/gui/gui.h
index a0ea4f496..04d76e538 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -58,7 +58,7 @@ class Gui final : public gcn::Gui
/**
* Constructor.
*/
- Gui(Graphics *const screen);
+ explicit Gui(Graphics *const screen);
A_DELETE_COPY(Gui)
@@ -188,4 +188,4 @@ extern SDLInput *guiInput; /**< GUI input */
*/
extern SDLFont *boldFont;
-#endif // GUI_H
+#endif // GUI_H
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index ae8fa5b15..c489d9278 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -240,7 +240,7 @@ InventoryWindow::InventoryWindow(Inventory *const inventory):
enableVisibleSound(true);
slotsChanged(mInventory);
- widgetResized(nullptr);
+ widgetResized(gcn::Event(nullptr));
if (!isMainInventory())
setVisible(true);
}
diff --git a/src/gui/itemamountwindow.h b/src/gui/itemamountwindow.h
index f1d9aabce..1ed3f4e59 100644
--- a/src/gui/itemamountwindow.h
+++ b/src/gui/itemamountwindow.h
@@ -122,4 +122,4 @@ class ItemAmountWindow final : public Window,
int mPrice;
};
-#endif // ITEM_AMOUNT_WINDOW_H
+#endif // ITEM_AMOUNT_WINDOW_H
diff --git a/src/gui/itempopup.h b/src/gui/itempopup.h
index 4817b8851..cf46e0661 100644
--- a/src/gui/itempopup.h
+++ b/src/gui/itempopup.h
@@ -78,4 +78,4 @@ class ItemPopup final : public Popup
gcn::Color getColor(const ItemType type) const;
};
-#endif // ITEMPOPUP_H
+#endif // ITEMPOPUP_H
diff --git a/src/gui/ministatuswindow.h b/src/gui/ministatuswindow.h
index d8d4347e3..f2edf6850 100644
--- a/src/gui/ministatuswindow.h
+++ b/src/gui/ministatuswindow.h
@@ -66,7 +66,7 @@ class MiniStatusWindow final : public Popup,
void updateStatus();
- void logic() override; // Updates icons
+ void logic() override;
void draw(gcn::Graphics *graphics) override;
diff --git a/src/gui/npcdialog.h b/src/gui/npcdialog.h
index 433a4472f..f8c50ddff 100644
--- a/src/gui/npcdialog.h
+++ b/src/gui/npcdialog.h
@@ -60,7 +60,7 @@ class NpcDialog final : public Window, public gcn::ActionListener,
*
* @see Window::Window
*/
- NpcDialog(const int npcId);
+ explicit NpcDialog(const int npcId);
A_DELETE_COPY(NpcDialog)
@@ -223,7 +223,6 @@ class NpcDialog final : public Window, public gcn::ActionListener,
// Used for the main input area
BrowserBox *mTextBox;
ScrollArea *mScrollArea;
- //TextBox *mTextBox;
std::string mText;
std::string mNewText;
@@ -275,4 +274,4 @@ class NpcDialog final : public Window, public gcn::ActionListener,
bool mShowAvatar;
};
-#endif // NPCDIALOG_H
+#endif // NPCDIALOG_H
diff --git a/src/gui/npcpostdialog.h b/src/gui/npcpostdialog.h
index 6dfd2bd48..261e6e482 100644
--- a/src/gui/npcpostdialog.h
+++ b/src/gui/npcpostdialog.h
@@ -36,7 +36,7 @@ public:
/**
* Constructor
*/
- NpcPostDialog(const int npcId);
+ explicit NpcPostDialog(const int npcId);
A_DELETE_COPY(NpcPostDialog)
diff --git a/src/gui/palette.h b/src/gui/palette.h
index dbb8327c6..30c8acec9 100644
--- a/src/gui/palette.h
+++ b/src/gui/palette.h
@@ -154,7 +154,7 @@ class Palette
/**
* Constructor
*/
- Palette(const int size);
+ explicit Palette(const int size);
/**
* Destructor
diff --git a/src/gui/questswindow.h b/src/gui/questswindow.h
index ad02c5397..8872189cb 100644
--- a/src/gui/questswindow.h
+++ b/src/gui/questswindow.h
@@ -92,13 +92,13 @@ class QuestsWindow final : public Window, public gcn::ActionListener
BrowserBox *mText;
ScrollArea *mTextScrollArea;
Button *mCloseButton;
- //quest variables: var, value
+ // quest variables: var, value
std::map<int, int> mVars;
- //quests: var, quests
+ // quests: var, quests
std::map<int, std::vector<QuestItem*> > mQuests;
std::vector<QuestEffect*> mAllEffects;
std::vector<const QuestEffect*> mMapEffects;
- //npc effects for current map and values: npc, effect
+ // npc effects for current map and values: npc, effect
NpcQuestEffectMap mNpcEffects;
std::vector<QuestItem*> mQuestLinks;
Image *mCompleteIcon;
diff --git a/src/gui/quitdialog.h b/src/gui/quitdialog.h
index 7f570bc1c..e6181746e 100644
--- a/src/gui/quitdialog.h
+++ b/src/gui/quitdialog.h
@@ -47,7 +47,7 @@ class QuitDialog final : public Window, public gcn::ActionListener,
*
* @pointerToMe will be set to NULL when the QuitDialog is destroyed
*/
- QuitDialog(QuitDialog **const pointerToMe);
+ explicit QuitDialog(QuitDialog **const pointerToMe);
A_DELETE_COPY(QuitDialog)
diff --git a/src/gui/registerdialog.h b/src/gui/registerdialog.h
index 02995de85..34bb0bac8 100644
--- a/src/gui/registerdialog.h
+++ b/src/gui/registerdialog.h
@@ -70,7 +70,7 @@ class RegisterDialog final : public Window, public gcn::ActionListener,
*
* @see Window::Window
*/
- RegisterDialog(LoginData *const loginData);
+ explicit RegisterDialog(LoginData *const loginData);
A_DELETE_COPY(RegisterDialog)
diff --git a/src/gui/sdlinput.h b/src/gui/sdlinput.h
index 58f05424a..e6983a37a 100644
--- a/src/gui/sdlinput.h
+++ b/src/gui/sdlinput.h
@@ -124,7 +124,7 @@ namespace Key
UP,
DOWN
};
-}
+} // namespace Key
/**
* SDL implementation of Input.
@@ -132,7 +132,6 @@ namespace Key
class SDLInput final : public gcn::Input
{
public:
-
/**
* Constructor.
*/
diff --git a/src/gui/selldialog.h b/src/gui/selldialog.h
index 00f281b2d..2002c67e4 100644
--- a/src/gui/selldialog.h
+++ b/src/gui/selldialog.h
@@ -53,12 +53,12 @@ class SellDialog final : public Window,
*
* @see Window::Window
*/
- SellDialog(const int npcId);
+ explicit SellDialog(const int npcId);
/**
* Constructor.
*/
- SellDialog(std::string nick);
+ explicit SellDialog(std::string nick);
A_DELETE_COPY(SellDialog)
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index af67129e0..844840f8d 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -133,7 +133,7 @@ Setup::Setup():
center();
- widgetResized(nullptr);
+ widgetResized(gcn::Event(nullptr));
setInGame(false);
enableVisibleSound(true);
}
diff --git a/src/gui/setup_audio.h b/src/gui/setup_audio.h
index 93544e52a..1a4c1c074 100644
--- a/src/gui/setup_audio.h
+++ b/src/gui/setup_audio.h
@@ -32,7 +32,7 @@
class Setup_Audio final : public SetupTabScroll
{
public:
- Setup_Audio(const Widget2 *const widget);
+ explicit Setup_Audio(const Widget2 *const widget);
A_DELETE_COPY(Setup_Audio)
diff --git a/src/gui/setup_chat.h b/src/gui/setup_chat.h
index 2e519f11c..53818caf4 100644
--- a/src/gui/setup_chat.h
+++ b/src/gui/setup_chat.h
@@ -33,7 +33,7 @@ class EditDialog;
class Setup_Chat final : public SetupTabScroll
{
public:
- Setup_Chat(const Widget2 *const widget);
+ explicit Setup_Chat(const Widget2 *const widget);
A_DELETE_COPY(Setup_Chat)
diff --git a/src/gui/setup_colors.h b/src/gui/setup_colors.h
index 380ef54a4..62241f6e3 100644
--- a/src/gui/setup_colors.h
+++ b/src/gui/setup_colors.h
@@ -41,7 +41,7 @@ class Setup_Colors final : public SetupTab,
public gcn::SelectionListener
{
public:
- Setup_Colors(const Widget2 *const widget);
+ explicit Setup_Colors(const Widget2 *const widget);
A_DELETE_COPY(Setup_Colors)
@@ -94,4 +94,4 @@ class Setup_Colors final : public SetupTab,
void updateGradType();
};
-#endif // SETUP_COLORS_H
+#endif // SETUP_COLORS_H
diff --git a/src/gui/setup_input.h b/src/gui/setup_input.h
index 2a7f13dd7..6548b70ba 100644
--- a/src/gui/setup_input.h
+++ b/src/gui/setup_input.h
@@ -44,7 +44,7 @@ class Setup_Input final : public SetupTab
/**
* Constructor
*/
- Setup_Input(const Widget2 *const widget);
+ explicit Setup_Input(const Widget2 *const widget);
A_DELETE_COPY(Setup_Input)
diff --git a/src/gui/setup_joystick.h b/src/gui/setup_joystick.h
index d703c6ae7..9807df2d2 100644
--- a/src/gui/setup_joystick.h
+++ b/src/gui/setup_joystick.h
@@ -36,7 +36,7 @@ class NamesModel;
class Setup_Joystick final : public SetupTab
{
public:
- Setup_Joystick(const Widget2 *const widget);
+ explicit Setup_Joystick(const Widget2 *const widget);
A_DELETE_COPY(Setup_Joystick)
diff --git a/src/gui/setup_other.h b/src/gui/setup_other.h
index e5b148017..2f0fdaf04 100644
--- a/src/gui/setup_other.h
+++ b/src/gui/setup_other.h
@@ -34,7 +34,7 @@ class TextField;
class Setup_Other final : public SetupTabScroll
{
public:
- Setup_Other(const Widget2 *const widget);
+ explicit Setup_Other(const Widget2 *const widget);
A_DELETE_COPY(Setup_Other)
diff --git a/src/gui/setup_perfomance.h b/src/gui/setup_perfomance.h
index 7cfcee3b4..b3c237bd7 100644
--- a/src/gui/setup_perfomance.h
+++ b/src/gui/setup_perfomance.h
@@ -34,7 +34,7 @@ class NamesModel;
class Setup_Perfomance final : public SetupTabScroll
{
public:
- Setup_Perfomance(const Widget2 *const widget);
+ explicit Setup_Perfomance(const Widget2 *const widget);
A_DELETE_COPY(Setup_Perfomance)
diff --git a/src/gui/setup_players.h b/src/gui/setup_players.h
index 759ec2c7f..8f9c6a4ef 100644
--- a/src/gui/setup_players.h
+++ b/src/gui/setup_players.h
@@ -33,7 +33,7 @@ class EditDialog;
class Setup_Players final : public SetupTabScroll
{
public:
- Setup_Players(const Widget2 *const widget);
+ explicit Setup_Players(const Widget2 *const widget);
A_DELETE_COPY(Setup_Players)
diff --git a/src/gui/setup_relations.h b/src/gui/setup_relations.h
index 92ebf9ec1..3ed9e7189 100644
--- a/src/gui/setup_relations.h
+++ b/src/gui/setup_relations.h
@@ -47,7 +47,7 @@ class Setup_Relations final : public SetupTab,
public PlayerRelationsListener
{
public:
- Setup_Relations(const Widget2 *const widget);
+ explicit Setup_Relations(const Widget2 *const widget);
A_DELETE_COPY(Setup_Relations)
diff --git a/src/gui/setup_theme.h b/src/gui/setup_theme.h
index 7f0015311..9357f629e 100644
--- a/src/gui/setup_theme.h
+++ b/src/gui/setup_theme.h
@@ -39,7 +39,7 @@ class ThemesModel;
class Setup_Theme final : public SetupTab
{
public:
- Setup_Theme(const Widget2 *const widget);
+ explicit Setup_Theme(const Widget2 *const widget);
A_DELETE_COPY(Setup_Theme)
diff --git a/src/gui/setup_touch.h b/src/gui/setup_touch.h
index eb8c15c2a..e15e9de4d 100644
--- a/src/gui/setup_touch.h
+++ b/src/gui/setup_touch.h
@@ -31,7 +31,7 @@ class TextField;
class Setup_Touch final : public SetupTabScroll
{
public:
- Setup_Touch(const Widget2 *const widget);
+ explicit Setup_Touch(const Widget2 *const widget);
A_DELETE_COPY(Setup_Touch)
diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h
index dc1a180b3..754227a2f 100644
--- a/src/gui/setup_video.h
+++ b/src/gui/setup_video.h
@@ -43,7 +43,7 @@ class TextDialog;
class Setup_Video final : public SetupTab, public gcn::KeyListener
{
public:
- Setup_Video(const Widget2 *const widget);
+ explicit Setup_Video(const Widget2 *const widget);
A_DELETE_COPY(Setup_Video)
diff --git a/src/gui/setup_visual.h b/src/gui/setup_visual.h
index 82c1bfe5e..2b8081cfd 100644
--- a/src/gui/setup_visual.h
+++ b/src/gui/setup_visual.h
@@ -29,7 +29,7 @@ class NamesModel;
class Setup_Visual final : public SetupTabScroll
{
public:
- Setup_Visual(const Widget2 *const widget);
+ explicit Setup_Visual(const Widget2 *const widget);
A_DELETE_COPY(Setup_Visual)
diff --git a/src/gui/setupactiondata.h b/src/gui/setupactiondata.h
index 0f56e4b96..38815898c 100644
--- a/src/gui/setupactiondata.h
+++ b/src/gui/setupactiondata.h
@@ -31,8 +31,6 @@
#include <string>
-//#include "debug.h"
-
struct SetupActionData final
{
std::string name;
diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp
index 3c65358ea..893809def 100644
--- a/src/gui/socialwindow.cpp
+++ b/src/gui/socialwindow.cpp
@@ -1272,8 +1272,7 @@ SocialWindow::SocialWindow() :
place(2, 0, mLeaveButton);
place(0, 1, mTabs, 4, 4);
- widgetResized(nullptr);
-
+ widgetResized(gcn::Event(nullptr));
loadWindowState();
diff --git a/src/gui/socialwindow.h b/src/gui/socialwindow.h
index 68abef2a4..9695bbb0e 100644
--- a/src/gui/socialwindow.h
+++ b/src/gui/socialwindow.h
@@ -163,4 +163,4 @@ protected:
extern SocialWindow *socialWindow;
-#endif // SOCIALWINDOW_H
+#endif // SOCIALWINDOW_H
diff --git a/src/gui/spellpopup.h b/src/gui/spellpopup.h
index 4a87f7d98..01a283dbc 100644
--- a/src/gui/spellpopup.h
+++ b/src/gui/spellpopup.h
@@ -69,4 +69,4 @@ class SpellPopup final : public Popup
Label *mItemComment;
};
-#endif // SPELLPOPUP_H
+#endif // SPELLPOPUP_H
diff --git a/src/gui/statuspopup.h b/src/gui/statuspopup.h
index 1547d9cfc..0dd0f4486 100644
--- a/src/gui/statuspopup.h
+++ b/src/gui/statuspopup.h
@@ -83,4 +83,4 @@ class StatusPopup final : public Popup
Label *mCameraMode;
};
-#endif // StatusPopup_H
+#endif // StatusPopup_H
diff --git a/src/gui/textcommandeditor.h b/src/gui/textcommandeditor.h
index c364a70b0..86d1c7c7d 100644
--- a/src/gui/textcommandeditor.h
+++ b/src/gui/textcommandeditor.h
@@ -48,7 +48,7 @@ class TextCommandEditor final : public Window, public gcn::ActionListener
/**
* Constructor.
*/
- TextCommandEditor(TextCommand *const command);
+ explicit TextCommandEditor(TextCommand *const command);
A_DELETE_COPY(TextCommandEditor)
diff --git a/src/gui/textpopup.h b/src/gui/textpopup.h
index e0dfe60ec..f5f63473b 100644
--- a/src/gui/textpopup.h
+++ b/src/gui/textpopup.h
@@ -79,4 +79,4 @@ class TextPopup final : public Popup
Label *mText3;
};
-#endif // TEXTPOPUP_H
+#endif // TEXTPOPUP_H
diff --git a/src/gui/unregisterdialog.h b/src/gui/unregisterdialog.h
index 19428b78b..c6a5b3309 100644
--- a/src/gui/unregisterdialog.h
+++ b/src/gui/unregisterdialog.h
@@ -46,7 +46,7 @@ class UnRegisterDialog final : public Window, public gcn::ActionListener
*
* @see Window::Window
*/
- UnRegisterDialog(LoginData *const loginData);
+ explicit UnRegisterDialog(LoginData *const loginData);
A_DELETE_COPY(UnRegisterDialog)
diff --git a/src/gui/updaterwindow.h b/src/gui/updaterwindow.h
index 0fd7dc93d..fb94b0e97 100644
--- a/src/gui/updaterwindow.h
+++ b/src/gui/updaterwindow.h
@@ -186,7 +186,8 @@ private:
/** The new progress value to be set in the logic method. */
float mDownloadProgress;
- /** The mutex used to guard access to mNewLabelCaption and mDownloadProgress. */
+ // The mutex used to guard access to mNewLabelCaption
+ // and mDownloadProgress.
Mutex mDownloadMutex;
/** The Adler32 checksum of the file currently downloading. */
diff --git a/src/gui/userpalette.cpp b/src/gui/userpalette.cpp
index c42a7aa27..9077da6c0 100644
--- a/src/gui/userpalette.cpp
+++ b/src/gui/userpalette.cpp
@@ -295,7 +295,7 @@ void UserPalette::addColor(const unsigned type, const unsigned rgb,
rgbValue = atox(rgbString);
else
rgbValue = atoi(rgbString.c_str());
- const gcn::Color &trueCol = rgbValue;
+ const gcn::Color &trueCol = gcn::Color(rgbValue);
grad = static_cast<GradientType>(config.getValue(configName + "Gradient",
static_cast<int>(grad)));
delay = config.getValueInt(configName + "Delay", delay);
diff --git a/src/gui/userpalette.h b/src/gui/userpalette.h
index 85d37d5c8..21bc84e6c 100644
--- a/src/gui/userpalette.h
+++ b/src/gui/userpalette.h
@@ -231,4 +231,4 @@ class UserPalette final : public Palette, public gcn::ListModel
extern UserPalette *userPalette;
-#endif // USER_PALETTE_H
+#endif // USER_PALETTE_H
diff --git a/src/gui/whoisonline.cpp b/src/gui/whoisonline.cpp
index 0c1a2998d..75e8a95d6 100644
--- a/src/gui/whoisonline.cpp
+++ b/src/gui/whoisonline.cpp
@@ -122,7 +122,7 @@ WhoIsOnline::WhoIsOnline():
download();
- widgetResized(nullptr);
+ widgetResized(gcn::Event(nullptr));
config.addListener("updateOnlineList", this);
config.addListener("groupFriends", this);
mUpdateOnlineList = config.getBoolValue("updateOnlineList");
diff --git a/src/gui/widgets/battletab.h b/src/gui/widgets/battletab.h
index 7bcb78d28..83828f744 100644
--- a/src/gui/widgets/battletab.h
+++ b/src/gui/widgets/battletab.h
@@ -31,7 +31,7 @@
class BattleTab final : public ChatTab
{
public:
- BattleTab(const Widget2 *const widget);
+ explicit BattleTab(const Widget2 *const widget);
A_DELETE_COPY(BattleTab)
diff --git a/src/gui/widgets/browserbox.h b/src/gui/widgets/browserbox.h
index 045e0d5d5..304fa1e6c 100644
--- a/src/gui/widgets/browserbox.h
+++ b/src/gui/widgets/browserbox.h
@@ -126,7 +126,7 @@ class BrowserBox final : public gcn::Widget,
* Sets the maximum numbers of rows in the browser box. 0 = no limit.
*/
void setMaxRow(unsigned max)
- { mMaxRows = max; };
+ { mMaxRows = max; }
/**
* Adds a text row to the browser.
diff --git a/src/gui/widgets/button.h b/src/gui/widgets/button.h
index d0431217e..90faa7d06 100644
--- a/src/gui/widgets/button.h
+++ b/src/gui/widgets/button.h
@@ -52,7 +52,7 @@ class Button final : public gcn::Button,
/**
* Default constructor.
*/
- Button(const Widget2 *const widget);
+ explicit Button(const Widget2 *const widget);
/**
* Constructor, sets the caption of the button to the given string and
diff --git a/src/gui/widgets/chattab.h b/src/gui/widgets/chattab.h
index 7105f3fc4..7f27615ae 100644
--- a/src/gui/widgets/chattab.h
+++ b/src/gui/widgets/chattab.h
@@ -209,4 +209,4 @@ class ChatTab : public Tab
extern ChatTab *localChatTab;
extern ChatTab *debugChatTab;
-#endif // CHATTAB_H
+#endif // CHATTAB_H
diff --git a/src/gui/widgets/container.h b/src/gui/widgets/container.h
index eb1d9b8e4..60da54672 100644
--- a/src/gui/widgets/container.h
+++ b/src/gui/widgets/container.h
@@ -45,7 +45,7 @@ class Container : public gcn::Container,
public Widget2
{
public:
- Container(const Widget2 *const widget);
+ explicit Container(const Widget2 *const widget);
~Container();
diff --git a/src/gui/widgets/desktop.h b/src/gui/widgets/desktop.h
index 9bafc0552..d08127630 100644
--- a/src/gui/widgets/desktop.h
+++ b/src/gui/widgets/desktop.h
@@ -47,7 +47,7 @@ class Label;
class Desktop final : public Container, private gcn::WidgetListener
{
public:
- Desktop(const Widget2 *const widget);
+ explicit Desktop(const Widget2 *const widget);
A_DELETE_COPY(Desktop)
@@ -71,4 +71,4 @@ class Desktop final : public Container, private gcn::WidgetListener
gcn::Color mBackgroundGrayColor;
};
-#endif // DESKTOP_H
+#endif // DESKTOP_H
diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h
index 30ce6692b..a145d708c 100644
--- a/src/gui/widgets/dropdown.h
+++ b/src/gui/widgets/dropdown.h
@@ -157,7 +157,6 @@ class DropDown final : public gcn::ActionListener,
bool mDroppedDown;
bool mPushed;
int mFoldedUpHeight;
-// gcn::FocusHandler mInternalFocusHandler;
bool mIsDragged;
typedef std::list<SelectionListener*> SelectionListenerList;
SelectionListenerList mSelectionListeners;
@@ -171,4 +170,4 @@ class DropDown final : public gcn::ActionListener,
static Skin *mSkin;
};
-#endif // end DROPDOWN_H
+#endif // end DROPDOWN_H
diff --git a/src/gui/widgets/flowcontainer.cpp b/src/gui/widgets/flowcontainer.cpp
index dda201904..80a746dd4 100644
--- a/src/gui/widgets/flowcontainer.cpp
+++ b/src/gui/widgets/flowcontainer.cpp
@@ -92,5 +92,5 @@ void FlowContainer::add(gcn::Widget *widget)
Container::add(widget);
widget->setSize(mBoxWidth, mBoxHeight);
- widgetResized(nullptr);
+ widgetResized(gcn::Event(nullptr));
}
diff --git a/src/gui/widgets/gmtab.h b/src/gui/widgets/gmtab.h
index f0ebc7e76..cadadca7e 100644
--- a/src/gui/widgets/gmtab.h
+++ b/src/gui/widgets/gmtab.h
@@ -29,7 +29,7 @@
class GmTab final : public ChatTab
{
public:
- GmTab(const Widget2 *const widget);
+ explicit GmTab(const Widget2 *const widget);
A_DELETE_COPY(GmTab)
@@ -50,4 +50,4 @@ class GmTab final : public ChatTab
extern GmTab *gmChatTab;
-#endif // GMTAB_H
+#endif // GMTAB_H
diff --git a/src/gui/widgets/guitable.h b/src/gui/widgets/guitable.h
index 0b2b4462c..08e319588 100644
--- a/src/gui/widgets/guitable.h
+++ b/src/gui/widgets/guitable.h
@@ -165,8 +165,8 @@ protected:
virtual int getColumnWidth(int i) const A_WARN_UNUSED;
private:
- int getRowForY(int y) const A_WARN_UNUSED; // -1 on error
- int getColumnForX(int x) const A_WARN_UNUSED; // -1 on error
+ int getRowForY(int y) const A_WARN_UNUSED; // -1 on error
+ int getColumnForX(int x) const A_WARN_UNUSED; // -1 on error
void recomputeDimensions();
bool mLinewiseMode;
bool mWrappingEnabled;
@@ -193,5 +193,4 @@ private:
gcn::Color mHighlightColor;
};
-
-#endif // TABLE_H
+#endif // TABLE_H
diff --git a/src/gui/widgets/icon.h b/src/gui/widgets/icon.h
index 7d681dd8b..bae76bb72 100644
--- a/src/gui/widgets/icon.h
+++ b/src/gui/widgets/icon.h
@@ -74,4 +74,4 @@ class Icon final : public gcn::Widget,
Image *mImage;
};
-#endif // ICON_H
+#endif // ICON_H
diff --git a/src/gui/widgets/itemshortcutcontainer.h b/src/gui/widgets/itemshortcutcontainer.h
index 47a520601..a416f52c4 100644
--- a/src/gui/widgets/itemshortcutcontainer.h
+++ b/src/gui/widgets/itemshortcutcontainer.h
@@ -43,7 +43,7 @@ class ItemShortcutContainer final : public ShortcutContainer
/**
* Constructor. Initializes the graphic.
*/
- ItemShortcutContainer(const unsigned number);
+ explicit ItemShortcutContainer(const unsigned number);
A_DELETE_COPY(ItemShortcutContainer)
diff --git a/src/gui/widgets/label.h b/src/gui/widgets/label.h
index 6c7df3f89..39146ffd2 100644
--- a/src/gui/widgets/label.h
+++ b/src/gui/widgets/label.h
@@ -42,7 +42,7 @@ class Label final : public gcn::Label, public Widget2
/**
* Constructor.
*/
- Label(const Widget2 *const widget);
+ explicit Label(const Widget2 *const widget);
/**
* Constructor. This version of the constructor sets the label with an
diff --git a/src/gui/widgets/layout.h b/src/gui/widgets/layout.h
index cb0000073..267e8da6e 100644
--- a/src/gui/widgets/layout.h
+++ b/src/gui/widgets/layout.h
@@ -72,7 +72,6 @@ class LayoutArray final
friend class LayoutCell;
public:
-
LayoutArray();
~LayoutArray();
@@ -121,9 +120,8 @@ class LayoutArray final
void reflow(const int nX, const int nY, const int nW, const int nH);
private:
-
// Copy not allowed, as the array owns all its cells.
- LayoutArray(LayoutArray const &);
+ explicit LayoutArray(LayoutArray const &);
LayoutArray &operator=(LayoutArray const &);
/**
@@ -289,7 +287,7 @@ class LayoutCell
private:
// Copy not allowed, as the cell may own an array.
- LayoutCell(LayoutCell const &);
+ explicit LayoutCell(LayoutCell const &);
LayoutCell &operator=(LayoutCell const &);
union
@@ -365,4 +363,4 @@ class Layout final : public LayoutCell
bool mComputed;
};
-#endif // WIDGET_LAYOUT_H
+#endif // WIDGET_LAYOUT_H
diff --git a/src/gui/widgets/layouthelper.h b/src/gui/widgets/layouthelper.h
index 57448ec01..fea4efdd6 100644
--- a/src/gui/widgets/layouthelper.h
+++ b/src/gui/widgets/layouthelper.h
@@ -38,7 +38,7 @@ class LayoutHelper final : public gcn::WidgetListener
/**
* Constructor.
*/
- LayoutHelper(gcn::Container *const container);
+ explicit LayoutHelper(gcn::Container *const container);
A_DELETE_COPY(LayoutHelper)
@@ -85,4 +85,4 @@ class LayoutHelper final : public gcn::WidgetListener
gcn::Container *mContainer; /**< Managed container */
};
-#endif // LAYOUTHELPER_H
+#endif // LAYOUTHELPER_H
diff --git a/src/gui/widgets/playerbox.h b/src/gui/widgets/playerbox.h
index 8526117a9..61ad7dae4 100644
--- a/src/gui/widgets/playerbox.h
+++ b/src/gui/widgets/playerbox.h
@@ -48,7 +48,7 @@ class PlayerBox final : public Widget2,
*/
PlayerBox(Being *const being, const std::string &skin = "");
- PlayerBox(std::string skin = "");
+ explicit PlayerBox(std::string skin = "");
A_DELETE_COPY(PlayerBox)
diff --git a/src/gui/widgets/progressindicator.h b/src/gui/widgets/progressindicator.h
index 1fc1dcd37..da80f59ec 100644
--- a/src/gui/widgets/progressindicator.h
+++ b/src/gui/widgets/progressindicator.h
@@ -52,4 +52,4 @@ class ProgressIndicator final : public gcn::Widget,
SimpleAnimation *mIndicator;
};
-#endif // PROGRESSINDICATOR_H
+#endif // PROGRESSINDICATOR_H
diff --git a/src/gui/widgets/radiobutton.h b/src/gui/widgets/radiobutton.h
index 860ede73e..481d18408 100644
--- a/src/gui/widgets/radiobutton.h
+++ b/src/gui/widgets/radiobutton.h
@@ -90,4 +90,4 @@ class RadioButton final : public gcn::RadioButton,
int mSpacing;
};
-#endif // RADIOBUTTON_H
+#endif // RADIOBUTTON_H
diff --git a/src/gui/widgets/setuptab.h b/src/gui/widgets/setuptab.h
index 7d0c45d17..a388daf82 100644
--- a/src/gui/widgets/setuptab.h
+++ b/src/gui/widgets/setuptab.h
@@ -40,7 +40,7 @@ class SetupTab : public Container,
public gcn::WidgetListener
{
public:
- SetupTab(const Widget2 *const widget);
+ explicit SetupTab(const Widget2 *const widget);
A_DELETE_COPY(SetupTab)
diff --git a/src/gui/widgets/setuptabscroll.h b/src/gui/widgets/setuptabscroll.h
index 2417bd400..e177ba6cb 100644
--- a/src/gui/widgets/setuptabscroll.h
+++ b/src/gui/widgets/setuptabscroll.h
@@ -35,7 +35,7 @@ class VertContainer;
class SetupTabScroll : public SetupTab
{
public:
- SetupTabScroll(const Widget2 *const widget);
+ explicit SetupTabScroll(const Widget2 *const widget);
A_DELETE_COPY(SetupTabScroll)
diff --git a/src/gui/widgets/shopitems.h b/src/gui/widgets/shopitems.h
index 954f2830a..e577916a2 100644
--- a/src/gui/widgets/shopitems.h
+++ b/src/gui/widgets/shopitems.h
@@ -50,7 +50,7 @@ class ShopItems final : public gcn::ListModel
* @param mergeDuplicates lets the Shop look for duplicate entries and
* merges them to one item.
*/
- ShopItems(const bool mergeDuplicates = false);
+ explicit ShopItems(const bool mergeDuplicates = false);
A_DELETE_COPY(ShopItems)
@@ -138,4 +138,4 @@ class ShopItems final : public gcn::ListModel
bool mMergeDuplicates;
};
-#endif // SHOPITEMS_H
+#endif // SHOPITEMS_H
diff --git a/src/gui/widgets/shoplistbox.h b/src/gui/widgets/shoplistbox.h
index ad58ea413..5bc63ca85 100644
--- a/src/gui/widgets/shoplistbox.h
+++ b/src/gui/widgets/shoplistbox.h
@@ -106,4 +106,4 @@ class ShopListBox final : public ListBox
static float mAlpha;
};
-#endif // SHOPLISTBOX_H
+#endif // SHOPLISTBOX_H
diff --git a/src/gui/widgets/slider.h b/src/gui/widgets/slider.h
index a6c608214..f1cc5b1b0 100644
--- a/src/gui/widgets/slider.h
+++ b/src/gui/widgets/slider.h
@@ -44,7 +44,7 @@ class Slider final : public gcn::Slider,
/**
* Constructor with scale start equal to 0.
*/
- Slider(const double scaleEnd = 1.0);
+ explicit Slider(const double scaleEnd = 1.0);
/**
* Constructor.
diff --git a/src/gui/widgets/sliderlist.h b/src/gui/widgets/sliderlist.h
index b07ca5598..4a0a9b351 100644
--- a/src/gui/widgets/sliderlist.h
+++ b/src/gui/widgets/sliderlist.h
@@ -83,4 +83,4 @@ class SliderList final : public Container,
int mSelectedIndex;
};
-#endif // end GUI_WIDGETS_SLIDERLIST_H
+#endif // end GUI_WIDGETS_SLIDERLIST_H
diff --git a/src/gui/widgets/spellshortcutcontainer.h b/src/gui/widgets/spellshortcutcontainer.h
index f879922ee..62a970c79 100644
--- a/src/gui/widgets/spellshortcutcontainer.h
+++ b/src/gui/widgets/spellshortcutcontainer.h
@@ -42,7 +42,7 @@ class SpellShortcutContainer final : public ShortcutContainer
/**
* Constructor. Initializes the graphic.
*/
- SpellShortcutContainer(const unsigned number);
+ explicit SpellShortcutContainer(const unsigned number);
A_DELETE_COPY(SpellShortcutContainer)
diff --git a/src/gui/widgets/tab.h b/src/gui/widgets/tab.h
index c1a9d37f2..40f47f6ff 100644
--- a/src/gui/widgets/tab.h
+++ b/src/gui/widgets/tab.h
@@ -47,7 +47,7 @@ class Tab : public gcn::BasicContainer,
public gcn::WidgetListener
{
public:
- Tab(const Widget2 *const widget);
+ explicit Tab(const Widget2 *const widget);
A_DELETE_COPY(Tab)
diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp
index e31d4f6cd..3eb09a113 100644
--- a/src/gui/widgets/tabbedarea.cpp
+++ b/src/gui/widgets/tabbedarea.cpp
@@ -65,7 +65,7 @@ TabbedArea::TabbedArea(const Widget2 *const widget) :
mArrowButton[0] = new Button(this, "<", "shift_left", this);
mArrowButton[1] = new Button(this, ">", "shift_right", this);
- widgetResized(nullptr);
+ widgetResized(gcn::Event(nullptr));
}
TabbedArea::~TabbedArea()
@@ -329,7 +329,7 @@ void TabbedArea::setSelectedTab(Tab *tab)
if (newTab)
newTab->setCurrent();
- widgetResized(nullptr);
+ widgetResized(gcn::Event(nullptr));
}
int TabbedArea::getSelectedTabIndex() const
diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h
index 7c90f19ea..40c60bd49 100644
--- a/src/gui/widgets/tabbedarea.h
+++ b/src/gui/widgets/tabbedarea.h
@@ -48,7 +48,7 @@ class TabbedArea final : public Widget2,
/**
* Constructor.
*/
- TabbedArea(const Widget2 *const widget);
+ explicit TabbedArea(const Widget2 *const widget);
A_DELETE_COPY(TabbedArea)
diff --git a/src/gui/widgets/tablemodel.h b/src/gui/widgets/tablemodel.h
index da200c52a..7e061efb1 100644
--- a/src/gui/widgets/tablemodel.h
+++ b/src/gui/widgets/tablemodel.h
@@ -159,4 +159,4 @@ protected:
std::vector<int> mWidths;
};
-#endif // TABLE_MODEL_H
+#endif // TABLE_MODEL_H
diff --git a/src/gui/widgets/textbox.h b/src/gui/widgets/textbox.h
index 1ec11311a..327a7a900 100644
--- a/src/gui/widgets/textbox.h
+++ b/src/gui/widgets/textbox.h
@@ -43,7 +43,7 @@ class TextBox final : public gcn::TextBox,
/**
* Constructor.
*/
- TextBox(const Widget2 *const widget);
+ explicit TextBox(const Widget2 *const widget);
A_DELETE_COPY(TextBox)
diff --git a/src/gui/widgets/tradetab.h b/src/gui/widgets/tradetab.h
index 19d85a645..c790a42bb 100644
--- a/src/gui/widgets/tradetab.h
+++ b/src/gui/widgets/tradetab.h
@@ -31,7 +31,7 @@
class TradeTab final : public ChatTab
{
public:
- TradeTab(const Widget2 *const widget);
+ explicit TradeTab(const Widget2 *const widget);
A_DELETE_COPY(TradeTab)
diff --git a/src/gui/widgets/whispertab.h b/src/gui/widgets/whispertab.h
index 7cf5ece0d..5bc9fe2c2 100644
--- a/src/gui/widgets/whispertab.h
+++ b/src/gui/widgets/whispertab.h
@@ -73,4 +73,4 @@ class WhisperTab final : public ChatTab
std::string mNick;
};
-#endif // CHANNELTAB_H
+#endif // CHANNELTAB_H
diff --git a/src/gui/widgets/widget2.h b/src/gui/widgets/widget2.h
index d8d158cf2..053b1560f 100644
--- a/src/gui/widgets/widget2.h
+++ b/src/gui/widgets/widget2.h
@@ -33,7 +33,7 @@ class Widget2
{
}
- Widget2(const Widget2 *const widget) :
+ explicit Widget2(const Widget2 *const widget) :
mPaletteOffset(widget ? widget->mPaletteOffset : 0)
{
checkPalette();
diff --git a/src/gui/widgets/windowcontainer.h b/src/gui/widgets/windowcontainer.h
index 660d2ab8a..27fc065fe 100644
--- a/src/gui/widgets/windowcontainer.h
+++ b/src/gui/widgets/windowcontainer.h
@@ -36,7 +36,7 @@
class WindowContainer : public Container
{
public:
- WindowContainer(const Widget2 *const widget);
+ explicit WindowContainer(const Widget2 *const widget);
void slowLogic();
diff --git a/src/gui/windowmenu.h b/src/gui/windowmenu.h
index cc152f72f..e32830c20 100644
--- a/src/gui/windowmenu.h
+++ b/src/gui/windowmenu.h
@@ -82,7 +82,7 @@ class WindowMenu final : public Container,
public gcn::MouseListener
{
public:
- WindowMenu(const Widget2 *const widget);
+ explicit WindowMenu(const Widget2 *const widget);
A_DELETE_COPY(WindowMenu)
diff --git a/src/gui/worldselectdialog.h b/src/gui/worldselectdialog.h
index 6bae954f8..1e7f09771 100644
--- a/src/gui/worldselectdialog.h
+++ b/src/gui/worldselectdialog.h
@@ -52,7 +52,7 @@ class WorldSelectDialog final : public Window, public gcn::ActionListener,
*
* @see Window::Window
*/
- WorldSelectDialog(Worlds worlds);
+ explicit WorldSelectDialog(Worlds worlds);
A_DELETE_COPY(WorldSelectDialog)
@@ -75,4 +75,4 @@ class WorldSelectDialog final : public Window, public gcn::ActionListener,
Button *mChooseWorld;
};
-#endif // WORLD_SELECT_DIALOG_H
+#endif // WORLD_SELECT_DIALOG_H