460_conversion.diff

The diff file to apply for bazaar, examples, rainbow, reference, tutorial, uppbox, uppdev, uppsrc, upptst directories - Sender Ghost, 05/26/2013 09:55 AM

Download (76.4 KB)

View differences:

bazaar/CtrlLibBoostPy/CtrlCore.cpp 2013-05-26 10:12:21 +0400
88 88
String CtrlToString(const Ctrl& c)
89 89
{
90 90
	return c.Name();
91
	return String().Cat() << String(typeid(c).name()) << ": " << AsString(c.GetData());
91
	return String(typeid(c).name()) << ": " << AsString(c.GetData());
92 92
}
93 93

  
94 94
enum PaintEnum {
bazaar/DeEncrypter/main.cpp 2013-05-26 10:09:32 +0400
74 74
	fsf.Multi();
75 75
	fsf.ClearTypes();
76 76
	
77
	if(!fsf.ExecuteOpen(String().Cat() << "Select files to " << ((encrypt)?("ENcrypt"):("DEcrypt")) ))
77
	if(!fsf.ExecuteOpen(String() << "Select files to " << ((encrypt)?("ENcrypt"):("DEcrypt")) ))
78 78
	{
79 79
		ToInfo("Canceled");
80 80
		return;
81 81
	}
82 82
	
83
	if(!dirs.ExecuteSelectDir(String().Cat() << "Select directory where to put " << ((encrypt)?("ENcrypted"):("DEcrypted")) << " files (same file name used)"))
83
	if(!dirs.ExecuteSelectDir(String() << "Select directory where to put " << ((encrypt)?("ENcrypted"):("DEcrypted")) << " files (same file name used)"))
84 84
	{
85 85
		ToInfo("Canceled");
86 86
		return;
bazaar/DispatcherTest/main.cpp 2013-05-26 10:09:32 +0400
16 16
	//pi.SetData(o);
17 17
	pi.Set(o);
18 18
	dl.SetData(o);
19
	st.SetText(String().Cat() << o);
19
	st.SetText(String() << o);
20 20
}
21 21

  
22 22
//
bazaar/DispatcherTest2/main.cpp 2013-05-26 10:09:32 +0400
16 16
	//pi.SetData(o);
17 17
	pi.Set(o);
18 18
	dl.SetData(o);
19
	st.SetText(String().Cat() << o);
19
	st.SetText(String() << o);
20 20
}
21 21

  
22 22
void MyPane::Dispatch(const int& o)
......
25 25
	//pi.SetData(o);
26 26
	pi.Set(o);
27 27
	dl.SetData(o);
28
	st.SetText(String().Cat() << o);
28
	st.SetText(String() << o);
29 29
}
30 30

  
31 31
//
bazaar/PlotLib/PlotSymbol.cpp 2013-05-26 10:09:32 +0400
39 39
}
40 40

  
41 41
String PlotSymbol::ToString()const{
42
	return String().Cat()<<s.cx<<"x"<<s.cy<<";"<<Color(c)<<";"<<Color(f)<<";"<<t;
42
	return String()<<s.cx<<"x"<<s.cy<<";"<<Color(c)<<";"<<Color(f)<<";"<<t;
43 43
}
44 44

  
45 45
PlotSymbol* PlotSymbol::Copy()const{
bazaar/PointCtrlTest/main.cpp 2013-05-26 10:09:32 +0400
38 38
	double y = pc.GetDataY();
39 39
	slx.SetData(x);
40 40
	sly.SetData(y);
41
	ToInfo(String().Cat() << "(" << x << "," << y << ")");
41
	ToInfo(String() << "(" << x << "," << y << ")");
42 42
}
43 43

  
44 44
void PointCtrlTest::OnAddPoint()
45 45
{
46
	ToInfo(String().Cat() << "Added: XY(" << pc.vp.Top() << ")");
46
	ToInfo(String() << "Added: XY(" << pc.vp.Top() << ")");
47 47
}
48 48

  
49 49
void PointCtrlTest::OnRemovePoint(int i)
50 50
{
51
	ToInfo(String().Cat() << "Removed Point @: " << i);
51
	ToInfo(String() << "Removed Point @: " << i);
52 52
}
53 53

  
54 54
void PointCtrlTest::OnMovePoint(int i)
55 55
{
56
	ToInfo(String().Cat() << "MovePoint @: " << i << " XY(" << pc.vp[i] << ")");
56
	ToInfo(String() << "MovePoint @: " << i << " XY(" << pc.vp[i] << ")");
57 57
}
58 58

  
59 59
GUI_APP_MAIN
bazaar/PopUpTest/main.cpp 2013-05-26 10:09:32 +0400
3 3
void PopUpTest::OkCB()
4 4
{
5 5
	String a = AsString(pu.ei.GetData());
6
	drop.SetLabel(String().Cat() << "dropped OK, " << a);
6
	drop.SetLabel(String() << "dropped OK, " << a);
7 7
}
8 8

  
9 9
void PopUpTest::CancelCB()
bazaar/Sound/SoundSystem.cpp 2013-05-26 10:09:32 +0400
34 34
}
35 35

  
36 36
String SoundAPI::ToString()const{
37
	return String().Cat() << name;
37
	return String() << name;
38 38
}
39 39

  
40 40
/* SoundSystem */
bazaar/ValueCtrl/ValueCtrl.h 2013-05-26 10:09:32 +0400
29 29
	int      Compare(const ValueEditKey& o) const { return SgnCompare(k, o.k); }
30 30
	void     Serialize(Stream& s)            { s % k; }
31 31
	String   ToString() const                { int i = GetValueTypeNoNameMap().Find(k); if(i>=0) return GetValueTypeNoNameMap()[i];
32
                                               return GetValueTypeNoNameMap().Add(k, String().Cat() << "ValueTypeNo_" << k); }
32
                                               return GetValueTypeNoNameMap().Add(k, String() << "ValueTypeNo_" << k); }
33 33
	unsigned GetHashValue() const            { return UPP::GetHashValue(k); }
34 34
	bool     IsNullInstance() const          { return IsNull(k); }
35 35

  
bazaar/WorkQueueTest2/main.cpp 2013-05-26 10:09:32 +0400
34 34

  
35 35
	//show results
36 36
	GuiLock __;
37
	inf.Insert(inf.GetCursor(), String().Cat() << "-|" << i << "|-");
37
	inf.Insert(inf.GetCursor(), String() << "-|" << i << "|-");
38 38
	inf.SetCursor(inf.GetLength());
39 39
}
40 40

  
examples/Puzzle/Puzzle.cpp 2013-05-26 10:09:32 +0400
114 114
			if(box[i] != i + 1)
115 115
				return;
116 116
		String dim;
117
		int& sm = score.GetAdd(String().Cat() << size.cx << "x" << size.cy);
117
		int& sm = score.GetAdd(String() << size.cx << "x" << size.cy);
118 118
		if(moves < sm) {
119 119
			sm = moves;
120 120
			PromptOK(t_("You win with the new best score!"));
rainbow/GtkMain/main.cpp 2013-05-26 10:09:32 +0400
60 60
		};
61 61
		Tuple2<int, const char *> *a = FindTuple(map, __countof(map), event & BUTTON);
62 62
		Tuple2<int, const char *> *b = FindTuple(map, __countof(map), event & ACTION);
63
		Log(String().Cat() << "MOUSE " << (a ? a->b : "") << '|' << (b ? b->b : "") << ' ' << p);
63
		Log(String() << "MOUSE " << (a ? a->b : "") << '|' << (b ? b->b : "") << ' ' << p);
64 64

  
65 65
		return TopWindow::MouseEvent(event, p, zdelta, keyflags);
66 66
	}
......
95 95
		w.DrawRect(GetSize(), White());
96 96
		int y = 0;
97 97
		w.DrawText(0, y += fcy, AsString(pos));
98
		w.DrawText(0, y += fcy, String().Cat() << "Shift: " << (int)GetShift());
99
		w.DrawText(0, y += fcy, String().Cat() << "Ctrl: " << (int)GetCtrl());
100
		w.DrawText(0, y += fcy, String().Cat() << "Alt: " << (int)GetAlt());
101
		w.DrawText(0, y += fcy, String().Cat() << "CapsLock: " << (int)GetCapsLock());
102
		w.DrawText(0, y += fcy, String().Cat() << "MouseLeft: " << (int)GetMouseLeft());
103
		w.DrawText(0, y += fcy, String().Cat() << "MouseRight: " << (int)GetMouseRight());
104
		w.DrawText(0, y += fcy, String().Cat() << "MouseMiddle: " << (int)GetMouseMiddle());
