amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 13:06:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Instead of the new_intrusive<T>() functions, use intrusive(new T)

Browse Source 
This means we no longer need 8 different functions for different numbers of arguments, and non-const references can now also be passed to constructors without problems.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1443 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2010-07-21 14:32:28 +00:00
parent 8800500d86
commit 51dfed69b4
66 changed files with 304 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/control/graph.cpp
+22 -22
View File
@@ -1019,39 +1019,39 @@ void GraphControl::setLayout(GraphType type, bool force) {
switch (type) {
case GRAPH_TYPE_BAR: {
intrusive_ptr<GraphContainer> combined(new GraphContainer());
combined->add(new_intrusive2<GraphValueAxis>(0, true));
combined->add(new_intrusive2<GraphLabelAxis>(0, HORIZONTAL));
combined->add(new_intrusive1<BarGraph>(0));
combined->add(new_intrusive2<GraphStats>(0, ALIGN_TOP_RIGHT));
graph = new_intrusive5<GraphWithMargins>(combined, 23,8,7,20);
combined->add(intrusive(new GraphValueAxis(0, true)));
combined->add(intrusive(new GraphLabelAxis(0, HORIZONTAL)));
combined->add(intrusive(new BarGraph(0)));
combined->add(intrusive(new GraphStats(0, ALIGN_TOP_RIGHT)));
graph = intrusive(new GraphWithMargins(combined, 23,8,7,20));
break;
} case GRAPH_TYPE_PIE: {
intrusive_ptr<GraphContainer> combined(new GraphContainer());
combined->add(new_intrusive5<GraphWithMargins>(new_intrusive1<PieGraph>(0), 0,0,120,0));
combined->add(new_intrusive3<GraphLegend>(0, ALIGN_TOP_RIGHT, false));
graph = new_intrusive5<GraphWithMargins>(combined, 20,20,20,20);
combined->add(intrusive(new GraphWithMargins(intrusive(new PieGraph(0)), 0,0,120,0)));
combined->add(intrusive(new GraphLegend(0, ALIGN_TOP_RIGHT, false)));
graph = intrusive(new GraphWithMargins(combined, 20,20,20,20));
break;
} case GRAPH_TYPE_STACK: {
intrusive_ptr<GraphContainer> combined(new GraphContainer());
combined->add(new_intrusive2<GraphValueAxis>(0, false));
combined->add(new_intrusive2<GraphLabelAxis>(0, HORIZONTAL));
combined->add(new_intrusive2<BarGraph2D>(0,1));
combined->add(new_intrusive3<GraphLegend>(1, ALIGN_TOP_RIGHT, true));
graph = new_intrusive5<GraphWithMargins>(combined, 23,8,7,20);
combined->add(intrusive(new GraphValueAxis(0, false)));
combined->add(intrusive(new GraphLabelAxis(0, HORIZONTAL)));
combined->add(intrusive(new BarGraph2D(0,1)));
combined->add(intrusive(new GraphLegend(1, ALIGN_TOP_RIGHT, true)));
graph = intrusive(new GraphWithMargins(combined, 23,8,7,20));
break;
} case GRAPH_TYPE_SCATTER: {
intrusive_ptr<GraphContainer> combined(new GraphContainer());
combined->add(new_intrusive4<GraphLabelAxis>(0, HORIZONTAL, false, DRAW_LINES_MID));
combined->add(new_intrusive4<GraphLabelAxis>(1, VERTICAL, false, DRAW_LINES_MID));
combined->add(new_intrusive2<ScatterGraph>(0,1));
graph = new_intrusive5<GraphWithMargins>(combined, 80,8,7,20);
combined->add(intrusive(new GraphLabelAxis(0, HORIZONTAL, false, DRAW_LINES_MID)));
combined->add(intrusive(new GraphLabelAxis(1, VERTICAL, false, DRAW_LINES_MID)));
combined->add(intrusive(new ScatterGraph(0,1)));
graph = intrusive(new GraphWithMargins(combined, 80,8,7,20));
break;
} case GRAPH_TYPE_SCATTER_PIE: {
intrusive_ptr<GraphContainer> combined(new GraphContainer());
combined->add(new_intrusive4<GraphLabelAxis>(0, HORIZONTAL, false, DRAW_LINES_MID));
combined->add(new_intrusive4<GraphLabelAxis>(1, VERTICAL, false, DRAW_LINES_MID));
combined->add(new_intrusive3<ScatterPieGraph>(0,1,2));
graph = new_intrusive5<GraphWithMargins>(combined, 80,8,7,20);
combined->add(intrusive(new GraphLabelAxis(0, HORIZONTAL, false, DRAW_LINES_MID)));
combined->add(intrusive(new GraphLabelAxis(1, VERTICAL, false, DRAW_LINES_MID)));
combined->add(intrusive(new ScatterPieGraph(0,1,2)));
graph = intrusive(new GraphWithMargins(combined, 80,8,7,20));
break;
} default:
graph = GraphP();
@@ -1065,7 +1065,7 @@ GraphType GraphControl::getLayout() const {
}
void GraphControl::setData(const GraphDataPre& data) {
setData(new_intrusive1<GraphData>(data));
setData(intrusive(new GraphData(data)));
}
void GraphControl::setData(const GraphDataP& data) {
if (graph) {