diff --git a/reference/FilterStream/FilterStream.cpp b/reference/FilterStream/FilterStream.cpp index 76ada50b5..77508124f 100644 --- a/reference/FilterStream/FilterStream.cpp +++ b/reference/FilterStream/FilterStream.cpp @@ -22,7 +22,6 @@ CONSOLE_APP_MAIN LOG(in.GetLine()); } - { HttpRequest http("www.ultimatepp.org"); InFilterStream in; diff --git a/reference/Pop3/Pop3.upp b/reference/Pop3/Pop3.upp index 056c98194..0e696921e 100644 --- a/reference/Pop3/Pop3.upp +++ b/reference/Pop3/Pop3.upp @@ -2,7 +2,8 @@ description "Examples of using Core/POP3 package to download gmail emails\377"; uses Core, - Core/POP3; + Core/POP3, + Core/SSL; file Pop3.cpp; diff --git a/reference/Pop3/init b/reference/Pop3/init index 1fb55a9bf..7be31d778 100644 --- a/reference/Pop3/init +++ b/reference/Pop3/init @@ -2,4 +2,5 @@ #define _Pop3_icpp_init_stub #include "Core/init" #include "Core/POP3/init" +#include "Core/SSL/init" #endif diff --git a/reference/SelectFile/main.cpp b/reference/SelectFile/main.cpp index 07969bb44..a2c05d40d 100644 --- a/reference/SelectFile/main.cpp +++ b/reference/SelectFile/main.cpp @@ -6,7 +6,7 @@ GUI_APP_MAIN { PromptOK(DeQtf(SelectFileOpen("Text files\t*.txt\nAll files\t*.*"))); - PromptOK(DeQtf(SelectFileSaveAs("Text files\t*.txt\nAll files\t*.*"))); + PromptOK(DeQtf(SelectFileSaveAs("Image files\t*.png *.jpg\nAll files\t*.*"))); SelectFileIn in("Text files\t*.txt"); if(in) { diff --git a/reference/SplitJoinMerge/JoinMerge.cpp b/reference/SplitJoinMerge/JoinMerge.cpp new file mode 100644 index 000000000..89dcb4372 --- /dev/null +++ b/reference/SplitJoinMerge/JoinMerge.cpp @@ -0,0 +1,47 @@ +#include + +using namespace Upp; + +int DelimFn(int c) +{ + return c == ';' || c == ' ' ? c : 0; +} + +const char *DelimTextFn(const char *s) +{ + bool found = false; + while(*s == ' ' || *s == ';') { + if(*s == ';') + found = true; + s++; + } + return found ? s : NULL; +} + +CONSOLE_APP_MAIN +{ + StdLogSetup(LOG_COUT|LOG_FILE); + + DUMP(Split("one,two,,three", ',')); + DUMP(Split("one,two,,three", ',', false)); + DUMP(Split("one; two; three", DelimFn)); + DUMP(Split(3, "one::two::three:x::four", "::")); + DUMP(Split("first something ; second;third something", DelimTextFn)); + + Vector h; h << "1" << "2" << "3"; + + DUMP(Join(h, ", ")); + + String a, b, c; + DUMP(SplitTo("1;2;3", ';', a, b, c)); + DUMP(a); + DUMP(b); + DUMP(c); + DUMP(SplitTo("1;2", ';', a, b, c)); + + DUMP(Merge("+", "hello", "", "world")); + + String text = "something"; + MergeWith(text, "_", "", "to", "", "merge"); + DUMP(text); +} diff --git a/reference/SplitJoinMerge/SplitJoinMerge.upp b/reference/SplitJoinMerge/SplitJoinMerge.upp new file mode 100644 index 000000000..14d834361 --- /dev/null +++ b/reference/SplitJoinMerge/SplitJoinMerge.upp @@ -0,0 +1,11 @@ +description "Demostrates Split, SplitTo, Join, Merge, MergeWith functions\377"; + +uses + Core; + +file + JoinMerge.cpp; + +mainconfig + "" = "SSE2"; + diff --git a/reference/SplitJoinMerge/init b/reference/SplitJoinMerge/init new file mode 100644 index 000000000..3b45a7ac9 --- /dev/null +++ b/reference/SplitJoinMerge/init @@ -0,0 +1,4 @@ +#ifndef _SplitJoinMerge_icpp_init_stub +#define _SplitJoinMerge_icpp_init_stub +#include "Core/init" +#endif diff --git a/reference/WebSocket/WebSocket.upp b/reference/WebSocket/WebSocket.upp index cf5554a74..02642cc5c 100644 --- a/reference/WebSocket/WebSocket.upp +++ b/reference/WebSocket/WebSocket.upp @@ -1,4 +1,4 @@ -description "Demostration of simple web-socket server\377"; +description "Demonstration of simple web-socket server\377"; uses Core;