Author: mordante
Date: Sun Feb 14 20:36:16 2010
New Revision: 41212
URL: http://svn.gna.org/viewcvs/wesnoth?rev=41212&view=rev
Log:
Reduced header dependencies.
Modified:
trunk/src/gui/dialogs/campaign_selection.cpp
trunk/src/gui/dialogs/lobby_main.cpp
trunk/src/gui/dialogs/lobby_main.hpp
trunk/src/gui/widgets/tree_view.cpp
trunk/src/gui/widgets/tree_view.hpp
Modified: trunk/src/gui/dialogs/campaign_selection.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/campaign_selection.cpp?rev=41212&r1=41211&r2=41212&view=diff
==============================================================================
--- trunk/src/gui/dialogs/campaign_selection.cpp (original)
+++ trunk/src/gui/dialogs/campaign_selection.cpp Sun Feb 14 20:36:16 2010
@@ -24,6 +24,7 @@
#include "gui/widgets/scroll_label.hpp"
#include "gui/widgets/settings.hpp"
#include "gui/widgets/tree_view.hpp"
+#include "gui/widgets/tree_view_node.hpp"
#include "gui/widgets/window.hpp"
#include "serialization/string_utils.hpp"
@@ -112,12 +113,12 @@
tree_group_field["label"] = "Campaigns won";
tree_group_item["tree_view_node_label"] = tree_group_field;
- ttree_view::tnode& completed =
+ ttree_view_node& completed =
tree.add_node("campaign_group",
tree_group_item);
tree_group_field["label"] = "Campaigns to conquer";
tree_group_item["tree_view_node_label"] = tree_group_field;
- ttree_view::tnode& not_completed =
+ ttree_view_node& not_completed =
tree.add_node("campaign_group",
tree_group_item);
/***** Setup campaign details. *****/
Modified: trunk/src/gui/dialogs/lobby_main.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/lobby_main.cpp?rev=41212&r1=41211&r2=41212&view=diff
==============================================================================
--- trunk/src/gui/dialogs/lobby_main.cpp (original)
+++ trunk/src/gui/dialogs/lobby_main.cpp Sun Feb 14 20:36:16 2010
@@ -31,6 +31,7 @@
#include "gui/widgets/text_box.hpp"
#include "gui/widgets/toggle_button.hpp"
#include "gui/widgets/toggle_panel.hpp"
+#include "gui/widgets/tree_view_node.hpp"
#include "foreach.hpp"
#include "formula_string_utils.hpp"
@@ -900,7 +901,7 @@
tree_group_field["use_markup"] = "true";
tree_group_item["name"] = tree_group_field;
- ttree_view::tnode& player =
+ ttree_view_node& player =
target_list->tree->add_child("player",
tree_group_item);
find_widget<ttoggle_panel>(&player,
"tree_view_node_label", false)
Modified: trunk/src/gui/dialogs/lobby_main.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/lobby_main.hpp?rev=41212&r1=41211&r2=41212&view=diff
==============================================================================
--- trunk/src/gui/dialogs/lobby_main.hpp (original)
+++ trunk/src/gui/dialogs/lobby_main.hpp Sun Feb 14 20:36:16 2010
@@ -58,7 +58,7 @@
tlabel* count;
ttoggle_button* show_toggle;
tlistbox* list;
- ttree_view::tnode* tree;
+ ttree_view_node* tree;
tlabel* tree_label;
};
Modified: trunk/src/gui/widgets/tree_view.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/tree_view.cpp?rev=41212&r1=41211&r2=41212&view=diff
==============================================================================
--- trunk/src/gui/widgets/tree_view.cpp (original)
+++ trunk/src/gui/widgets/tree_view.cpp Sun Feb 14 20:36:16 2010
@@ -17,6 +17,7 @@
#include "gui/widgets/tree_view.hpp"
#include "gui/auxiliary/log.hpp"
+#include "gui/widgets/tree_view_node.hpp"
#include "gui/widgets/window.hpp"
#include <boost/bind.hpp>
@@ -30,7 +31,7 @@
: tscrollbar_container(2)
, node_definitions_(node_definitions)
, indention_step_size_(0)
- , root_node_(new tnode(
+ , root_node_(new ttree_view_node(
"root"
, node_definitions_
, NULL
@@ -41,11 +42,17 @@
{
}
-void ttree_view::remove_node(tnode* node)
+ttree_view_node& ttree_view::add_node(const std::string& id
+ , const std::map<std::string /* widget id */, string_map>& data)
+{
+ return get_root_node().add_child(id, data);
+}
+
+void ttree_view::remove_node(ttree_view_node* node)
{
assert(node && node != root_node_ && node->parent_);
- boost::ptr_vector<tnode>::iterator itor =
+ boost::ptr_vector<ttree_view_node>::iterator itor =
node->parent_->children_.begin();
for( ; itor != node->parent_->children_.end(); ++itor) {
@@ -80,6 +87,11 @@
assert(root_node_);
root_node_->impl_populate_dirty_list(caller, call_stack);
+}
+
+bool ttree_view::empty() const
+{
+ return root_node_->empty();
}
namespace {
Modified: trunk/src/gui/widgets/tree_view.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/tree_view.hpp?rev=41212&r1=41211&r2=41212&view=diff
==============================================================================
--- trunk/src/gui/widgets/tree_view.hpp (original)
+++ trunk/src/gui/widgets/tree_view.hpp Sun Feb 14 20:36:16 2010
@@ -18,10 +18,9 @@
#include "gui/widgets/scrollbar_container.hpp"
#include "gui/auxiliary/window_builder/tree_view.hpp"
-// Can be changed to forward declaration once ilor is finished with the lobby.
-#include "gui/widgets/tree_view_node.hpp"
+namespace gui2 {
-namespace gui2 {
+class ttree_view_node;
class ttree_view
: public tscrollbar_container
@@ -30,8 +29,6 @@
friend class ttree_view_node;
public:
- // Can be removed once ilor is done with the lobby.
- typedef ttree_view_node tnode;
typedef implementation::tbuilder_tree_view::tnode tnode_definition;
/**
@@ -52,10 +49,7 @@
ttree_view_node& get_root_node() { return *root_node_; }
ttree_view_node& add_node(const std::string& id
- , const std::map<std::string /* widget id */,
string_map>& data)
- {
- return get_root_node().add_child(id, data);
- }
+ , const std::map<std::string /* widget id */,
string_map>& data);
void remove_node(ttree_view_node* tree_view_node);
@@ -67,7 +61,7 @@
void set_self_active(const bool /*active*/) {}
// { state_ = active ? ENABLED : DISABLED; }
- bool empty() const { return root_node_->empty(); }
+ bool empty() const;
/***** ***** ***** setters / getters for members ***** ****** *****/
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