98
		w.DrawText(0, y += fcy, String() << "Shift: " << (int)GetShift());
99
		w.DrawText(0, y += fcy, String() << "Ctrl: " << (int)GetCtrl());
100
		w.DrawText(0, y += fcy, String() << "Alt: " << (int)GetAlt());
101
		w.DrawText(0, y += fcy, String() << "CapsLock: " << (int)GetCapsLock());
102
		w.DrawText(0, y += fcy, String() << "MouseLeft: " << (int)GetMouseLeft());
103
		w.DrawText(0, y += fcy, String() << "MouseRight: " << (int)GetMouseRight());
104
		w.DrawText(0, y += fcy, String() << "MouseMiddle: " << (int)GetMouseMiddle());
105 105
		y = 0;
106 106
		for(int i = 0; i < log.GetCount(); i++) {
107 107
			w.DrawText(100, y, log[i]);
rainbow/WinAlt/WinAltClip.cpp 2013-05-26 10:09:32 +0400
61 61
	String s = txt;
62 62
	s << "\n" << GetLastErrorMessage();
63 63
	MessageBox(::GetActiveWindow(), s, "Clipboard error", MB_ICONSTOP | MB_OK | MB_APPLMODAL);
64
	ClipboardLog(String().Cat() << s << " ERROR");
64
	ClipboardLog(String() << s << " ERROR");
65 65
#endif
66 66
}
67 67

  
......
70 70
void ClipboardError(const char *txt, int format)
71 71
{
72 72
#ifdef flagCHECKCLIPBOARD
73
	ClipboardError(String().Cat() << txt << ' ' << FromWin32CF(format));
73
	ClipboardError(String() << txt << ' ' << FromWin32CF(format));
74 74
#endif
75 75
}
76 76

  
rainbow/WinAlt/WinAltDnD.cpp 2013-05-26 10:09:32 +0400
44 44

  
45 45
String AsString(POINTL p)
46 46
{
47
	return String().Cat() << "[" << p.x << ", " << p.y << "]";
47
	return String() << "[" << p.x << ", " << p.y << "]";
48 48
}
49 49

  
50 50
struct UDropTarget : public IDropTarget {
reference/ArrayCtrl/main.cpp 2013-05-26 10:09:32 +0400
22 22
struct MyConvert : public Convert {
23 23
	Value Format(const Value& v) const {
24 24
		ValueArray va = v;
25
		return String().Cat() << va[0] << " - " << va[1] << " - " << va[2];
25
		return String() << va[0] << " - " << va[1] << " - " << va[2];
26 26
	}
27 27
};
28 28

  
......
37 37
void ArrayCtrlExample::DoubleClick()
38 38
{
39 39
	if(array.IsCursor())
40
		PromptOK(String().Cat() << "ID1: " << array.Get(ID1) << ", first column" << array.Get(0));
40
		PromptOK(String() << "ID1: " << array.Get(ID1) << ", first column" << array.Get(0));
41 41
}
42 42

  
43 43
ArrayCtrlExample::ArrayCtrlExample()
reference/brc/bin.cpp 2013-05-26 10:09:32 +0400
8 8

  
9 9
CONSOLE_APP_MAIN
10 10
{
11
	puts(String().Cat() << "brc length: " << bin_brc_length);
11
	puts(String() << "brc length: " << bin_brc_length);
12 12
	fflush(stdout);
13
	puts(String().Cat() << "cpp length: " << bin_cpp_length);
13
	puts(String() << "cpp length: " << bin_cpp_length);
14 14
	fflush(stdout);
15
	puts(String().Cat() << "all count:  " << bin_all_count);
15
	puts(String() << "all count:  " << bin_all_count);
16 16
	fflush(stdout);
17
//	puts(String().Cat() << "cpp: <<<\n" << (const char *)bin_cpp << "\n>>>");
17
//	puts(String() << "cpp: <<<\n" << (const char *)bin_cpp << "\n>>>");
18 18
	MemReadStream in1(bin_cpp, bin_cpp_length);
19
	puts(String().Cat() << "cpp: <<<\n" << BZ2Decompress(in1) << "\n>>>");
19
	puts(String() << "cpp: <<<\n" << BZ2Decompress(in1) << "\n>>>");
20 20
	fflush(stdout);
21
//	puts(String().Cat() << "brc: <<<\n" << (const char *)bin_brc << "\n>>>");
21
//	puts(String() << "brc: <<<\n" << (const char *)bin_brc << "\n>>>");
22 22
	MemReadStream in2(bin_brc, bin_brc_length);
23
	puts(String().Cat() << "brc: <<<\n" << BZ2Decompress(in2) << "\n>>>");
23
	puts(String() << "brc: <<<\n" << BZ2Decompress(in2) << "\n>>>");
24 24
	fflush(stdout);
25 25
	for(int i = 0; i < bin_all_count; i++) {
26
		puts(String().Cat() << "all length[" << i << "]: " << bin_all_length[i]);
26
		puts(String() << "all length[" << i << "]: " << bin_all_length[i]);
27 27
		fflush(stdout);
28
		puts(String().Cat() << "all files[" << i << "]: " << bin_all_files[i]);
28
		puts(String() << "all files[" << i << "]: " << bin_all_files[i]);
29 29
		fflush(stdout);
30 30
		MemReadStream in3(bin_all[i], bin_all_length[i]);
31
		puts(String().Cat() << "all[" << i << "]: <<<\n" << BZ2Decompress(in3) << "\n>>>");
31
		puts(String() << "all[" << i << "]: <<<\n" << BZ2Decompress(in3) << "\n>>>");
32 32
		fflush(stdout);
33 33
	}
34 34
}
reference/Common/Common.cpp 2013-05-26 10:09:32 +0400
6 6
	String a;
7 7
	int    b;
8 8

  
9
	String   ToString() const            { return String().Cat() << '(' << a << ", " << b << ')'; }
9
	String   ToString() const            { return String() << '(' << a << ", " << b << ')'; }
10 10
	unsigned GetHashValue() const        { return CombineHash() << a << b; }
11 11
	int      Compare(const Foo& x) const { return CombineCompare(a, x.a)(b, x.b); }
12 12
	void     Serialize(Stream& s)        { s % a % b; }
reference/CtrlRetriever/main.cpp 2013-05-26 10:09:32 +0400
21 21
	dlg.Run();
22 22
	r.Retrieve();
23 23

  
24
	PromptOK(String().Cat() << "text: [* " << DeQtf(text) << "]&"
24
	PromptOK(String() << "text: [* " << DeQtf(text) << "]&"
25 25
	                        << "option: [* " << (option ? "true" : "false"));
26 26
}
reference/GuiWebCrawler/GuiWebCrawler.cpp 2013-05-26 10:09:32 +0400
90 90
			else {
91 91
				String html = w.http;
92 92
				total += html.GetCount();
93
				finished.Add(u, w.http.IsError() ? String().Cat() << w.http.GetErrorDesc()
94
				                                 : String().Cat() << w.http.GetStatusCode()
93
				finished.Add(u, w.http.IsError() ? String() << w.http.GetErrorDesc()
94
				                                 : String() << w.http.GetStatusCode()
95 95
				                                   << ' ' << w.http.GetReasonPhrase()
96 96
				                                   << " (" << html.GetCount() << " bytes)",
97 97
				             w.urli);
reference/RescaleFilter/main.cpp 2013-05-26 10:09:32 +0400
37 37
			w.DrawImage(x, 600, RescaleFilter(img, Size(250, 250), RectC(40, 40, 100, 100), m));
38 38
		}
39 39
		
40
		w.DrawText(GetSize().cx - 200, 40, String().Cat() << "Elapsed " << tm << "s");
40
		w.DrawText(GetSize().cx - 200, 40, String() << "Elapsed " << tm << "s");
41 41
	}
42 42
	
43 43
	void Sync()
reference/Switch/main.cpp 2013-05-26 10:09:32 +0400
38 38
	dlg.s2 <<= 2;
39 39
	if(dlg.Execute() != IDOK)
40 40
		return;
41
	PromptOK(String().Cat() << "First: " << ~dlg.s1 << ", second: " << ~dlg.s2);
41
	PromptOK(String() << "First: " << ~dlg.s1 << ", second: " << ~dlg.s2);
42 42
}
reference/Value/Value.cpp 2013-05-26 10:09:32 +0400
13 13

  
14 14
	int      Compare(const RichFoo& o) const { return CombineCompare(a, o.a)(b, o.b); }
15 15
	void     Serialize(Stream& s)            { s % a % b; }
16
	String   ToString() const                { return String().Cat() << a << ", " << b; }
