github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

bazaar: Fixing for C++11

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@9130 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2015-11-01 19:19:17 +00:00
parent 2d302b70d2
commit 2a208a73e1
10 changed files with 60 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

36
bazaar/PieTest/PieTest.upp
View file

@ -1,18 +1,18 @@
description "Bazaar: PieChart control test&demo by Andrei-Catalin";
uses
CtrlLib,
Scatter,
Report,
PdfDraw;
file
PieTest.h,
main.cpp,
PieTest.lay,
PieTest.iml,
app.tpp;
mainconfig
"" = "GUI";
description "Bazaar: PieChart control test&demo by Andrei-Catalin\377";
uses
CtrlLib,
Scatter,
Report,
PdfDraw;
file
PieTest.h,
main.cpp,
PieTest.lay,
PieTest.iml,
app.tpp;
mainconfig
"" = "GUI";

4
bazaar/PolyXML/PolyXML.h
View file

@ -38,7 +38,7 @@ template<class T> class PolyXMLUnknown : public T
{
XmlNode node = ParseXML(rawXML);
xml.Add();
xml.Node() = node;
xml.Node() = pick(node);
}
}
};
@ -191,7 +191,7 @@ template<class K, class T> class PolyXMLArrayMapOne : public ArrayMap<K, One<T>
// Xmlizer
void Xmlize(XmlIO &xml);
One<T>& Add(const K &key, pick_ One<T> &data) { return ArrayMap<K, One<T> >::AddPick(key, data); }
One<T>& Add(const K &key, pick_ One<T> &data) { return ArrayMap<K, One<T> >::AddPick(key, pick(data)); }
// progress callback
Callback2<int, int>Progress;

3
bazaar/ProductVersion/ProductVersion.upp
View file

@ -1,5 +1,8 @@
description "Small class to handle application versions\377";
uses
Core;
file
ProductVersion.h,
ProductVersion.cpp;

1
bazaar/ProductVersion/init
View file

@ -1,3 +1,4 @@
#ifndef _ProductVersion_icpp_init_stub
#define _ProductVersion_icpp_init_stub
#include "Core/init"
#endif

13
bazaar/ProductVersionTest/ProductVersionTest.cpp Normal file
View file

@ -0,0 +1,13 @@
#include <Core/Core.h>
#include <ProductVersion/ProductVersion.h>
using namespace Upp;
CONSOLE_APP_MAIN
{
ProductVersion v(1, 2, 3);
ProductVersion v2 = v;
v2.IncDevel();
DUMP(v < v2);
}

10
bazaar/ProductVersionTest/ProductVersionTest.upp Normal file
View file

@ -0,0 +1,10 @@
uses
Core,
ProductVersion;
file
ProductVersionTest.cpp;
mainconfig
"" = "";

5
bazaar/ProductVersionTest/init Normal file
View file

@ -0,0 +1,5 @@
#ifndef _ProductVersionTest_icpp_init_stub
#define _ProductVersionTest_icpp_init_stub
#include "Core/init"
#include "ProductVersion/init"
#endif

8
bazaar/Scatter/Scatter.cpp
View file

@ -416,7 +416,7 @@ void Scatter::Graduation_FormatY2(Formats fi)
Scatter &Scatter::AddSeries(Vector<XY> & points,const String& legend,const bool& join, const class::Color& pcolor, const int& width, const int& thickness)
{
vPointsData.AddPick(points);
vPointsData.AddPick(pick(points));
vJoin.Add(join);
vSmooth.Add(false);
vPColors.Add(pcolor);
@ -851,7 +851,7 @@ void Scatter::RemoveAllSeries()
void Scatter::PlotFunction(PlotFunc f, const String& legend, const class::Color& fcolor, const int& weight)
{
Vector<XY> series;
vFunctionData.AddPick(series);
vFunctionData.AddPick(pick(series));
vAdress.Add(f);
@ -874,7 +874,7 @@ void Scatter::PlotParaFunction(PlotParamFunc f, const String& legend, const clas
}
vFColors.Add(fcolor);
vFThickness.Add(weight);
vFunctionData.AddPick(series);
vFunctionData.AddPick(pick(series));
vFPrimaryY.Add(true);
vFPattern.Add(LINE_SOLID);
vFLegend.Add(legend);
@ -1781,7 +1781,7 @@ Vector<XY> Scatter::Cubic(const Vector<XY>& DataSet, const int& fineness,double
OutSet<<XY(b0*t*t*t+b1*t*t+b2*t+b3, a0*t*t*t+a1*t*t+a2*t+a3);
}
}
return Vector<XY>(OutSet);
return Vector<XY>(pick(OutSet));
}
void ParseTextMultiline(const String &text, Font fnt, Array <String> &texts, Array <Size> &sizes) {

2
bazaar/XMLMenu/WithXMLMenu.h
View file

@ -142,7 +142,7 @@ template<class T> class WithXMLMenu : public T, public XMLMenuInterface
// gets a context menu by name -- NULL if none
MenuBar *GetContextMenu(String const &name);
// xml support
// xml supportbin
void Xmlize(XmlIO xml);
};

6
bazaar/XMLMenu/XMLCommand.h
View file

@ -66,19 +66,19 @@ class XMLCommand : DeepCopyOption<XMLCommand>
// an array of available commands
class XMLCommands : DeepCopyOption<XMLCommands>
{
private:
ArrayMap<String, XMLCommand> commands;
public:
rval_default(XMLCommands);
// default constructor
XMLCommands() {}
// copy constructor
XMLCommands(XMLCommands const &cmds, int dummy) : commands(cmds.commands, 0) {}
// pick constructor
XMLCommands(XMLCommands rval_ cmds) : commands(pick(cmds.commands)) {}
// adds a custom command
XMLCommands &Add(String const &id, String const &cmd);