Author: shadowmaster
Date: Wed Oct 26 03:11:06 2011
New Revision: 51652
URL: http://svn.gna.org/viewcvs/wesnoth?rev=51652&view=rev
Log:
Move struct addon_info to its own header file (requires no implementation, it
will be shared by upcoming code)
Added:
trunk/src/addon/info.hpp
- copied, changed from r51651, trunk/src/gui/dialogs/addon/description.hpp
Modified:
trunk/src/gui/dialogs/addon/description.hpp
Copied: trunk/src/addon/info.hpp (from r51651,
trunk/src/gui/dialogs/addon/description.hpp)
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/addon/info.hpp?p2=trunk/src/addon/info.hpp&p1=trunk/src/gui/dialogs/addon/description.hpp&r1=51651&r2=51652&rev=51652&view=diff
==============================================================================
--- trunk/src/gui/dialogs/addon/description.hpp (original)
+++ trunk/src/addon/info.hpp Wed Oct 26 03:11:06 2011
@@ -13,11 +13,10 @@
See the COPYING file for more details.
*/
-#ifndef GUI_DIALOGS_ADDON_DESCRIPTION_HPP_INCLUDED
-#define GUI_DIALOGS_ADDON_DESCRIPTION_HPP_INCLUDED
+#ifndef ADDON_INFO_HPP_INCLUDED
+#define ADDON_INFO_HPP_INCLUDED
-#include "gui/dialogs/dialog.hpp"
-
+#include <string>
#include <vector>
struct addon_info
@@ -42,31 +41,4 @@
std::vector<std::string> translations;
};
-namespace gui2 {
-
-class taddon_description : public tdialog
-{
-public:
-
- /**
- * Constructor.
- *
- * @param addon The information about the addon to show.
- */
- explicit taddon_description(const addon_info& addon);
-
- /** The display function see @ref tdialog for more information. */
- static void display(const addon_info& addon, CVideo& video)
- {
- taddon_description(addon).show(video);
- }
-
-private:
-
- /** Inherited from tdialog, implemented by REGISTER_DIALOG. */
- virtual const std::string& window_id() const;
-};
-
-}
-
#endif
Modified: trunk/src/gui/dialogs/addon/description.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/addon/description.hpp?rev=51652&r1=51651&r2=51652&view=diff
==============================================================================
--- trunk/src/gui/dialogs/addon/description.hpp (original)
+++ trunk/src/gui/dialogs/addon/description.hpp Wed Oct 26 03:11:06 2011
@@ -18,29 +18,7 @@
#include "gui/dialogs/dialog.hpp"
-#include <vector>
-
-struct addon_info
-{
- addon_info()
- : name()
- , description()
- , icon()
- , version()
- , author()
- , sizestr()
- , translations()
- {
- }
-
- std::string name;
- std::string description;
- std::string icon;
- std::string version;
- std::string author;
- std::string sizestr;
- std::vector<std::string> translations;
-};
+#include "addon/info.hpp"
namespace gui2 {
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