16
	String   ToString() const                { return String() << a << ", " << b; }
17 17
	unsigned GetHashValue() const            { return CombineHash(a, b); }
18 18
	bool     IsNullInstance() const          { return IsNull(a); }
19 19

  
tutorial/Core01/main.cpp 2013-05-26 10:09:32 +0400
17 17
	for(int i = 0; i < 10; i++)
18 18
		a << i << ", ";
19 19
	DUMP(a);
20
	DUMP(String().Cat() << "Number is " << 123 << ".");
20
	DUMP(String() << "Number is " << 123 << ".");
21 21
	a = "0123456789";
22 22
	DUMP(a.GetLength());
23 23
	a.Insert(6, "<inserted>");
tutorial/Gui20c/main.cpp 2013-05-26 10:09:32 +0400
22 22
	MyApp app;
23 23
	switch(app.Run()) {
24 24
	case IDOK:
25
		PromptOK(String().Cat() << "OK: " << ~app.date);
25
		PromptOK(String() << "OK: " << ~app.date);
26 26
		break;
27 27
	case IDCANCEL:
28 28
		Exclamation("Canceled");
tutorial/Gui20d/main.cpp 2013-05-26 10:09:32 +0400
11 11
	CtrlLayoutOKCancel(app, "MyApp");
12 12
	switch(app.Run()) {
13 13
	case IDOK:
14
		PromptOK(String().Cat() << "OK: " << ~app.date);
14
		PromptOK(String() << "OK: " << ~app.date);
15 15
		break;
16 16
	case IDCANCEL:
17 17
		Exclamation("Canceled");
uppbox/MakeInstall4/Main.cpp 2013-05-26 10:09:32 +0400
20 20
	String r;
21 21
	int q = Sys(s, r);
22 22
	if(q)
23
		Error(String().Cat() << "Failed: " << s << "\r\n" <<
23
		Error(String() << "Failed: " << s << "\r\n" <<
24 24
		      "Exit code: " << q << "\r\n" <<
25 25
		      "Output: " << r);
26 26
	return r;
uppbox/uppweb/www.cpp 2013-05-26 10:09:32 +0400
269 269
String Www(const char *topic, int lang, String topicLocation = "topic://uppweb/www/")
270 270
{
271 271
	String strLang = ToLower(LNGAsText(lang));
272
	String www = GatherTopics(tt, String().Cat() << topicLocation << topic << "$" << strLang);
272
	String www = GatherTopics(tt, String() << topicLocation << topic << "$" << strLang);
273 273
	if (www != "index.html")
274 274
		return www;
275
	return GatherTopics(tt, String().Cat() << topicLocation << topic << "$" << "en-us");
275
	return GatherTopics(tt, String() << topicLocation << topic << "$" << "en-us");
276 276
}
277 277

  
278 278
String FolderLinks(String package, String group, int lang)
......
328 328
	Sort(ls, Isort());
329 329
	for(int i = 0; i < ls.GetCount(); i++) {
330 330
		String name = ls[i];
331
		String link = String().Cat() << www << '$' << name << "$" << ToLower(LNGAsText(language)) << ".html";
331
		String link = String() << www << '$' << name << "$" << ToLower(LNGAsText(language)) << ".html";
332 332
		Topic& topic = tt.Add(link);
333 333
		topic.title = name;
334 334
		String fn = AppendFileName(
......
950 950

  
951 951
	Date d = GetSysDate();
952 952
	lastUpdate = HtmlItalic() / HtmlArial(8) / HtmlFontColor(Gray()) /
953
	                   (String().Cat() << "Last update " << GetSysDate());
953
	                   (String() << "Last update " << GetSysDate());
954 954

  
955 955
//	Vector<String> amazon = Split(LoadFile(GetRcFile("amazon.txt")), '\n');//440
956 956

  
uppbox/Uvs2/DlgFiles.cpp 2013-05-26 11:06:24 +0400
1292 1292
	try {
1293 1293
		DlgSyncProgress progress("Stahov?n? zm?n");
1294 1294
		FtpClient ftp;
1295
		progress.SetText(String().Cat() << "Otev?r?m server '" << job.host << "'");
1295
		progress.SetText(String() << "Otev?r?m server '" << job.host << "'");
1296 1296
		OpenFTP(ftp);
1297 1297
		progress.SetText("Stahuji index posledn?ho bloku");
1298 1298
		int hblock = GetHostBlock(ftp);
......
1301 1301
		int lblock = GetLocalBlock();
1302 1302
		if(!IsNull(lblock)) {
1303 1303
			if(lblock > hblock)
1304
				throw Exc(String().Cat() << "Index posledn?ho bloku v lok?ln?m archivu (" << lblock
1304
				throw Exc(String() << "Index posledn?ho bloku v lok?ln?m archivu (" << lblock
1305 1305
				<< ") je v?t?? ne? na serveru (" << hblock << ").");
1306 1306
			if(lblock == hblock)
1307
				throw Exc(String().Cat() << "Vzd?len? archiv neobsahuje ??dn? nov? zm?ny.");
1307
				throw Exc(String() << "Vzd?len? archiv neobsahuje ??dn? nov? zm?ny.");
1308 1308
		}
1309 1309
		Array<UvsDataBlock> blocks = Download(ftp, Nvl(lblock, 0) + 1, hblock, true, progress);
1310 1310
		for(int i = 0; i < blocks.GetCount(); i++)
......
1477 1477
								repv = true;
1478 1478
								ft = lft - 1;
1479 1479
								au = "Lost";
1480
								sep = String().Cat() << '#' << ft << ' ' << AsCString(au) << '\n';
1480
								sep = String() << '#' << ft << ' ' << AsCString(au) << '\n';
1481 1481
							}
1482 1482
						}
1483 1483
						else {
......
1490 1490
									auto_repair_rtime)) {
1491 1491
									repv = true;
1492 1492
									ft = rt;
1493
									sep = String().Cat() << '#' << ft << ' ' << AsCString(au) << '\n';
1493
									sep = String() << '#' << ft << ' ' << AsCString(au) << '\n';
1494 1494
								}
1495 1495
							}
1496 1496
							if(IsNull(au)) {
......
1500 1500
									auto_repair_author)) {
1501 1501
									repv = true;
1502 1502
									au = "Unknown";
1503
									sep = String().Cat() << '#' << ft << ' ' << AsCString(au) << '\n';
1503
									sep = String() << '#' << ft << ' ' << AsCString(au) << '\n';
1504 1504
								}
1505 1505
							}
1506 1506
							lft = ft;
......
2712 2712
	ConAdd(t_("Reading changes: "));
2713 2713
	int load_total = last - first + 1;
2714 2714
	for(int i = first; i <= last; i++) {
2715
		ConAdd(String().Cat() << (i == first || (i - first) % 5 ? " " : "\n   ") << i);
2715
		ConAdd(String() << (i == first || (i - first) % 5 ? " " : "\n   ") << i);
2716 2716
		String path = FormatInt(i) + ".udb";
2717 2717
		String filename = job.GetLocalPath(path);
2718 2718
		String file = LoadFile(filename);
......
3214 3214

  
3215 3215
void DlgFiles::ConLine(const char *text, bool arc_con)
3216 3216
{
3217
	ConAdd(String().Cat() << text << '\n', arc_con);
3217
	ConAdd(String() << text << '\n', arc_con);
3218 3218
}
3219 3219

  
3220 3220
bool DlgFiles::IsSyncTime()
......
3248 3248

  
3249 3249
void DlgFiles::SetProgressCount(int count, int total)
3250 3250
{
3251
	progress.Text(String().Cat() << count << " / " << total);
3251
	progress.Text(String() << count << " / " << total);
3252 3252
	progress.Set(count, total);
3253 3253
}
3254 3254

  
uppbox/Uvs2/util.cpp 2013-05-26 11:08:25 +0400
1262 1262
	static const char incomplete[] = "Ne?pln? nebo po?kozen? data, ofset ";
1263 1263
	int dirlen = 0, datalen = 0;
1264 1264
	if(e - p < BLOCK_KEY_LENGTH + 6 * 4)
1265
		throw Exc(String().Cat() << incomplete << 0);
1265
		throw Exc(String() << incomplete << 0);
1266 1266
	if(memcmp(p, block_key, BLOCK_KEY_LENGTH))
1267 1267
		throw Exc("Neplatn? identifika?n? k?d datov?ho bloku.");
1268 1268
	p += BLOCK_KEY_LENGTH;
......
1286 1286
	p += 8;
1287 1287
	int item_bytes = (version <= 1 ? 8 : 16);
1288 1288
	if(e - p < item_bytes * down_count)
1289
		throw Exc(String().Cat() << incomplete << (p - ~data));
1289
		throw Exc(String() << incomplete << (p - ~data));
1290 1290
	Vector<int> data_length;
1291 1291
	Vector<dword> data_crc;
1292 1292
	Vector<int> version_length;
uppdev/BiCubic/main.cpp 2013-05-26 10:09:32 +0400
199 199
		w.DrawImage(GetSize().cx - 400, 100, rescale(TestImg::img2(), 400, 400, k, ka, ~method));
200 200
		w.DrawImage(GetSize().cx - 400, 500, rescale(TestImg::img3(), 400, 400, k, ka, ~method));
201 201
		
202
		w.DrawText(GetSize().cx - 200, 40, String().Cat() << "Time " << tm);
202
		w.DrawText(GetSize().cx - 200, 40, String() << "Time " << tm);
203 203

  
204 204
		for(int i = 0; i < TestImg().GetCount(); i++) {
205 205
			w.DrawImage(250 * i, GetSize().cy - 84, Rescale(TestImg().Get(i), 84, 84));
uppdev/brc/bin.cpp 2013-05-26 10:09:33 +0400
8 8

  
9 9
CONSOLE_APP_MAIN
10 10
{
11
	puts(String().Cat() << "brc length: " << bin_brc_length);
11
	puts(String() << "brc length: " << bin_brc_length);
12 12
	fflush(stdout);
13
	puts(String().Cat() << "cpp length: " << bin_cpp_length);
13
	puts(String() << "cpp length: " << bin_cpp_length);
14 14
	fflush(stdout);
15
	puts(String().Cat() << "all count:  " << bin_all_count);
15
	puts(String() << "all count:  " << bin_all_count);
16 16
	fflush(stdout);
17
//	puts(String().Cat() << "cpp: <<<\n" << (const char *)bin_cpp << "\n>>>");
17
//	puts(String() << "cpp: <<<\n" << (const char *)bin_cpp << "\n>>>");
18 18
	MemReadStream in1(bin_cpp, bin_cpp_length);
19
	puts(String().Cat() << "cpp: <<<\n" << BZ2Decompress(in1) << "\n>>>");
19
	puts(String() << "cpp: <<<\n" << BZ2Decompress(in1) << "\n>>>");
20 20
	fflush(stdout);
21
//	puts(String().Cat() << "brc: <<<\n" << (const char *)bin_brc << "\n>>>");
21
//	puts(String() << "brc: <<<\n" << (const char *)bin_brc << "\n>>>");
22 22
	MemReadStream in2(bin_brc, bin_brc_length);
23
	puts(String().Cat() << "brc: <<<\n" << BZ2Decompress(in2) << "\n>>>");
23
	puts(String() << "brc: <<<\n" << BZ2Decompress(in2) << "\n>>>");
24 24
	fflush(stdout);
25 25
	for(int i = 0; i < bin_all_count; i++) {
26
		puts(String().Cat() << "all length[" << i << "]: " << bin_all_length[i]);
26
		puts(String() << "all length[" << i << "]: " << bin_all_length[i]);
27 27
		fflush(stdout);
28
		puts(String().Cat() << "all files[" << i << "]: " << bin_all_files[i]);
28
		puts(String() << "all files[" << i << "]: " << bin_all_files[i]);
29 29
		fflush(stdout);
30
		puts(String().Cat() << "all[" << i << "]: <<<\n" << BZ2Decompress(String(bin_all[i], bin_all_length[i])) << "\n>>>");
30
		puts(String() << "all[" << i << "]: <<<\n" << BZ2Decompress(String(bin_all[i], bin_all_length[i])) << "\n>>>");
31 31
		fflush(stdout);
32 32
	}
33 33
}
uppdev/Cham/main.cpp 2013-05-26 10:09:33 +0400
135 135
	void PutLooks(const char *s, const Value *look, int count = 4)
136 136
	{
137 137
		for(int i = 0; i < count; i++)
138
			PutLook(String().Cat() << s << " " << i, look[i]);
138
			PutLook(String() << s << " " << i, look[i]);
139 139
	}
140 140
	
141 141
	MyApp() {
uppdev/coff/uld/linkjob.cpp 2013-05-26 10:09:33 +0400
327 327

  
328 328
String LinkJob::Usage()
329 329
{
330
	return String().Cat()
330
	return String()
331 331
		<< NFormat("uld COFF linker, version %d.%d.r%d, release date: %`\n%s",
332 332
			ULD_VERSION_MAJOR, ULD_VERSION_MINOR, ULD_VERSION_RELEASE, ULD_DATE, ULD_COPYRIGHT) << "\n"
333 333
		"\n"
......
654 654
					break;
655 655

  
656 656
				case 'l':
657
					LoadFile(String().Cat() << "lib" << ptr << ".a", false);
657
					LoadFile(String() << "lib" << ptr << ".a", false);
658 658
					break;
659 659

  
660 660
				case 'M':
......
3078 3078
		cache_library_index.Clear();
3079 3079
		for(int i = 0; i < object_cache.GetCount(); i++) {
3080 3080
			const Cache& obj = object_cache[i];
3081
			cache_name_index.Add(String().Cat() << obj.library << ':' << obj.file);
3081
			cache_name_index.Add(String() << obj.library << ':' << obj.file);
3082 3082
			cache_library_index.Add(obj.library);
3083 3083
		}
3084 3084
	}
uppdev/CoreTopics/NetNode.cpp 2013-05-26 11:10:22 +0400
91 91
			}
92 92
			if(n.lpComment && *n.lpComment)
93 93
				if(nn.name.GetCount())
94
					nn.name = String().Cat() << FromSystemCharset(n.lpComment)
94
					nn.name = FromSystemCharset(n.lpComment)
95 95
					                         << " (" << nn.name << ")";
96 96
				else
97 97
					nn.name = FromSystemCharset(n.lpComment);
uppdev/CoreTopics/Value.h 2013-05-26 10:09:33 +0400
285 285
	RawValueRep()                             {}
286 286
	static const RawValueRep *Cast(const Value::Void *p) {
287 287
		ASSERT_(dynamic_cast<const RawValueRep *>(p),
288
		        String().Cat() << "Invalid value conversion: "
288
		        String() << "Invalid value conversion: "
289 289
		                       << typeid(*p).name() << " -> " << typeid(T).name());
290 290
		return (const RawValueRep *) p;
291 291
	}
......
438 438
	static Value::Void *Create(Stream& s)            { return new RichValueRep(s); }
439 439
	static const RichValueRep *Cast(const Value::Void *p) {
440 440
		ASSERT_(dynamic_cast<const RichValueRep *>(p),
441
		        String().Cat() << "Invalid value conversion: "
441
		        String() << "Invalid value conversion: "
442 442
		                       << typeid(*p).name() << " -> " << typeid(T).name());
443 443
		return (const RichValueRep *) p;
444 444
	}
uppdev/CoreTopics/XML.cpp 2013-05-26 10:09:33 +0400
415 415
void  XmlParser::PassTag(const char *tag)
416 416
{
417 417
	if(!Tag(tag))
418
		throw XmlError(String().Cat() << '\'' << tag << "'\' tag expected");
418
		throw XmlError(String() << '\'' << tag << "'\' tag expected");
419 419
}
420 420

  
421 421
void  XmlParser::PassTag(const String& tag)
422 422
{
423 423
	if(!Tag(tag))
424
		throw XmlError(String().Cat() << '\'' << tag << "'\' tag expected");
424
		throw XmlError(String() << '\'' << tag << "'\' tag expected");
425 425
}
426 426

  
427 427
bool  XmlParser::IsEnd()
......
452 452
void  XmlParser::PassEnd()
453 453
{
454 454
	if(!End())
455
		throw XmlError(String().Cat() << "Expected \'" << (stack.GetCount() ? stack.Top().tag : String()) << "\' end-tag");
455
		throw XmlError(String() << "Expected \'" << (stack.GetCount() ? stack.Top().tag : String()) << "\' end-tag");
456 456
}
457 457

  
458 458
bool  XmlParser::TagE(const char *tag)
uppdev/DropListBug/main.cpp 2013-05-26 10:09:33 +0400
30 30
	
31 31
	void AddButtonClicked()
32 32
	{
33
		dropList.Add(String().Cat() << chr++);
33
		dropList.Add(String() << chr++);
34 34
		dropList.SetIndex(dropList.GetCount() - 1);
35 35
	}
36 36
	
uppdev/Flex/Flex.h 2013-05-26 10:09:33 +0400
66 66
	int FindUpperBound(const T& x, const Less& less = StdLess<T>()) const;
67 67
	int FindUpperBound(const T& x) const { return FindUpperBound(x, StdLess<T>()); }
68 68
	
69
	String GetInfo() const { return String().Cat() << "NBLK:" << NBLK << ", blocks:" << blk_count; }
69
	String GetInfo() const { return String() << "NBLK:" << NBLK << ", blocks:" << blk_count; }
70 70

  
71 71
	Flex(int sh = 11) {
72 72
		Init();
uppdev/Gen2/main.cpp 2013-05-26 10:09:33 +0400
257 257
		spot[0][i].kind = TRAP;
258 258
		spot[PMSK][i].kind = TRAP;
259 259
	}*/
260
	Title(String().Cat() << "Step: " << step << " Gen: " << gen << ", pop: " << creature.GetCount()
260
	Title(String() << "Step: " << step << " Gen: " << gen << ", pop: " << creature.GetCount()
261 261
	      << ", born: " << born << ", died: " << died << " best: " << best);
262 262
	Refresh();
263 263
}
uppdev/NetBrowse/main.cpp 2013-05-26 10:09:33 +0400
90 90
	}
91 91
	if(n.lpComment && *n.lpComment)
92 92
		if(name.GetCount())
93
			return String().Cat() << n.lpComment << " (" << name << ")";
93
			return String() << n.lpComment << " (" << name << ")";
94 94
		else
95 95
			return n.lpComment;
96 96
	return name;
uppdev/Network/Network.cpp 2013-05-26 10:09:33 +0400
36 36
					/*
37 37
						LOG("Is a file share");
38 38
						LOG(lpnr[ctr].lpRemoteName);
39
						FindFile ff(String().Cat() << lpnr[ctr].lpRemoteName << "\\*.*");
39
						FindFile ff(String() << lpnr[ctr].lpRemoteName << "\\*.*");
40 40
						while(ff) {
41 41
							LOG("  " << ff.GetName());
42 42
							ff.Next();
uppdev/OffsetBug/SvgDraw.cpp 2013-05-26 10:09:33 +0400
14 14
	_svgNode.SetAttr("xmlns:xlink", "http://www.w3.org/1999/xlink");
15 15
	_svgNode.SetAttr("width", xPixels);
16 16
	_svgNode.SetAttr("height", yPixels);
17
	_svgNode.SetAttr("viewBox", String().Cat() << "0 0 " << xPixels << " " << yPixels);
17
	_svgNode.SetAttr("viewBox", String() << "0 0 " << xPixels << " " << yPixels);
18 18
	
19 19
	_defsNode = &_svgNode.Add("defs");
20 20
	_currentParentNode = &_svgNode;
......
49 49
void SvgDraw::OffsetOp(Point p)
50 50
{
51 51
	Begin();
52
	_currentParentNode->SetAttr("transform", String().Cat() << "translate(" << p.x << ", " << p.y << ")");
52
	_currentParentNode->SetAttr("transform", String() << "translate(" << p.x << ", " << p.y << ")");
53 53
	////actual_offset += p;
54 54
}
55 55

  
......
68 68
	path.SetAttr("d", pathD);
69 69
	clipPath.SetAttr("id", id);
70 70
	
71
	_currentParentNode->SetAttr("clip-path", String().Cat() << "url(#" << id << ")");
71
	_currentParentNode->SetAttr("clip-path", String() << "url(#" << id << ")");
72 72

  
73 73
	return false; // todo:
74 74
}
......
88 88
	path.SetAttr("d", pathD);
89 89
	clipPath.SetAttr("id", id);
90 90
	
91
	_currentParentNode->SetAttr("transform", String().Cat() << "translate(" << r.left << ", " << r.top << ")");
91
	_currentParentNode->SetAttr("transform", String() << "translate(" << r.left << ", " << r.top << ")");
92 92
	////actual_offset += r.TopLeft();
93
	_currentParentNode->SetAttr("clip-path", String().Cat() << "url(#" << id << ")");
93
	_currentParentNode->SetAttr("clip-path", String() << "url(#" << id << ")");
94 94
	
95 95
	return false; // todo:
96 96
}
......
98 98
bool SvgDraw::ExcludeClipOp(const Rect& r)
99 99
{
100 100
	//todo:
101
	PromptOK(String().Cat() << "ExcludeClipOp(" << r << ") not implemented");
101
	PromptOK(String() << "ExcludeClipOp(" << r << ") not implemented");
102 102
	return false;
103 103
}
104 104

  
105 105
bool SvgDraw::IntersectClipOp(const Rect& r)
106 106
{
107 107
	//todo:
108
	PromptOK(String().Cat() << "IntersectClipOp(" << r << ") not implemented");
108
	PromptOK(String() << "IntersectClipOp(" << r << ") not implemented");
109 109
	return false;
110 110
}
111 111

  
......
119 119
bool SvgDraw::IsPaintingOp(const Rect& r) const
120 120
{
121 121
	//todo:
122
	PromptOK(String().Cat() << "IsPaintingOp(" << r << ") not implemented");
122
	PromptOK(String() << "IsPaintingOp(" << r << ") not implemented");
123 123
	return false;
124 124
}
125 125

  
......
290 290

  
291 291
String SvgDraw::GetNextId()
292 292
{
293
	return String().Cat() << "id" << _nextId++;
293
	return String() << "id" << _nextId++;
294 294
}
295 295

  
296 296
END_UPP_NAMESPACE
uppdev/Puzzle/Puzzle.cpp 2013-05-26 10:09:33 +0400
111 111
			if(box[i] != i + 1)
112 112
				return;
113 113
		String dim;
114
		int& sm = score.GetAdd(String().Cat() << size.cx << "x" << size.cy);
114
		int& sm = score.GetAdd(String() << size.cx << "x" << size.cy);
115 115
		if(moves < sm) {
116 116
			sm = moves;
117 117
			PromptOK(t_("You win with the new best score!"));
uppdev/RichTextP/EncodeHTML.cpp 2013-05-26 10:09:33 +0400
39 39

  
40 40
String HtmlDot(int q, Zoom z)
41 41
{
42
	return String().Cat() << ' ' << z * q << "px";
42
	return String() << ' ' << z * q << "px";
43 43
}
44 44

  
45 45
String HtmlDotl(int q, Zoom z)
46 46
{
47
	return String().Cat() << ' ' << max((int)!!q, z * q) << "px";
47
	return String() << ' ' << max((int)!!q, z * q) << "px";
48 48
}
49 49

  
50 50
String HtmlStyleColor(Color c, const char *cl = "color")
uppdev/SqlExp/SqlExp.cpp 2013-05-26 10:09:33 +0400
48 48

  
49 49
CONSOLE_APP_MAIN
50 50
{
51
	DLOG(SqlCompile(PGSQL, String().Cat() << '\t' << TABLE(COLUMN1, COLUMN2) << '\t' << " from \t" << TABLE << "\t"));
51
	DLOG(SqlCompile(PGSQL, String() << '\t' << TABLE(COLUMN1, COLUMN2) << '\t' << " from \t" << TABLE << "\t"));
52 52
//	return;
53 53
	qtf << "[C1 {{1:1 SqlExp C`+`+:: PostgreSQL";
54 54
	EXP(Select(COLUMN).From(TABLE));
uppdev/SvgDraw/SvgDraw.cpp 2013-05-26 10:09:33 +0400
23 23
	StringBuffer final;
24 24
	final << XmlHeader() 
25 25
	      << XmlDocType("svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\"")
26
	      << svg(String().Cat() << "<defs>\n" << ~_defs << "</defs>\n" << ~_body);
26
	      << svg(String() << "<defs>\n" << ~_defs << "</defs>\n" << ~_body);
27 27
	return ~final;
28 28
}
29 29

  
......
45 45
void SvgDraw::OffsetOp(Point p)
46 46
{
47 47
	Begin();
48
	AddAttr("transform", String().Cat() << "translate(" << p.x << ", " << p.y << ")");
48
	AddAttr("transform", String() << "translate(" << p.x << ", " << p.y << ")");
49 49
	_body << ">\n";
50 50
	actual_offset += p;
51 51
}
......
53 53
bool SvgDraw::ClipOp(const Rect& r)
54 54
{
55 55
	Begin();
56
	AddAttr("clip-path", String().Cat() << "url(#" << AddPath(r) << ")");
56
	AddAttr("clip-path", String() << "url(#" << AddPath(r) << ")");
57 57
	_body << ">\n";
58 58

  
59 59
	return false; // todo:
......
62 62
bool SvgDraw::ClipoffOp(const Rect& r)
63 63
{
64 64
	Begin();
65
	AddAttr("transform", String().Cat() << "translate(" << r.left << ", " << r.top << ")");
66
	AddAttr("clip-path", String().Cat() << "url(#" << AddPath(r.Offseted(-r.TopLeft())) << ")");
65
	AddAttr("transform", String() << "translate(" << r.left << ", " << r.top << ")");
66
	AddAttr("clip-path", String() << "url(#" << AddPath(r.Offseted(-r.TopLeft())) << ")");
67 67
	_body << ">\n";
68 68
	actual_offset += r.TopLeft();
69 69
	
......
73 73
bool SvgDraw::ExcludeClipOp(const Rect& r)
74 74
{
75 75
	//todo:
76
	PromptOK(String().Cat() << "ExcludeClipOp(" << r << ") not implemented");
76
	PromptOK(String() << "ExcludeClipOp(" << r << ") not implemented");
77 77
	return false;
78 78
}
79 79

  
80 80
bool SvgDraw::IntersectClipOp(const Rect& r)
81 81
{
82 82
	//todo:
83
	PromptOK(String().Cat() << "IntersectClipOp(" << r << ") not implemented");
83
	PromptOK(String() << "IntersectClipOp(" << r << ") not implemented");
84 84
	return false;
85 85
}
86 86

  
......
94 94
bool SvgDraw::IsPaintingOp(const Rect& r) const
95 95
{
96 96
	//todo:
97
	PromptOK(String().Cat() << "IsPaintingOp(" << r << ") not implemented");
97
	PromptOK(String() << "IsPaintingOp(" << r << ") not implemented");
98 98
	return false;
99 99
}
100 100

  
......
251 251
	XmlTag t("text");
252 252
	t("x", xAttr)("y", y + font.GetHeight())("style", style);
253 253
	if (angle != 0)
254
		t("transform", String().Cat() << "rotate(-" << (angle / 10) << ", " << x << ", " << y << ")");
254
		t("transform", String() << "rotate(-" << (angle / 10) << ", " << x << ", " << y << ")");
255 255
	AddTag(t, DeXml(WString(text).ToString()));
256 256
}
257 257

  
258 258
String SvgDraw::GetNextId()
259 259
{
260
	return String().Cat() << "id" << _nextId++;
260
	return String() << "id" << _nextId++;
261 261
}
262 262

  
263 263
String SvgDraw::AddPath(Rect const &r)
uppdev/UWord/UWord.cpp 2013-05-26 10:09:33 +0400
285 285

  
286 286
GUI_APP_MAIN
287 287
{
288
//	DUMP(XGetSelectionOwner(Xdisplay, XAtom(String().Cat() << "_NET_WM_CM_S" << Xscreenno)) != None);
288
//	DUMP(XGetSelectionOwner(Xdisplay, XAtom(String() << "_NET_WM_CM_S" << Xscreenno)) != None);
289 289
//	return;
290 290

  
291 291
//	DUMP((Xheight*25.4/XheightMM));
uppdev/wince/wince.cpp 2013-05-26 10:09:33 +0400
28 28

  
29 29
	virtual void LeftDown(Point p, dword keyflags)
30 30
	{
31
		lbl = String().Cat() << "LEFTDOWN " << p;
31
		lbl = String() << "LEFTDOWN " << p;
32 32
		Refresh();
33 33
	}
34 34

  
35 35
	void LeftDouble(Point p, dword keyflags)
36 36
	{
37
		lbl = String().Cat() << "LEFTDOUBLE " << p;
37
		lbl = String() << "LEFTDOUBLE " << p;
38 38
		Refresh();
39 39
	}
40 40

  
41 41
	virtual void LeftUp(Point p, dword keyflags)
42 42
	{
43
		lbl = String().Cat() << "LEFTUP " << p;
43
		lbl = String() << "LEFTUP " << p;
44 44
		Refresh();
45 45
	}
46 46

  
47 47
	virtual void MouseMove(Point p, dword keyflags)
48 48
	{
49
		lbl = String().Cat() << "MOUSEMOVE " << p;
49
		lbl = String() << "MOUSEMOVE " << p;
50 50
		Refresh();
51 51
	}
52 52

  
uppsrc/BuildAll/BuildAll.cpp 2013-05-26 10:09:33 +0400
34 34
{
35 35
	String flags = release ? "r" : "b";
36 36
	String mn = release ? "R" : "D";
37
	String n = String().Cat() << nest << '-' << bm << '-' << mn;
37
	String n = String() << nest << '-' << bm << '-' << mn;
38 38
	Cout() << n << '\n';
39 39
	String outdir = AppendFileName(output, n);
40 40
	DeleteFolderDeep(outdir);
uppsrc/coff/uar/lib.cpp 2013-05-26 10:09:33 +0400
14 14

  
15 15
String UARArchiveJob::Usage()
16 16
{
17
	return String().Cat()
17
	return String()
18 18
		<< NFormat("uar COFF librarian, version %d.%d.r%d, release date %`\n%s",
19 19
		UAR_VERSION_MAJOR, UAR_VERSION_MINOR, UAR_VERSION_RELEASE, UAR_DATE, UAR_COPYRIGHT) << "\n"
20 20
		"\n"
uppsrc/coff/uld/linkjob.cpp 2013-05-26 10:09:33 +0400
301 301

  
302 302
String LinkJob::Usage()
303 303
{
304
	return String().Cat()
304
	return String()
305 305
		<< NFormat("uld COFF linker, version %d.%d.r%d, release date: %`\n%s",
306 306
			ULD_VERSION_MAJOR, ULD_VERSION_MINOR, ULD_VERSION_RELEASE, ULD_DATE, ULD_COPYRIGHT) << "\n"
307 307
		"\n"
......
2833 2833
		cache_library_index.Clear();
2834 2834
		for(int i = 0; i < object_cache.GetCount(); i++) {
2835 2835
			const Cache& obj = object_cache[i];
2836
			cache_name_index.Add(String().Cat() << obj.library << ':' << obj.file);
2836
			cache_name_index.Add(String() << obj.library << ':' << obj.file);
2837 2837
			cache_library_index.Add(obj.library);
2838 2838
		}
2839 2839
	}
uppsrc/Core/Complex.h 2013-05-26 10:09:33 +0400
23 23

  
24 24
template<> inline bool IsNull(const Complex& r) { return r.real() < DOUBLE_NULL_LIM || r.imag() < DOUBLE_NULL_LIM; }
25 25
template<> inline unsigned GetHashValue(const Complex& x) { return CombineHash(x.real(), x.imag()); }
26
template<> inline String AsString(const std::complex<double>& x) { return String().Cat() << "(" << x.real() << "," << x.imag() << ")"; }
26
template<> inline String AsString(const std::complex<double>& x) { return String() << "(" << x.real() << "," << x.imag() << ")"; }
27 27
template<> inline String AsString(const Complex& x) { return AsString((const std::complex<double>&)x); }
28 28

  
29 29
template<> inline dword ValueTypeNo(const Complex*) { return COMPLEX_V; }
uppsrc/Core/InetUtil.cpp 2013-05-26 10:09:33 +0400
8 8
	{ "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };
9 9
	static const char *month[] =
10 10
	{ "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
11
	return String().Cat()
11
	return String()
12 12
		<< dayofweek[DayOfWeek(tm)] << ", "
13 13
		<< (int)tm.day << ' ' << month[tm.month - 1]
14 14
		<< ' ' << (int)tm.year
uppsrc/Core/NetNode.cpp 2013-05-26 11:12:34 +0400
99 99
			}
100 100
			if(n.lpComment && *n.lpComment)
101 101
				if(nn.name.GetCount())
102
					nn.name = String().Cat() << FromSystemCharset(n.lpComment)
102
					nn.name = FromSystemCharset(n.lpComment)
103 103
					                         << " (" << nn.name << ")";
104 104
				else
105 105
					nn.name = FromSystemCharset(n.lpComment);
uppsrc/Core/Tuple.h 2013-05-26 10:09:33 +0400
14 14
	
15 15
	unsigned GetHashValue() const             { return CombineHash(a, b); }
16 16

  
17
	String   ToString() const                 { return String().Cat() << '(' << a << ", " << b << ')'; }
17
	String   ToString() const                 { return String() << '(' << a << ", " << b << ')'; }
18 18
};
19 19

  
20 20
template<typename A, typename B>
......
50 50
	
51 51
	unsigned GetHashValue() const             { return CombineHash(a, b, c); }
52 52
	
53
	String   ToString() const                 { return String().Cat() << '(' << a << ", " << b << ", " << c << ')'; }
53
	String   ToString() const                 { return String() << '(' << a << ", " << b << ", " << c << ')'; }
54 54
};
55 55

  
56 56
template<typename A, typename B, typename C>
......
89 89
	
90 90
	unsigned GetHashValue() const             { return CombineHash(a, b, c, d); }
91 91

  
92
	String   ToString() const                 { return String().Cat() << '(' << a << ", " << b << ", " << c << ", " << d << ')'; }
92
	String   ToString() const                 { return String() << '(' << a << ", " << b << ", " << c << ", " << d << ')'; }
93 93
};
94 94

  
95 95
template<typename A, typename B, typename C, typename D>
uppsrc/Core/Value.hpp 2013-05-26 10:09:33 +0400
178 178
#ifdef _DEBUG
179 179
		dword t = GetValueTypeNo<T>();
180 180
		ASSERT_(t < 255 && (t == STRING_V ? IsString() : Is((byte)t)),
181
		        String().Cat() << "Invalid value conversion: "
181
		        String() << "Invalid value conversion: "
182 182
		                       << GetName() << " -> " << typeid(T).name());
183 183
#endif
184 184
		return *(T*)&data;
185 185
	}
186 186
	const RawValueRep<T> *x = dynamic_cast<const RawValueRep<T>*>(ptr());
187 187
	ASSERT_(x,
188
	        String().Cat() << "Invalid value conversion: "
188
	        String() << "Invalid value conversion: "
189 189
	                       << GetName() << " -> " << typeid(T).name());
190 190
	return x->Get();
191 191
}
uppsrc/Core/XML.cpp 2013-05-26 10:09:33 +0400
469 469
void  XmlParser::PassTag(const char *tag)
470 470
{
471 471
	if(!Tag(tag))
472
		throw XmlError(String().Cat() << '\'' << tag << "'\' tag expected");
472
		throw XmlError(String() << '\'' << tag << "'\' tag expected");
473 473
}
474 474

  
475 475
void  XmlParser::PassTag(const String& tag)
476 476
{
477 477
	if(!Tag(tag))
478
		throw XmlError(String().Cat() << '\'' << tag << "'\' tag expected");
478
		throw XmlError(String() << '\'' << tag << "'\' tag expected");
479 479
}
480 480

  
481 481
bool  XmlParser::IsEnd()
......
506 506
void  XmlParser::PassEnd()
507 507
{
508 508
	if(!End())
509
		throw XmlError(String().Cat() << "Expected \'" << (stack.GetCount() ? stack.Top().tag : String()) << "\' end-tag");
509
		throw XmlError(String() << "Expected \'" << (stack.GetCount() ? stack.Top().tag : String()) << "\' end-tag");
510 510
}
511 511

  
512 512
bool  XmlParser::TagE(const char *tag)
uppsrc/CppBase/Parser.cpp 2013-05-26 10:09:33 +0400
688 688
			Decl& a = r.Add();
689 689
			a.name = lex.GetId();
690 690
			a.function = true;
691
			a.natural = String().Cat() << "void " << a.name << "(Http& http)";
691
			a.natural = String() << "void " << a.name << "(Http& http)";
692 692
			Decl& p = a.param.Add();
693 693
			p.name = "http";
694 694
			p.type = "Http";
......
705 705
			Decl& a = r.Add();
706 706
			a.name = lex.GetId();
707 707
			a.function = true;
708
			a.natural = String().Cat() << "void " << a.name << "(RpcData& rpc)";
708
			a.natural = String() << "void " << a.name << "(RpcData& rpc)";
709 709
			Decl& p = a.param.Add();
710 710
			p.name = "rpc";
711 711
			p.type = "RpcData";
uppsrc/CtrlCore/Ctrl.cpp 2013-05-26 11:14:14 +0400
17 17
#ifdef PLATFORM_WIN32
18 18
	MessageBox(NULL, s, GetExeTitle(), MB_OK | MB_ICONQUESTION);
19 19
#else
20
	fputs(String().Cat() << GetExeTitle() << ": " << s << '\n', stderr);
20
	fputs(GetExeTitle() << ": " << s << '\n', stderr);
21 21
#endif
22 22
	return true;
23 23
}
uppsrc/CtrlCore/CtrlKbd.cpp 2013-05-26 10:09:33 +0400
190 190
{
191 191
	GuiLock __;
192 192
	if(IsUsrLog())
193
		UsrLogT(6, String().Cat() << "SETFOCUS " << Desc(this));
193
		UsrLogT(6, String() << "SETFOCUS " << Desc(this));
194 194
	LLOG("Ctrl::SetFocus " << Desc(this));
195 195
	LLOG("focusCtrlWnd " << UPP::Name(focusCtrlWnd));
196 196
	LLOG("Ctrl::SetFocus0 -> deferredSetFocus = NULL; was: " << UPP::Name(defferedSetFocus));
uppsrc/CtrlCore/Win32Clip.cpp 2013-05-26 10:09:33 +0400
68 68
	String s = txt;
69 69
	s << "\n" << GetLastErrorMessage();
70 70
	MessageBox(::GetActiveWindow(), s, "Clipboard error", MB_ICONSTOP | MB_OK | MB_APPLMODAL);
71
	ClipboardLog(String().Cat() << s << " ERROR");
71
	ClipboardLog(String() << s << " ERROR");
72 72
}
73 73

  
74 74
String FromWin32CF(int cf);
......
77 77
{
78 78
	if(!DebugClipboard()) 
79 79
		return;
80
	ClipboardError(String().Cat() << txt << ' ' << FromWin32CF(format));
80
	ClipboardError(String() << txt << ' ' << FromWin32CF(format));
81 81
}
82 82

  
83 83
bool ClipboardOpen()
uppsrc/CtrlCore/Win32DnD.cpp 2013-05-26 10:09:33 +0400
44 44

  
45 45
String AsString(POINTL p)
46 46
{
47
	return String().Cat() << "[" << p.x << ", " << p.y << "]";
47
	return String() << "[" << p.x << ", " << p.y << "]";
48 48
}
49 49

  
50 50
struct UDropTarget : public IDropTarget {
uppsrc/CtrlCore/X11Wnd.cpp 2013-05-26 10:09:33 +0400
675 675
bool Ctrl::IsCompositedGui()
676 676
{
677 677
	GuiLock __;
678
	static bool b = XGetSelectionOwner(Xdisplay, XAtom(String().Cat() << "_NET_WM_CM_S" << Xscreenno)) != None;
678
	static bool b = XGetSelectionOwner(Xdisplay, XAtom(String() << "_NET_WM_CM_S" << Xscreenno)) != None;
679 679
	return b;
680 680
}
681 681

  
uppsrc/Esc/Esc.cpp 2013-05-26 10:09:33 +0400
440 440
double Esc::Number(const EscValue& a, const char *oper)
441 441
{
442 442
	if(!a.IsNumber())
443
		ThrowError(String().Cat() << "number expected for '" << oper << "', encountered " << Lims(a.ToString()));
443
		ThrowError(String() << "number expected for '" << oper << "', encountered " << Lims(a.ToString()));
444 444
	return a.GetNumber();
445 445
}
446 446

  
447 447
int Esc::Int(const EscValue& a, const char *oper)
448 448
{
449 449
	if(!a.IsInt())
450
		ThrowError(String().Cat() << "integer expected for '" << oper << "', encountered " << Lims(a.ToString()));
450
		ThrowError(String() << "integer expected for '" << oper << "', encountered " << Lims(a.ToString()));
451 451
	return a.GetInt();
452 452
}
453 453

  
uppsrc/Esc/EscRun.cpp 2013-05-26 10:09:33 +0400
76 76
String EscEscape::DumpType(int i)
77 77
{
78 78
	if(i < arg.GetCount())
79
		return String().Cat() << " (" << arg[i].GetTypeName() << " present)";
79
		return String() << " (" << arg[i].GetTypeName() << " present)";
80 80
	else
81 81
		return " (not enough arguments)";
82 82
}
......
85 85
{
86 86
	if(i < arg.GetCount() && arg[i].IsNumber())
87 87
		return;
88
	ThrowError(String().Cat() << "number expected as parameter " << i + 1 << InCall()
88
	ThrowError(String() << "number expected as parameter " << i + 1 << InCall()
89 89
	           << DumpType(i));
90 90
}
91 91

  
......
107 107
{
108 108
	if(i < arg.GetCount() && arg[i].IsArray())
109 109
		return;
110
	ThrowError(String().Cat() << "array expected as parameter " << i + 1 << InCall()
110
	ThrowError(String() << "array expected as parameter " << i + 1 << InCall()
111 111
	           << DumpType(i));
112 112
}
113 113

  
......
115 115
{
116 116
	if(i < arg.GetCount() && arg[i].IsMap())
117 117
		return;
118
	ThrowError(String().Cat() << "map expected as parameter " << i + 1 << InCall());
118
	ThrowError(String() << "map expected as parameter " << i + 1 << InCall());
119 119
}
120 120

  
121 121
void Escape(ArrayMap<String, EscValue>& globals, const char *function, Callback1<EscEscape&> escape)
uppsrc/Geom/Draw/hrr.cpp 2013-05-26 11:15:48 +0400
1466 1466
		decoder = CreateDecoder(info);
1467 1467
		if(decoder.IsEmpty()) {
1468 1468
			draw.DrawText(cdest.left, cdest.top,
1469
				String().Cat() << "Unsupported HRR encoding: " << info.GetMethod(), StdFont());
1469
				String() << "Unsupported HRR encoding: " << info.GetMethod(), StdFont());
1470 1470
			draw.End();
1471 1471
			LLOG(EndIndent << "//HRR:x: encoder not found, exiting");
1472 1472
			return;
......
1766 1766
	}
1767 1767
	One<StreamRasterEncoder> encoder = CreateEncoder(info);
1768 1768
	if(!encoder)
1769
		throw Exc(String().Cat() << "Unsupported HRR encoding: " << info.GetMethod());
1769
		throw Exc(String() << "Unsupported HRR encoding: " << info.GetMethod());
1770 1770

  
1771 1771
	bool abort = false;
1772 1772
	try
uppsrc/Geom/Draw/pathDraw.cpp 2013-05-26 11:16:51 +0400
451 451
			else if(*p == '$')
452 452
			{ // style name
453 453
				if(*++p != '\"')
454
					throw Exc(String().Cat() << "o?ek?v?n znak \", nalezeno: " << StringSample(p, 10));
454
					throw Exc(String() << "o?ek?v?n znak \", nalezeno: " << StringSample(p, 10));
455 455
				p = ParseCString(p + 1, name);
456 456
			}
457 457
			else if(*p == '\"')
......
459 459
				String sn;
460 460
				p = ParseCString(p + 1, sn);
461 461
				if(*p != '=')
462
					throw Exc(String().Cat() << "o?ek?v?no '=', nalezeno: " << StringSample(p, 10));
462
					throw Exc(String() << "o?ek?v?no '=', nalezeno: " << StringSample(p, 10));
463 463
				if(IsNull(sn))
464
					throw Exc(String().Cat() << "n?zev stylu je pr?zdn?");
464
					throw Exc(String() << "n?zev stylu je pr?zdn?");
465 465
				for(p++; *p && *p != '\n' && (byte)*p <= ' '; p++)
466 466
					;
467 467
				PathStyle ps;
468 468
				p = ps.Decode(p);
469 469
				if(!p)
470
					throw Exc(String().Cat() << "neplatn? definice stylu '" << name << "'");
470
					throw Exc(String() << "neplatn? definice stylu '" << name << "'");
471 471
				if(map.Find(sn) < 0 || update_existing)
472 472
					Set(sn, ps);
473 473
			}
474 474
			else
475
				throw Exc(String().Cat() << "neplatn? za??tek ??dku: " << StringSample(p, 10));
475
				throw Exc(String() << "neplatn? za??tek ??dku: " << StringSample(p, 10));
476 476
	}
477 477
	catch(Exc e)
478 478
	{
479
		throw Exc(String().Cat() << "??dek " << line << ": " << e);
479
		throw Exc(String() << "??dek " << line << ": " << e);
480 480
	}
481 481
}
482 482

  
uppsrc/Geom/fp3.cpp 2013-05-26 10:09:33 +0400
151 151

  
152 152
String Matrixf3::ToString() const
153 153
{
154
	return String().Cat() << "[x = " << x << ", y = " << y << ", z = " << z << ", a = " << a << "]";
154
	return String() << "[x = " << x << ", y = " << y << ", z = " << z << ", a = " << a << "]";
155 155
}
156 156

  
157 157
Matrixf3 Matrixf3Move(Pointf3 vector)
uppsrc/Geom/geometry.cpp 2013-05-26 10:09:33 +0400
263 263

  
264 264
String Matrixf::ToString() const
265 265
{
266
	return String().Cat() << "[x = " << x << ", y = " << y << ", a = " << a << "]";
266
	return String() << "[x = " << x << ", y = " << y << ", a = " << a << "]";
267 267
}
268 268

  
269 269
END_UPP_NAMESPACE
uppsrc/ide/Assist.cpp 2013-05-26 10:09:33 +0400
612 612
			String h;
613 613
			for(int i = 0; i < include_back; i++)
614 614
				h << "../";
615
			Paste(ToUnicode(String().Cat() << "#include " 
615
			Paste(ToUnicode(String() << "#include " 
616 616
			                << (include_local ? "\"" : "<")
617 617
			                << h << include_path
618 618
			                << f.name
uppsrc/ide/Browser/Base.cpp 2013-05-26 10:09:33 +0400
46 46
void BrowserScanError(int line, const String& text)
47 47
{
48 48
	if(s_console)
49
		PutConsole(String().Cat() << s_file << " (" << line << "): " << text);
49
		PutConsole(String() << s_file << " (" << line << "): " << text);
50 50
}
51 51

  
52 52
void SaveCodeBase()
uppsrc/ide/Builders/CppBuilder.cpp 2013-05-26 10:09:33 +0400
2 2

  
3 3
void PutCompileTime(int time, int count)
4 4
{
5
	PutConsole(String().Cat() << count << " file(s) compiled in " << GetPrintTime(time)
5
	PutConsole(String() << count << " file(s) compiled in " << GetPrintTime(time)
6 6
	           << " " << int(GetTickCount() - time) / count << " msec/file");
7 7
}
8 8

  
uppsrc/ide/Builders/MakeFile.cpp 2013-05-26 10:09:33 +0400
120 120
	}
121 121

  
122 122
	makefile.config << outdir << " = $(UPPOUT)"
123
		<< GetMakePath(AdjustMakePath(String().Cat() << package << '/' << method << '-' << Join(x, "-") << '/')) << "\n"
123
		<< GetMakePath(AdjustMakePath(String() << package << '/' << method << '-' << Join(x, "-") << '/')) << "\n"
124 124
		<< macros << " = " << macdef << "\n";
125 125

  
126 126
	makefile.install << "\t-mkdir -p $(" << outdir << ")\n";
uppsrc/ide/Core/Hdepend.cpp 2013-05-26 10:09:33 +0400
313 313
	else {
314 314
		info.time = ff.GetLastWriteTime();
315 315
		if(info.time > GetSysTime() + 10)
316
			PutConsole(String().Cat() << "WARNING: " << path << " has invalid (future) time " << info.time);
316
			PutConsole(String() << "WARNING: " << path << " has invalid (future) time " << info.time);
317 317
		ScanFile(path, ii);
318 318
	}
319 319
	return ii;
......
396 396
			if(ff) {
397 397
				Time tm = ff.GetLastWriteTime();
398 398
				if(tm > GetSysTime() + 10)
399
					PutConsole(String().Cat() << "WARNING: " << dep[i] << " has invalid (future) time " << tm);
399
					PutConsole(String() << "WARNING: " << dep[i] << " has invalid (future) time " << tm);
400 400
				if(tm > h)
401 401
					h = tm;
402 402
			}
......
419 419
		return true;
420 420
	for(int i = 0; i < info.depend.GetCount(); i++)
421 421
		if(!info.bydefine[i] && !map[info.depend[i]].CanBlitz()) {
422
			PutVerbose(String().Cat() << map.GetKey(info.depend[i])
422
			PutVerbose(String() << map.GetKey(info.depend[i])
423 423
			           << "(1) : blocks BLITZ of " << path);
424 424
			return false;
425 425
		}
uppsrc/ide/Core/Package.cpp 2013-05-26 10:09:33 +0400
64 64
		return MatchWhen_X(when, flag);
65 65
	}
66 66
	catch(CParser::Error e) {
67
		PutConsole(String().Cat()
67
		PutConsole(String()
68 68
		           << "Invalid When expression: " << AsCString(when) << ": " << e);
69 69
		return false;
70 70
	}
uppsrc/ide/Cpp.cpp 2013-05-26 10:09:33 +0400
107 107
void AssistScanError(int line, const String& text)
108 108
{
109 109
#ifdef _DEBUG_X_0
... This diff was truncated because it exceeds the maximum size that can be displayed.