Cpp11 initializers: last src root changeset (#6022)

[oweals/minetest.git] / src / guiEngine.h

diff --git a/src/guiEngine.h b/src/guiEngine.h
index 7f35949d1891e54a207acb383f23ec6385892807..e6cea6b4fe91691f8b347c079880d1c7c44a46c5 100644 (file)
--- a/src/guiEngine.h
+++ b/src/guiEngine.h
@@ -27,7 +27,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "modalMenu.h"
 #include "guiFormSpecMenu.h"
 #include "sound.h"
-#include "tile.h"
+#include "client/tile.h"
+#include "util/enriched_string.h"
 
 /******************************************************************************/
 /* Typedefs and macros                                                        */
@@ -73,13 +74,13 @@ public:
         * receive fields transmitted by guiFormSpecMenu
         * @param fields map containing formspec field elements currently active
         */
-       void gotText(std::map<std::string, std::string> fields);
+       void gotText(const StringMap &fields);
 
        /**
         * receive text/events transmitted by guiFormSpecMenu
         * @param text textual representation of event
         */
-       void gotText(std::wstring text);
+       void gotText(const std::wstring &text);
 
 private:
        /** target to transmit data to */
@@ -138,6 +139,7 @@ private:
 class GUIEngine {
        /** grant ModApiMainMenu access to private members */
        friend class ModApiMainMenu;
+       friend class ModApiSound;
 
 public:
        /**
@@ -148,7 +150,8 @@ public:
         * @param smgr scene manager to add scene elements to
         * @param data struct to transfer data to main game handling
         */
-       GUIEngine(      irr::IrrlichtDevice* dev,
+       GUIEngine(irr::IrrlichtDevice* dev,
+                       JoystickController *joystick,
                        gui::IGUIElement* parent,
                        IMenuManager *menumgr,
                        scene::ISceneManager* smgr,
@@ -175,7 +178,8 @@ public:
        }
 
        /** pass async callback to scriptengine **/
-       unsigned int queueAsync(std::string serialized_fct,std::string serialized_params);
+       unsigned int queueAsync(const std::string &serialized_fct,
+                       const std::string &serialized_params);
 
 private:
 
@@ -185,8 +189,8 @@ private:
        /** run main menu loop */
        void run();
 
-       /** handler to limit frame rate within main menu */
-       void limitFrameRate();
+       /** update size of topleftext element */
+       void updateTopLeftTextSize();
 
        /** device to draw at */
        irr::IrrlichtDevice*     m_device;
@@ -199,28 +203,28 @@ private:
        /** pointer to data beeing transfered back to main game handling */
        MainMenuData*            m_data;
        /** pointer to texture source */
-       ISimpleTextureSource*    m_texture_source;
+       ISimpleTextureSource    *m_texture_source = nullptr;
        /** pointer to soundmanager*/
-       ISoundManager*           m_sound_manager;
+       ISoundManager           *m_sound_manager = nullptr;
 
        /** representation of form source to be used in mainmenu formspec */
-       FormspecFormSource*      m_formspecgui;
+       FormspecFormSource      *m_formspecgui = nullptr;
        /** formspec input receiver */
-       TextDestGuiEngine*       m_buttonhandler;
+       TextDestGuiEngine       *m_buttonhandler = nullptr;
        /** the formspec menu */
-       GUIFormSpecMenu*         m_menu;
+       GUIFormSpecMenu         *m_menu = nullptr;
 
        /** reference to kill variable managed by SIGINT handler */
        bool&                    m_kill;
 
        /** variable used to abort menu and return back to main game handling */
-       bool                     m_startgame;
+       bool                     m_startgame = false;
 
        /** scripting interface */
-       MainMenuScripting*       m_script;
+       MainMenuScripting       *m_script = nullptr;
 
        /** script basefolder */
-       std::string              m_scriptdir;
+       std::string              m_scriptdir = "";
 
        /**
         * draw background layer
@@ -256,22 +260,21 @@ private:
         * @param url url to download
         * @param target file to store to
         */
-       static bool downloadFile(std::string url,std::string target);
+       static bool downloadFile(const std::string &url, const std::string &target);
 
        /** array containing pointers to current specified texture layers */
        image_definition m_textures[TEX_LAYER_MAX];
 
-       /** draw version string in topleft corner */
-       void drawVersion();
-
        /**
-        * specify text to be appended to version string
+        * specify text to appear as top left string
         * @param text to set
         */
-       void setTopleftText(std::string append);
+       void setTopleftText(const std::string &text);
 
        /** pointer to gui element shown at topleft corner */
-       irr::gui::IGUIStaticText*       m_irr_toplefttext;
+       irr::gui::IGUIStaticText *m_irr_toplefttext = nullptr;
+       /** and text that is in it */
+       EnrichedString m_toplefttext;
 
        /** initialize cloud subsystem */
        void cloudInit();
@@ -293,7 +296,7 @@ private:
        };
 
        /** is drawing of clouds enabled atm */
-       bool        m_clouds_enabled;
+       bool        m_clouds_enabled = true;
        /** data used to draw clouds */
        clouddata   m_cloud;
 
@@ -305,6 +308,4 @@ private:
 
 };
 
-
-
 #endif /* GUI_ENGINE_H_ */