diff --git a/uppsrc/CodeEditor/CHighlight.cpp b/uppsrc/CodeEditor/CHighlight.cpp index 032f66091..f463c70a7 100644 --- a/uppsrc/CodeEditor/CHighlight.cpp +++ b/uppsrc/CodeEditor/CHighlight.cpp @@ -1,6 +1,6 @@ #include "CodeEditor.h" -NAMESPACE_UPP +namespace Upp { #define LTIMING(x) // RTIMING(x) @@ -362,4 +362,4 @@ void CSyntax::Highlight(const wchar *ltext, const wchar *e, HighlightOutput& hls hls.SetPaper(0, hls.v.GetCount(), hl_style[PAPER_IFDEF].color); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CodeEditor/CInit.cpp b/uppsrc/CodeEditor/CInit.cpp index e112a0422..5f9eae1f4 100644 --- a/uppsrc/CodeEditor/CInit.cpp +++ b/uppsrc/CodeEditor/CInit.cpp @@ -1,6 +1,6 @@ #include "CodeEditor.h" -NAMESPACE_UPP +namespace Upp { Vector > CSyntax::keyword; Vector > CSyntax::name; @@ -353,4 +353,4 @@ int CSyntax::LoadSyntax(const char *keywords[], const char *names[]) // Changed return keyword.GetCount() - 1; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CodeEditor/CLogic.cpp b/uppsrc/CodeEditor/CLogic.cpp index fe57df1f8..679c92f25 100644 --- a/uppsrc/CodeEditor/CLogic.cpp +++ b/uppsrc/CodeEditor/CLogic.cpp @@ -1,6 +1,6 @@ #include "CodeEditor.h" -NAMESPACE_UPP +namespace Upp { void CSyntax::IndentInsert(CodeEditor& e, int chr, int count) { @@ -205,4 +205,4 @@ void CSyntax::CheckSyntaxRefresh(CodeEditor& e, int pos, const WString& text) e.Refresh(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CodeEditor/CRegister.icpp b/uppsrc/CodeEditor/CRegister.icpp index b68e6b82e..10c8f269f 100644 --- a/uppsrc/CodeEditor/CRegister.icpp +++ b/uppsrc/CodeEditor/CRegister.icpp @@ -1,6 +1,6 @@ #include "CodeEditor.h" -NAMESPACE_UPP +namespace Upp { void CreateCSyntax(One& e, int kind) { @@ -62,4 +62,4 @@ INITBLOCK EditorSyntax::Register("log", callback(CreateLogSyntax), "*.log *.info", "Log (*.log)"); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CodeEditor/CSyntax.cpp b/uppsrc/CodeEditor/CSyntax.cpp index 5f03c9ada..d679a5385 100644 --- a/uppsrc/CodeEditor/CSyntax.cpp +++ b/uppsrc/CodeEditor/CSyntax.cpp @@ -1,6 +1,6 @@ #include "CodeEditor.h" -NAMESPACE_UPP +namespace Upp { const wchar *eatstring(const wchar *s) { int delim = *s++; @@ -347,4 +347,4 @@ void CSyntax::Serialize(Stream& s) s % highlight; }; -END_UPP_NAMESPACE +} diff --git a/uppsrc/CodeEditor/CodeEditor.cpp b/uppsrc/CodeEditor/CodeEditor.cpp index cad4b2f27..d4dd4a3f3 100644 --- a/uppsrc/CodeEditor/CodeEditor.cpp +++ b/uppsrc/CodeEditor/CodeEditor.cpp @@ -1,6 +1,6 @@ #include "CodeEditor.h" -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // DLOG(x) #define LTIMING(x) // RTIMING(x) @@ -1063,4 +1063,4 @@ CodeEditor::CodeEditor() { CodeEditor::~CodeEditor() {} -END_UPP_NAMESPACE +} diff --git a/uppsrc/CodeEditor/CodeEditor.h b/uppsrc/CodeEditor/CodeEditor.h index 9420a36e3..047517485 100644 --- a/uppsrc/CodeEditor/CodeEditor.h +++ b/uppsrc/CodeEditor/CodeEditor.h @@ -5,7 +5,7 @@ #include #include -NAMESPACE_UPP +namespace Upp { #define LAYOUTFILE #include @@ -514,6 +514,6 @@ public: String ReadList(WithDropChoice& e); void WriteList(WithDropChoice& e, const String& data); -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CodeEditor/DiffSyntax.cpp b/uppsrc/CodeEditor/DiffSyntax.cpp index 1577e53f8..347875c16 100644 --- a/uppsrc/CodeEditor/DiffSyntax.cpp +++ b/uppsrc/CodeEditor/DiffSyntax.cpp @@ -1,6 +1,6 @@ #include "CodeEditor.h" -NAMESPACE_UPP +namespace Upp { DiffSyntax::DiffSyntax() { @@ -91,4 +91,4 @@ bool DiffSyntax::IsPattern(const wchar *current, const wchar *end, String patter return (containing && (i == pattern.GetCount())); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CodeEditor/EditorBar.cpp b/uppsrc/CodeEditor/EditorBar.cpp index cac396d42..8319005d3 100644 --- a/uppsrc/CodeEditor/EditorBar.cpp +++ b/uppsrc/CodeEditor/EditorBar.cpp @@ -1,6 +1,6 @@ #include "CodeEditor.h" -NAMESPACE_UPP +namespace Upp { void Renumber(LineInfo& lf) { @@ -530,4 +530,4 @@ void SetError(LineInfo& li, int line, int err) li.At(line).error = err; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CodeEditor/FindReplace.cpp b/uppsrc/CodeEditor/FindReplace.cpp index 7ca7c0dbf..1a18ab690 100644 --- a/uppsrc/CodeEditor/FindReplace.cpp +++ b/uppsrc/CodeEditor/FindReplace.cpp @@ -1,6 +1,6 @@ #include "CodeEditor.h" -NAMESPACE_UPP +namespace Upp { void CodeEditor::InitFindReplace() { @@ -892,4 +892,4 @@ void CodeEditor::FindPrev() FindPrevNext(true); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CodeEditor/HighlightOut.cpp b/uppsrc/CodeEditor/HighlightOut.cpp index 30ee952bb..821d5e0e9 100644 --- a/uppsrc/CodeEditor/HighlightOut.cpp +++ b/uppsrc/CodeEditor/HighlightOut.cpp @@ -1,6 +1,6 @@ #include "CodeEditor.h" -NAMESPACE_UPP +namespace Upp { HighlightOutput::HighlightOutput(Vector& v) : v(v) @@ -130,4 +130,4 @@ const wchar *HighlightOutput::CString(const wchar *p) return p; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CodeEditor/Lang.cpp b/uppsrc/CodeEditor/Lang.cpp index c0c47293e..f7239c3ac 100644 --- a/uppsrc/CodeEditor/Lang.cpp +++ b/uppsrc/CodeEditor/Lang.cpp @@ -1,6 +1,6 @@ #include "CodeEditor.h" -NAMESPACE_UPP +namespace Upp { Array GetLineIdent(const char *line) { @@ -201,4 +201,4 @@ bool CodeEditor::FindLangString(bool back) return false; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CodeEditor/LogSyntax.cpp b/uppsrc/CodeEditor/LogSyntax.cpp index aceddb5b2..a6dc45775 100644 --- a/uppsrc/CodeEditor/LogSyntax.cpp +++ b/uppsrc/CodeEditor/LogSyntax.cpp @@ -1,6 +1,6 @@ #include "CodeEditor.h" -NAMESPACE_UPP +namespace Upp { inline bool Is3(const wchar *s, int c) { @@ -76,4 +76,4 @@ void LogSyntax::Highlight(const wchar *s, const wchar *end, HighlightOutput& hls hls.SetPaper(0, hls.GetCount(), hl_style[PAPER_BLOCK2].color); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CodeEditor/PythonSyntax.cpp b/uppsrc/CodeEditor/PythonSyntax.cpp index 1b221f951..f21782c0f 100644 --- a/uppsrc/CodeEditor/PythonSyntax.cpp +++ b/uppsrc/CodeEditor/PythonSyntax.cpp @@ -1,6 +1,6 @@ #include "CodeEditor.h" -NAMESPACE_UPP +namespace Upp { PythonSyntax::PythonSyntax() {} @@ -216,4 +216,4 @@ char PythonSyntax::GetIdentationByType(Identation::Type type) return '\t'; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CodeEditor/Register.cpp b/uppsrc/CodeEditor/Register.cpp index ba2af675a..6b078b26b 100644 --- a/uppsrc/CodeEditor/Register.cpp +++ b/uppsrc/CodeEditor/Register.cpp @@ -1,6 +1,6 @@ #include "CodeEditor.h" -NAMESPACE_UPP +namespace Upp { ArrayMap& EditorSyntax::defs() { @@ -37,4 +37,4 @@ String EditorSyntax::GetSyntaxForFilename(const char *fn) return Null; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CodeEditor/Style.cpp b/uppsrc/CodeEditor/Style.cpp index 0e88af9b7..d9dbbba73 100644 --- a/uppsrc/CodeEditor/Style.cpp +++ b/uppsrc/CodeEditor/Style.cpp @@ -1,6 +1,6 @@ #include "CodeEditor.h" -NAMESPACE_UPP +namespace Upp { HlStyle HighlightSetup::hl_style[HL_COUNT]; byte HighlightSetup::hilite_scope = 0; @@ -172,4 +172,4 @@ void HighlightSetup::DefaultHlStyles() SetHlStyle(WARN_WHITESPACE, Blend(SColorLight, SRed)); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CodeEditor/Syntax.cpp b/uppsrc/CodeEditor/Syntax.cpp index edfc4672e..847936c9d 100644 --- a/uppsrc/CodeEditor/Syntax.cpp +++ b/uppsrc/CodeEditor/Syntax.cpp @@ -1,6 +1,6 @@ #include "CodeEditor.h" -NAMESPACE_UPP +namespace Upp { void EditorSyntax::Clear() { @@ -56,4 +56,4 @@ void EditorSyntax::CheckSyntaxRefresh(CodeEditor& e, int pos, const WString& tex EditorSyntax::~EditorSyntax() {} -END_UPP_NAMESPACE +} diff --git a/uppsrc/CodeEditor/TagSyntax.cpp b/uppsrc/CodeEditor/TagSyntax.cpp index 768a3ec18..1c9de627f 100644 --- a/uppsrc/CodeEditor/TagSyntax.cpp +++ b/uppsrc/CodeEditor/TagSyntax.cpp @@ -1,6 +1,6 @@ #include "CodeEditor.h" -NAMESPACE_UPP +namespace Upp { TagSyntax::TagSyntax() { @@ -302,4 +302,4 @@ void TagSyntax::Serialize(Stream& s) % html; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/App.cpp b/uppsrc/Core/App.cpp index 5ffbace2f..aac3408a8 100644 --- a/uppsrc/Core/App.cpp +++ b/uppsrc/Core/App.cpp @@ -19,7 +19,7 @@ #undef CY #endif -NAMESPACE_UPP +namespace Upp { #ifdef PLATFORM_WIN32 @@ -662,4 +662,4 @@ String GetDownloadFolder() { return GetShellFolder("XDG_DOWNLOAD_DIR", "XDG_DOW #endif -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/BlockStream.cpp b/uppsrc/Core/BlockStream.cpp index f20240bbb..1b63e0210 100644 --- a/uppsrc/Core/BlockStream.cpp +++ b/uppsrc/Core/BlockStream.cpp @@ -1,6 +1,6 @@ #include "Core.h" -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // DLOG(x) #define LDUMP(x) // DUMP(x) @@ -518,4 +518,4 @@ bool FileOut::Open(const char *fn, mode_t acm) #endif -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/Bom.cpp b/uppsrc/Core/Bom.cpp index fff8e5423..74e2e970c 100644 --- a/uppsrc/Core/Bom.cpp +++ b/uppsrc/Core/Bom.cpp @@ -1,6 +1,6 @@ #include "Core.h" -NAMESPACE_UPP +namespace Upp { static void sLoadBom(Stream& in, String *t, WString *wt, byte def_charset) { @@ -124,4 +124,4 @@ bool SaveFileBOMUtf8(const char *path, const String& data) return SaveStreamBOMUtf8(out, data); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/CharSet.cpp b/uppsrc/Core/CharSet.cpp index bfc80e625..00d805389 100644 --- a/uppsrc/Core/CharSet.cpp +++ b/uppsrc/Core/CharSet.cpp @@ -1,6 +1,6 @@ #include -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // LOG(x) @@ -2846,4 +2846,4 @@ String ToAscii(const String& s, byte charset) return r; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/CoWork.cpp b/uppsrc/Core/CoWork.cpp index 7388bf053..1765c68b8 100644 --- a/uppsrc/Core/CoWork.cpp +++ b/uppsrc/Core/CoWork.cpp @@ -1,6 +1,6 @@ #include "Core.h" -NAMESPACE_UPP +namespace Upp { #ifdef _MULTITHREADED @@ -251,5 +251,5 @@ CoWork::~CoWork() #endif -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/Color.cpp b/uppsrc/Core/Color.cpp index 020ad7e57..6ec9ecff3 100644 --- a/uppsrc/Core/Color.cpp +++ b/uppsrc/Core/Color.cpp @@ -1,6 +1,6 @@ #include "Core.h" -NAMESPACE_UPP +namespace Upp { void RGBtoHSV(double r, double g, double b, double& h, double& s, double& v) { @@ -186,4 +186,4 @@ bool IsLight(Color c) return Grayscale(c) > 255 - 80; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/Convert.cpp b/uppsrc/Core/Convert.cpp index f9c1093de..e985ab4a9 100644 --- a/uppsrc/Core/Convert.cpp +++ b/uppsrc/Core/Convert.cpp @@ -1,6 +1,6 @@ #include "Core.h" -NAMESPACE_UPP +namespace Upp { unsigned stou(const char *s, void *endptr, unsigned base) { @@ -605,4 +605,4 @@ Value FormatConvert::Format(const Value& v) const return UPP::Format(format, va.Get()); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/Core.h b/uppsrc/Core/Core.h index cb3e657fe..a40595649 100644 --- a/uppsrc/Core/Core.h +++ b/uppsrc/Core/Core.h @@ -231,19 +231,12 @@ namespace std { #endif #endif -namespace Upp {}; - -#ifdef flagNONAMESPACE -#define NAMESPACE_UPP -#define END_UPP_NAMESPACE -#define UPP -#else +// deprecated, use 'namespace' directly instead of macros #define NAMESPACE_UPP namespace Upp { -#define END_UPP_NAMESPACE }; +#define END_UPP_NAMESPACE } #define UPP Upp -#endif -NAMESPACE_UPP +namespace Upp { #ifndef flagNODEPRECATED #define DEPRECATED @@ -343,7 +336,7 @@ NTL_MOVEABLE(SIZE) NTL_MOVEABLE(RECT) #endif -END_UPP_NAMESPACE +} #if (defined(TESTLEAKS) || defined(HEAPDBG)) && defined(COMPILER_GCC) && defined(UPP_HEAP) diff --git a/uppsrc/Core/Cpu.cpp b/uppsrc/Core/Cpu.cpp index bbe6b214f..77509ae05 100644 --- a/uppsrc/Core/Cpu.cpp +++ b/uppsrc/Core/Cpu.cpp @@ -1,6 +1,6 @@ #include "Core.h" -NAMESPACE_UPP +namespace Upp { #ifdef CPU_X86 @@ -174,4 +174,4 @@ void EndianSwap(int *v, size_t count) ENDIAN_SWAP void EndianSwap(int64 *v, size_t count) ENDIAN_SWAP void EndianSwap(uint64 *v, size_t count) ENDIAN_SWAP -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/Debug.cpp b/uppsrc/Core/Debug.cpp index 5963370e3..1770703fb 100644 --- a/uppsrc/Core/Debug.cpp +++ b/uppsrc/Core/Debug.cpp @@ -5,7 +5,7 @@ #endif -NAMESPACE_UPP +namespace Upp { #define LTIMING(x) // TIMING(x) @@ -294,14 +294,14 @@ dword _DBG_Value_GetType(Value const &v) { return v.GetType(); } String _DBG_Value_AsString(Value const &v) { return AsString(v); } #endif -END_UPP_NAMESPACE +} #if defined(__GNUG__) && defined(PLATFORM_POSIX) #include #include #include -NAMESPACE_UPP +namespace Upp { struct cpp_demangle_handle__ { char* p; @@ -315,17 +315,17 @@ String CppDemangle(const char* name) { return (status==0) ? result.p : name ; } -END_UPP_NAMESPACE +} #else -NAMESPACE_UPP +namespace Upp { String CppDemangle(const char* name) { return TrimLeft("struct ", TrimLeft("class ", name)); } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/Core/Dli.cpp b/uppsrc/Core/Dli.cpp index 43b044241..e66e82aae 100644 --- a/uppsrc/Core/Dli.cpp +++ b/uppsrc/Core/Dli.cpp @@ -12,7 +12,7 @@ typedef void *DLLHANDLE; #include -NAMESPACE_UPP +namespace Upp { class PeFile { @@ -101,7 +101,7 @@ const char *PeFile::FindExportRaw(const char *name, bool case_sensitive) const return 0; } -END_UPP_NAMESPACE +} HMODULE CheckDll__(const char *fn, const char *const *names, UPP::Vector& plist) { diff --git a/uppsrc/Core/FileMapping.cpp b/uppsrc/Core/FileMapping.cpp index f955fe878..53941a2d5 100644 --- a/uppsrc/Core/FileMapping.cpp +++ b/uppsrc/Core/FileMapping.cpp @@ -4,7 +4,7 @@ #include #endif -NAMESPACE_UPP +namespace Upp { static int sMappingGranularity_() { @@ -228,4 +228,4 @@ String FileMapping::GetData(int64 offset, int len) } } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/FilterStream.cpp b/uppsrc/Core/FilterStream.cpp index 80813fc22..fbb57a090 100644 --- a/uppsrc/Core/FilterStream.cpp +++ b/uppsrc/Core/FilterStream.cpp @@ -1,6 +1,6 @@ #include "Core.h" -NAMESPACE_UPP +namespace Upp { InFilterStream::InFilterStream() { @@ -172,4 +172,4 @@ void OutFilterStream::Out(const void *ptr, int size) out->Put(ptr, size); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/Format.cpp b/uppsrc/Core/Format.cpp index c88f04814..0ef3b563c 100644 --- a/uppsrc/Core/Format.cpp +++ b/uppsrc/Core/Format.cpp @@ -1,7 +1,7 @@ #include "Core.h" //#BLITZ_APPROVE -NAMESPACE_UPP +namespace Upp { // Old format --------------------------- @@ -1224,4 +1224,4 @@ String DeFormat(const char *text) return x; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/Gtypes.cpp b/uppsrc/Core/Gtypes.cpp index 0bd348bcd..1629f3a48 100644 --- a/uppsrc/Core/Gtypes.cpp +++ b/uppsrc/Core/Gtypes.cpp @@ -1,6 +1,6 @@ #include "Core.h" -NAMESPACE_UPP +namespace Upp { //template <> //void Rect_::Union(const Rect_& r) { @@ -161,4 +161,4 @@ double Bearing(const Pointf& p) return atan2(p.y, p.x); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/Hash.cpp b/uppsrc/Core/Hash.cpp index ee6a202e3..579704ecd 100644 --- a/uppsrc/Core/Hash.cpp +++ b/uppsrc/Core/Hash.cpp @@ -1,6 +1,6 @@ #include -NAMESPACE_UPP +namespace Upp { #ifdef _MSC_VER #pragma inline_depth(255) @@ -359,4 +359,4 @@ void Bits::Set(int i, bool b) bp[q] = (bp[q] & ~(1 << i)) | (b << i); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/Http.cpp b/uppsrc/Core/Http.cpp index 9e4a7a75c..23391a29a 100644 --- a/uppsrc/Core/Http.cpp +++ b/uppsrc/Core/Http.cpp @@ -1,6 +1,6 @@ #include "Core.h" -NAMESPACE_UPP +namespace Upp { namespace Ini { INI_BOOL(HttpRequest_Trace, false, "Activates HTTP requests tracing") @@ -901,4 +901,4 @@ String HttpRequest::GetPhaseName() const return phase >= 0 && phase <= FAILED ? m[phase] : ""; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/InetUtil.cpp b/uppsrc/Core/InetUtil.cpp index e3e50091d..9804b670e 100644 --- a/uppsrc/Core/InetUtil.cpp +++ b/uppsrc/Core/InetUtil.cpp @@ -1,6 +1,6 @@ #include "Core.h" -NAMESPACE_UPP +namespace Upp { static const char *s_www_month[] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" @@ -725,4 +725,4 @@ void UrlInfo::Parse(const String& url_) } } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/JSON.cpp b/uppsrc/Core/JSON.cpp index f44469efa..a6f80ca68 100644 --- a/uppsrc/Core/JSON.cpp +++ b/uppsrc/Core/JSON.cpp @@ -1,6 +1,6 @@ #include "Core.h" -NAMESPACE_UPP +namespace Upp { Value ParseJSON(CParser& p) { @@ -368,4 +368,4 @@ String sJsonFile(const char *file) return file ? String(file) : ConfigFile(GetExeTitle() + ".json"); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/Lang.cpp b/uppsrc/Core/Lang.cpp index 6824782d8..b11a792b7 100644 --- a/uppsrc/Core/Lang.cpp +++ b/uppsrc/Core/Lang.cpp @@ -11,7 +11,7 @@ #endif #endif -NAMESPACE_UPP +namespace Upp { #define LLOG(x) LOG(x) @@ -175,4 +175,4 @@ String GetNativeLangName(int language) { return GetLanguageInfo(language).native_name.ToString(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/LocalProcess.cpp b/uppsrc/Core/LocalProcess.cpp index cd65f1ad7..28c984592 100644 --- a/uppsrc/Core/LocalProcess.cpp +++ b/uppsrc/Core/LocalProcess.cpp @@ -1,6 +1,6 @@ #include "Core.h" -NAMESPACE_UPP +namespace Upp { #ifdef PLATFORM_POSIX //#BLITZ_APPROVE @@ -642,4 +642,4 @@ String Sys(const char *cmd, const Vector& arg, bool convertcharset) return Sys(cmd, arg, r, convertcharset) ? String::GetVoid() : r; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/Log.cpp b/uppsrc/Core/Log.cpp index d437058a9..ef92bb5d7 100644 --- a/uppsrc/Core/Log.cpp +++ b/uppsrc/Core/Log.cpp @@ -1,6 +1,6 @@ #include "Core.h" -NAMESPACE_UPP +namespace Upp { StaticCriticalSection log_mutex; @@ -483,4 +483,4 @@ namespace Ini { INI_BOOL(user_log, false, "Activates logging of user actions"); }; -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/MD5.cpp b/uppsrc/Core/MD5.cpp index a63892f3f..fa52283c4 100644 --- a/uppsrc/Core/MD5.cpp +++ b/uppsrc/Core/MD5.cpp @@ -1,6 +1,6 @@ #include "Core.h" -NAMESPACE_UPP +namespace Upp { #define MD5_CTX UPP_MD5_CTX @@ -390,4 +390,4 @@ String MD5StringS(const String& data) return MD5StringS(~data, data.GetCount()); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/MIME.cpp b/uppsrc/Core/MIME.cpp index cb7351ad0..44590f305 100644 --- a/uppsrc/Core/MIME.cpp +++ b/uppsrc/Core/MIME.cpp @@ -1,6 +1,6 @@ #include "Core.h" -NAMESPACE_UPP +namespace Upp { static Tuple sEXT_MIME[] = { { "txt", "text/plain" }, @@ -242,4 +242,4 @@ String MIMEToFileExt(const String& mime) return q >= 0 ? sEXT()[q] : "bin"; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/Mt.cpp b/uppsrc/Core/Mt.cpp index 4be570fa0..524b4c49c 100644 --- a/uppsrc/Core/Mt.cpp +++ b/uppsrc/Core/Mt.cpp @@ -1,6 +1,6 @@ #include "Core.h" -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // DLOG(x) @@ -649,4 +649,4 @@ bool StartAuxThread(auxthread_t (auxthread__ *fn)(void *ptr), void *ptr) return false; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/NetNode.cpp b/uppsrc/Core/NetNode.cpp index e243dec99..59e753741 100644 --- a/uppsrc/Core/NetNode.cpp +++ b/uppsrc/Core/NetNode.cpp @@ -2,7 +2,7 @@ #ifdef PLATFORM_WIN32 -NAMESPACE_UPP +namespace Upp { NetNode::NetNode() { @@ -131,6 +131,6 @@ int NetNode::GetDisplayType() const return UNKNOWN; } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/Core/POP3/InetMessage.cpp b/uppsrc/Core/POP3/InetMessage.cpp index 4f4b183c9..74de286a3 100644 --- a/uppsrc/Core/POP3/InetMessage.cpp +++ b/uppsrc/Core/POP3/InetMessage.cpp @@ -2,7 +2,7 @@ #define LLOG(x) // DLOG(x) -NAMESPACE_UPP +namespace Upp { String QDecode(const String& s) { @@ -354,4 +354,4 @@ String FormatMessageIDs(const Index& id) return r; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/POP3/POP3.cpp b/uppsrc/Core/POP3/POP3.cpp index 52ef82b6f..fc45eb940 100644 --- a/uppsrc/Core/POP3/POP3.cpp +++ b/uppsrc/Core/POP3/POP3.cpp @@ -1,6 +1,6 @@ #include "POP3.h" -NAMESPACE_UPP +namespace Upp { static bool sPop3Trace; #define LLOG(x) do { if(sPop3Trace) RLOG(CompressLog(String().Cat() << x)); } while(0) @@ -255,4 +255,4 @@ Pop3::~Pop3() Logout(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/POP3/POP3.h b/uppsrc/Core/POP3/POP3.h index 5ff82ae5c..843bbef3b 100644 --- a/uppsrc/Core/POP3/POP3.h +++ b/uppsrc/Core/POP3/POP3.h @@ -3,7 +3,7 @@ #include -NAMESPACE_UPP +namespace Upp { class Pop3 : public TcpSocket { @@ -110,6 +110,6 @@ struct MIMEHeader { Index ParseMessageIDs(const String& s); String FormatMessageIDs(const Index& id); -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/Core/Path.cpp b/uppsrc/Core/Path.cpp index 43e492421..f3ba8fb61 100644 --- a/uppsrc/Core/Path.cpp +++ b/uppsrc/Core/Path.cpp @@ -30,7 +30,7 @@ #endif -NAMESPACE_UPP +namespace Upp { static int sDirSep(int c) { return c == '/' || c == '\\' ? c : 0; @@ -1043,4 +1043,4 @@ bool FileSystemInfo::FolderExists(String path) const return !fi.IsEmpty() && fi[0].is_directory; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/Ptr.cpp b/uppsrc/Core/Ptr.cpp index fd06058ae..32c7e45c3 100644 --- a/uppsrc/Core/Ptr.cpp +++ b/uppsrc/Core/Ptr.cpp @@ -1,6 +1,6 @@ #include "Core.h" -NAMESPACE_UPP +namespace Upp { /* Faster, but consuming more memory.... PteBase::Prec *PteBase::PtrAdd() @@ -81,4 +81,4 @@ PtrBase::~PtrBase() Release(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/Random.cpp b/uppsrc/Core/Random.cpp index 01bd3a2f0..7d8406ef8 100644 --- a/uppsrc/Core/Random.cpp +++ b/uppsrc/Core/Random.cpp @@ -1,6 +1,6 @@ #include "Core.h" -NAMESPACE_UPP +namespace Upp { /* A C-program for MT19937, with initialization improved 2002/1/26. @@ -267,4 +267,4 @@ double Randomf() return Random64(I64(4503599627370496)) / 4503599627370496.0; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/Rpc/Rpc.h b/uppsrc/Core/Rpc/Rpc.h index 189f9f273..70fdcdc18 100644 --- a/uppsrc/Core/Rpc/Rpc.h +++ b/uppsrc/Core/Rpc/Rpc.h @@ -4,7 +4,7 @@ #ifndef Rpc_Rpc_h #define Rpc_Rpc_h -NAMESPACE_UPP +namespace Upp { enum { RPC_SERVER_JSON_ERROR = -32700, // Parse error @@ -363,6 +363,6 @@ void SuppressRpcServerTraceForMethodCall(); #include "legacy.h" -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/Core/Rpc/imp/Client.cpp b/uppsrc/Core/Rpc/imp/Client.cpp index 30a714ce1..5780cc0d3 100644 --- a/uppsrc/Core/Rpc/imp/Client.cpp +++ b/uppsrc/Core/Rpc/imp/Client.cpp @@ -1,7 +1,7 @@ #include #include -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // LOG(x) @@ -242,4 +242,4 @@ void RpcRequest::ClearError() error.Clear(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/Rpc/imp/Server.cpp b/uppsrc/Core/Rpc/imp/Server.cpp index b6a656329..105ee036e 100644 --- a/uppsrc/Core/Rpc/imp/Server.cpp +++ b/uppsrc/Core/Rpc/imp/Server.cpp @@ -3,7 +3,7 @@ #define LLOG(x) // DLOG(x) -NAMESPACE_UPP +namespace Upp { typedef void (*RpcFnPtr)(RpcData&); @@ -382,4 +382,4 @@ bool RpcServerLoop(int port, const char *group) } } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/Rpc/imp/Value.cpp b/uppsrc/Core/Rpc/imp/Value.cpp index b8bc9d528..95839e617 100644 --- a/uppsrc/Core/Rpc/imp/Value.cpp +++ b/uppsrc/Core/Rpc/imp/Value.cpp @@ -1,7 +1,7 @@ #include #include -NAMESPACE_UPP +namespace Upp { String FormatIso8601(Time t) { @@ -160,4 +160,4 @@ void ValuePut(Value& v, const Json& json) v = RawToValue(x); } -END_UPP_NAMESPACE \ No newline at end of file +} \ No newline at end of file diff --git a/uppsrc/Core/Rpc/imp/Xml.cpp b/uppsrc/Core/Rpc/imp/Xml.cpp index 62e676ac9..36a33f0bc 100644 --- a/uppsrc/Core/Rpc/imp/Xml.cpp +++ b/uppsrc/Core/Rpc/imp/Xml.cpp @@ -1,7 +1,7 @@ #include #include -NAMESPACE_UPP +namespace Upp { Value ParseXmlRpcValue(XmlParser& p) { @@ -189,4 +189,4 @@ String FormatXmlRpcError(int code, const char *text) return r; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/SHA1.cpp b/uppsrc/Core/SHA1.cpp index b2e2fcbf0..854c62153 100644 --- a/uppsrc/Core/SHA1.cpp +++ b/uppsrc/Core/SHA1.cpp @@ -1,6 +1,6 @@ #include "Core.h" -NAMESPACE_UPP +namespace Upp { /* SHA-1 in C @@ -210,4 +210,4 @@ String SHA1StringS(const String& data) return SHA1StringS(~data, data.GetLength()); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/SMTP/SMTP.h b/uppsrc/Core/SMTP/SMTP.h index 51d1b1b9c..ec1ffbcd5 100644 --- a/uppsrc/Core/SMTP/SMTP.h +++ b/uppsrc/Core/SMTP/SMTP.h @@ -3,7 +3,7 @@ #include -NAMESPACE_UPP +namespace Upp { class Smtp : public TcpSocket { struct Attachment @@ -91,6 +91,6 @@ public: static String FormatAddr(const String& addr, const String& name); }; -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/Core/SMTP/Smtp.cpp b/uppsrc/Core/SMTP/Smtp.cpp index ada48aefd..f9d30f224 100644 --- a/uppsrc/Core/SMTP/Smtp.cpp +++ b/uppsrc/Core/SMTP/Smtp.cpp @@ -1,6 +1,6 @@ #include "SMTP.h" -NAMESPACE_UPP +namespace Upp { namespace Ini { INI_BOOL(Smtp_Trace, false, "Activates HTTP requests tracing") @@ -425,4 +425,4 @@ Smtp::Smtp() New(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/SSL/InitExit.icpp b/uppsrc/Core/SSL/InitExit.icpp index b17248517..5c6b5dd35 100644 --- a/uppsrc/Core/SSL/InitExit.icpp +++ b/uppsrc/Core/SSL/InitExit.icpp @@ -2,7 +2,7 @@ #define LLOG(x) // DLOG(x) -NAMESPACE_UPP +namespace Upp { static int64 UPP_SSL_alloc = 0; @@ -103,4 +103,4 @@ void SslInitThread() {} #endif -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/SSL/SSL.h b/uppsrc/Core/SSL/SSL.h index cf1bd217d..144e91de1 100644 --- a/uppsrc/Core/SSL/SSL.h +++ b/uppsrc/Core/SSL/SSL.h @@ -5,7 +5,7 @@ #include #include -NAMESPACE_UPP +namespace Upp { void SslInitThread(); @@ -133,4 +133,4 @@ String SslToString(X509_NAME *name); Date Asn1ToDate(ASN1_STRING *time); String Asn1ToString(ASN1_STRING *s); -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/SSL/Socket.icpp b/uppsrc/Core/SSL/Socket.icpp index 59c7e531c..fa312472b 100644 --- a/uppsrc/Core/SSL/Socket.icpp +++ b/uppsrc/Core/SSL/Socket.icpp @@ -2,7 +2,7 @@ #define LLOG(x) // DLOG(x) -NAMESPACE_UPP +namespace Upp { struct TcpSocket::SSLImp : TcpSocket::SSL { virtual bool Start(); @@ -222,4 +222,4 @@ void TcpSocket::SSLImp::Close() ssl = NULL; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/SSL/Util.cpp b/uppsrc/Core/SSL/Util.cpp index 1724d8f8a..d57fd0184 100644 --- a/uppsrc/Core/SSL/Util.cpp +++ b/uppsrc/Core/SSL/Util.cpp @@ -1,6 +1,6 @@ #include "SSL.h" -NAMESPACE_UPP +namespace Upp { String SslBuffer::Get() const { @@ -205,4 +205,4 @@ String Asn1ToString(ASN1_STRING *s) return String(s->data, s->length); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/Socket.cpp b/uppsrc/Core/Socket.cpp index 53e4df600..20257d61e 100644 --- a/uppsrc/Core/Socket.cpp +++ b/uppsrc/Core/Socket.cpp @@ -9,7 +9,7 @@ #include #endif -NAMESPACE_UPP +namespace Upp { #ifdef PLATFORM_WIN32 #pragma comment(lib, "ws2_32.lib") @@ -1019,4 +1019,4 @@ SocketWaitEvent::SocketWaitEvent() FD_ZERO(exception); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/SplitMerge.cpp b/uppsrc/Core/SplitMerge.cpp index 439b5ff68..6f9284885 100644 --- a/uppsrc/Core/SplitMerge.cpp +++ b/uppsrc/Core/SplitMerge.cpp @@ -1,6 +1,6 @@ #include "Core.h" -NAMESPACE_UPP +namespace Upp { template Vector SplitGeneric(int maxcount, const F& delim, const Char *s, bool ignoreempty = true) @@ -325,4 +325,4 @@ __Expand12(E__NFBody) #undef E__PI #undef E__NFBody -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/StrUtil.cpp b/uppsrc/Core/StrUtil.cpp index 34644a08c..101ac3db1 100644 --- a/uppsrc/Core/StrUtil.cpp +++ b/uppsrc/Core/StrUtil.cpp @@ -1,6 +1,6 @@ #include "Core.h" -NAMESPACE_UPP +namespace Upp { int wstrlen(const wchar *s) { @@ -145,4 +145,4 @@ WString FilterWhile(const wchar *s, int (*filter)(int)) return result; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/Stream.cpp b/uppsrc/Core/Stream.cpp index a074fa964..5b7e0ff2f 100644 --- a/uppsrc/Core/Stream.cpp +++ b/uppsrc/Core/Stream.cpp @@ -4,7 +4,7 @@ #include #endif -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // RLOG(x) #define LDUMP(x) // RDUMP(x) @@ -1478,4 +1478,4 @@ int StreamHeading(Stream& stream, int ver, int minver, int maxver, const char* t return ver; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/String.cpp b/uppsrc/Core/String.cpp index 9fb9f04d0..ff725c16d 100644 --- a/uppsrc/Core/String.cpp +++ b/uppsrc/Core/String.cpp @@ -1,6 +1,6 @@ #include "Core.h" -NAMESPACE_UPP +namespace Upp { #ifdef _DEBUG void String0::Dsyn() @@ -514,4 +514,4 @@ int CompareNoCase(const String& a, const char *b, byte encoding) return IterCompare(a.Begin(), a.End(), b, b + strlen(b), StringICompare__(encoding)); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/StringFind.cpp b/uppsrc/Core/StringFind.cpp index 9cb957509..fa1a3be59 100644 --- a/uppsrc/Core/StringFind.cpp +++ b/uppsrc/Core/StringFind.cpp @@ -1,6 +1,6 @@ #include "Core.h" -NAMESPACE_UPP +namespace Upp { #ifdef CPU_X86 // Use unaligned access @@ -208,4 +208,4 @@ int find(const wchar *text, int len, const wchar *needle, int nlen, int from) } #endif -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/TimeDate.cpp b/uppsrc/Core/TimeDate.cpp index 99ee86d3e..645be601d 100644 --- a/uppsrc/Core/TimeDate.cpp +++ b/uppsrc/Core/TimeDate.cpp @@ -1,6 +1,6 @@ #include "Core.h" -NAMESPACE_UPP +namespace Upp { static int s_month[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 @@ -702,4 +702,4 @@ Time TimeFromUTC(int64 seconds) return tm - GetLeapSeconds(tm); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/Topic.cpp b/uppsrc/Core/Topic.cpp index a5320764a..18d540f50 100644 --- a/uppsrc/Core/Topic.cpp +++ b/uppsrc/Core/Topic.cpp @@ -1,6 +1,6 @@ #include "Core.h" -NAMESPACE_UPP +namespace Upp { struct TopicData__ : Moveable { String title; @@ -92,7 +92,7 @@ Topic GetTopicLNG(const char *path) ("$" + ToLower(LNGAsText(SetLNGCharset(GetCurrentLanguage(), CHARSET_DEFAULT))))); } -END_UPP_NAMESPACE +} void RegisterTopic__(const char *topicfile, const char *topic, const char *title, const UPP::byte *data, int len) diff --git a/uppsrc/Core/Util.cpp b/uppsrc/Core/Util.cpp index 08baf26c8..96c21b6ce 100644 --- a/uppsrc/Core/Util.cpp +++ b/uppsrc/Core/Util.cpp @@ -9,7 +9,7 @@ # include #endif -NAMESPACE_UPP +namespace Upp { bool PanicMode; @@ -874,4 +874,4 @@ WString Replace(const WString& s, const VectorMap& fr) return Replace__(s, fr.GetKeys(), fr.GetValues()); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/Uuid.cpp b/uppsrc/Core/Uuid.cpp index a02a92299..a747d4347 100644 --- a/uppsrc/Core/Uuid.cpp +++ b/uppsrc/Core/Uuid.cpp @@ -1,6 +1,6 @@ #include "Core.h" -NAMESPACE_UPP +namespace Upp { //#BLITZ_APPROVE @@ -109,4 +109,4 @@ ValueGen& UuidValueGen() return Single(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/Value.cpp b/uppsrc/Core/Value.cpp index 05260c7f3..8364c20ae 100644 --- a/uppsrc/Core/Value.cpp +++ b/uppsrc/Core/Value.cpp @@ -1,6 +1,6 @@ #include "Core.h" -NAMESPACE_UPP +namespace Upp { #ifndef flagSO const Nuller Null; @@ -768,4 +768,4 @@ String GetErrorText(const Value& v) { return ((RichValueRep *)v.GetVoidPtr())->Get(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/ValueUtil.cpp b/uppsrc/Core/ValueUtil.cpp index 74efe6118..885369071 100644 --- a/uppsrc/Core/ValueUtil.cpp +++ b/uppsrc/Core/ValueUtil.cpp @@ -1,6 +1,6 @@ #include "Core.h" -NAMESPACE_UPP +namespace Upp { static String sAsString(const Vector& v); @@ -687,5 +687,5 @@ INITBLOCK Value::Register("Rectf"); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/Vcont.cpp b/uppsrc/Core/Vcont.cpp index e737f2ec8..233b39c31 100644 --- a/uppsrc/Core/Vcont.cpp +++ b/uppsrc/Core/Vcont.cpp @@ -1,6 +1,6 @@ #include "Core.h" -NAMESPACE_UPP +namespace Upp { struct Vector_ { void *vector; @@ -83,4 +83,4 @@ thread__ int invector_cache_blki_; thread__ int invector_cache_offset_; thread__ int invector_cache_end_; -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/WString.cpp b/uppsrc/Core/WString.cpp index 57c1250c4..010529413 100644 --- a/uppsrc/Core/WString.cpp +++ b/uppsrc/Core/WString.cpp @@ -1,6 +1,6 @@ #include "Core.h" -NAMESPACE_UPP +namespace Upp { wchar *WString0::Alloc(int& count) { @@ -406,4 +406,4 @@ int CompareNoCase(const WString& a, const wchar *b) return IterCompare(a.Begin(), a.End(), b, b + wstrlen(b), WStringICompare__()); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/WebSocket.cpp b/uppsrc/Core/WebSocket.cpp index 5534bd7e1..816db9956 100644 --- a/uppsrc/Core/WebSocket.cpp +++ b/uppsrc/Core/WebSocket.cpp @@ -2,7 +2,7 @@ #define LLOG(x) // DLOG(x) -NAMESPACE_UPP +namespace Upp { bool WebSocket::WebAccept(TcpSocket& socket_, HttpHeader& hdr) { @@ -163,4 +163,4 @@ void WebSocket::Close() } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/Win32Util.cpp b/uppsrc/Core/Win32Util.cpp index 4b4ce096b..ef34fcf36 100644 --- a/uppsrc/Core/Win32Util.cpp +++ b/uppsrc/Core/Win32Util.cpp @@ -1,6 +1,6 @@ #include "Core.h" -NAMESPACE_UPP +namespace Upp { #ifdef PLATFORM_WIN32 @@ -212,4 +212,4 @@ void Win32Event::Set() #endif -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/XML.cpp b/uppsrc/Core/XML.cpp index 4d7c6a616..2c314d0ba 100644 --- a/uppsrc/Core/XML.cpp +++ b/uppsrc/Core/XML.cpp @@ -1,6 +1,6 @@ #include "Core.h" -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // LOG(x) @@ -1158,4 +1158,4 @@ IgnoreXmlPaths::IgnoreXmlPaths(const char *s) list = Split(s, ';'); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/Xmlize.cpp b/uppsrc/Core/Xmlize.cpp index 3540aec07..6c302738b 100644 --- a/uppsrc/Core/Xmlize.cpp +++ b/uppsrc/Core/Xmlize.cpp @@ -1,6 +1,6 @@ #include "Core.h" -NAMESPACE_UPP +namespace Upp { template<> void Xmlize(XmlIO& xml, String& var) @@ -282,4 +282,4 @@ Value LoadJsonValue(const XmlNode& n) return m; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/heap.cpp b/uppsrc/Core/heap.cpp index 9c234940d..e40eec978 100644 --- a/uppsrc/Core/heap.cpp +++ b/uppsrc/Core/heap.cpp @@ -1,6 +1,6 @@ #include "Core.h" -NAMESPACE_UPP +namespace Upp { #ifdef UPP_HEAP @@ -237,7 +237,7 @@ void MemoryShrink() #endif -END_UPP_NAMESPACE +} #ifdef UPP_HEAP #include diff --git a/uppsrc/Core/heapdbg.cpp b/uppsrc/Core/heapdbg.cpp index fbe3eaba2..5b48215e7 100644 --- a/uppsrc/Core/heapdbg.cpp +++ b/uppsrc/Core/heapdbg.cpp @@ -8,7 +8,7 @@ int sMemDiagInitCount; #endif -NAMESPACE_UPP +namespace Upp { #if defined(UPP_HEAP) @@ -242,7 +242,7 @@ void MemoryInitDiagnostics() #endif -END_UPP_NAMESPACE +} #if (defined(TESTLEAKS) || defined(HEAPDBG)) && defined(COMPILER_GCC) && defined(UPP_HEAP) diff --git a/uppsrc/Core/heaputil.cpp b/uppsrc/Core/heaputil.cpp index d5cd03ad1..4b50b5831 100644 --- a/uppsrc/Core/heaputil.cpp +++ b/uppsrc/Core/heaputil.cpp @@ -6,7 +6,7 @@ #include #endif -NAMESPACE_UPP +namespace Upp { #include "HeapImp.h" @@ -317,6 +317,6 @@ EXITBLOCK { } #endif -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/Core/lheap.cpp b/uppsrc/Core/lheap.cpp index be5349114..e7fa1bf34 100644 --- a/uppsrc/Core/lheap.cpp +++ b/uppsrc/Core/lheap.cpp @@ -1,6 +1,6 @@ #include "Core.h" -NAMESPACE_UPP +namespace Upp { #ifdef UPP_HEAP @@ -291,4 +291,4 @@ size_t Heap::LGetBlockSize(void *ptr) { #endif -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/mathutil.cpp b/uppsrc/Core/mathutil.cpp index 3dca60143..f5ed584be 100644 --- a/uppsrc/Core/mathutil.cpp +++ b/uppsrc/Core/mathutil.cpp @@ -1,6 +1,6 @@ #include "Core.h" -NAMESPACE_UPP +namespace Upp { // iscale: computes x * y / z. @@ -233,4 +233,4 @@ double ceilr(double d, int digits) return ceil(d / fac) * fac; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/parser.cpp b/uppsrc/Core/parser.cpp index d64a9271c..06fc6bb79 100644 --- a/uppsrc/Core/parser.cpp +++ b/uppsrc/Core/parser.cpp @@ -1,6 +1,6 @@ #include "Core.h" -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // DLOG(x) #define LTIMING(x) // RTIMING(x) @@ -601,4 +601,4 @@ String AsCString(const String& s, int linemax, const char *linepfx, dword flags) return AsCString(s, s.End(), linemax, linepfx, flags); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/sheap.cpp b/uppsrc/Core/sheap.cpp index e05ec208f..cb5ee6f42 100644 --- a/uppsrc/Core/sheap.cpp +++ b/uppsrc/Core/sheap.cpp @@ -1,6 +1,6 @@ #include -NAMESPACE_UPP +namespace Upp { #ifdef UPP_HEAP @@ -428,4 +428,4 @@ MemoryProfile *PeakMemoryProfile() #endif -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/t.cpp b/uppsrc/Core/t.cpp index 4458883a0..f8fcb8d60 100644 --- a/uppsrc/Core/t.cpp +++ b/uppsrc/Core/t.cpp @@ -1,6 +1,6 @@ #include "Core.h" -NAMESPACE_UPP +namespace Upp { #define TFILE #include @@ -453,4 +453,4 @@ bool LoadLngFile(const char *file) return true; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Core/z.cpp b/uppsrc/Core/z.cpp index 24104e762..5faa37537 100644 --- a/uppsrc/Core/z.cpp +++ b/uppsrc/Core/z.cpp @@ -3,7 +3,7 @@ #define LDUMP(x) // DDUMP(x) #define LLOG(x) // DLOG(x) -NAMESPACE_UPP +namespace Upp { #ifndef DEF_MEM_LEVEL #define DEF_MEM_LEVEL 8 @@ -515,4 +515,4 @@ void sCompressStreamCopy_(Stream& out, Stream& in, EventGate progr progress(orig_in.GetPos(), insz); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CppBase/Base.cpp b/uppsrc/CppBase/Base.cpp index 8b224524f..851589200 100644 --- a/uppsrc/CppBase/Base.cpp +++ b/uppsrc/CppBase/Base.cpp @@ -1,6 +1,6 @@ #include "CppBase.h" -NAMESPACE_UPP +namespace Upp { #define LLOG(x) #define LTIMING(x) // RTIMING(x) @@ -113,4 +113,4 @@ void CppBase::RemoveFile(int filei) } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CppBase/Body.cpp b/uppsrc/CppBase/Body.cpp index e7a363d95..525aeb7f3 100644 --- a/uppsrc/CppBase/Body.cpp +++ b/uppsrc/CppBase/Body.cpp @@ -2,7 +2,7 @@ #define LLOG(x) // DLOG(x) -NAMESPACE_UPP +namespace Upp { void Parser::Locals(const String& type) { @@ -304,4 +304,4 @@ String Parser::ResolveAutoType() return i < 0 ? String() : s[i]; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CppBase/CppBase.h b/uppsrc/CppBase/CppBase.h index 602b938d3..0a70358ed 100644 --- a/uppsrc/CppBase/CppBase.h +++ b/uppsrc/CppBase/CppBase.h @@ -3,7 +3,7 @@ #include -NAMESPACE_UPP +namespace Upp { bool IsCPPFile(const String& file); bool IsHFile(const String& path); @@ -677,6 +677,6 @@ void ResolveTParam(const CppBase& codebase, Vector& typ Index GetExpressionType(const CppBase& codebase, const Parser& parser, const Vector& xp); Vector MakeXP(const char *s); -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CppBase/CppBase.upp b/uppsrc/CppBase/CppBase.upp index 660c065cb..96b9d6b1a 100644 --- a/uppsrc/CppBase/CppBase.upp +++ b/uppsrc/CppBase/CppBase.upp @@ -1,7 +1,5 @@ description "Partly heurestic (imprecise) C++ parser for purposes of Assist++ (intellisense)\377"; -optimize_speed; - uses Core; diff --git a/uppsrc/CppBase/CppItem.cpp b/uppsrc/CppBase/CppItem.cpp index 509d9d51b..49d45e643 100644 --- a/uppsrc/CppBase/CppItem.cpp +++ b/uppsrc/CppBase/CppItem.cpp @@ -1,6 +1,6 @@ #include "CppBase.h" -NAMESPACE_UPP +namespace Upp { String CppItem::ToString() const { @@ -78,4 +78,4 @@ void CppItem::Dump(Stream& s) const #undef PUT } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CppBase/Parser.cpp b/uppsrc/CppBase/Parser.cpp index e2be2feb9..eeec3b273 100644 --- a/uppsrc/CppBase/Parser.cpp +++ b/uppsrc/CppBase/Parser.cpp @@ -1,6 +1,6 @@ #include "CppBase.h" -NAMESPACE_UPP +namespace Upp { #ifdef _MSC_VER #pragma inline_depth(255) @@ -1828,4 +1828,4 @@ Vector Parser::GetNamespaces() const return ns; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CppBase/Pre.cpp b/uppsrc/CppBase/Pre.cpp index 4f79784d9..6d360174c 100644 --- a/uppsrc/CppBase/Pre.cpp +++ b/uppsrc/CppBase/Pre.cpp @@ -1,6 +1,6 @@ #include "CppBase.h" -NAMESPACE_UPP +namespace Upp { #ifdef _MSC_VER #pragma inline_depth(255) @@ -169,4 +169,4 @@ SrcFile PreProcess(Stream& in, Parser& parser) // This is not really C preproces return pick(res); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CppBase/Qualify.cpp b/uppsrc/CppBase/Qualify.cpp index 9f805ff6d..5fd82ec3b 100644 --- a/uppsrc/CppBase/Qualify.cpp +++ b/uppsrc/CppBase/Qualify.cpp @@ -1,6 +1,6 @@ #include "CppBase.h" -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // DLOG(x) #define LTIMING(x) // RTIMING(x) @@ -311,4 +311,4 @@ void Qualify(CppBase& base) QualifyPass2(base); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CppBase/ScopeInfo.cpp b/uppsrc/CppBase/ScopeInfo.cpp index f7c9c7687..a78ec5f30 100644 --- a/uppsrc/CppBase/ScopeInfo.cpp +++ b/uppsrc/CppBase/ScopeInfo.cpp @@ -1,6 +1,6 @@ #include "CppBase.h" -NAMESPACE_UPP +namespace Upp { #define LLOG(x) #define LTIMING(x) // RTIMING(x) @@ -129,4 +129,4 @@ const Vector& ScopeInfo::GetScopes(const String& usings_) return scopes; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CppBase/cpp.cpp b/uppsrc/CppBase/cpp.cpp index c8b13b732..848dc55b9 100644 --- a/uppsrc/CppBase/cpp.cpp +++ b/uppsrc/CppBase/cpp.cpp @@ -1,6 +1,6 @@ #include "CppBase.h" -NAMESPACE_UPP +namespace Upp { #define LTIMING(x) // RTIMING(x) #define LLOG(x) // DLOG(x) @@ -377,4 +377,4 @@ String Cpp::GetDependeciesMd5(const Vector& m) return md5.FinishString(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CppBase/cpplex.cpp b/uppsrc/CppBase/cpplex.cpp index 251c05d3e..cf4443376 100644 --- a/uppsrc/CppBase/cpplex.cpp +++ b/uppsrc/CppBase/cpplex.cpp @@ -2,7 +2,7 @@ // #define LOGNEXT _DBG_ -NAMESPACE_UPP +namespace Upp { #ifdef _MSC_VER #pragma inline_depth(255) @@ -496,4 +496,4 @@ const char *Lex::Pos(int pos) return pos < term.GetCount() ? term[pos].ptr : ptr; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CppBase/macro.cpp b/uppsrc/CppBase/macro.cpp index 1aa4564bb..268a05666 100644 --- a/uppsrc/CppBase/macro.cpp +++ b/uppsrc/CppBase/macro.cpp @@ -1,6 +1,6 @@ #include "CppBase.h" -NAMESPACE_UPP +namespace Upp { inline bool IsSpc(byte c) { @@ -157,4 +157,4 @@ String CppMacro::Expand(const Vector& p, const Vector& ep) const return r; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CppBase/ppfile.cpp b/uppsrc/CppBase/ppfile.cpp index 96cb1aacb..76a2b1b98 100644 --- a/uppsrc/CppBase/ppfile.cpp +++ b/uppsrc/CppBase/ppfile.cpp @@ -1,6 +1,6 @@ #include "CppBase.h" -NAMESPACE_UPP +namespace Upp { #define LTIMING(x) // RTIMING(x) #define LLOG(x) // DLOG(x) @@ -659,4 +659,4 @@ void SerializePPFiles(Stream& s) #endif } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CppBase/srcfiles.cpp b/uppsrc/CppBase/srcfiles.cpp index 425713234..f59535b74 100644 --- a/uppsrc/CppBase/srcfiles.cpp +++ b/uppsrc/CppBase/srcfiles.cpp @@ -1,6 +1,6 @@ #include "CppBase.h" -NAMESPACE_UPP +namespace Upp { #define LTIMING(x) // RTIMING(x) @@ -77,4 +77,4 @@ bool IncludesFile(const String& parent_path, const String& header_path) return pi >= 0 && i >= 0 && sIncludes.Find(MAKEQWORD(pi, i)) >= 0; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlCore/Ctrl.cpp b/uppsrc/CtrlCore/Ctrl.cpp index f54d318fa..815948d45 100644 --- a/uppsrc/CtrlCore/Ctrl.cpp +++ b/uppsrc/CtrlCore/Ctrl.cpp @@ -1,6 +1,6 @@ #include "CtrlCore.h" -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // DLOG(x) @@ -1041,4 +1041,4 @@ int Ctrl::GetExitCode() const return exitcode; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlCore/CtrlChild.cpp b/uppsrc/CtrlCore/CtrlChild.cpp index 690c44972..174acf6ba 100644 --- a/uppsrc/CtrlCore/CtrlChild.cpp +++ b/uppsrc/CtrlCore/CtrlChild.cpp @@ -1,6 +1,6 @@ #include "CtrlCore.h" -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // DLOG(x) @@ -291,4 +291,4 @@ const TopWindow *Ctrl::GetMainWindow() const return const_cast(this)->GetMainWindow(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlCore/CtrlClip.cpp b/uppsrc/CtrlCore/CtrlClip.cpp index 7176d38b8..887d46b13 100644 --- a/uppsrc/CtrlCore/CtrlClip.cpp +++ b/uppsrc/CtrlCore/CtrlClip.cpp @@ -1,6 +1,6 @@ #include "CtrlCore.h" -NAMESPACE_UPP +namespace Upp { String sRawClipData(const Value& data) { @@ -289,4 +289,4 @@ INITBLOCK { InitRichImage(GetImageClip, AcceptImage, GetImage, ClipFmtsImage); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlCore/CtrlCore.h b/uppsrc/CtrlCore/CtrlCore.h index 5da3995c9..12318c4a4 100644 --- a/uppsrc/CtrlCore/CtrlCore.h +++ b/uppsrc/CtrlCore/CtrlCore.h @@ -36,7 +36,7 @@ #include GUIPLATFORM_INCLUDE -NAMESPACE_UPP +namespace Upp { #ifdef _MULTITHREADED void EnterGuiMutex(); @@ -1625,6 +1625,6 @@ RichText ParseRTF(const char *rtf); #include GUIPLATFORM_INCLUDE_AFTER -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CtrlCore/CtrlCore.icpp b/uppsrc/CtrlCore/CtrlCore.icpp index f02f12668..e267ac89c 100644 --- a/uppsrc/CtrlCore/CtrlCore.icpp +++ b/uppsrc/CtrlCore/CtrlCore.icpp @@ -1,6 +1,6 @@ #include "CtrlCore.h" -NAMESPACE_UPP +namespace Upp { #define TFILE #include @@ -19,4 +19,4 @@ INITBLOCK { SetRenderGlyph(sRenderGlyph); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlCore/CtrlDraw.cpp b/uppsrc/CtrlCore/CtrlDraw.cpp index 0ce8fa50b..054a2d961 100644 --- a/uppsrc/CtrlCore/CtrlDraw.cpp +++ b/uppsrc/CtrlCore/CtrlDraw.cpp @@ -1,6 +1,6 @@ #include "CtrlCore.h" -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // DLOG(x) #define LTIMING(x) // TIMING(x) @@ -795,4 +795,4 @@ void Ctrl::GlobalBackBuffer(bool b) globalbackbuffer = b; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlCore/CtrlKbd.cpp b/uppsrc/CtrlCore/CtrlKbd.cpp index a508a0d77..3c80447df 100644 --- a/uppsrc/CtrlCore/CtrlKbd.cpp +++ b/uppsrc/CtrlCore/CtrlKbd.cpp @@ -1,6 +1,6 @@ #include "CtrlCore.h" -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // DLOG(x) @@ -419,4 +419,4 @@ String GetKeyDesc(dword key) return desc; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlCore/CtrlMouse.cpp b/uppsrc/CtrlCore/CtrlMouse.cpp index 1356ad0d7..d5014c68b 100644 --- a/uppsrc/CtrlCore/CtrlMouse.cpp +++ b/uppsrc/CtrlCore/CtrlMouse.cpp @@ -1,6 +1,6 @@ #include "CtrlCore.h" -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // DLOG(x) @@ -720,4 +720,4 @@ WaitCursor::~WaitCursor() { Ctrl::OverrideCursor(prev); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlCore/CtrlMt.cpp b/uppsrc/CtrlCore/CtrlMt.cpp index 3d7e1619f..c0e158bc9 100644 --- a/uppsrc/CtrlCore/CtrlMt.cpp +++ b/uppsrc/CtrlCore/CtrlMt.cpp @@ -2,7 +2,7 @@ #define LLOG(x) // DLOG(x) -NAMESPACE_UPP +namespace Upp { #ifdef _MULTITHREADED @@ -103,4 +103,4 @@ void Ctrl::Call(Function cb) #endif -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlCore/CtrlPos.cpp b/uppsrc/CtrlCore/CtrlPos.cpp index f3dfbeeeb..352304591 100644 --- a/uppsrc/CtrlCore/CtrlPos.cpp +++ b/uppsrc/CtrlCore/CtrlPos.cpp @@ -1,6 +1,6 @@ #include "CtrlCore.h" -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // DLOG(x) #define LTIMING(x) // RTIMING(x) @@ -500,4 +500,4 @@ Rect Ctrl::GetWorkArea(Point pt) return GetPrimaryWorkArea(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlCore/CtrlTimer.cpp b/uppsrc/CtrlCore/CtrlTimer.cpp index cf0bd65ec..aadcdfa4b 100644 --- a/uppsrc/CtrlCore/CtrlTimer.cpp +++ b/uppsrc/CtrlCore/CtrlTimer.cpp @@ -1,6 +1,6 @@ #include "CtrlCore.h" -NAMESPACE_UPP +namespace Upp { // #define LOG_QUEUE #define LLOG(x) // LOG(x) @@ -181,4 +181,4 @@ dword GetTimeClick() return sTClick; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlCore/DHCtrl.cpp b/uppsrc/CtrlCore/DHCtrl.cpp index 8596f210e..dbe28db01 100644 --- a/uppsrc/CtrlCore/DHCtrl.cpp +++ b/uppsrc/CtrlCore/DHCtrl.cpp @@ -2,7 +2,7 @@ #ifdef GUI_WIN -NAMESPACE_UPP +namespace Upp { #ifndef PLATFORM_WINCE @@ -113,6 +113,6 @@ DHCtrl::~DHCtrl() #endif -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CtrlCore/DrawOpWin32.cpp b/uppsrc/CtrlCore/DrawOpWin32.cpp index 9b9f277df..b57b4b98a 100644 --- a/uppsrc/CtrlCore/DrawOpWin32.cpp +++ b/uppsrc/CtrlCore/DrawOpWin32.cpp @@ -2,7 +2,7 @@ #ifdef GUI_WIN -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // LOG(x) #define LTIMING(x) // RTIMING(x) @@ -290,6 +290,6 @@ void SystemDraw::DrawEllipseOp(const Rect& r, Color color, int width, Color penc ::Ellipse(GetHandle(), r.left, r.top, r.right, r.bottom); } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CtrlCore/DrawOpX11.cpp b/uppsrc/CtrlCore/DrawOpX11.cpp index 199d008f8..319089b5d 100644 --- a/uppsrc/CtrlCore/DrawOpX11.cpp +++ b/uppsrc/CtrlCore/DrawOpX11.cpp @@ -2,7 +2,7 @@ #ifdef GUI_X11 -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // LOG(x) #define LTIMING(x) // TIMING(x) @@ -306,6 +306,6 @@ void SystemDraw::DrawArcOp(const Rect& rc, Point start, Point end, int width, Co XChangeGC(Xdisplay, GetGC(), GCForeground, &gcv_old); } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CtrlCore/DrawTextWin32.cpp b/uppsrc/CtrlCore/DrawTextWin32.cpp index e6ae4bc71..337ddba16 100644 --- a/uppsrc/CtrlCore/DrawTextWin32.cpp +++ b/uppsrc/CtrlCore/DrawTextWin32.cpp @@ -2,7 +2,7 @@ #ifdef GUI_WIN -NAMESPACE_UPP +namespace Upp { #define LLOG(x) @@ -41,6 +41,6 @@ void SystemDraw::DrawTextOp(int x, int y, int angle, const wchar *text, Font fon ::SelectObject(handle, orgfont); } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CtrlCore/DrawTextX11.cpp b/uppsrc/CtrlCore/DrawTextX11.cpp index 62085c3cc..bf4ecda2a 100644 --- a/uppsrc/CtrlCore/DrawTextX11.cpp +++ b/uppsrc/CtrlCore/DrawTextX11.cpp @@ -2,7 +2,7 @@ #ifdef GUI_X11 -NAMESPACE_UPP +namespace Upp { #define LTIMING(x) #define LLOG(x) // DLOG(x) @@ -261,6 +261,6 @@ void SystemDraw::DrawTextOp(int x, int y, int angle, const wchar *text, Font fon } } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CtrlCore/DrawWin32.cpp b/uppsrc/CtrlCore/DrawWin32.cpp index cc782b3d2..a94aeb6e8 100644 --- a/uppsrc/CtrlCore/DrawWin32.cpp +++ b/uppsrc/CtrlCore/DrawWin32.cpp @@ -2,7 +2,7 @@ #ifdef GUI_WIN -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // LOG(x) #define LTIMING(x) // RTIMING(x) @@ -484,6 +484,6 @@ PrintDraw::~PrintDraw() { } #endif -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CtrlCore/DrawX11.cpp b/uppsrc/CtrlCore/DrawX11.cpp index ac78ebf6c..7eaf04287 100644 --- a/uppsrc/CtrlCore/DrawX11.cpp +++ b/uppsrc/CtrlCore/DrawX11.cpp @@ -18,7 +18,7 @@ #undef Font #undef Display -NAMESPACE_UPP +namespace Upp { #define LLOG(x) //LOG(x) #define LTIMING(x) //TIMING(x) @@ -451,6 +451,6 @@ bool ScreenInPaletteMode() return Xpalette; } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CtrlCore/EncodeRTF.cpp b/uppsrc/CtrlCore/EncodeRTF.cpp index b0b631d37..f647b5607 100644 --- a/uppsrc/CtrlCore/EncodeRTF.cpp +++ b/uppsrc/CtrlCore/EncodeRTF.cpp @@ -4,7 +4,7 @@ #include -NAMESPACE_UPP +namespace Upp { static int GetParaHeight(const Array& parts) { @@ -740,4 +740,4 @@ void RTFEncoder::PutDocument() PutTxt(richtext, 0, dot_page_size.cx - dot_margins.left - dot_margins.right); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlCore/Frame.cpp b/uppsrc/CtrlCore/Frame.cpp index cb46d08d7..9f03e8a08 100644 --- a/uppsrc/CtrlCore/Frame.cpp +++ b/uppsrc/CtrlCore/Frame.cpp @@ -1,6 +1,6 @@ #include "CtrlCore.h" -NAMESPACE_UPP +namespace Upp { #ifdef flagSO CtrlFrame::CtrlFrame() {} @@ -161,4 +161,4 @@ void LayoutFrameBottom(Rect& r, Ctrl *ctrl, int cy) } } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlCore/GdkImage.cpp b/uppsrc/CtrlCore/GdkImage.cpp index b8a59fafb..7a245d594 100644 --- a/uppsrc/CtrlCore/GdkImage.cpp +++ b/uppsrc/CtrlCore/GdkImage.cpp @@ -2,7 +2,7 @@ #ifdef GUI_GTK -NAMESPACE_UPP +namespace Upp { void ImageGdk::Free() { @@ -57,6 +57,6 @@ ImageGdk::~ImageGdk() Free(); } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CtrlCore/Gtk.h b/uppsrc/CtrlCore/Gtk.h index e4c8e0115..a20666a9f 100644 --- a/uppsrc/CtrlCore/Gtk.h +++ b/uppsrc/CtrlCore/Gtk.h @@ -20,7 +20,7 @@ #pragma clang diagnostic pop #endif -NAMESPACE_UPP +namespace Upp { class SystemDraw : public Draw { virtual dword GetInfo() const; @@ -211,6 +211,6 @@ int type; \ int rmsecs(); -END_UPP_NAMESPACE +} #define GUIPLATFORM_INCLUDE_AFTER diff --git a/uppsrc/CtrlCore/GtkApp.cpp b/uppsrc/CtrlCore/GtkApp.cpp index 4cf55697c..8f858dad3 100644 --- a/uppsrc/CtrlCore/GtkApp.cpp +++ b/uppsrc/CtrlCore/GtkApp.cpp @@ -4,7 +4,7 @@ #define CATCH_ERRORS 0 -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // DLOG(x) @@ -86,6 +86,6 @@ void ExitGtkApp() #endif } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CtrlCore/GtkCapture.cpp b/uppsrc/CtrlCore/GtkCapture.cpp index 0dac626b3..5ab321e97 100644 --- a/uppsrc/CtrlCore/GtkCapture.cpp +++ b/uppsrc/CtrlCore/GtkCapture.cpp @@ -2,7 +2,7 @@ #ifdef GUI_GTK -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // DLOG(x) @@ -89,6 +89,6 @@ void Ctrl::CaptureSync() } } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CtrlCore/GtkClip.cpp b/uppsrc/CtrlCore/GtkClip.cpp index 78d7646d0..17a5c03ab 100644 --- a/uppsrc/CtrlCore/GtkClip.cpp +++ b/uppsrc/CtrlCore/GtkClip.cpp @@ -3,7 +3,7 @@ #ifdef GUI_GTK -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // DLOG(x) @@ -412,6 +412,6 @@ void Ctrl::SetSelectionSource(const char *fmts) gselection().Put(s[i], ClipData(s[i], RenderPrimarySelection)); } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CtrlCore/GtkCreate.cpp b/uppsrc/CtrlCore/GtkCreate.cpp index 57d47f45d..fd3c742d2 100644 --- a/uppsrc/CtrlCore/GtkCreate.cpp +++ b/uppsrc/CtrlCore/GtkCreate.cpp @@ -2,7 +2,7 @@ #ifdef GUI_GTK -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // DLOG(x) @@ -155,6 +155,6 @@ void Ctrl::PopUp(Ctrl *owner, bool savebits, bool activate, bool, bool) } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CtrlCore/GtkCtrl.cpp b/uppsrc/CtrlCore/GtkCtrl.cpp index ef515ea2a..e92edd93d 100644 --- a/uppsrc/CtrlCore/GtkCtrl.cpp +++ b/uppsrc/CtrlCore/GtkCtrl.cpp @@ -4,7 +4,7 @@ #define LLOG(x) // DLOG(x) -NAMESPACE_UPP +namespace Upp { void Ctrl::GuiPlatformConstruct() { @@ -64,6 +64,6 @@ void Ctrl::InstallPanicBox() { } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CtrlCore/GtkDnD.cpp b/uppsrc/CtrlCore/GtkDnD.cpp index 3e1a3f439..91836ef43 100644 --- a/uppsrc/CtrlCore/GtkDnD.cpp +++ b/uppsrc/CtrlCore/GtkDnD.cpp @@ -2,7 +2,7 @@ #ifdef GUI_GTK -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // DLOG(x) @@ -347,6 +347,6 @@ void Ctrl::DndExit() gtk_drag_dest_unset(top->window); } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CtrlCore/GtkDrawImage.cpp b/uppsrc/CtrlCore/GtkDrawImage.cpp index 2f91da4ec..397144bbf 100644 --- a/uppsrc/CtrlCore/GtkDrawImage.cpp +++ b/uppsrc/CtrlCore/GtkDrawImage.cpp @@ -4,7 +4,7 @@ //#include -NAMESPACE_UPP +namespace Upp { #define LTIMING(x) // RTIMING(x) #define LLOG(x) @@ -232,6 +232,6 @@ Image Image::SizeBottomRight() FCURSOR_(GDK_BOTTOM_RIGHT_CORNER) Image Image::Cross() FCURSOR_(GDK_CROSSHAIR) Image Image::Hand() FCURSOR_(GDK_HAND1) -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CtrlCore/GtkDrawOp.cpp b/uppsrc/CtrlCore/GtkDrawOp.cpp index 2305c801a..edcd367a5 100644 --- a/uppsrc/CtrlCore/GtkDrawOp.cpp +++ b/uppsrc/CtrlCore/GtkDrawOp.cpp @@ -2,7 +2,7 @@ #ifdef GUI_GTK -NAMESPACE_UPP +namespace Upp { #define LLOG(x) @@ -317,6 +317,6 @@ void SystemDraw::DrawEllipseOp(const Rect& r, Color color, int pen, Color pencol } } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CtrlCore/GtkDrawText.cpp b/uppsrc/CtrlCore/GtkDrawText.cpp index 621a4ac78..dde240750 100644 --- a/uppsrc/CtrlCore/GtkDrawText.cpp +++ b/uppsrc/CtrlCore/GtkDrawText.cpp @@ -6,7 +6,7 @@ // #include -NAMESPACE_UPP +namespace Upp { #define LLOG(x) @@ -114,6 +114,6 @@ void SystemDraw::DrawTextOp(int x, int y, int angle, const wchar *text, Font fon } } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CtrlCore/GtkEvent.cpp b/uppsrc/CtrlCore/GtkEvent.cpp index 96cf971c3..ca3c43542 100644 --- a/uppsrc/CtrlCore/GtkEvent.cpp +++ b/uppsrc/CtrlCore/GtkEvent.cpp @@ -2,7 +2,7 @@ #ifdef GUI_GTK -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // DLOG(rmsecs() << ' ' << x) //_DBG_ #define LOG_EVENTS @@ -628,6 +628,6 @@ void Ctrl::GuiSleep(int ms) FetchEvents(TRUE); } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CtrlCore/GtkTop.cpp b/uppsrc/CtrlCore/GtkTop.cpp index e1d325288..17ba8ad1c 100644 --- a/uppsrc/CtrlCore/GtkTop.cpp +++ b/uppsrc/CtrlCore/GtkTop.cpp @@ -2,7 +2,7 @@ #ifdef GUI_GTK -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // DLOG(x) @@ -274,6 +274,6 @@ void TopWindow::SerializePlacement(Stream& s, bool reminimize) } } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CtrlCore/GtkUtil.cpp b/uppsrc/CtrlCore/GtkUtil.cpp index 6dba666f7..a4dae7068 100644 --- a/uppsrc/CtrlCore/GtkUtil.cpp +++ b/uppsrc/CtrlCore/GtkUtil.cpp @@ -2,7 +2,7 @@ #ifdef GUI_GTK -NAMESPACE_UPP +namespace Upp { void DrawDragLine(SystemDraw& w, bool horz, int x, int y, int len, int n, const int *pattern, Color color, int animation) { @@ -162,6 +162,6 @@ int rmsecs() return msecs(msecs0); } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CtrlCore/GtkWnd.cpp b/uppsrc/CtrlCore/GtkWnd.cpp index da21ed9ff..b06e5667f 100644 --- a/uppsrc/CtrlCore/GtkWnd.cpp +++ b/uppsrc/CtrlCore/GtkWnd.cpp @@ -2,7 +2,7 @@ #ifdef GUI_GTK -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // DLOG(x) @@ -517,6 +517,6 @@ Vector SplitCmdLine__(const char *cmd) return out; } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CtrlCore/GtkX11Util.cpp b/uppsrc/CtrlCore/GtkX11Util.cpp index 222689f45..2db03ac7c 100644 --- a/uppsrc/CtrlCore/GtkX11Util.cpp +++ b/uppsrc/CtrlCore/GtkX11Util.cpp @@ -4,7 +4,7 @@ #ifdef GDK_WINDOWING_X11 -NAMESPACE_UPP +namespace Upp { #define Time XTime #define Font XFont @@ -163,7 +163,7 @@ GdkFilterReturn Ctrl::RootKeyFilter(GdkXEvent *xevent, GdkEvent *Xevent, gpointe return GDK_FILTER_CONTINUE; } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CtrlCore/ImageWin32.cpp b/uppsrc/CtrlCore/ImageWin32.cpp index 613b9c37b..20ad00f82 100644 --- a/uppsrc/CtrlCore/ImageWin32.cpp +++ b/uppsrc/CtrlCore/ImageWin32.cpp @@ -4,7 +4,7 @@ #include -NAMESPACE_UPP +namespace Upp { #define LTIMING(x) // RTIMING(x) #define LLOG(x) // DLOG(x) @@ -635,6 +635,6 @@ Image Image::Hand() WCURSOR_(IDC_HAND) #endif -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CtrlCore/ImageX11.cpp b/uppsrc/CtrlCore/ImageX11.cpp index b1ea80af7..cc3a70fae 100644 --- a/uppsrc/CtrlCore/ImageX11.cpp +++ b/uppsrc/CtrlCore/ImageX11.cpp @@ -2,7 +2,7 @@ #ifdef GUI_X11 -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // DLOG(x) @@ -470,6 +470,6 @@ void *SystemDraw::CursorX11(const Image& img) return (void *)c; } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CtrlCore/LocalLoop.cpp b/uppsrc/CtrlCore/LocalLoop.cpp index 7bb481697..935d11610 100644 --- a/uppsrc/CtrlCore/LocalLoop.cpp +++ b/uppsrc/CtrlCore/LocalLoop.cpp @@ -1,6 +1,6 @@ #include "CtrlCore.h" -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // DLOG(x) @@ -240,4 +240,4 @@ bool PointLoop(Ctrl& ctrl, const Image& img) return PointLoop(ctrl, m, 1); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlCore/MetaFile.cpp b/uppsrc/CtrlCore/MetaFile.cpp index 2c96c894f..4557574c6 100644 --- a/uppsrc/CtrlCore/MetaFile.cpp +++ b/uppsrc/CtrlCore/MetaFile.cpp @@ -2,7 +2,7 @@ #ifdef GUI_WIN -NAMESPACE_UPP +namespace Upp { #ifndef PLATFORM_WINCE @@ -331,6 +331,6 @@ String AsWMF(const Drawing& iw) #endif -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CtrlCore/ParseRTF.cpp b/uppsrc/CtrlCore/ParseRTF.cpp index 2de74f939..08f052c73 100644 --- a/uppsrc/CtrlCore/ParseRTF.cpp +++ b/uppsrc/CtrlCore/ParseRTF.cpp @@ -1,6 +1,6 @@ #include "CtrlCore.h" -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // DLOG(x) @@ -1278,4 +1278,4 @@ void RTFParser::ReadTableStyle() CellInfoAt(ts.stylecol).format.align = ALIGN_BOTTOM; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlCore/SystemDraw.cpp b/uppsrc/CtrlCore/SystemDraw.cpp index b2114449e..df5dd4805 100644 --- a/uppsrc/CtrlCore/SystemDraw.cpp +++ b/uppsrc/CtrlCore/SystemDraw.cpp @@ -1,6 +1,6 @@ #include "CtrlCore.h" -NAMESPACE_UPP +namespace Upp { #define LTIMING(x) @@ -72,4 +72,4 @@ BackDraw::~BackDraw() Destroy(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlCore/TopWin32.cpp b/uppsrc/CtrlCore/TopWin32.cpp index 2b5542644..841af00b7 100644 --- a/uppsrc/CtrlCore/TopWin32.cpp +++ b/uppsrc/CtrlCore/TopWin32.cpp @@ -2,7 +2,7 @@ #ifdef GUI_WIN -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // DLOG(x) @@ -448,6 +448,6 @@ void TopWindow::SerializePlacement(Stream& s, bool reminimize) } } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CtrlCore/TopWindow.cpp b/uppsrc/CtrlCore/TopWindow.cpp index d1a1f572b..8fc7a0671 100644 --- a/uppsrc/CtrlCore/TopWindow.cpp +++ b/uppsrc/CtrlCore/TopWindow.cpp @@ -1,6 +1,6 @@ #include "CtrlCore.h" -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // DLOG(x) @@ -533,4 +533,4 @@ void ArrangeOKCancel(Ctrl& ok, Ctrl& cancel) } } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlCore/UtilWin32.cpp b/uppsrc/CtrlCore/UtilWin32.cpp index 324bcc193..8f25d87a9 100644 --- a/uppsrc/CtrlCore/UtilWin32.cpp +++ b/uppsrc/CtrlCore/UtilWin32.cpp @@ -2,7 +2,7 @@ #ifdef GUI_WIN -NAMESPACE_UPP +namespace Upp { SystemDraw& ScreenInfo(); @@ -89,6 +89,6 @@ void DrawDragRect(Ctrl& q, const Rect& rect1, const Rect& rect2, const Rect& cli DrawDragRect(w, rect1, rect2, clip, n, color, sGetAniPat(pattern, animation)); } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CtrlCore/UtilX11.cpp b/uppsrc/CtrlCore/UtilX11.cpp index 11342860a..774b5707a 100644 --- a/uppsrc/CtrlCore/UtilX11.cpp +++ b/uppsrc/CtrlCore/UtilX11.cpp @@ -2,7 +2,7 @@ #ifdef GUI_X11 -NAMESPACE_UPP +namespace Upp { Vector RectRgn(const Rect& r) { @@ -98,6 +98,6 @@ void FinishDragRect(Ctrl& q) { } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CtrlCore/Win32Clip.cpp b/uppsrc/CtrlCore/Win32Clip.cpp index 1f3ca1bce..85dce3fb3 100644 --- a/uppsrc/CtrlCore/Win32Clip.cpp +++ b/uppsrc/CtrlCore/Win32Clip.cpp @@ -3,7 +3,7 @@ #ifdef GUI_WIN -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // LOG(x) @@ -537,6 +537,6 @@ void PasteClip::GuiPlatformConstruct() dt = NULL; } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CtrlCore/Win32Ctrl.cpp b/uppsrc/CtrlCore/Win32Ctrl.cpp index be7e05e4d..02526550c 100644 --- a/uppsrc/CtrlCore/Win32Ctrl.cpp +++ b/uppsrc/CtrlCore/Win32Ctrl.cpp @@ -4,7 +4,7 @@ #define LLOG(x) // DLOG(x) -NAMESPACE_UPP +namespace Upp { void Ctrl::GuiPlatformConstruct() { @@ -122,6 +122,6 @@ String Ctrl::Name() const { return s; } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CtrlCore/Win32DnD.cpp b/uppsrc/CtrlCore/Win32DnD.cpp index cdb8d5131..947f93c3c 100644 --- a/uppsrc/CtrlCore/Win32DnD.cpp +++ b/uppsrc/CtrlCore/Win32DnD.cpp @@ -2,7 +2,7 @@ #ifdef GUI_WIN -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // LOG(x) @@ -537,6 +537,6 @@ UDropTarget *NewUDropTarget(Ctrl *ctrl) void Ctrl::SetSelectionSource(const char *fmts) {} -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CtrlCore/Win32Gui.h b/uppsrc/CtrlCore/Win32Gui.h index 38e6c9d17..db8659060 100644 --- a/uppsrc/CtrlCore/Win32Gui.h +++ b/uppsrc/CtrlCore/Win32Gui.h @@ -1,7 +1,7 @@ #define GUI_WIN #define GUI_WIN32 -NAMESPACE_UPP +namespace Upp { class SystemDraw : public Draw { public: @@ -326,7 +326,7 @@ public: ~ImageDraw(); }; -END_UPP_NAMESPACE +} #define GUIPLATFORM_KEYCODES_INCLUDE "Win32Keys.h" @@ -344,13 +344,13 @@ END_UPP_NAMESPACE #define GUIPLATFORM_TOPWINDOW_DECLS_INCLUDE "Win32Top.h" -NAMESPACE_UPP +namespace Upp { inline unsigned GetHashValue(const HWND& hwnd) { return (unsigned)(intptr_t)hwnd; } -END_UPP_NAMESPACE +} #ifdef PLATFORM_WIN32 #ifndef PLATFORM_WINCE diff --git a/uppsrc/CtrlCore/Win32Proc.cpp b/uppsrc/CtrlCore/Win32Proc.cpp index 81cdb61ce..2ff81dea8 100644 --- a/uppsrc/CtrlCore/Win32Proc.cpp +++ b/uppsrc/CtrlCore/Win32Proc.cpp @@ -6,7 +6,7 @@ //#include "imm.h" -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // DLOG(x) @@ -484,6 +484,6 @@ LRESULT Ctrl::WindowProc(UINT message, WPARAM wParam, LPARAM lParam) { void Ctrl::PreDestroy() {} -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CtrlCore/Win32Wnd.cpp b/uppsrc/CtrlCore/Win32Wnd.cpp index a20b92615..c84faf7f8 100644 --- a/uppsrc/CtrlCore/Win32Wnd.cpp +++ b/uppsrc/CtrlCore/Win32Wnd.cpp @@ -2,7 +2,7 @@ #ifdef GUI_WIN -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // DLOG(x) #define LOGTIMING 0 @@ -1355,6 +1355,6 @@ Vector SplitCmdLine__(const char *cmd) return out; } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CtrlCore/X11App.cpp b/uppsrc/CtrlCore/X11App.cpp index 0ca34bcf0..2b1d77bf1 100644 --- a/uppsrc/CtrlCore/X11App.cpp +++ b/uppsrc/CtrlCore/X11App.cpp @@ -4,7 +4,7 @@ #include -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // DLOG(x) @@ -614,6 +614,6 @@ void _DBG_Ungrab(void) { } #endif -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CtrlCore/X11Clip.cpp b/uppsrc/CtrlCore/X11Clip.cpp index 4b3a0369d..172131cec 100644 --- a/uppsrc/CtrlCore/X11Clip.cpp +++ b/uppsrc/CtrlCore/X11Clip.cpp @@ -2,7 +2,7 @@ #ifdef GUI_X11 -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // LOG(x) @@ -403,6 +403,6 @@ void PasteClip::GuiPlatformConstruct() type = 0; } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CtrlCore/X11Ctrl.cpp b/uppsrc/CtrlCore/X11Ctrl.cpp index 35e529f54..654bda168 100644 --- a/uppsrc/CtrlCore/X11Ctrl.cpp +++ b/uppsrc/CtrlCore/X11Ctrl.cpp @@ -2,7 +2,7 @@ #ifdef GUI_X11 -NAMESPACE_UPP +namespace Upp { void Ctrl::GuiPlatformConstruct() { @@ -122,6 +122,6 @@ void Ctrl::SyncCaret() { } } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CtrlCore/X11DHCtrl.cpp b/uppsrc/CtrlCore/X11DHCtrl.cpp index 2ef3f2e4f..78dac971e 100644 --- a/uppsrc/CtrlCore/X11DHCtrl.cpp +++ b/uppsrc/CtrlCore/X11DHCtrl.cpp @@ -2,7 +2,7 @@ #ifdef GUI_X11 -NAMESPACE_UPP +namespace Upp { ///////////////////////////////////////////////////////////////////////////////////////// // Constructor @@ -419,6 +419,6 @@ XVisualInfo DHCtrl::GetVisualInfo(void) return visualInfo; } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CtrlCore/X11DnD.cpp b/uppsrc/CtrlCore/X11DnD.cpp index 2b39aaa2b..38dfc4c8d 100644 --- a/uppsrc/CtrlCore/X11DnD.cpp +++ b/uppsrc/CtrlCore/X11DnD.cpp @@ -4,7 +4,7 @@ #define LLOG(x) // DLOG(x) -NAMESPACE_UPP +namespace Upp { bool Xdnd_waiting_status; bool Xdnd_waiting_finished; @@ -425,6 +425,6 @@ void Ctrl::DropEvent(XWindow& w, XEvent *event) } } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CtrlCore/X11Gui.h b/uppsrc/CtrlCore/X11Gui.h index 51e6977b4..e731b4aa5 100644 --- a/uppsrc/CtrlCore/X11Gui.h +++ b/uppsrc/CtrlCore/X11Gui.h @@ -25,7 +25,7 @@ #define XFalse 0 #define XTrue 1 -NAMESPACE_UPP +namespace Upp { extern XDisplay *Xdisplay; extern Visual *Xvisual; @@ -225,7 +225,7 @@ public: ~ImageDraw(); }; -END_UPP_NAMESPACE +} #include "X11/keysym.h" @@ -244,7 +244,7 @@ END_UPP_NAMESPACE #define GUIPLATFORM_PASTECLIP_DECLS \ int type; -NAMESPACE_UPP +namespace Upp { String XAtomName(Atom atom); Atom XAtom(const char *name); @@ -259,4 +259,4 @@ Index& _NET_Supported(); #define GUIPLATFORM_INCLUDE_AFTER "X11GuiA.h" -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlCore/X11ImgClip.cpp b/uppsrc/CtrlCore/X11ImgClip.cpp index a6ef7ecba..f36a0ca66 100644 --- a/uppsrc/CtrlCore/X11ImgClip.cpp +++ b/uppsrc/CtrlCore/X11ImgClip.cpp @@ -4,7 +4,7 @@ #include -NAMESPACE_UPP +namespace Upp { const char *ClipFmtsImage() { @@ -75,6 +75,6 @@ void Append(VectorMap& data, const Image& img) data.Add("image/bmp", ClipData(img, sBmp)); } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CtrlCore/X11Proc.cpp b/uppsrc/CtrlCore/X11Proc.cpp index a0c64ffc1..b7ef55b5d 100644 --- a/uppsrc/CtrlCore/X11Proc.cpp +++ b/uppsrc/CtrlCore/X11Proc.cpp @@ -2,7 +2,7 @@ #ifdef GUI_X11 -NAMESPACE_UPP +namespace Upp { #define LLOG(x) //DLOG(x) @@ -388,6 +388,6 @@ void Ctrl::EventProc(XWindow& w, XEvent *event) DropEvent(w, event); } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CtrlCore/X11Top.cpp b/uppsrc/CtrlCore/X11Top.cpp index 6045801df..4bc14cbe2 100644 --- a/uppsrc/CtrlCore/X11Top.cpp +++ b/uppsrc/CtrlCore/X11Top.cpp @@ -2,7 +2,7 @@ #ifdef GUI_X11 -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // DLOG(x) @@ -510,6 +510,6 @@ void TopWindow::SerializePlacement(Stream& s, bool reminimize) } } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CtrlCore/X11Wnd.cpp b/uppsrc/CtrlCore/X11Wnd.cpp index b4e719e4d..50606b64a 100644 --- a/uppsrc/CtrlCore/X11Wnd.cpp +++ b/uppsrc/CtrlCore/X11Wnd.cpp @@ -4,7 +4,7 @@ #include -NAMESPACE_UPP +namespace Upp { #ifdef _DEBUG @@ -1135,6 +1135,6 @@ ViewDraw::~ViewDraw() LeaveGuiMutex(); } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CtrlLib/AKeys.cpp b/uppsrc/CtrlLib/AKeys.cpp index c752dd172..d083a10ed 100644 --- a/uppsrc/CtrlLib/AKeys.cpp +++ b/uppsrc/CtrlLib/AKeys.cpp @@ -1,6 +1,6 @@ #include "CtrlLib.h" -NAMESPACE_UPP +namespace Upp { struct KeyBinding : Moveable { KeyInfo *key; @@ -373,4 +373,4 @@ bool Match(const KeyInfo& k, dword key) return findarg(key, k.key[0], k.key[1], k.key[2], k.key[3]) >= 0; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/ArrayCtrl.cpp b/uppsrc/CtrlLib/ArrayCtrl.cpp index e8130ab00..ccbaba7b4 100644 --- a/uppsrc/CtrlLib/ArrayCtrl.cpp +++ b/uppsrc/CtrlLib/ArrayCtrl.cpp @@ -1,6 +1,6 @@ #include "CtrlLib.h" -NAMESPACE_UPP +namespace Upp { #define LTIMING(x) // DTIMING(x) @@ -3121,4 +3121,4 @@ void ArrayOption::Paint(Draw& w, const Rect& r, const Value& q, w.DrawImage(p.x, p.y, img); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/Bar.cpp b/uppsrc/CtrlLib/Bar.cpp index e88d1faf6..8f09641ef 100644 --- a/uppsrc/CtrlLib/Bar.cpp +++ b/uppsrc/CtrlLib/Bar.cpp @@ -1,6 +1,6 @@ #include "CtrlLib.h" -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // LOG(x) @@ -772,4 +772,4 @@ void LRUList::RemoveEntry(const String& path) lru.Remove(q); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/Button.cpp b/uppsrc/CtrlLib/Button.cpp index 848936317..2c1c47012 100644 --- a/uppsrc/CtrlLib/Button.cpp +++ b/uppsrc/CtrlLib/Button.cpp @@ -1,6 +1,6 @@ #include "CtrlLib.h" -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // LOG(x) @@ -864,4 +864,4 @@ void DataPusher::SetDataAction(const Value& value) UpdateActionRefresh(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/Ch.cpp b/uppsrc/CtrlLib/Ch.cpp index 655c0b62d..f0854cdef 100644 --- a/uppsrc/CtrlLib/Ch.cpp +++ b/uppsrc/CtrlLib/Ch.cpp @@ -1,6 +1,6 @@ #include "CtrlLib.h" -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // RLOG(x) @@ -90,4 +90,4 @@ void ChSysInit() #endif -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/ChGtk.cpp b/uppsrc/CtrlLib/ChGtk.cpp index fa478a54a..a55f2d337 100644 --- a/uppsrc/CtrlLib/ChGtk.cpp +++ b/uppsrc/CtrlLib/ChGtk.cpp @@ -8,7 +8,7 @@ #define LLOG(x) // DLOG(x) #define LDUMP(x) // DDUMP(x) -NAMESPACE_UPP +namespace Upp { #define IMAGECLASS AmbientCtrlsImg #define IMAGEFILE @@ -709,7 +709,7 @@ void ChHostSkin() CurrentSoundTheme = GtkStyleString("gtk-sound-theme-name"); } -END_UPP_NAMESPACE +} #endif #endif diff --git a/uppsrc/CtrlLib/ChGtk0.cpp b/uppsrc/CtrlLib/ChGtk0.cpp index 2d9fa0fec..675428bea 100644 --- a/uppsrc/CtrlLib/ChGtk0.cpp +++ b/uppsrc/CtrlLib/ChGtk0.cpp @@ -3,17 +3,17 @@ #ifdef PLATFORM_X11 #ifdef flagNOGTK -NAMESPACE_UPP +namespace Upp { void ChHostSkin() {} -END_UPP_NAMESPACE +} #else #include "ChGtk.h" -NAMESPACE_UPP +namespace Upp { #if defined(_DEBUG)// && 0 #include @@ -648,7 +648,7 @@ void GtkChScrollBar(Value *lbutton, Value *lbutton2, */ } -END_UPP_NAMESPACE +} #endif #endif diff --git a/uppsrc/CtrlLib/ChWin32.cpp b/uppsrc/CtrlLib/ChWin32.cpp index bd0275284..04759ae29 100644 --- a/uppsrc/CtrlLib/ChWin32.cpp +++ b/uppsrc/CtrlLib/ChWin32.cpp @@ -1,6 +1,6 @@ #include "CtrlLib.h" -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // RLOG(x) #define LTIMING(x) // RTIMING(x) @@ -26,7 +26,7 @@ void ChHostSkin() #else -END_UPP_NAMESPACE +} #include #if defined(_MSC_VER) && _MSC_VER > 1400 // Visual C > 2005 @@ -35,7 +35,7 @@ END_UPP_NAMESPACE #include #endif -NAMESPACE_UPP +namespace Upp { #define DLLFILENAME "uxtheme.dll" #define DLIMODULE XpTheme @@ -650,4 +650,4 @@ void ChSysInit() #endif -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/ColorPopup.cpp b/uppsrc/CtrlLib/ColorPopup.cpp index 8ed73deff..58b5fcf7e 100644 --- a/uppsrc/CtrlLib/ColorPopup.cpp +++ b/uppsrc/CtrlLib/ColorPopup.cpp @@ -1,6 +1,6 @@ #include "CtrlLib.h" -NAMESPACE_UPP +namespace Upp { static struct { const char *name; @@ -434,4 +434,4 @@ ColorPopUp::ColorPopUp() voidtext = t_("(none)"); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/ColorPusher.cpp b/uppsrc/CtrlLib/ColorPusher.cpp index 99cfe0ad4..be8d45a7b 100644 --- a/uppsrc/CtrlLib/ColorPusher.cpp +++ b/uppsrc/CtrlLib/ColorPusher.cpp @@ -1,6 +1,6 @@ #include "CtrlLib.h" -NAMESPACE_UPP +namespace Upp { ColorPusher::~ColorPusher() {} @@ -157,4 +157,4 @@ ColorButton::ColorButton() Transparent(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/ColumnList.cpp b/uppsrc/CtrlLib/ColumnList.cpp index 5727a34ab..7ffc43820 100644 --- a/uppsrc/CtrlLib/ColumnList.cpp +++ b/uppsrc/CtrlLib/ColumnList.cpp @@ -1,6 +1,6 @@ #include "CtrlLib.h" -NAMESPACE_UPP +namespace Upp { void ColumnList::MouseWheel(Point p, int zdelta, dword keyflags) { sb.Wheel(zdelta); @@ -1073,4 +1073,4 @@ ColumnList::ColumnList() { ColumnList::~ColumnList() {} -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/CtrlLib.h b/uppsrc/CtrlLib/CtrlLib.h index 9c3c97996..a1c0f88f7 100644 --- a/uppsrc/CtrlLib/CtrlLib.h +++ b/uppsrc/CtrlLib/CtrlLib.h @@ -7,7 +7,7 @@ #undef Status #endif -NAMESPACE_UPP +namespace Upp { #define IMAGECLASS CtrlImg #define IMAGEFILE @@ -56,6 +56,6 @@ class Bar; #include -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CtrlLib/CtrlLib.icpp b/uppsrc/CtrlLib/CtrlLib.icpp index 4081a4055..fd32a1adf 100644 --- a/uppsrc/CtrlLib/CtrlLib.icpp +++ b/uppsrc/CtrlLib/CtrlLib.icpp @@ -1,6 +1,6 @@ #include "CtrlLib.h" -NAMESPACE_UPP +namespace Upp { #define TFILE #include @@ -17,4 +17,4 @@ INITBLOCK { }; #endif -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/CtrlUtil.cpp b/uppsrc/CtrlLib/CtrlUtil.cpp index 32fe88cec..f87b88901 100644 --- a/uppsrc/CtrlLib/CtrlUtil.cpp +++ b/uppsrc/CtrlLib/CtrlUtil.cpp @@ -1,6 +1,6 @@ #include "CtrlLib.h" -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // RLOG(x) @@ -347,4 +347,4 @@ void FileSelButton::Detach() if(p) p->RemoveFrame(button); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/DateTimeCtrl.cpp b/uppsrc/CtrlLib/DateTimeCtrl.cpp index b6281fe24..a94eac0a4 100644 --- a/uppsrc/CtrlLib/DateTimeCtrl.cpp +++ b/uppsrc/CtrlLib/DateTimeCtrl.cpp @@ -1,6 +1,6 @@ #include -NAMESPACE_UPP +namespace Upp { const Point Calendar::nullday = Point(-1, -1); @@ -1552,4 +1552,4 @@ CH_STYLE(Calendar, Style, StyleDefault) spinhighlight = true; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/DlgColor.cpp b/uppsrc/CtrlLib/DlgColor.cpp index 71e1427ed..289bf32c0 100644 --- a/uppsrc/CtrlLib/DlgColor.cpp +++ b/uppsrc/CtrlLib/DlgColor.cpp @@ -1,6 +1,6 @@ #include "CtrlLib.h" -NAMESPACE_UPP +namespace Upp { class FetchColorCtrl : public Button { @@ -1608,4 +1608,4 @@ void ColorCtrl::DoAction() SetDataAction(GetConvert().Scan(new_color)); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/DocEdit.cpp b/uppsrc/CtrlLib/DocEdit.cpp index 9bb9c8519..33f08f0f7 100644 --- a/uppsrc/CtrlLib/DocEdit.cpp +++ b/uppsrc/CtrlLib/DocEdit.cpp @@ -1,6 +1,6 @@ #include "CtrlLib.h" -NAMESPACE_UPP +namespace Upp { void DocEdit::MouseWheel(Point p, int zdelta, dword keyflags) { @@ -600,4 +600,4 @@ void DocEdit::LeftDrag(Point p, dword flags) } } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/DropChoice.cpp b/uppsrc/CtrlLib/DropChoice.cpp index ef52109ad..8549861b3 100644 --- a/uppsrc/CtrlLib/DropChoice.cpp +++ b/uppsrc/CtrlLib/DropChoice.cpp @@ -1,6 +1,6 @@ #include "CtrlLib.h" -NAMESPACE_UPP +namespace Upp { DropChoice::DropChoice() { always_drop = false; @@ -174,4 +174,4 @@ DropChoice& DropChoice::AlwaysDrop(bool e) return *this; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/DropList.cpp b/uppsrc/CtrlLib/DropList.cpp index d65dc86d5..5437f8409 100644 --- a/uppsrc/CtrlLib/DropList.cpp +++ b/uppsrc/CtrlLib/DropList.cpp @@ -1,6 +1,6 @@ #include "CtrlLib.h" -NAMESPACE_UPP +namespace Upp { int DropList::FindKey(const Value& k) const { @@ -335,4 +335,4 @@ void operator*=(DropList& list, const MapConvert& convert) Append(list, convert); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/EditField.cpp b/uppsrc/CtrlLib/EditField.cpp index 2a6230c1a..300a388d4 100644 --- a/uppsrc/CtrlLib/EditField.cpp +++ b/uppsrc/CtrlLib/EditField.cpp @@ -1,6 +1,6 @@ #include "CtrlLib.h" -NAMESPACE_UPP +namespace Upp { CH_VALUE(ViewEdge, CtrlsImg::VE()); @@ -1100,4 +1100,4 @@ EditField::EditField() EditField::~EditField() {} -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/FileList.cpp b/uppsrc/CtrlLib/FileList.cpp index da2892619..4464359ad 100644 --- a/uppsrc/CtrlLib/FileList.cpp +++ b/uppsrc/CtrlLib/FileList.cpp @@ -1,6 +1,6 @@ #include "CtrlLib.h" -NAMESPACE_UPP +namespace Upp { int GetTextSize(const FontInfo& fi, const wchar *text, const wchar *end) { int w = 0; @@ -383,4 +383,4 @@ FileList::FileList() { FileList::~FileList() {} -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/FileSel.cpp b/uppsrc/CtrlLib/FileSel.cpp index 647e1fc75..10b0ac6a7 100644 --- a/uppsrc/CtrlLib/FileSel.cpp +++ b/uppsrc/CtrlLib/FileSel.cpp @@ -1,6 +1,6 @@ #include -NAMESPACE_UPP +namespace Upp { #ifdef GUI_WIN void AvoidPaintingCheck__(); @@ -2171,4 +2171,4 @@ FileSel::FileSel() FileSel::~FileSel() {} -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/FileSelUtil.cpp b/uppsrc/CtrlLib/FileSelUtil.cpp index df71f6bf8..8b9b66453 100644 --- a/uppsrc/CtrlLib/FileSelUtil.cpp +++ b/uppsrc/CtrlLib/FileSelUtil.cpp @@ -1,6 +1,6 @@ #include "CtrlLib.h" -NAMESPACE_UPP +namespace Upp { FileSel& GFileSel() { @@ -85,4 +85,4 @@ bool SelectSaveFile(const char *types, const String& data) return true; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/FrameSplitter.cpp b/uppsrc/CtrlLib/FrameSplitter.cpp index 09ce13b86..f4471b736 100644 --- a/uppsrc/CtrlLib/FrameSplitter.cpp +++ b/uppsrc/CtrlLib/FrameSplitter.cpp @@ -1,6 +1,6 @@ #include "CtrlLib.h" -NAMESPACE_UPP +namespace Upp { void SplitterFrame::FrameAdd(Ctrl& parent) { @@ -150,4 +150,4 @@ SplitterFrame::SplitterFrame() SetStyle(Splitter::StyleDefault()); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/Gtk.cpp b/uppsrc/CtrlLib/Gtk.cpp index a1c19dc20..b9858f445 100644 --- a/uppsrc/CtrlLib/Gtk.cpp +++ b/uppsrc/CtrlLib/Gtk.cpp @@ -1,6 +1,6 @@ #include "CtrlLib.h" -NAMESPACE_UPP +namespace Upp { #ifdef GUI_GTK @@ -75,4 +75,4 @@ bool FileSelector::Execute(bool open, const char *title) #endif -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/HeaderCtrl.cpp b/uppsrc/CtrlLib/HeaderCtrl.cpp index deeddd553..84134879e 100644 --- a/uppsrc/CtrlLib/HeaderCtrl.cpp +++ b/uppsrc/CtrlLib/HeaderCtrl.cpp @@ -1,6 +1,6 @@ #include "CtrlLib.h" -NAMESPACE_UPP +namespace Upp { HeaderCtrl::Column::Column() { @@ -907,4 +907,4 @@ HeaderCtrl::HeaderCtrl() { HeaderCtrl::~HeaderCtrl() {} -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/Help.cpp b/uppsrc/CtrlLib/Help.cpp index 9efd39aa7..0b37808a5 100644 --- a/uppsrc/CtrlLib/Help.cpp +++ b/uppsrc/CtrlLib/Help.cpp @@ -1,6 +1,6 @@ #include "CtrlLib.h" -NAMESPACE_UPP +namespace Upp { Topic HelpWindow::AcquireTopic(const String& topic) { @@ -316,4 +316,4 @@ HelpWindow::HelpWindow() view.BackPaintHint(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/LNGCtrl.cpp b/uppsrc/CtrlLib/LNGCtrl.cpp index 9a10a5c5b..e606ec5ac 100644 --- a/uppsrc/CtrlLib/LNGCtrl.cpp +++ b/uppsrc/CtrlLib/LNGCtrl.cpp @@ -1,7 +1,7 @@ #include "CtrlLib.h" -NAMESPACE_UPP +namespace Upp { Size LNGCtrl::GetMinSize() const { @@ -81,4 +81,4 @@ LNGCtrl::~LNGCtrl() { } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/LabelBase.cpp b/uppsrc/CtrlLib/LabelBase.cpp index f97d34a02..8b27cdb64 100644 --- a/uppsrc/CtrlLib/LabelBase.cpp +++ b/uppsrc/CtrlLib/LabelBase.cpp @@ -1,6 +1,6 @@ #include "CtrlLib.h" -NAMESPACE_UPP +namespace Upp { void CtrlsImageLook(Value *look, int i, int n) { @@ -656,4 +656,4 @@ void DisplayPopup::Set(Ctrl *_ctrl, const Rect& _item, Refresh(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/LineEdit.cpp b/uppsrc/CtrlLib/LineEdit.cpp index f1a70a1b5..0fcab78fe 100644 --- a/uppsrc/CtrlLib/LineEdit.cpp +++ b/uppsrc/CtrlLib/LineEdit.cpp @@ -1,6 +1,6 @@ #include "CtrlLib.h" -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // LOG(x) #define LTIMING(x) // RTIMING(x) @@ -1300,4 +1300,4 @@ void LineEdit::LeftDrag(Point p, dword flags) } } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/MenuBar.cpp b/uppsrc/CtrlLib/MenuBar.cpp index 604e7fa31..796599d0d 100644 --- a/uppsrc/CtrlLib/MenuBar.cpp +++ b/uppsrc/CtrlLib/MenuBar.cpp @@ -4,7 +4,7 @@ #include #endif -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // DLOG(x) #define LTIMING(x) // RTIMING(x) @@ -606,4 +606,4 @@ MenuBar::~MenuBar() LLOG("~MenuBar 1"); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/MenuImp.h b/uppsrc/CtrlLib/MenuImp.h index 8795d1ede..c4b2d6b55 100644 --- a/uppsrc/CtrlLib/MenuImp.h +++ b/uppsrc/CtrlLib/MenuImp.h @@ -3,7 +3,7 @@ #ifndef CtrlCore_MenuImp_h #define CtrlCore_MenuImp_h -NAMESPACE_UPP +namespace Upp { class MenuItemBase : public Ctrl, public Bar::Item { public: @@ -183,6 +183,6 @@ public: TopMenuItem() { NoInitFocus(); } }; -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CtrlLib/MenuItem.cpp b/uppsrc/CtrlLib/MenuItem.cpp index 9ee09f485..8e3d56c6c 100644 --- a/uppsrc/CtrlLib/MenuItem.cpp +++ b/uppsrc/CtrlLib/MenuItem.cpp @@ -4,7 +4,7 @@ #include #endif -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // DLOG(x) #define LTIMING(x) // RTIMING(x) @@ -660,4 +660,4 @@ void TopMenuItem::SyncState() } } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/MultiButton.cpp b/uppsrc/CtrlLib/MultiButton.cpp index 95495c29b..9da13f2d6 100644 --- a/uppsrc/CtrlLib/MultiButton.cpp +++ b/uppsrc/CtrlLib/MultiButton.cpp @@ -1,6 +1,6 @@ #include "CtrlLib.h" -NAMESPACE_UPP +namespace Upp { CH_STYLE(MultiButton, Style, StyleDefault) { @@ -740,4 +740,4 @@ void MultiButtonFrame::AddTo(Ctrl& w) w.AddFrame(*this); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/PopupTable.cpp b/uppsrc/CtrlLib/PopupTable.cpp index 76c5ad610..578d63cca 100644 --- a/uppsrc/CtrlLib/PopupTable.cpp +++ b/uppsrc/CtrlLib/PopupTable.cpp @@ -1,6 +1,6 @@ #include "CtrlLib.h" -NAMESPACE_UPP +namespace Upp { CH_VALUE(DropEdge, ChBorder(BlackBorder())); @@ -146,4 +146,4 @@ PopUpTable::PopUpTable() { PopUpTable::~PopUpTable() {} -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/PrinterJob.cpp b/uppsrc/CtrlLib/PrinterJob.cpp index 6659d971c..cc965db3f 100644 --- a/uppsrc/CtrlLib/PrinterJob.cpp +++ b/uppsrc/CtrlLib/PrinterJob.cpp @@ -13,7 +13,7 @@ #endif -NAMESPACE_UPP +namespace Upp { #ifdef GUI_WIN @@ -463,4 +463,4 @@ PrinterJob& PrinterJob::CurrentPage(int i) #endif -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/Progress.cpp b/uppsrc/CtrlLib/Progress.cpp index 9b44bf2a5..1b8e9493c 100644 --- a/uppsrc/CtrlLib/Progress.cpp +++ b/uppsrc/CtrlLib/Progress.cpp @@ -1,6 +1,6 @@ #include "CtrlLib.h" -NAMESPACE_UPP +namespace Upp { CH_STYLE(ProgressIndicator, Style, StyleDefault) { @@ -277,4 +277,4 @@ bool Progress::StepCanceled(int n) return cancel; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/Prompt.cpp b/uppsrc/CtrlLib/Prompt.cpp index 09ac18bc9..d61df6adc 100644 --- a/uppsrc/CtrlLib/Prompt.cpp +++ b/uppsrc/CtrlLib/Prompt.cpp @@ -1,6 +1,6 @@ #include "CtrlLib.h" -NAMESPACE_UPP +namespace Upp { struct PromptDlgWnd__ : TopWindow { bool esc; @@ -286,4 +286,4 @@ int PromptSaveDontSaveCancel(const char *qtf) { CtrlImg::save(), NoButtonImage(), Null); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/RichTextView.cpp b/uppsrc/CtrlLib/RichTextView.cpp index b81b2484b..790b93dee 100644 --- a/uppsrc/CtrlLib/RichTextView.cpp +++ b/uppsrc/CtrlLib/RichTextView.cpp @@ -1,6 +1,6 @@ #include "CtrlLib.h" -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // LOG(x) @@ -505,4 +505,4 @@ bool Print(const RichText& text, const Rect& page, int currentpage, const char * #endif -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/ScrollBar.cpp b/uppsrc/CtrlLib/ScrollBar.cpp index 2935f2797..64eee5b31 100644 --- a/uppsrc/CtrlLib/ScrollBar.cpp +++ b/uppsrc/CtrlLib/ScrollBar.cpp @@ -1,6 +1,6 @@ #include "CtrlLib.h" -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // LOG(x) @@ -834,4 +834,4 @@ void Scroller::Scroll(Ctrl& p, int newposy) Scroll(p, p.GetSize(), newposy); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/SliderCtrl.cpp b/uppsrc/CtrlLib/SliderCtrl.cpp index 354e175b3..a8b6e5094 100644 --- a/uppsrc/CtrlLib/SliderCtrl.cpp +++ b/uppsrc/CtrlLib/SliderCtrl.cpp @@ -1,6 +1,6 @@ #include "CtrlLib.h" -NAMESPACE_UPP +namespace Upp { SliderCtrl::SliderCtrl() : value(Null) @@ -229,4 +229,4 @@ void SliderCtrl::LostFocus() SliderCtrl::~SliderCtrl() {} -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/Splitter.cpp b/uppsrc/CtrlLib/Splitter.cpp index 8aeed91d4..d827d4167 100644 --- a/uppsrc/CtrlLib/Splitter.cpp +++ b/uppsrc/CtrlLib/Splitter.cpp @@ -1,6 +1,6 @@ #include "CtrlLib.h" -NAMESPACE_UPP +namespace Upp { CH_STYLE(Splitter, Style, StyleDefault) { @@ -293,4 +293,4 @@ Splitter::Splitter() { Splitter::~Splitter() {} -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/Static.cpp b/uppsrc/CtrlLib/Static.cpp index 818b19aba..56a78a4f1 100644 --- a/uppsrc/CtrlLib/Static.cpp +++ b/uppsrc/CtrlLib/Static.cpp @@ -1,6 +1,6 @@ #include "CtrlLib.h" -NAMESPACE_UPP +namespace Upp { void StaticText::Paint(Draw& w) { @@ -376,4 +376,4 @@ void DisplayCtrl::SetDisplay(const Display& d) pr.SetDisplay(d); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/StatusBar.cpp b/uppsrc/CtrlLib/StatusBar.cpp index 5f8d751d6..eb4616ef1 100644 --- a/uppsrc/CtrlLib/StatusBar.cpp +++ b/uppsrc/CtrlLib/StatusBar.cpp @@ -1,6 +1,6 @@ #include "CtrlLib.h" -NAMESPACE_UPP +namespace Upp { class RightInfoFrame : public CtrlFrame { virtual void FrameLayout(Rect& r); @@ -308,4 +308,4 @@ ProgressInfo::~ProgressInfo() info->Set(Null); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/SuggestCtrl.cpp b/uppsrc/CtrlLib/SuggestCtrl.cpp index 7e42db02f..6fcbc3b8e 100644 --- a/uppsrc/CtrlLib/SuggestCtrl.cpp +++ b/uppsrc/CtrlLib/SuggestCtrl.cpp @@ -1,6 +1,6 @@ #include "CtrlLib.h" -NAMESPACE_UPP +namespace Upp { void SuggestCtrl::CancelMode() { @@ -159,4 +159,4 @@ SuggestCtrl::SuggestCtrl() just_start = false; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/Switch.cpp b/uppsrc/CtrlLib/Switch.cpp index 86fe0f129..a053ed2cc 100644 --- a/uppsrc/CtrlLib/Switch.cpp +++ b/uppsrc/CtrlLib/Switch.cpp @@ -1,6 +1,6 @@ #include "CtrlLib.h" -NAMESPACE_UPP +namespace Upp { #define LDUMP(x) // DUMP(x) @@ -322,4 +322,4 @@ Switch::Switch() { Switch::~Switch() {} -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/TabCtrl.cpp b/uppsrc/CtrlLib/TabCtrl.cpp index ba5516804..7ca2922cb 100644 --- a/uppsrc/CtrlLib/TabCtrl.cpp +++ b/uppsrc/CtrlLib/TabCtrl.cpp @@ -1,6 +1,6 @@ #include "CtrlLib.h" -NAMESPACE_UPP +namespace Upp { CH_STYLE(TabCtrl, Style, StyleDefault) { @@ -621,4 +621,4 @@ TabDlg::TabDlg() Ctrl::Add(exit); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/Text.cpp b/uppsrc/CtrlLib/Text.cpp index aa130d6f3..e6c960011 100644 --- a/uppsrc/CtrlLib/Text.cpp +++ b/uppsrc/CtrlLib/Text.cpp @@ -2,7 +2,7 @@ #define LTIMING(x) // RTIMING(x) -NAMESPACE_UPP +namespace Upp { TextCtrl::TextCtrl() { @@ -980,4 +980,4 @@ String TextCtrl::GetSelectionData(const String& fmt) const return GetTextClip(GetSelectionW(), fmt); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/ToolBar.cpp b/uppsrc/CtrlLib/ToolBar.cpp index 9f7537ca2..240eef6f0 100644 --- a/uppsrc/CtrlLib/ToolBar.cpp +++ b/uppsrc/CtrlLib/ToolBar.cpp @@ -1,6 +1,6 @@ #include "CtrlLib.h" -NAMESPACE_UPP +namespace Upp { #define LTIMING(x) // TIMING(x) @@ -128,4 +128,4 @@ void StaticBarArea::Paint(Draw& w) upperframe ? Null : GetScreenRect().bottom); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/ToolButton.cpp b/uppsrc/CtrlLib/ToolButton.cpp index 4ec1f486f..66e3d0d20 100644 --- a/uppsrc/CtrlLib/ToolButton.cpp +++ b/uppsrc/CtrlLib/ToolButton.cpp @@ -1,6 +1,6 @@ #include "CtrlLib.h" -NAMESPACE_UPP +namespace Upp { #define LTIMING(x) // TIMING(x) @@ -353,4 +353,4 @@ int ToolButton::OverPaint() const return style->overpaint; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/ToolTip.cpp b/uppsrc/CtrlLib/ToolTip.cpp index e0f3906df..b9444c354 100644 --- a/uppsrc/CtrlLib/ToolTip.cpp +++ b/uppsrc/CtrlLib/ToolTip.cpp @@ -1,6 +1,6 @@ #include "CtrlLib.h" -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // DLOG(x) @@ -241,4 +241,4 @@ void PerformDescription() } } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/TrayIconGtk.cpp b/uppsrc/CtrlLib/TrayIconGtk.cpp index 89986fdfb..4f089e471 100644 --- a/uppsrc/CtrlLib/TrayIconGtk.cpp +++ b/uppsrc/CtrlLib/TrayIconGtk.cpp @@ -9,7 +9,7 @@ #endif #endif -NAMESPACE_UPP +namespace Upp { TrayIcon::TrayIcon() { @@ -139,6 +139,6 @@ TrayIcon::~TrayIcon() g_object_unref(tray_icon); } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CtrlLib/TrayIconWin32.cpp b/uppsrc/CtrlLib/TrayIconWin32.cpp index ceedc1f40..a7b288a24 100644 --- a/uppsrc/CtrlLib/TrayIconWin32.cpp +++ b/uppsrc/CtrlLib/TrayIconWin32.cpp @@ -10,7 +10,7 @@ #endif #endif -NAMESPACE_UPP +namespace Upp { #ifdef GUI_WIN @@ -217,4 +217,4 @@ LRESULT TrayIcon::WindowProc(UINT message, WPARAM wParam, LPARAM lParam) #endif #endif -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/TrayIconX11.cpp b/uppsrc/CtrlLib/TrayIconX11.cpp index 5c3b38aeb..440a2b3fe 100644 --- a/uppsrc/CtrlLib/TrayIconX11.cpp +++ b/uppsrc/CtrlLib/TrayIconX11.cpp @@ -14,7 +14,7 @@ #endif #endif -NAMESPACE_UPP +namespace Upp { Atom TraySelection() { @@ -242,6 +242,6 @@ void TrayIcon::BalloonTimeout() { } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/CtrlLib/TreeCtrl.cpp b/uppsrc/CtrlLib/TreeCtrl.cpp index dde2b829b..c524a18a5 100644 --- a/uppsrc/CtrlLib/TreeCtrl.cpp +++ b/uppsrc/CtrlLib/TreeCtrl.cpp @@ -1,6 +1,6 @@ #include "CtrlLib.h" -NAMESPACE_UPP +namespace Upp { TreeCtrl::Node::Node() { @@ -1772,4 +1772,4 @@ int Copy(TreeCtrl& dst, int did, int i, const TreeCtrl& src, int id) return did; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/Update.cpp b/uppsrc/CtrlLib/Update.cpp index 170e42ec4..f441658e3 100644 --- a/uppsrc/CtrlLib/Update.cpp +++ b/uppsrc/CtrlLib/Update.cpp @@ -1,6 +1,6 @@ #include "CtrlLib.h" -NAMESPACE_UPP +namespace Upp { #ifdef GUI_WIN #ifndef PLATFORM_WINCE @@ -184,4 +184,4 @@ bool SelfUpdateSelf() #endif #endif -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/Win32.cpp b/uppsrc/CtrlLib/Win32.cpp index 190500ffa..0a222d5b8 100644 --- a/uppsrc/CtrlLib/Win32.cpp +++ b/uppsrc/CtrlLib/Win32.cpp @@ -10,7 +10,7 @@ #endif -NAMESPACE_UPP +namespace Upp { #ifdef GUI_WIN @@ -192,4 +192,4 @@ bool FileSelector::Execute(bool open, const char *dlgtitle) { #endif #endif -END_UPP_NAMESPACE +} diff --git a/uppsrc/CtrlLib/Windows.cpp b/uppsrc/CtrlLib/Windows.cpp index 54c3f9f32..66364a3c8 100644 --- a/uppsrc/CtrlLib/Windows.cpp +++ b/uppsrc/CtrlLib/Windows.cpp @@ -1,6 +1,6 @@ #include -NAMESPACE_UPP +namespace Upp { void WindowsList() { @@ -50,4 +50,4 @@ void WindowsMenu(Bar& bar) bar.Add(t_("More windows.."), callback(WindowsList)); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/DocTypes/DocTable.cpp b/uppsrc/DocTypes/DocTable.cpp index 5c4925050..afeadd3fb 100644 --- a/uppsrc/DocTypes/DocTable.cpp +++ b/uppsrc/DocTypes/DocTable.cpp @@ -1,6 +1,6 @@ #include "DocTypes.h" -NAMESPACE_UPP +namespace Upp { TableCell& TableCell::NewPar() { par.Add(); @@ -534,4 +534,4 @@ int Table::GetWidth(int zoom) const { return cx + 2 * GetFrameWidth(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/DocTypes/DocTypes.cpp b/uppsrc/DocTypes/DocTypes.cpp index 12c6e4f2f..8452a54f9 100644 --- a/uppsrc/DocTypes/DocTypes.cpp +++ b/uppsrc/DocTypes/DocTypes.cpp @@ -1,6 +1,6 @@ #include "DocTypes.h" -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // DLOG(x) #define LDUMP(x) // DDUMP(x) @@ -681,4 +681,4 @@ void DocOut::Put(const Document& doc) { Put(doc.GetTable(i)); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/DocTypes/DocTypes.h b/uppsrc/DocTypes/DocTypes.h index 348836735..a55e20529 100644 --- a/uppsrc/DocTypes/DocTypes.h +++ b/uppsrc/DocTypes/DocTypes.h @@ -9,7 +9,7 @@ #include #include -NAMESPACE_UPP +namespace Upp { enum { DOC_SCREEN_ZOOM = 140 }; @@ -708,7 +708,7 @@ public: #endif }; -END_UPP_NAMESPACE +} #include "Report.h" #include "QtfCtrl.h" diff --git a/uppsrc/DocTypes/ParaFormat.cpp b/uppsrc/DocTypes/ParaFormat.cpp index 99aa67ecf..de365ea32 100644 --- a/uppsrc/DocTypes/ParaFormat.cpp +++ b/uppsrc/DocTypes/ParaFormat.cpp @@ -1,6 +1,6 @@ #include "DocTypes.h" -NAMESPACE_UPP +namespace Upp { FontInfo ParaTypo::Part::Set(Font _font, Color _color) { font = _font; @@ -127,4 +127,4 @@ bool ParaTypo::Format(Alignment _align, int _total, char *_text, int *_width, return PutRaw(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/DocTypes/QtfCtrl.cpp b/uppsrc/DocTypes/QtfCtrl.cpp index f6b5f0602..f7461ddb7 100644 --- a/uppsrc/DocTypes/QtfCtrl.cpp +++ b/uppsrc/DocTypes/QtfCtrl.cpp @@ -1,6 +1,6 @@ #include "DocTypes.h" -NAMESPACE_UPP +namespace Upp { void QtfCtrl::MouseWheel(Point p, int zdelta, dword keyflags) { sb.Wheel(zdelta); @@ -123,4 +123,4 @@ void QtfCtrl::Pick(pick_ Document& _doc) { Refresh(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/DocTypes/QtfCtrl.h b/uppsrc/DocTypes/QtfCtrl.h index 7166ea633..eae89b2a4 100644 --- a/uppsrc/DocTypes/QtfCtrl.h +++ b/uppsrc/DocTypes/QtfCtrl.h @@ -1,6 +1,6 @@ // OBSOLETE!!! Use RichTextView instead! -NAMESPACE_UPP +namespace Upp { class QtfCtrl : public Ctrl { public: @@ -71,4 +71,4 @@ public: virtual ~QtfCtrl(); }; -END_UPP_NAMESPACE +} diff --git a/uppsrc/DocTypes/QtfEncoder.cpp b/uppsrc/DocTypes/QtfEncoder.cpp index 6d49e4803..60e1142af 100644 --- a/uppsrc/DocTypes/QtfEncoder.cpp +++ b/uppsrc/DocTypes/QtfEncoder.cpp @@ -1,6 +1,6 @@ #include "DocTypes.h" -NAMESPACE_UPP +namespace Upp { static Color DocQTFColor[] = { Black, LtGray, White, Red, Green, Blue, LtRed, WhiteGray, LtCyan, Yellow @@ -260,4 +260,4 @@ String AsQtf(const Document& text) return qtf; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/DocTypes/QtfParser.cpp b/uppsrc/DocTypes/QtfParser.cpp index a2a0346dc..4f56575b7 100644 --- a/uppsrc/DocTypes/QtfParser.cpp +++ b/uppsrc/DocTypes/QtfParser.cpp @@ -1,6 +1,6 @@ #include "DocTypes.h" -NAMESPACE_UPP +namespace Upp { int QtfParser::GetNumber() { int n = 0; @@ -383,4 +383,4 @@ void QtfParser::Init() { ender = END; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/DocTypes/Report.cpp b/uppsrc/DocTypes/Report.cpp index afe257001..67ae7c73a 100644 --- a/uppsrc/DocTypes/Report.cpp +++ b/uppsrc/DocTypes/Report.cpp @@ -1,6 +1,6 @@ #include "DocTypes.h" -NAMESPACE_UPP +namespace Upp { DocReport::DocReport(const char *_name) { name = _name; @@ -254,4 +254,4 @@ void PutQTF(DocReport& r, const char *qtf) r.SetYPos(end.y); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/DocTypes/Report.h b/uppsrc/DocTypes/Report.h index 72571d191..c3696671a 100644 --- a/uppsrc/DocTypes/Report.h +++ b/uppsrc/DocTypes/Report.h @@ -1,4 +1,4 @@ -NAMESPACE_UPP +namespace Upp { #define LAYOUTFILE #include @@ -185,4 +185,4 @@ public: void PutQTF(DocReport& r, const char *qtf); -END_UPP_NAMESPACE +} diff --git a/uppsrc/DocTypes/RtfDocOut.cpp b/uppsrc/DocTypes/RtfDocOut.cpp index 6ded8dadc..850820b19 100644 --- a/uppsrc/DocTypes/RtfDocOut.cpp +++ b/uppsrc/DocTypes/RtfDocOut.cpp @@ -1,6 +1,6 @@ #include -NAMESPACE_UPP +namespace Upp { RtfDocOut::RtfDocOut() { color.Add(Black()); @@ -273,4 +273,4 @@ String RtfDocOut::Get() { return out; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/DocTypes/ShowReport.cpp b/uppsrc/DocTypes/ShowReport.cpp index a4f3c71ed..2806658d8 100644 --- a/uppsrc/DocTypes/ShowReport.cpp +++ b/uppsrc/DocTypes/ShowReport.cpp @@ -7,7 +7,7 @@ #pragma comment(lib, "comdlg32.lib") #endif -NAMESPACE_UPP +namespace Upp { void ReportCtrl::MouseWheel(Point, int zdelta, dword) { sb.Wheel(zdelta); @@ -328,4 +328,4 @@ bool DocReport::Print(int page, const char *_name) return Print0(page, _name ? _name : ~name); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Docking/DockConfig.cpp b/uppsrc/Docking/DockConfig.cpp index 567475e51..f6987827e 100644 --- a/uppsrc/Docking/DockConfig.cpp +++ b/uppsrc/Docking/DockConfig.cpp @@ -1,6 +1,6 @@ #include "Docking.h" -NAMESPACE_UPP +namespace Upp { #define HIGHLIGHT_DURATION 1000 @@ -352,4 +352,4 @@ String DockConfigDlg::PositionString(DockableCtrl *dc) const return t_("Hidden"); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Docking/DockCont.cpp b/uppsrc/Docking/DockCont.cpp index 80accae83..02f728365 100644 --- a/uppsrc/Docking/DockCont.cpp +++ b/uppsrc/Docking/DockCont.cpp @@ -1,6 +1,6 @@ #include "Docking.h" -NAMESPACE_UPP +namespace Upp { // ImgButton void ImgButton::Paint(Draw &w) @@ -841,4 +841,4 @@ DockCont::DockCont() Lock(false); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Docking/DockMenu.cpp b/uppsrc/Docking/DockMenu.cpp index 557bd77e0..baa091c24 100644 --- a/uppsrc/Docking/DockMenu.cpp +++ b/uppsrc/Docking/DockMenu.cpp @@ -1,6 +1,6 @@ #include "Docking.h" -NAMESPACE_UPP +namespace Upp { #define DOCKBACK(x) callback(dock, &DockWindow::x) #define DOCKBACK1(x, arg) callback1(dock, &DockWindow::x, arg) @@ -154,4 +154,4 @@ const char * DockMenu::AlignText(int align) return 0; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Docking/DockPane.cpp b/uppsrc/Docking/DockPane.cpp index 8ce88084d..146e8130b 100644 --- a/uppsrc/Docking/DockPane.cpp +++ b/uppsrc/Docking/DockPane.cpp @@ -1,6 +1,6 @@ #include "Docking.h" -NAMESPACE_UPP +namespace Upp { /* int DockPane::ClientToPos(const Size& p) @@ -419,4 +419,4 @@ DockPane::DockPane() pos.Clear(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Docking/DockTabBar.cpp b/uppsrc/Docking/DockTabBar.cpp index c3de68127..fa81fb391 100644 --- a/uppsrc/Docking/DockTabBar.cpp +++ b/uppsrc/Docking/DockTabBar.cpp @@ -3,7 +3,7 @@ #define ANIM_SPEED 10 #define ANIM_FRAMES 10 -NAMESPACE_UPP +namespace Upp { // DockTabBar int AutoHideBar::autohide_timeout = 1000; @@ -297,4 +297,4 @@ void AutoHideBar::HidePopup::ChildMouseEvent(Ctrl *child, int event, Point p, in WhenEnter(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Docking/DockWindow.cpp b/uppsrc/Docking/DockWindow.cpp index 815711168..405ad337a 100644 --- a/uppsrc/Docking/DockWindow.cpp +++ b/uppsrc/Docking/DockWindow.cpp @@ -1,6 +1,6 @@ #include "Docking.h" -NAMESPACE_UPP +namespace Upp { #define ALIGN_ASSERT(al) ASSERT(al >= 0 && al < 4) #define FRAME_MOVE_DIV 5 // Outside fraction of the highlight that the mouse must be in to trigger dockpane reordering @@ -1707,4 +1707,4 @@ CH_STYLE(PopUpDockWindow, Style, StyleDefault) outersize = 25; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Docking/DockableCtrl.cpp b/uppsrc/Docking/DockableCtrl.cpp index 4d4695aa2..a3b26ab70 100644 --- a/uppsrc/Docking/DockableCtrl.cpp +++ b/uppsrc/Docking/DockableCtrl.cpp @@ -1,6 +1,6 @@ #include "Docking.h" -NAMESPACE_UPP +namespace Upp { #define IMAGECLASS DockingImg #define IMAGEFILE @@ -190,4 +190,4 @@ CH_STYLE(DockableCtrl, Style, StyleDefaultVert) handle_vert = true; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Docking/Docking.h b/uppsrc/Docking/Docking.h index f4de08fca..fc4a47b04 100644 --- a/uppsrc/Docking/Docking.h +++ b/uppsrc/Docking/Docking.h @@ -4,7 +4,7 @@ #include #include -NAMESPACE_UPP +namespace Upp { class DockWindow; @@ -462,6 +462,6 @@ T& DockWindow::CreateDockable(WString title) return q; } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/Docking/ToolWin.cpp b/uppsrc/Docking/ToolWin.cpp index 921097ead..39600f193 100644 --- a/uppsrc/Docking/ToolWin.cpp +++ b/uppsrc/Docking/ToolWin.cpp @@ -1,6 +1,6 @@ #include "Docking.h" -NAMESPACE_UPP +namespace Upp { int ToolWin::GetTitleCy() const { @@ -229,4 +229,4 @@ ToolWin::ToolWin() FrameLess(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Draw/BiCubic.cpp b/uppsrc/Draw/BiCubic.cpp index ae5f975f8..c6f310afc 100644 --- a/uppsrc/Draw/BiCubic.cpp +++ b/uppsrc/Draw/BiCubic.cpp @@ -1,6 +1,6 @@ #include "Draw.h" -NAMESPACE_UPP +namespace Upp { double BicubicKernel(double x) { @@ -70,4 +70,4 @@ Image RescaleBicubic(const Image& img, Size sz, Gate2 progress) return RescaleBicubic(img, sz, img.GetSize(), progress); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Draw/Cham.cpp b/uppsrc/Draw/Cham.cpp index 08f8ca6ab..4f60a615e 100644 --- a/uppsrc/Draw/Cham.cpp +++ b/uppsrc/Draw/Cham.cpp @@ -18,7 +18,7 @@ inline void LOGPNG(const char *name, const Image& m) #endif -NAMESPACE_UPP +namespace Upp { #define LTIMING(x) // RTIMING(x) @@ -617,4 +617,4 @@ void ColoredOverride(Iml& target, Iml& source) Override(target, source, true); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Draw/DDARasterizer.cpp b/uppsrc/Draw/DDARasterizer.cpp index c40827183..670870663 100644 --- a/uppsrc/Draw/DDARasterizer.cpp +++ b/uppsrc/Draw/DDARasterizer.cpp @@ -1,6 +1,6 @@ #include "Draw.h" -NAMESPACE_UPP +namespace Upp { DDARasterizer::DDARasterizer() { @@ -247,4 +247,4 @@ DDARasterizer& DDARasterizer::Ellipse(const Rect& rect) DDARasterizer::~DDARasterizer() {} -END_UPP_NAMESPACE +} diff --git a/uppsrc/Draw/Display.cpp b/uppsrc/Draw/Display.cpp index ab1acc449..4b3f9edeb 100644 --- a/uppsrc/Draw/Display.cpp +++ b/uppsrc/Draw/Display.cpp @@ -1,6 +1,6 @@ #include "Draw.h" -NAMESPACE_UPP +namespace Upp { #define IMAGECLASS DrawImg #define IMAGEFILE @@ -408,4 +408,4 @@ PaintRect::PaintRect(const Display& _display, const Value& _val) { value = _val; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Draw/Draw.cpp b/uppsrc/Draw/Draw.cpp index 1d975c39f..8f544f772 100644 --- a/uppsrc/Draw/Draw.cpp +++ b/uppsrc/Draw/Draw.cpp @@ -1,6 +1,6 @@ #include "Draw.h" -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // RLOG(x) #define LTIMING(x) // RTIMING(x) @@ -521,4 +521,4 @@ void NilDraw::DrawTextOp(int x, int y, int angle, const wchar *text, Font font, void NilDraw::DrawDrawingOp(const Rect& target, const Drawing& w) {} void NilDraw::DrawPaintingOp(const Rect& target, const Painting& w) {} -END_UPP_NAMESPACE +} diff --git a/uppsrc/Draw/Draw.h b/uppsrc/Draw/Draw.h index 5af5502ad..d1720cadb 100644 --- a/uppsrc/Draw/Draw.h +++ b/uppsrc/Draw/Draw.h @@ -9,7 +9,7 @@ #define CUSTOM_FONTSYS #endif -NAMESPACE_UPP +namespace Upp { class Drawing; class Draw; @@ -901,6 +901,6 @@ DrawingToPdfFnType GetDrawingToPdfFn(); #include "DDARasterizer.h" #include "SDraw.h" -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/Draw/DrawData.cpp b/uppsrc/Draw/DrawData.cpp index 20d20111f..b0ca08e13 100644 --- a/uppsrc/Draw/DrawData.cpp +++ b/uppsrc/Draw/DrawData.cpp @@ -1,6 +1,6 @@ #include "Draw.h" -NAMESPACE_UPP +namespace Upp { #define LTIMING(x) // #define BENCHMARK_RLE @@ -122,4 +122,4 @@ void Draw::DrawDataOp(int x, int y, int cx, int cy, const String& data, const ch DataDrawer::~DataDrawer() {} -END_UPP_NAMESPACE +} diff --git a/uppsrc/Draw/DrawRasterData.cpp b/uppsrc/Draw/DrawRasterData.cpp index 5c9d4ecad..8b00fa066 100644 --- a/uppsrc/Draw/DrawRasterData.cpp +++ b/uppsrc/Draw/DrawRasterData.cpp @@ -1,6 +1,6 @@ #include "Draw.h" -NAMESPACE_UPP +namespace Upp { struct cDrawRasterData : DataDrawer { int cx; @@ -37,4 +37,4 @@ void DrawRasterData(Draw& w, int x, int y, int cx, int cy, const String& data) w.DrawData(x, y, cx, cy, data, "image_data"); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Draw/DrawText.cpp b/uppsrc/Draw/DrawText.cpp index 896752bf4..283c28572 100644 --- a/uppsrc/Draw/DrawText.cpp +++ b/uppsrc/Draw/DrawText.cpp @@ -1,6 +1,6 @@ #include "Draw.h" -NAMESPACE_UPP +namespace Upp { #if defined(flagWINGL) || defined(flagLINUXGL) #include @@ -259,4 +259,4 @@ Size GetTextSize(const String& text, Font font) return GetTextSize(text, font, text.GetLength()); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Draw/DrawTextUtil.cpp b/uppsrc/Draw/DrawTextUtil.cpp index 0d8888e59..815f465b2 100644 --- a/uppsrc/Draw/DrawTextUtil.cpp +++ b/uppsrc/Draw/DrawTextUtil.cpp @@ -1,6 +1,6 @@ #include "Draw.h" -NAMESPACE_UPP +namespace Upp { void DrawTextEllipsis(Draw& w, int x, int y, int cx, const wchar *text, const char *ellipsis, Font font, Color ink, int n) @@ -125,4 +125,4 @@ void DrawTLText(Draw& draw, int x, int y, int cx, const wchar *text, } } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Draw/DrawUtil.cpp b/uppsrc/Draw/DrawUtil.cpp index cc8e3110c..47f48e185 100644 --- a/uppsrc/Draw/DrawUtil.cpp +++ b/uppsrc/Draw/DrawUtil.cpp @@ -1,6 +1,6 @@ #include "Draw.h" -NAMESPACE_UPP +namespace Upp { #define LTIMING(x) // TIMING(x) @@ -582,4 +582,4 @@ void SetRenderGlyph(Image (*f)(int cx, int x, Font font, int chr, int py, int pc render_glyph = f; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Draw/Drawing.cpp b/uppsrc/Draw/Drawing.cpp index 6c54c7c25..4c5806e77 100644 --- a/uppsrc/Draw/Drawing.cpp +++ b/uppsrc/Draw/Drawing.cpp @@ -1,6 +1,6 @@ #include "Draw.h" -NAMESPACE_UPP +namespace Upp { enum { DRAWING_BEGIN = 1, @@ -705,4 +705,4 @@ void Drawing::Serialize(Stream& s) } } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Draw/Font.cpp b/uppsrc/Draw/Font.cpp index 9515c505b..041717568 100644 --- a/uppsrc/Draw/Font.cpp +++ b/uppsrc/Draw/Font.cpp @@ -2,7 +2,7 @@ #define LLOG(x) // DLOG(x) -NAMESPACE_UPP +namespace Upp { static StaticMutex sFontLock; @@ -569,4 +569,4 @@ FontInfo Font::Info() const return h; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Draw/FontCR.cpp b/uppsrc/Draw/FontCR.cpp index 2addd1111..64752257e 100644 --- a/uppsrc/Draw/FontCR.cpp +++ b/uppsrc/Draw/FontCR.cpp @@ -1,6 +1,6 @@ #include "Draw.h" -NAMESPACE_UPP +namespace Upp { enum { CG_NONE, @@ -314,4 +314,4 @@ bool Replace(Font fnt, int chr, Font& rfnt) return false; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Draw/FontFc.cpp b/uppsrc/Draw/FontFc.cpp index 28c82daf4..ba1bde389 100644 --- a/uppsrc/Draw/FontFc.cpp +++ b/uppsrc/Draw/FontFc.cpp @@ -13,7 +13,7 @@ // #include // The only function required from that header: FT_EXPORT( const char* ) FT_Get_X11_Font_Format( FT_Face face ); // Put here to avoid include path issues... -NAMESPACE_UPP +namespace Upp { static FT_Library sFTlib; @@ -390,7 +390,7 @@ void RenderCharacterSys(FontGlyphConsumer& sw, double x, double y, int ch, Font fnt.IsItalic() && !(face->style_flags & FT_STYLE_FLAG_ITALIC)); } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/Draw/FontWin32.cpp b/uppsrc/Draw/FontWin32.cpp index bac51aa91..62b644ffe 100644 --- a/uppsrc/Draw/FontWin32.cpp +++ b/uppsrc/Draw/FontWin32.cpp @@ -1,6 +1,6 @@ #include "Draw.h" -NAMESPACE_UPP +namespace Upp { #ifndef CUSTOM_FONTSYS @@ -423,4 +423,4 @@ void RenderCharacterSys(FontGlyphConsumer& sw, double x, double y, int ch, Font #endif -END_UPP_NAMESPACE +} diff --git a/uppsrc/Draw/Image.cpp b/uppsrc/Draw/Image.cpp index f85e9af8e..30df32980 100644 --- a/uppsrc/Draw/Image.cpp +++ b/uppsrc/Draw/Image.cpp @@ -1,6 +1,6 @@ #include "Draw.h" -NAMESPACE_UPP +namespace Upp { #define LTIMING(x) // RTIMING(x) @@ -523,4 +523,4 @@ Size GetImageStringDots(const String& src) return sz; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Draw/ImageAnyDraw.cpp b/uppsrc/Draw/ImageAnyDraw.cpp index 5d5ee6244..ce63568b9 100644 --- a/uppsrc/Draw/ImageAnyDraw.cpp +++ b/uppsrc/Draw/ImageAnyDraw.cpp @@ -1,6 +1,6 @@ #include "Draw.h" -NAMESPACE_UPP +namespace Upp { dword ImageAnyDraw::GetInfo() const { @@ -166,4 +166,4 @@ ImageAnyDraw::~ImageAnyDraw() delete draw; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Draw/ImageBlit.cpp b/uppsrc/Draw/ImageBlit.cpp index e9196b88a..8bcd7d6f8 100644 --- a/uppsrc/Draw/ImageBlit.cpp +++ b/uppsrc/Draw/ImageBlit.cpp @@ -1,6 +1,6 @@ #include "Draw.h" -NAMESPACE_UPP +namespace Upp { void Fill(RGBA *t, RGBA c, int len) { @@ -404,4 +404,4 @@ void MultiplyComponents(RGBA *t, const RGBA *s, int len, int num, int den) TransformComponents(t, s, len, trans, trans, trans, trans); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Draw/ImageChOp.cpp b/uppsrc/Draw/ImageChOp.cpp index dbff3b342..88a4ad851 100644 --- a/uppsrc/Draw/ImageChOp.cpp +++ b/uppsrc/Draw/ImageChOp.cpp @@ -1,6 +1,6 @@ #include "Draw.h" -NAMESPACE_UPP +namespace Upp { int Diff(RGBA a, RGBA b) { @@ -298,4 +298,4 @@ Image ChPartMaker::Make() const return ib; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Draw/ImageOp.cpp b/uppsrc/Draw/ImageOp.cpp index 7b9280cae..bb7bab446 100644 --- a/uppsrc/Draw/ImageOp.cpp +++ b/uppsrc/Draw/ImageOp.cpp @@ -1,6 +1,6 @@ #include "Draw.h" -NAMESPACE_UPP +namespace Upp { Image WithHotSpots(const Image& m, int x1, int y1, int x2, int y2) { @@ -827,4 +827,4 @@ Image Dither(const Image& m, int dival) return ib; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Draw/ImageScale.cpp b/uppsrc/Draw/ImageScale.cpp index 3c7ba6dd1..6d1d1ffc2 100644 --- a/uppsrc/Draw/ImageScale.cpp +++ b/uppsrc/Draw/ImageScale.cpp @@ -1,6 +1,6 @@ #include "Draw.h" -NAMESPACE_UPP +namespace Upp { enum { @@ -508,4 +508,4 @@ Image Rescale(const Image& src, int cx, int cy, Gate2 progress) return Rescale(src, Size(cx, cy)); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Draw/Iml.cpp b/uppsrc/Draw/Iml.cpp index 0bc107409..372a5ad2d 100644 --- a/uppsrc/Draw/Iml.cpp +++ b/uppsrc/Draw/Iml.cpp @@ -1,6 +1,6 @@ #include "Draw.h" -NAMESPACE_UPP +namespace Upp { Vector UnpackImlData(const void *ptr, int len) { @@ -203,4 +203,4 @@ void SetImlImage(const char *name, const Image& m) } } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Draw/MakeCache.cpp b/uppsrc/Draw/MakeCache.cpp index ff5a4008c..dbb6e3c91 100644 --- a/uppsrc/Draw/MakeCache.cpp +++ b/uppsrc/Draw/MakeCache.cpp @@ -1,6 +1,6 @@ #include "Draw.h" -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // DLOG(x) @@ -267,4 +267,4 @@ Image CachedSetColorKeepAlphaPaintOnly(const Image& img, Color color) return MakeImagePaintOnly(m); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Draw/Palette.cpp b/uppsrc/Draw/Palette.cpp index fac5e6d45..b2c582752 100644 --- a/uppsrc/Draw/Palette.cpp +++ b/uppsrc/Draw/Palette.cpp @@ -1,6 +1,6 @@ #include "Draw.h" -NAMESPACE_UPP +namespace Upp { #define LTIMING(x) @@ -278,4 +278,4 @@ void CreatePalette(Raster& raster, RGBA *palette, int ncolors, PaletteCv& cv) CreatePaletteCv(palette, ncolors, cv); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Draw/Raster.cpp b/uppsrc/Draw/Raster.cpp index bae8160ca..f8d538876 100644 --- a/uppsrc/Draw/Raster.cpp +++ b/uppsrc/Draw/Raster.cpp @@ -1,6 +1,6 @@ #include "Draw.h" -NAMESPACE_UPP +namespace Upp { Raster::Info::Info() { @@ -278,4 +278,4 @@ Image StreamRaster::LoadStringAny(const String& s, const Gate2 progres return LoadAny(ss, progress); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Draw/RasterEncoder.cpp b/uppsrc/Draw/RasterEncoder.cpp index 89ce9cc8b..1e260f98e 100644 --- a/uppsrc/Draw/RasterEncoder.cpp +++ b/uppsrc/Draw/RasterEncoder.cpp @@ -1,6 +1,6 @@ #include "Draw.h" -NAMESPACE_UPP +namespace Upp { RasterEncoder::RasterEncoder() { @@ -177,4 +177,4 @@ String StreamRasterEncoder::SaveString(const Image& img) return SaveString(r); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Draw/RasterFormat.cpp b/uppsrc/Draw/RasterFormat.cpp index e299ed51b..66fbab95f 100644 --- a/uppsrc/Draw/RasterFormat.cpp +++ b/uppsrc/Draw/RasterFormat.cpp @@ -1,6 +1,6 @@ #include "Draw.h" -NAMESPACE_UPP +namespace Upp { static int sMaskPos16(dword mask) { @@ -367,4 +367,4 @@ void RasterFormat::Read(RGBA *t, const byte *s, int cx, const RGBA *palette) con } } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Draw/RasterWrite.cpp b/uppsrc/Draw/RasterWrite.cpp index ba24a2450..67ba56348 100644 --- a/uppsrc/Draw/RasterWrite.cpp +++ b/uppsrc/Draw/RasterWrite.cpp @@ -1,6 +1,6 @@ #include "Draw.h" -NAMESPACE_UPP +namespace Upp { extern int um_table__[256]; void sInitUmTable__(); @@ -341,4 +341,4 @@ void RasterFormat::Write(byte *t, const RGBA *s, int cx, const PaletteCv *palcv) } } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Draw/RescaleFilter.cpp b/uppsrc/Draw/RescaleFilter.cpp index 115dab898..4d0e19fb8 100644 --- a/uppsrc/Draw/RescaleFilter.cpp +++ b/uppsrc/Draw/RescaleFilter.cpp @@ -1,6 +1,6 @@ #include "Draw.h" -NAMESPACE_UPP +namespace Upp { #define LDUMP(x) // DUMP(x) @@ -253,4 +253,4 @@ Image RescaleFilter(const Image& img, int cx, int cy, int filter, Gate2 #include -NAMESPACE_UPP +namespace Upp { class DropGrid : public Convert, public GridDisplay, public Ctrl { @@ -235,6 +235,6 @@ class DropGrid : public Convert, public GridDisplay, public Ctrl }; -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/Esc/Esc.cpp b/uppsrc/Esc/Esc.cpp index da5d36432..5bfcd8fbe 100644 --- a/uppsrc/Esc/Esc.cpp +++ b/uppsrc/Esc/Esc.cpp @@ -1,7 +1,7 @@ #include -NAMESPACE_UPP +namespace Upp { #ifdef _MSC_VER #pragma inline_depth(255) @@ -1254,4 +1254,4 @@ void Esc::Run() DoStatement(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Esc/Esc.h b/uppsrc/Esc/Esc.h index 72d6d1054..ac6c7c2ea 100644 --- a/uppsrc/Esc/Esc.h +++ b/uppsrc/Esc/Esc.h @@ -4,7 +4,7 @@ #include -NAMESPACE_UPP +namespace Upp { enum EscTypeKind { ESC_VOID, ESC_DOUBLE, ESC_ARRAY, ESC_MAP, ESC_LAMBDA, ESC_INT64 }; @@ -318,6 +318,6 @@ bool IsTime(const EscValue& v); String Expand(const String& doc, ArrayMap& global, int oplimit = 50000, String (*format)(const Value& v) = StdFormat); -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/Esc/EscArray.cpp b/uppsrc/Esc/EscArray.cpp index 286171670..447fe402c 100644 --- a/uppsrc/Esc/EscArray.cpp +++ b/uppsrc/Esc/EscArray.cpp @@ -1,6 +1,6 @@ #include "Esc.h" -NAMESPACE_UPP +namespace Upp { #define LTIMING(x) // RTIMING(x) @@ -165,4 +165,4 @@ EscValue::EscValue(int n) total++; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Esc/EscMap.cpp b/uppsrc/Esc/EscMap.cpp index c416219fe..8d04c667b 100644 --- a/uppsrc/Esc/EscMap.cpp +++ b/uppsrc/Esc/EscMap.cpp @@ -1,6 +1,6 @@ #include "Esc.h" -NAMESPACE_UPP +namespace Upp { #define LTIMING(x) // RTIMING(x) @@ -70,4 +70,4 @@ int EscValue::GetFieldInt(const char *id) const return HasNumberField(id) ? MapGet(id).GetInt() : 0; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Esc/EscRun.cpp b/uppsrc/Esc/EscRun.cpp index bb972c657..6ba95f163 100644 --- a/uppsrc/Esc/EscRun.cpp +++ b/uppsrc/Esc/EscRun.cpp @@ -1,7 +1,7 @@ #include "Esc.h" -NAMESPACE_UPP +namespace Upp { #define LTIMING(x) // RTIMING(x) @@ -289,4 +289,4 @@ String Expand(const String& doc, ArrayMap& global, return out; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Esc/EscStdLib.cpp b/uppsrc/Esc/EscStdLib.cpp index 57b9fdbb2..20738f4a8 100644 --- a/uppsrc/Esc/EscStdLib.cpp +++ b/uppsrc/Esc/EscStdLib.cpp @@ -1,7 +1,7 @@ #include -NAMESPACE_UPP +namespace Upp { #define LTIMING(x) // RTIMING(x) @@ -295,4 +295,4 @@ void StdLib(ArrayMap& global) Escape(global, "cos(value)", ESC_cos); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Esc/EscValue.cpp b/uppsrc/Esc/EscValue.cpp index 727b1e880..685d9a87f 100644 --- a/uppsrc/Esc/EscValue.cpp +++ b/uppsrc/Esc/EscValue.cpp @@ -1,7 +1,7 @@ #include -NAMESPACE_UPP +namespace Upp { #define LTIMING(x) // RTIMING(x) @@ -361,4 +361,4 @@ bool IsTrue(const EscValue& a) return a.GetCount(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Esc/Value.cpp b/uppsrc/Esc/Value.cpp index 986add934..3118b428d 100644 --- a/uppsrc/Esc/Value.cpp +++ b/uppsrc/Esc/Value.cpp @@ -1,7 +1,7 @@ #include -NAMESPACE_UPP +namespace Upp { EscValue EscFromStdValue(const Value& v) { @@ -63,4 +63,4 @@ void StdValueLib(ArrayMap& global) Escape(global, "StdFormat(x)", SIC_StdFormat); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/GLCtrl/GLCtrl.cpp b/uppsrc/GLCtrl/GLCtrl.cpp index 09d91dd1d..b92738130 100644 --- a/uppsrc/GLCtrl/GLCtrl.cpp +++ b/uppsrc/GLCtrl/GLCtrl.cpp @@ -1,6 +1,6 @@ #include "GLCtrl.h" -NAMESPACE_UPP +namespace Upp { void GLCtrl::GLResize(int w, int h) { @@ -41,4 +41,4 @@ Vector GLCtrl::Pick(int x, int y) #endif -END_UPP_NAMESPACE +} diff --git a/uppsrc/GLCtrl/GLCtrl.h b/uppsrc/GLCtrl/GLCtrl.h index 6d5ef83ae..a2e054b73 100644 --- a/uppsrc/GLCtrl/GLCtrl.h +++ b/uppsrc/GLCtrl/GLCtrl.h @@ -25,7 +25,7 @@ #undef Display #endif -NAMESPACE_UPP +namespace Upp { #ifdef GUI_GTK @@ -168,6 +168,6 @@ public: #endif -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/GLCtrl/GLPicking.cpp b/uppsrc/GLCtrl/GLPicking.cpp index 8082894ba..6b6ce6e12 100644 --- a/uppsrc/GLCtrl/GLPicking.cpp +++ b/uppsrc/GLCtrl/GLPicking.cpp @@ -1,6 +1,6 @@ #include "GLCtrl.h" -NAMESPACE_UPP +namespace Upp { #if defined(GUI_X11) || defined(GUI_WIN32) @@ -62,4 +62,4 @@ Vector GLCtrl::GLPicking::ParseHits(GLuint *buffer, int hits) #endif -END_UPP_NAMESPACE +} diff --git a/uppsrc/GLCtrl/GtkGLCtrl.cpp b/uppsrc/GLCtrl/GtkGLCtrl.cpp index 12bf6a58d..e7c6c5c63 100644 --- a/uppsrc/GLCtrl/GtkGLCtrl.cpp +++ b/uppsrc/GLCtrl/GtkGLCtrl.cpp @@ -6,7 +6,7 @@ #include #include -NAMESPACE_UPP +namespace Upp { GdkGLConfig *sGlconfig; @@ -64,6 +64,6 @@ void GLCtrl::Paint(Draw& w) } } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/GLCtrl/Win32GLCtrl.cpp b/uppsrc/GLCtrl/Win32GLCtrl.cpp index 9b58c8d5d..92ad8cf6e 100644 --- a/uppsrc/GLCtrl/Win32GLCtrl.cpp +++ b/uppsrc/GLCtrl/Win32GLCtrl.cpp @@ -1,6 +1,6 @@ #include "GLCtrl.h" -NAMESPACE_UPP +namespace Upp { #ifdef PLATFORM_WIN32 @@ -106,4 +106,4 @@ LRESULT GLCtrl::GLPane::WindowProc(UINT message, WPARAM wParam, LPARAM lParam) #endif -END_UPP_NAMESPACE +} diff --git a/uppsrc/GLCtrl/X11GLCtrl.cpp b/uppsrc/GLCtrl/X11GLCtrl.cpp index d1df09a77..863b94d57 100644 --- a/uppsrc/GLCtrl/X11GLCtrl.cpp +++ b/uppsrc/GLCtrl/X11GLCtrl.cpp @@ -1,6 +1,6 @@ #include "GLCtrl.h" -NAMESPACE_UPP +namespace Upp { #ifdef GUI_X11 @@ -152,4 +152,4 @@ void GLCtrl::GLPane::Paint(Draw &draw) #endif -END_UPP_NAMESPACE +} diff --git a/uppsrc/Geom/Coords/GeomCoords.h b/uppsrc/Geom/Coords/GeomCoords.h index fa55e43ea..64466cf84 100644 --- a/uppsrc/Geom/Coords/GeomCoords.h +++ b/uppsrc/Geom/Coords/GeomCoords.h @@ -4,7 +4,7 @@ #include //#include -NAMESPACE_UPP +namespace Upp { #define MINRAD (DEGRAD / 60.0) #define SECRAD (DEGRAD / 3600.0) @@ -815,6 +815,6 @@ public: PlanarSegmentTree CreatePlanarTree(const LinearSegmentTree& left, const LinearSegmentTree& top, const LinearSegmentTree& right, const LinearSegmentTree& bottom, const SegmentTreeInfo& info); -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/Geom/Coords/coords.cpp b/uppsrc/Geom/Coords/coords.cpp index 2fc91daa8..fb4c418a7 100644 --- a/uppsrc/Geom/Coords/coords.cpp +++ b/uppsrc/Geom/Coords/coords.cpp @@ -1,6 +1,6 @@ #include "GeomCoords.h" -NAMESPACE_UPP +namespace Upp { GisCoords::Arg GisCoords::Arg::Edit(double& v, String ident, String name, String help_topic, double min, double max, bool not_null) { @@ -489,4 +489,4 @@ bool GisTransform::Equals(const GisTransform& t) const return Source() == t.Source() && Target() == t.Target(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Geom/Coords/ellipsoid.cpp b/uppsrc/Geom/Coords/ellipsoid.cpp index b2c83198f..ec189fc21 100644 --- a/uppsrc/Geom/Coords/ellipsoid.cpp +++ b/uppsrc/Geom/Coords/ellipsoid.cpp @@ -1,6 +1,6 @@ #include "GeomCoords.h" -NAMESPACE_UPP +namespace Upp { struct EPSGEllipsoid { @@ -759,4 +759,4 @@ bool operator == (const GisEllipsoid& ea, const GisEllipsoid& eb) return ea.a == eb.a && ea.b == eb.b && ea.from_wgs84 == eb.from_wgs84; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Geom/Coords/method.cpp b/uppsrc/Geom/Coords/method.cpp index 7e630dcac..8d60415e2 100644 --- a/uppsrc/Geom/Coords/method.cpp +++ b/uppsrc/Geom/Coords/method.cpp @@ -2,7 +2,7 @@ #include "method.h" -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // RLOG(x) @@ -855,4 +855,4 @@ GisCoords GisCoords::GetEPSG(int code) return GisCoords(gc); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Geom/Coords/method.h b/uppsrc/Geom/Coords/method.h index 18c558076..dff5c0f61 100644 --- a/uppsrc/Geom/Coords/method.h +++ b/uppsrc/Geom/Coords/method.h @@ -1,7 +1,7 @@ #ifndef _Gis3_Coords_method_h_ #define _Gis3_Coords_method_h_ -NAMESPACE_UPP +namespace Upp { class GisCoordsLonLat : public GisCoords::Data { @@ -226,6 +226,6 @@ public: GisCoordsGaussLatitude gauss; }; -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/Geom/Coords/util.cpp b/uppsrc/Geom/Coords/util.cpp index b5a814a78..01c3c176a 100644 --- a/uppsrc/Geom/Coords/util.cpp +++ b/uppsrc/Geom/Coords/util.cpp @@ -1,6 +1,6 @@ #include "GeomCoords.h" -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // RLOG(x) @@ -1384,4 +1384,4 @@ void GisCoordsGaussLatitude::Create(double a, double e2, double base_parallel) gauss_latitude.CreateInverse(base_parallel - 30, base_parallel + 30, gslf, 300, 5000, 4); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Geom/Ctrl/CoordCtrl.cpp b/uppsrc/Geom/Ctrl/CoordCtrl.cpp index d1b7c7cc0..7eb3cccb3 100644 --- a/uppsrc/Geom/Ctrl/CoordCtrl.cpp +++ b/uppsrc/Geom/Ctrl/CoordCtrl.cpp @@ -1,6 +1,6 @@ #include "GeomCtrl.h" -NAMESPACE_UPP +namespace Upp { EditDegree::EditDegree() { @@ -44,4 +44,4 @@ bool EditDegree::Key(dword key, int repcnt) return EditValue::Key(key, repcnt); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Geom/Ctrl/CoordCtrl.h b/uppsrc/Geom/Ctrl/CoordCtrl.h index 3743c5c22..4123c4595 100644 --- a/uppsrc/Geom/Ctrl/CoordCtrl.h +++ b/uppsrc/Geom/Ctrl/CoordCtrl.h @@ -1,7 +1,7 @@ #ifndef _Geom_Ctrl_CoordCtrl_h_ #define _Geom_Ctrl_CoordCtrl_h_ -NAMESPACE_UPP +namespace Upp { class EditDegree : public EditValue { @@ -19,6 +19,6 @@ private: SpinButtons spin; }; -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/Geom/Ctrl/GeomCtrl_init.icpp b/uppsrc/Geom/Ctrl/GeomCtrl_init.icpp index 682fa2572..496bd16f7 100644 --- a/uppsrc/Geom/Ctrl/GeomCtrl_init.icpp +++ b/uppsrc/Geom/Ctrl/GeomCtrl_init.icpp @@ -1,8 +1,8 @@ #include "GeomCtrl.h" -NAMESPACE_UPP +namespace Upp { #define TFILE #include -END_UPP_NAMESPACE +} diff --git a/uppsrc/Geom/Ctrl/PlotterCtrl.cpp b/uppsrc/Geom/Ctrl/PlotterCtrl.cpp index 66f9fa77e..dd455493c 100644 --- a/uppsrc/Geom/Ctrl/PlotterCtrl.cpp +++ b/uppsrc/Geom/Ctrl/PlotterCtrl.cpp @@ -1,6 +1,6 @@ #include "GeomCtrl.h" -NAMESPACE_UPP +namespace Upp { #define IMAGECLASS PlotterImg #define IMAGEFILE @@ -1269,4 +1269,4 @@ void PanDragDrop::Cancel() GetOwner().PanOffset(Point(0, 0)); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Geom/Ctrl/PlotterCtrl.h b/uppsrc/Geom/Ctrl/PlotterCtrl.h index d6300230d..02c882cb5 100644 --- a/uppsrc/Geom/Ctrl/PlotterCtrl.h +++ b/uppsrc/Geom/Ctrl/PlotterCtrl.h @@ -1,4 +1,4 @@ -NAMESPACE_UPP +namespace Upp { class PlotterDragDrop; @@ -348,4 +348,4 @@ private: PlotterCtrl& owner; }; -END_UPP_NAMESPACE +} diff --git a/uppsrc/Geom/Ctrl/pathCtrl.cpp b/uppsrc/Geom/Ctrl/pathCtrl.cpp index 6b70eae4f..f3922297d 100644 --- a/uppsrc/Geom/Ctrl/pathCtrl.cpp +++ b/uppsrc/Geom/Ctrl/pathCtrl.cpp @@ -1,6 +1,6 @@ #include "GeomCtrl.h" -NAMESPACE_UPP +namespace Upp { #define LAYOUTFILE #include @@ -2314,4 +2314,4 @@ void PathStyleCtrl::DoAction() SetDataAction(s); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Geom/Ctrl/pathCtrl.h b/uppsrc/Geom/Ctrl/pathCtrl.h index 975c2a122..73dc1574e 100644 --- a/uppsrc/Geom/Ctrl/pathCtrl.h +++ b/uppsrc/Geom/Ctrl/pathCtrl.h @@ -4,7 +4,7 @@ ////////////////////////////////////////////////////////////////////// // PathEditorCtrl:: -NAMESPACE_UPP +namespace Upp { class PathEditorCtrl : public DragDropCtrl, public CtrlFrame { @@ -289,4 +289,4 @@ private: ////////////////////////////////////////////////////////////////////// -END_UPP_NAMESPACE +} diff --git a/uppsrc/Geom/Draw/coordutil.cpp b/uppsrc/Geom/Draw/coordutil.cpp index 5796c0fcb..4e6fc0602 100644 --- a/uppsrc/Geom/Draw/coordutil.cpp +++ b/uppsrc/Geom/Draw/coordutil.cpp @@ -1,6 +1,6 @@ #include "GeomDraw.h" -NAMESPACE_UPP +namespace Upp { static void ExpandSegmentUp(Vector& src, Vector& dest, const LinearSegmentTree::Node *node, Point smin, Point dmin) { @@ -201,4 +201,4 @@ void PlotRect(PlotterTool& tool, GisTransform transform, const Rectf& src) PlotLine(tool, transform, src.BottomLeft(), src.TopLeft()); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Geom/Draw/coordutil.h b/uppsrc/Geom/Draw/coordutil.h index 332e0128a..59863d99b 100644 --- a/uppsrc/Geom/Draw/coordutil.h +++ b/uppsrc/Geom/Draw/coordutil.h @@ -1,7 +1,7 @@ #ifndef _Geom_Draw_coordutil_h_ #define _Geom_Draw_coordutil_h_ -NAMESPACE_UPP +namespace Upp { void AlphaTransformPaint(ImageBuffer& out, const Image& in, const PlanarSegmentTree& planar, @@ -16,6 +16,6 @@ void PaintPlanarTree(Draw& draw, const PlanarSegmentTree& planar, void PlotLine(PlotterTool& tool, GisTransform transform, Pointf source1, Pointf source2); void PlotRect(PlotterTool& tool, GisTransform transform, const Rectf& src); -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/Geom/Draw/hrr.cpp b/uppsrc/Geom/Draw/hrr.cpp index 28296b614..e13628f41 100644 --- a/uppsrc/Geom/Draw/hrr.cpp +++ b/uppsrc/Geom/Draw/hrr.cpp @@ -9,7 +9,7 @@ #include #include -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // LOG(x) @@ -2010,4 +2010,4 @@ int HRR::SizeOfInstance() const return sizeof(*this) + directory_sizeof + cache_sizeof; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Geom/Draw/hrr.h b/uppsrc/Geom/Draw/hrr.h index fd29918b0..d06457bde 100644 --- a/uppsrc/Geom/Draw/hrr.h +++ b/uppsrc/Geom/Draw/hrr.h @@ -1,7 +1,7 @@ #ifndef __Geom_Draw_hrr__ #define __Geom_Draw_hrr__ -NAMESPACE_UPP +namespace Upp { //#include "Stream.h" @@ -234,6 +234,6 @@ private: int map_offset; }; -END_UPP_NAMESPACE +} #endif//__Geom_Draw_hrr__ diff --git a/uppsrc/Geom/Draw/imgtran.cpp b/uppsrc/Geom/Draw/imgtran.cpp index 0d3285189..35bbab8b9 100644 --- a/uppsrc/Geom/Draw/imgtran.cpp +++ b/uppsrc/Geom/Draw/imgtran.cpp @@ -1,6 +1,6 @@ #include "GeomDraw.h" -NAMESPACE_UPP +namespace Upp { //#define BILINEAR_TIMING @@ -566,4 +566,4 @@ Image BilinearRotate(const Image& m, int angle) return ib; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Geom/Draw/imgtran.h b/uppsrc/Geom/Draw/imgtran.h index 9d9e2e2d8..aed45916a 100644 --- a/uppsrc/Geom/Draw/imgtran.h +++ b/uppsrc/Geom/Draw/imgtran.h @@ -1,7 +1,7 @@ #ifndef _Geom_Draw_imgtran_h_ #define _Geom_Draw_imgtran_h_ -NAMESPACE_UPP +namespace Upp { void LinearSet(ImageBuffer& dest, Point d0, Point d1, Point d2, RGBA color, const Rect *opt_clip = NULL); void LinearCopy(ImageBuffer& dest, Point d0, Point d1, Point d2, @@ -21,6 +21,6 @@ void BilinearCopy(ImageBuffer& dest, Point destpos[4], Image BilinearRotate(const Image& m, int angle); -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/Geom/Draw/pathDraw.cpp b/uppsrc/Geom/Draw/pathDraw.cpp index 454806163..53abd52fe 100644 --- a/uppsrc/Geom/Draw/pathDraw.cpp +++ b/uppsrc/Geom/Draw/pathDraw.cpp @@ -1,6 +1,6 @@ #include "GeomDraw.h" -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // LOG(x) @@ -2033,4 +2033,4 @@ void PathStyleDisplay::Paint(Draw& draw, const Rect& rc, const Value& v, Color i } } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Geom/Draw/pathDraw.h b/uppsrc/Geom/Draw/pathDraw.h index d5eaba967..8a49aaaaa 100644 --- a/uppsrc/Geom/Draw/pathDraw.h +++ b/uppsrc/Geom/Draw/pathDraw.h @@ -1,4 +1,4 @@ -NAMESPACE_UPP +namespace Upp { class PlotterTool; @@ -394,4 +394,4 @@ protected: const PathStyleMap *path_map; }; -END_UPP_NAMESPACE +} diff --git a/uppsrc/Geom/Draw/path_aux.cpp b/uppsrc/Geom/Draw/path_aux.cpp index bfd41b817..6affae5ce 100644 --- a/uppsrc/Geom/Draw/path_aux.cpp +++ b/uppsrc/Geom/Draw/path_aux.cpp @@ -3,7 +3,7 @@ #include "GeomDraw.h" -NAMESPACE_UPP +namespace Upp { static void PathDraw_Output_1_1(PathDraw::Output& out, Point a, Point b) { @@ -3099,4 +3099,4 @@ void (*PathDraw_Output_Thick[5][5])(PathDraw::Output& out, Point a, Point b) = }, }; -END_UPP_NAMESPACE +} diff --git a/uppsrc/Geom/Draw/plotter.cpp b/uppsrc/Geom/Draw/plotter.cpp index ae35e3b60..2c71f0f35 100644 --- a/uppsrc/Geom/Draw/plotter.cpp +++ b/uppsrc/Geom/Draw/plotter.cpp @@ -1,6 +1,6 @@ #include "GeomDraw.h" -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // LOG(x) @@ -2595,4 +2595,4 @@ void PlotterTest() } #endif -END_UPP_NAMESPACE +} diff --git a/uppsrc/Geom/Draw/plotter.h b/uppsrc/Geom/Draw/plotter.h index 0b9d13e31..0a2ac4f1e 100644 --- a/uppsrc/Geom/Draw/plotter.h +++ b/uppsrc/Geom/Draw/plotter.h @@ -1,4 +1,4 @@ -NAMESPACE_UPP +namespace Upp { typedef const signed char LineStyle[]; typedef const signed char *LineStyleArg; @@ -506,4 +506,4 @@ private: VectorMap > cache; }; -END_UPP_NAMESPACE +} diff --git a/uppsrc/Geom/Geom.h b/uppsrc/Geom/Geom.h index 359154472..833449ffe 100644 --- a/uppsrc/Geom/Geom.h +++ b/uppsrc/Geom/Geom.h @@ -3,13 +3,13 @@ #include -NAMESPACE_UPP +namespace Upp { #include "geometry.h" #include "fp3.h" #include "linsolv.h" #include "delaunay.h" -END_UPP_NAMESPACE +} #endif//__Geom__ diff --git a/uppsrc/Geom/delaunay.cpp b/uppsrc/Geom/delaunay.cpp index b5e3dab43..8541638aa 100644 --- a/uppsrc/Geom/delaunay.cpp +++ b/uppsrc/Geom/delaunay.cpp @@ -1,6 +1,6 @@ #include "Geom.h" -NAMESPACE_UPP +namespace Upp { #define DELDUMP @@ -236,4 +236,4 @@ void Delaunay::AddHull(int i) } } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Geom/fp3.cpp b/uppsrc/Geom/fp3.cpp index 1e0f70175..832b36302 100644 --- a/uppsrc/Geom/fp3.cpp +++ b/uppsrc/Geom/fp3.cpp @@ -1,6 +1,6 @@ #include "Geom.h" -NAMESPACE_UPP +namespace Upp { Pointf3 Length(Pointf3 p, double length) { @@ -380,4 +380,4 @@ Pointf3 Camera::InverseXY(Pointf point, double z) const return Pointf3(dx / dr, dy / dr, z); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Geom/geometry.cpp b/uppsrc/Geom/geometry.cpp index 1648bc05a..5b1ce4703 100644 --- a/uppsrc/Geom/geometry.cpp +++ b/uppsrc/Geom/geometry.cpp @@ -1,6 +1,6 @@ #include "Geom.h" -NAMESPACE_UPP +namespace Upp { Pointf Length(const Pointf& p, double length) { @@ -266,4 +266,4 @@ String Matrixf::ToString() const return String().Cat() << "[x = " << x << ", y = " << y << ", a = " << a << "]"; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Geom/linsolv.cpp b/uppsrc/Geom/linsolv.cpp index df89d88e6..3b4a6457a 100644 --- a/uppsrc/Geom/linsolv.cpp +++ b/uppsrc/Geom/linsolv.cpp @@ -1,6 +1,6 @@ #include "Geom.h" -NAMESPACE_UPP +namespace Upp { LinearSolver::LinearSolver(int count, double tolerance) : rows(count) @@ -126,4 +126,4 @@ void LinearSolver::SelfTest() } } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Geom/polyalg.cpp b/uppsrc/Geom/polyalg.cpp index 9a4f634f2..9a13dcace 100644 --- a/uppsrc/Geom/polyalg.cpp +++ b/uppsrc/Geom/polyalg.cpp @@ -1,6 +1,6 @@ #include "Geom.h" -NAMESPACE_UPP +namespace Upp { #define POLY_TIMING(n) // RTIMING(n) #define POLY_LOGGING 0 // 1 = on, 0 = off @@ -1030,4 +1030,4 @@ void PolygonIterator::DumpDone(int i) const RLOG(out); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Geom/vecalg.cpp b/uppsrc/Geom/vecalg.cpp index a9e0c51c2..115667205 100644 --- a/uppsrc/Geom/vecalg.cpp +++ b/uppsrc/Geom/vecalg.cpp @@ -1,6 +1,6 @@ #include "Geom.h" -NAMESPACE_UPP +namespace Upp { double Distance(Pointf X, Pointf A, Pointf B, double *arg) { @@ -1804,4 +1804,4 @@ bool VecIntersection::AA(const VecArcInfo &a1, const VecArcInfo &a2) ////////////////////////////////////////////////////////////////////// -END_UPP_NAMESPACE +} diff --git a/uppsrc/GridCtrl/GridBase.cpp b/uppsrc/GridCtrl/GridBase.cpp index 7bf98fb92..0e3ec5736 100644 --- a/uppsrc/GridCtrl/GridBase.cpp +++ b/uppsrc/GridCtrl/GridBase.cpp @@ -1,6 +1,6 @@ #include "GridCtrl.h" -NAMESPACE_UPP +namespace Upp { int GridCtrl::ItemRect::sortCol; int GridCtrl::ItemRect::sortMode; @@ -299,4 +299,4 @@ Value GridCtrl::ItemRect::ExtractValue(int r, int c) const return IsType(v) ? Value(ValueTo(v).text) : v; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/GridCtrl/GridCtrl.cpp b/uppsrc/GridCtrl/GridCtrl.cpp index c9d01cc31..52957dfad 100644 --- a/uppsrc/GridCtrl/GridCtrl.cpp +++ b/uppsrc/GridCtrl/GridCtrl.cpp @@ -1,6 +1,6 @@ #include -NAMESPACE_UPP +namespace Upp { #ifdef COMPILER_MSC #pragma warning(disable: 4355) @@ -8699,4 +8699,4 @@ GridCtrl::ItemRect& GridCtrl::AddRow(__List##I(E__Value)) { \ } __Expand(E__AddF1) -END_UPP_NAMESPACE +} diff --git a/uppsrc/GridCtrl/GridCtrl.h b/uppsrc/GridCtrl/GridCtrl.h index 100c4a8ef..fde5b531f 100644 --- a/uppsrc/GridCtrl/GridCtrl.h +++ b/uppsrc/GridCtrl/GridCtrl.h @@ -5,7 +5,7 @@ #include #endif -NAMESPACE_UPP +namespace Upp { #include "GridUtils.h" #include "GridDisplay.h" @@ -1883,6 +1883,6 @@ class GridText : Ctrl template<> void Xmlize(XmlIO& xml, GridCtrl& g); template<> void Jsonize(JsonIO& json, GridCtrl& g); -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/GridCtrl/GridDisplay.cpp b/uppsrc/GridCtrl/GridDisplay.cpp index 915f913c2..89f7c1e3c 100644 --- a/uppsrc/GridCtrl/GridDisplay.cpp +++ b/uppsrc/GridCtrl/GridDisplay.cpp @@ -1,6 +1,6 @@ #include -NAMESPACE_UPP +namespace Upp { #include "GridDisplay.h" #define IMAGECLASS GridImg @@ -454,4 +454,4 @@ void GridDisplay::DrawText(Draw &w, int mx, int x, int y, int cx, int cy, int al } } -END_UPP_NAMESPACE +} diff --git a/uppsrc/GridCtrl/GridSort.cpp b/uppsrc/GridCtrl/GridSort.cpp index 2232f5664..37b1b7caf 100644 --- a/uppsrc/GridCtrl/GridSort.cpp +++ b/uppsrc/GridCtrl/GridSort.cpp @@ -1,6 +1,6 @@ #include "GridCtrl.h" -NAMESPACE_UPP +namespace Upp { /* bool GridCtrl::operator<(const Vector& a, const Vector& b) @@ -234,4 +234,4 @@ Vector GridCtrl::GetSortOrder() const return v; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/GridCtrl/GridUtils.cpp b/uppsrc/GridCtrl/GridUtils.cpp index 8176e0111..f0ec8124b 100644 --- a/uppsrc/GridCtrl/GridUtils.cpp +++ b/uppsrc/GridCtrl/GridUtils.cpp @@ -1,6 +1,6 @@ #include -NAMESPACE_UPP +namespace Upp { LineEdit *dlog = NULL; int dlev = 0; @@ -65,4 +65,4 @@ void LogGui(int level, const char *fmt, ...) dlog->SetCursor(pos); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/HexView/HexView.cpp b/uppsrc/HexView/HexView.cpp index eedb323d1..4a0f15f57 100644 --- a/uppsrc/HexView/HexView.cpp +++ b/uppsrc/HexView/HexView.cpp @@ -1,6 +1,6 @@ #include "HexView.h" -NAMESPACE_UPP +namespace Upp { inline int FormatHexDigit(int c) { return c < 10 ? c + '0' : c - 10 + 'a'; @@ -491,4 +491,4 @@ HexView::HexView() WhenGoto = THISBACK(StdGoto); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/HexView/HexView.h b/uppsrc/HexView/HexView.h index b5e62af8b..e4641cac0 100644 --- a/uppsrc/HexView/HexView.h +++ b/uppsrc/HexView/HexView.h @@ -3,7 +3,7 @@ #include -NAMESPACE_UPP +namespace Upp { #define LAYOUTFILE #include @@ -95,6 +95,6 @@ public: HexView(); }; -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/IconDes/AlphaCtrl.cpp b/uppsrc/IconDes/AlphaCtrl.cpp index b0a58da7c..c000270d7 100644 --- a/uppsrc/IconDes/AlphaCtrl.cpp +++ b/uppsrc/IconDes/AlphaCtrl.cpp @@ -1,6 +1,6 @@ #include "IconDes.h" -NAMESPACE_UPP +namespace Upp { void AlphaCtrl::Layout() { @@ -122,4 +122,4 @@ AlphaCtrl::AlphaCtrl() maskvalue = 255; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/IconDes/Bar.cpp b/uppsrc/IconDes/Bar.cpp index d9c7afb3a..2c9cd82d1 100644 --- a/uppsrc/IconDes/Bar.cpp +++ b/uppsrc/IconDes/Bar.cpp @@ -1,6 +1,6 @@ #include "IconDes.h" -NAMESPACE_UPP +namespace Upp { #define KEYNAMESPACE IconDesKeys #define KEYGROUPNAME "Icon designer" @@ -318,4 +318,4 @@ IconDes::IconDes() single_mode = false; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/IconDes/EditPos.cpp b/uppsrc/IconDes/EditPos.cpp index 2a02273b3..738e27677 100644 --- a/uppsrc/IconDes/EditPos.cpp +++ b/uppsrc/IconDes/EditPos.cpp @@ -1,6 +1,6 @@ #include "IconDes.h" -NAMESPACE_UPP +namespace Upp { bool IsSelection(const Image& m) { const RGBA *s = m; @@ -59,4 +59,4 @@ void IconDes::SetEditPos(const EditPos& e) SyncImage(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/IconDes/Event.cpp b/uppsrc/IconDes/Event.cpp index 69d6ce943..d5e01672c 100644 --- a/uppsrc/IconDes/Event.cpp +++ b/uppsrc/IconDes/Event.cpp @@ -1,6 +1,6 @@ #include "IconDes.h" -NAMESPACE_UPP +namespace Upp { void IconDes::LeftDown(Point p, dword flags) { @@ -109,4 +109,4 @@ Image IconDes::CursorImage(Point p, dword flags) return flags & K_SHIFT ? fill_cursor : cursor_image; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/IconDes/Fast.cpp b/uppsrc/IconDes/Fast.cpp index 9395b59de..9c20398c0 100644 --- a/uppsrc/IconDes/Fast.cpp +++ b/uppsrc/IconDes/Fast.cpp @@ -1,6 +1,6 @@ #include "IconDes.h" -NAMESPACE_UPP +namespace Upp { void IconDes::MaskSelection() { @@ -98,4 +98,4 @@ void IconDes::Set(Point p, RGBA rgba, dword flags) } } -END_UPP_NAMESPACE +} diff --git a/uppsrc/IconDes/IconDes.cpp b/uppsrc/IconDes/IconDes.cpp index 8b4d59262..87b9e88e7 100644 --- a/uppsrc/IconDes/IconDes.cpp +++ b/uppsrc/IconDes/IconDes.cpp @@ -1,6 +1,6 @@ #include "IconDes.h" -NAMESPACE_UPP +namespace Upp { IconDes::Slot::Slot() { @@ -599,4 +599,4 @@ void IconDes::SingleMode() resize <<= THISBACK(EditImage); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/IconDes/IconDes.h b/uppsrc/IconDes/IconDes.h index 43cfd6b46..0b29627cb 100644 --- a/uppsrc/IconDes/IconDes.h +++ b/uppsrc/IconDes/IconDes.h @@ -6,7 +6,7 @@ #include -NAMESPACE_UPP +namespace Upp { #define IMAGECLASS IconDesImg #define IMAGEFILE @@ -394,6 +394,6 @@ struct ImlImage { bool LoadIml(const String& data, Array& img, int& format); String SaveIml(const Array& iml, int format); -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/IconDes/IconDraw.cpp b/uppsrc/IconDes/IconDraw.cpp index 22d4337da..19f1e6b5f 100644 --- a/uppsrc/IconDes/IconDraw.cpp +++ b/uppsrc/IconDes/IconDraw.cpp @@ -1,6 +1,6 @@ #include "IconDes.h" -NAMESPACE_UPP +namespace Upp { void IconDraw::PutHorz(int x, int y, int cx) { @@ -61,4 +61,4 @@ void IconDraw::DrawEllipseOp(const Rect& r, Color color, int pen, Color pencolor } } -END_UPP_NAMESPACE +} diff --git a/uppsrc/IconDes/Image.cpp b/uppsrc/IconDes/Image.cpp index e814a65df..647331d1b 100644 --- a/uppsrc/IconDes/Image.cpp +++ b/uppsrc/IconDes/Image.cpp @@ -1,6 +1,6 @@ #include "IconDes.h" -NAMESPACE_UPP +namespace Upp { void IconDes::Interpolate() { @@ -486,4 +486,4 @@ void IconDes::Colors() } } -END_UPP_NAMESPACE +} diff --git a/uppsrc/IconDes/ImageOp.cpp b/uppsrc/IconDes/ImageOp.cpp index 9076d7800..f0d28f838 100644 --- a/uppsrc/IconDes/ImageOp.cpp +++ b/uppsrc/IconDes/ImageOp.cpp @@ -1,6 +1,6 @@ #include "IconDes.h" -NAMESPACE_UPP +namespace Upp { struct sFloodFill { Rect rc; @@ -202,4 +202,4 @@ Image DownSample3x(const Image& src) return ib; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/IconDes/ImlFile.cpp b/uppsrc/IconDes/ImlFile.cpp index 9b69cf966..672c15882 100644 --- a/uppsrc/IconDes/ImlFile.cpp +++ b/uppsrc/IconDes/ImlFile.cpp @@ -1,6 +1,6 @@ #include "IconDes.h" -NAMESPACE_UPP +namespace Upp { class AlphaImageInfo { @@ -370,4 +370,4 @@ String SaveIml(const Array& iml, int format) { return out.GetResult(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/IconDes/List.cpp b/uppsrc/IconDes/List.cpp index db25cde0b..45655116b 100644 --- a/uppsrc/IconDes/List.cpp +++ b/uppsrc/IconDes/List.cpp @@ -1,6 +1,6 @@ #include "IconDes.h" -NAMESPACE_UPP +namespace Upp { static String sFormatImageName(const String& name, const Image& img, bool exp) { @@ -502,4 +502,4 @@ void IconDes::Drag() ilist.DoDragAndDrop(InternalClip(ilist, "icondes-icon"), ilist.GetDragSample(), DND_MOVE); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/IconDes/Paint.cpp b/uppsrc/IconDes/Paint.cpp index 4b8501347..64c07bddd 100644 --- a/uppsrc/IconDes/Paint.cpp +++ b/uppsrc/IconDes/Paint.cpp @@ -1,6 +1,6 @@ #include "IconDes.h" -NAMESPACE_UPP +namespace Upp { #define IMAGECLASS IconDesImg #define IMAGEFILE @@ -172,4 +172,4 @@ void IconDes::Paint(Draw& w) Color(200, 200, 255), 3); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/IconDes/RGBACtrl.cpp b/uppsrc/IconDes/RGBACtrl.cpp index 720b62ff5..7fe1ebe49 100644 --- a/uppsrc/IconDes/RGBACtrl.cpp +++ b/uppsrc/IconDes/RGBACtrl.cpp @@ -1,6 +1,6 @@ #include "IconDes.h" -NAMESPACE_UPP +namespace Upp { Color s_stdcolor[] = { Black, @@ -198,4 +198,4 @@ RGBACtrl::RGBACtrl() SyncText(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/IconDes/Smoothen.cpp b/uppsrc/IconDes/Smoothen.cpp index 5a4b8a206..ccd084813 100644 --- a/uppsrc/IconDes/Smoothen.cpp +++ b/uppsrc/IconDes/Smoothen.cpp @@ -1,6 +1,6 @@ #include "IconDes.h" -NAMESPACE_UPP +namespace Upp { RGBA GetPixel(const Image& img, int x, int y) { @@ -91,4 +91,4 @@ void IconDes::Smoothen() } } -END_UPP_NAMESPACE +} diff --git a/uppsrc/IconDes/Text.cpp b/uppsrc/IconDes/Text.cpp index 78cb2f4cb..ba6385172 100644 --- a/uppsrc/IconDes/Text.cpp +++ b/uppsrc/IconDes/Text.cpp @@ -1,6 +1,6 @@ #include "IconDes.h" -NAMESPACE_UPP +namespace Upp { IconDes::TextDlg::TextDlg() { @@ -80,4 +80,4 @@ void IconDes::Text() SetBar(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/MySql/MySql.cpp b/uppsrc/MySql/MySql.cpp index 53859145f..cd3144a64 100644 --- a/uppsrc/MySql/MySql.cpp +++ b/uppsrc/MySql/MySql.cpp @@ -4,7 +4,7 @@ #define LLOG(x) // DLOG(x) -NAMESPACE_UPP +namespace Upp { class MySqlConnection : public SqlConnection { protected: @@ -541,6 +541,6 @@ bool MySqlUpdateSchema(const SqlSchema& sch, int i, StatementExecutor& se) { return true; } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/MySql/MySql.h b/uppsrc/MySql/MySql.h index 73b436795..96db06c0d 100644 --- a/uppsrc/MySql/MySql.h +++ b/uppsrc/MySql/MySql.h @@ -16,7 +16,7 @@ #include #endif -NAMESPACE_UPP +namespace Upp { const char *MySqlReadString(const char *s, String& stmt); @@ -83,7 +83,7 @@ public: ~MySqlSession() { Close(); } }; -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/ODBC/ODBC.cpp b/uppsrc/ODBC/ODBC.cpp index 03ca03bb9..cad128dda 100644 --- a/uppsrc/ODBC/ODBC.cpp +++ b/uppsrc/ODBC/ODBC.cpp @@ -1,6 +1,6 @@ #include "ODBC.h" -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // DLOG(x) @@ -745,4 +745,4 @@ Value ODBCConnection::GetInsertedId() const : sql.Select("@@IDENTITY"); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/ODBC/ODBC.h b/uppsrc/ODBC/ODBC.h index 02b1195d6..306e446da 100644 --- a/uppsrc/ODBC/ODBC.h +++ b/uppsrc/ODBC/ODBC.h @@ -5,7 +5,7 @@ #include #include -NAMESPACE_UPP +namespace Upp { bool ODBCPerformScript(const String& text, StatementExecutor& executor, Gate2 progress_canceled = false); @@ -64,6 +64,6 @@ public: ~ODBCSession(); }; -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/Ole/Ctrl/OleCtrl.h b/uppsrc/Ole/Ctrl/OleCtrl.h index caba81aae..67632c73f 100644 --- a/uppsrc/Ole/Ctrl/OleCtrl.h +++ b/uppsrc/Ole/Ctrl/OleCtrl.h @@ -4,7 +4,7 @@ #include #include -NAMESPACE_UPP +namespace Upp { #define OCXLOG RLOG // redefine to RLOG if you want logs in retail versions @@ -824,6 +824,6 @@ private: VectorMap point_map; }; -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/Ole/Ctrl/control.cpp b/uppsrc/Ole/Ctrl/control.cpp index 2dc374514..acb88649c 100644 --- a/uppsrc/Ole/Ctrl/control.cpp +++ b/uppsrc/Ole/Ctrl/control.cpp @@ -2,7 +2,7 @@ #ifdef PLATFORM_WIN32 -NAMESPACE_UPP +namespace Upp { LPOLESTR AllocString(String s) { @@ -1204,6 +1204,6 @@ HRESULT OcxConnectionPointContainer::FindConnectionPoint(REFIID riid, IConnectio return LOGRESULT(S_OK); } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/Ole/Ctrl/util.cpp b/uppsrc/Ole/Ctrl/util.cpp index 126ddcb2f..c7acc1710 100644 --- a/uppsrc/Ole/Ctrl/util.cpp +++ b/uppsrc/Ole/Ctrl/util.cpp @@ -2,7 +2,7 @@ #ifdef PLATFORM_WIN32 -NAMESPACE_UPP +namespace Upp { enum { HIMETRIC_INCH = 2540 }; // HIMETRIC units per inch @@ -734,6 +734,6 @@ void ExeRunServer() } #endif -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/Ole/util.cpp b/uppsrc/Ole/util.cpp index 1973474c7..ccb4f6784 100644 --- a/uppsrc/Ole/util.cpp +++ b/uppsrc/Ole/util.cpp @@ -2,7 +2,7 @@ #if defined(PLATFORM_WIN32) && defined(COMPILER_MSC) -NAMESPACE_UPP +namespace Upp { ////////////////////////////////////////////////////////////////////// // GUID @@ -450,6 +450,6 @@ void OleStream::RawSeek(int64 pos) ////////////////////////////////////////////////////////////////////// -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/Ole/util.h b/uppsrc/Ole/util.h index 67de0d94c..60bdae7e8 100644 --- a/uppsrc/Ole/util.h +++ b/uppsrc/Ole/util.h @@ -1,6 +1,6 @@ #if defined(PLATFORM_WIN32) && defined(COMPILER_MSC) -NAMESPACE_UPP +namespace Upp { #ifdef COMPILER_MSC typedef __int64 longlong_t; @@ -322,6 +322,6 @@ protected: int64 current_offset; }; -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/OleDB/OleDB.cpp b/uppsrc/OleDB/OleDB.cpp index b19153aa8..e8d6dad60 100644 --- a/uppsrc/OleDB/OleDB.cpp +++ b/uppsrc/OleDB/OleDB.cpp @@ -4,7 +4,7 @@ #if defined(PLATFORM_WIN32) && defined(COMPILER_MSC) -NAMESPACE_UPP +namespace Upp { // #define BYREF // This was not success, maybe later? @@ -1554,6 +1554,6 @@ String MSSQLTextType(int width) return "text"; } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/OleDB/OleDB.h b/uppsrc/OleDB/OleDB.h index 4221ff086..197110bb7 100644 --- a/uppsrc/OleDB/OleDB.h +++ b/uppsrc/OleDB/OleDB.h @@ -20,7 +20,7 @@ #undef byte #undef CY -NAMESPACE_UPP +namespace Upp { bool OleDBPerformScript(const String& text, StatementExecutor& executor, Gate2 progress_canceled = false); String MSSQLTextType(int width); @@ -78,7 +78,7 @@ protected: int level; }; -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/Oracle/Oci7.cpp b/uppsrc/Oracle/Oci7.cpp index 9fd89dc47..3cd72230d 100644 --- a/uppsrc/Oracle/Oci7.cpp +++ b/uppsrc/Oracle/Oci7.cpp @@ -13,7 +13,7 @@ typedef byte text; }; */ -NAMESPACE_UPP +namespace Upp { #ifdef PLATFORM_WIN32 #define DLLFILENAME "ociw32.dll" @@ -983,4 +983,4 @@ Vector Oracle7::EnumReservedWords() return OracleSchemaReservedWords(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Oracle/Oci8.cpp b/uppsrc/Oracle/Oci8.cpp index 84565ce85..d19f310d3 100644 --- a/uppsrc/Oracle/Oci8.cpp +++ b/uppsrc/Oracle/Oci8.cpp @@ -1,7 +1,7 @@ #include "Oracle8.h" #include "OciCommon.h" -NAMESPACE_UPP +namespace Upp { #define LLOG(x) RLOG(x) @@ -1757,4 +1757,4 @@ OracleClob::~OracleClob() { Close(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Oracle/OciCommon.h b/uppsrc/Oracle/OciCommon.h index d20ba28b8..0433222b2 100644 --- a/uppsrc/Oracle/OciCommon.h +++ b/uppsrc/Oracle/OciCommon.h @@ -2,7 +2,7 @@ #define __Oracle_OciCommon__ // excerpt from OCI headers (OCI7 & OCI8) -NAMESPACE_UPP +namespace Upp { struct OCIEnv; struct OCIServer; struct OCISession; @@ -11,7 +11,7 @@ struct OCIBind; struct OCIDefine; struct OCISnapshot; struct OCIParam; -END_UPP_NAMESPACE +} #define oci_boolean int typedef void dvoid; diff --git a/uppsrc/Oracle/OraCommon.cpp b/uppsrc/Oracle/OraCommon.cpp index 21ebcb4c7..3347956fb 100644 --- a/uppsrc/Oracle/OraCommon.cpp +++ b/uppsrc/Oracle/OraCommon.cpp @@ -2,7 +2,7 @@ #include "OciCommon.h" #include "OraCommon.h" -NAMESPACE_UPP +namespace Upp { Date OciDecodeDate(const byte data[7]) { Date d; @@ -539,4 +539,4 @@ Sql::ERRORCLASS OciErrorClass(int errcode) : Sql::ERROR_UNSPECIFIED; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Oracle/OraCommon.h b/uppsrc/Oracle/OraCommon.h index d1b2f1224..fe22190bc 100644 --- a/uppsrc/Oracle/OraCommon.h +++ b/uppsrc/Oracle/OraCommon.h @@ -4,7 +4,7 @@ class OciSqlConnection; -NAMESPACE_UPP +namespace Upp { Date OciDecodeDate(const byte data[7]); bool OciEncodeDate(byte data[7], Date d); @@ -82,6 +82,6 @@ protected: virtual void SetParam(int i, OracleRef ref) = 0; }; -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/Oracle/Oracle7.h b/uppsrc/Oracle/Oracle7.h index 03f15e384..c43ee33d2 100644 --- a/uppsrc/Oracle/Oracle7.h +++ b/uppsrc/Oracle/Oracle7.h @@ -5,7 +5,7 @@ #include "OraCommon.h" #include "OciCommon.h" -NAMESPACE_UPP +namespace Upp { #define DLLFILENAME "ociw32.dll" #define DLIMODULE OCI7 @@ -79,6 +79,6 @@ public: typedef Oracle7 OracleSession; -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/Oracle/Oracle8.h b/uppsrc/Oracle/Oracle8.h index 30f01b6d2..1481048f0 100644 --- a/uppsrc/Oracle/Oracle8.h +++ b/uppsrc/Oracle/Oracle8.h @@ -5,7 +5,7 @@ #include "OraCommon.h" #include "OciCommon.h" -NAMESPACE_UPP +namespace Upp { #if defined(PLATFORM_WIN32) && defined(COMPILER_MSC) #define __STDC__ 1 @@ -174,6 +174,6 @@ public: #undef text #endif -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/Oracle/Oracle_init.icpp b/uppsrc/Oracle/Oracle_init.icpp index a10bce2ea..187d2e562 100644 --- a/uppsrc/Oracle/Oracle_init.icpp +++ b/uppsrc/Oracle/Oracle_init.icpp @@ -1,8 +1,8 @@ #include -NAMESPACE_UPP +namespace Upp { #define TFILE #include -END_UPP_NAMESPACE +} diff --git a/uppsrc/Painter/Approximate.cpp b/uppsrc/Painter/Approximate.cpp index e8548a249..8b6fa5c67 100644 --- a/uppsrc/Painter/Approximate.cpp +++ b/uppsrc/Painter/Approximate.cpp @@ -1,6 +1,6 @@ #include "Painter.h" -NAMESPACE_UPP +namespace Upp { static void sQuadratic(LinearPathConsumer& t, const Pointf& p1, const Pointf& p2, const Pointf& p3, double qt, int lvl) @@ -70,4 +70,4 @@ void ApproximateCubic(LinearPathConsumer& t, t.Line(p4); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Painter/Context.cpp b/uppsrc/Painter/Context.cpp index 2b8ef2a31..8ce6cd718 100644 --- a/uppsrc/Painter/Context.cpp +++ b/uppsrc/Painter/Context.cpp @@ -1,6 +1,6 @@ #include "Painter.h" -NAMESPACE_UPP +namespace Upp { void BufferPainter::BeginOp() { @@ -140,4 +140,4 @@ BufferPainter::BufferPainter(ImageBuffer& ib, int mode) dopreclip = false; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Painter/Dasher.cpp b/uppsrc/Painter/Dasher.cpp index dc7dcde9c..600f6e455 100644 --- a/uppsrc/Painter/Dasher.cpp +++ b/uppsrc/Painter/Dasher.cpp @@ -1,6 +1,6 @@ #include "Painter.h" -NAMESPACE_UPP +namespace Upp { void Dasher::Put(const Pointf& p) { @@ -59,4 +59,4 @@ void Dasher::Init(const Vector& p, double distance) p0 = Pointf(0, 0); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Painter/DrawOp.cpp b/uppsrc/Painter/DrawOp.cpp index 6c68fe7bf..fb1e84922 100644 --- a/uppsrc/Painter/DrawOp.cpp +++ b/uppsrc/Painter/DrawOp.cpp @@ -1,6 +1,6 @@ #include "Painter.h" -NAMESPACE_UPP +namespace Upp { dword Painter::GetInfo() const { @@ -246,4 +246,4 @@ void Painter::DrawPaintingOp(const Rect& target, const Painting& p) End(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Painter/Fillers.cpp b/uppsrc/Painter/Fillers.cpp index a0aced0e5..19c893b23 100644 --- a/uppsrc/Painter/Fillers.cpp +++ b/uppsrc/Painter/Fillers.cpp @@ -1,7 +1,7 @@ #include "Painter.h" #include "Fillers.h" -NAMESPACE_UPP +namespace Upp { void FillRGBA(RGBA *t, RGBA c, int len) { @@ -507,4 +507,4 @@ void NoAAFillerFilter::Render(int val) t->Render(val < 128 ? 0 : 256); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Painter/Fillers.h b/uppsrc/Painter/Fillers.h index e5fa6873f..c98346fd6 100644 --- a/uppsrc/Painter/Fillers.h +++ b/uppsrc/Painter/Fillers.h @@ -1,7 +1,7 @@ #ifndef S_PAINTER_FILLERS_H #define S_PAINTER_FILLERS_H -NAMESPACE_UPP +namespace Upp { struct SolidFiller : Rasterizer::Filler { RGBA *t; @@ -95,6 +95,6 @@ struct NoAAFillerFilter : Rasterizer::Filler { void Set(Rasterizer::Filler *f) { t = f; } }; -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/Painter/FontX11.cpp b/uppsrc/Painter/FontX11.cpp index 24db30bf0..07929024d 100644 --- a/uppsrc/Painter/FontX11.cpp +++ b/uppsrc/Painter/FontX11.cpp @@ -21,7 +21,7 @@ #include #include -NAMESPACE_UPP +namespace Upp { FT_Face FTFace(Font fnt, String *rpath); @@ -150,6 +150,6 @@ void PaintCharacterSys(Painter& sw, double x, double y, int ch, Font fnt) sw.EvenOdd(true); } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/Painter/Gradient.cpp b/uppsrc/Painter/Gradient.cpp index abd53d199..1bc6a24d5 100644 --- a/uppsrc/Painter/Gradient.cpp +++ b/uppsrc/Painter/Gradient.cpp @@ -1,6 +1,6 @@ #include "Painter.h" -NAMESPACE_UPP +namespace Upp { void BufferPainter::MakeGradient(RGBA color1, RGBA color2, int n) { @@ -75,4 +75,4 @@ void BufferPainter::StrokeOp(double width, const RGBA& color1, const RGBA& color Stroke(width, gradient, Xform2D::Scale(1.0 / 500) * transsrc, sLinearStyle(style)); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Painter/Image.cpp b/uppsrc/Painter/Image.cpp index 9a0ad58e0..bd6545967 100644 --- a/uppsrc/Painter/Image.cpp +++ b/uppsrc/Painter/Image.cpp @@ -1,6 +1,6 @@ #include "Painter.h" -NAMESPACE_UPP +namespace Upp { struct RGBAV { dword r, g, b, a; @@ -208,4 +208,4 @@ void BufferPainter::StrokeOp(double width, const Image& image, const Xform2D& tr RenderImage(width, image, transsrc, flags); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Painter/Interpolator.cpp b/uppsrc/Painter/Interpolator.cpp index 1c7afdf64..4495fdd88 100644 --- a/uppsrc/Painter/Interpolator.cpp +++ b/uppsrc/Painter/Interpolator.cpp @@ -1,6 +1,6 @@ #include "Painter.h" -NAMESPACE_UPP +namespace Upp { void LinearInterpolator::Dda2::Set(int p1, int p2, int len) { @@ -42,4 +42,4 @@ Point LinearInterpolator::Get() return Point(ddax.Get(), dday.Get()); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Painter/Mask.cpp b/uppsrc/Painter/Mask.cpp index 1b4c29463..e754a90c3 100644 --- a/uppsrc/Painter/Mask.cpp +++ b/uppsrc/Painter/Mask.cpp @@ -1,6 +1,6 @@ #include "Painter.h" -NAMESPACE_UPP +namespace Upp { void BufferPainter::BeginMaskOp() { @@ -82,4 +82,4 @@ void BufferPainter::FinishMask() attr.mask = false; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Painter/OnPath.cpp b/uppsrc/Painter/OnPath.cpp index ed52129c5..d2f8955a2 100644 --- a/uppsrc/Painter/OnPath.cpp +++ b/uppsrc/Painter/OnPath.cpp @@ -1,6 +1,6 @@ #include "Painter.h" -NAMESPACE_UPP +namespace Upp { void BufferPainter::BeginOnPathOp(double q, bool abs) { @@ -30,4 +30,4 @@ void BufferPainter::BeginOnPathOp(double q, bool abs) pathlen = 0; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Painter/PaintPainting.icpp b/uppsrc/Painter/PaintPainting.icpp index c4cbd218d..fcb550396 100644 --- a/uppsrc/Painter/PaintPainting.icpp +++ b/uppsrc/Painter/PaintPainting.icpp @@ -1,6 +1,6 @@ #include "Painter.h" -NAMESPACE_UPP +namespace Upp { template void sGet(T& r, StringStream& ss) @@ -326,4 +326,4 @@ INITBLOCK ImageAnyDrawPainter(sCP, sEP); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Painter/Painter.cpp b/uppsrc/Painter/Painter.cpp index 9d1b0c890..cbbdbb1ec 100644 --- a/uppsrc/Painter/Painter.cpp +++ b/uppsrc/Painter/Painter.cpp @@ -1,6 +1,6 @@ #include "Painter.h" -NAMESPACE_UPP +namespace Upp { struct PaintCharPath : FontGlyphConsumer { Painter *sw; @@ -629,4 +629,4 @@ DrawPainter::~DrawPainter() w.DrawImage(0, 0, *this); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Painter/Painter.h b/uppsrc/Painter/Painter.h index b84ace681..c5b912da1 100644 --- a/uppsrc/Painter/Painter.h +++ b/uppsrc/Painter/Painter.h @@ -5,7 +5,7 @@ #define PAINTER_TIMING(x) // RTIMING(x) -NAMESPACE_UPP +namespace Upp { struct Xform2D { Pointf x, y, t; @@ -443,6 +443,6 @@ Rectf GetSVGBoundingBox(const char *svg); Image RenderSVGImage(Size sz, const char *svg, Callback2 resloader); Image RenderSVGImage(Size sz, const char *svg); -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/Painter/PainterPath.cpp b/uppsrc/Painter/PainterPath.cpp index 6760cca9e..e50257cf9 100644 --- a/uppsrc/Painter/PainterPath.cpp +++ b/uppsrc/Painter/PainterPath.cpp @@ -1,6 +1,6 @@ #include "Painter.h" -NAMESPACE_UPP +namespace Upp { bool Painter::ReadBool(CParser& p) { @@ -114,4 +114,4 @@ Painter& Painter::Path(const char *path) return *this; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Painter/Painting.cpp b/uppsrc/Painter/Painting.cpp index 5baeb1f0e..3c2710bab 100644 --- a/uppsrc/Painter/Painting.cpp +++ b/uppsrc/Painter/Painting.cpp @@ -1,6 +1,6 @@ #include "Painter.h" -NAMESPACE_UPP +namespace Upp { void PaintingPainter::ClearOp(const RGBA& color) { @@ -333,4 +333,4 @@ void PaintingPainter::Create(Sizef sz) Create(sz.cx, sz.cy); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Painter/Path.cpp b/uppsrc/Painter/Path.cpp index 269203efb..993edbaf3 100644 --- a/uppsrc/Painter/Path.cpp +++ b/uppsrc/Painter/Path.cpp @@ -2,7 +2,7 @@ #define LLOG(x) // DLOG(x) -NAMESPACE_UPP +namespace Upp { void BufferPainter::ClearPath() { @@ -142,4 +142,4 @@ void BufferPainter::CharacterOp(const Pointf& p, int ch, Font fnt) #endif } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Painter/RadialGradient.cpp b/uppsrc/Painter/RadialGradient.cpp index 798e8fd2a..bd07ed3a3 100644 --- a/uppsrc/Painter/RadialGradient.cpp +++ b/uppsrc/Painter/RadialGradient.cpp @@ -1,6 +1,6 @@ #include "Painter.h" -NAMESPACE_UPP +namespace Upp { struct PainterRadialSpan : SpanSource { LinearInterpolator interpolator; @@ -93,4 +93,4 @@ void BufferPainter::StrokeOp(double width, const Pointf& f, const RGBA& color1, RenderRadial(width, f, color1, color2, transsrc, style); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Painter/Rasterizer.cpp b/uppsrc/Painter/Rasterizer.cpp index 0c47c66fd..86edd3a2d 100644 --- a/uppsrc/Painter/Rasterizer.cpp +++ b/uppsrc/Painter/Rasterizer.cpp @@ -25,7 +25,7 @@ #define LLOG(x) // DLOG(x) -NAMESPACE_UPP +namespace Upp { void Rasterizer::Init() { @@ -351,4 +351,4 @@ void Rasterizer::Render(int y, Rasterizer::Filler& g, bool evenodd) g.End(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Painter/RasterizerClip.cpp b/uppsrc/Painter/RasterizerClip.cpp index ff0878442..3739371f7 100644 --- a/uppsrc/Painter/RasterizerClip.cpp +++ b/uppsrc/Painter/RasterizerClip.cpp @@ -2,7 +2,7 @@ #define LLOG(x) // DLOG(x) -NAMESPACE_UPP +namespace Upp { void Rasterizer::CvLine(double x1, double y1, double x2, double y2) { @@ -100,4 +100,4 @@ void Rasterizer::Line(const Pointf& p) p0 = p; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Painter/Render.cpp b/uppsrc/Painter/Render.cpp index 7e457d0bf..b9f7e946f 100644 --- a/uppsrc/Painter/Render.cpp +++ b/uppsrc/Painter/Render.cpp @@ -1,7 +1,7 @@ #include "Painter.h" #include "Fillers.h" -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // DLOG(x) @@ -263,4 +263,4 @@ void BufferPainter::ClipOp() } } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Painter/RenderChar.cpp b/uppsrc/Painter/RenderChar.cpp index 3bbf5c071..f21b24516 100644 --- a/uppsrc/Painter/RenderChar.cpp +++ b/uppsrc/Painter/RenderChar.cpp @@ -1,6 +1,6 @@ #include "Painter.h" -NAMESPACE_UPP +namespace Upp { struct GlyphPainter : NilPainter, LinearPathConsumer { Vector glyph; @@ -127,4 +127,4 @@ void BufferPainter::ApproximateChar(LinearPathConsumer& t, const CharData& ch, d } } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Painter/Stroker.cpp b/uppsrc/Painter/Stroker.cpp index 550330ea3..3c9fe9c20 100644 --- a/uppsrc/Painter/Stroker.cpp +++ b/uppsrc/Painter/Stroker.cpp @@ -2,7 +2,7 @@ #define LLOG(x) // DLOG(x) -NAMESPACE_UPP +namespace Upp { void Stroker::Init(double width, double miterlimit, double tolerance, int _linecap, int _linejoin, const Rect& preclip_) { @@ -181,4 +181,4 @@ void Stroker::End() PutEnd(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Painter/SvgArc.cpp b/uppsrc/Painter/SvgArc.cpp index 970d0ffd9..25950145e 100644 --- a/uppsrc/Painter/SvgArc.cpp +++ b/uppsrc/Painter/SvgArc.cpp @@ -1,6 +1,6 @@ #include "Painter.h" -NAMESPACE_UPP +namespace Upp { void Painter::DoArc0(double theta, double th_sweep, const Xform2D& m) { @@ -64,4 +64,4 @@ void Painter::DoSvgArc(const Pointf& rr, double xangle, int large, int sweep, DoArc0(theta, th_sweep, m); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Painter/SvgBounds.cpp b/uppsrc/Painter/SvgBounds.cpp index 2aea46700..3ea25456f 100644 --- a/uppsrc/Painter/SvgBounds.cpp +++ b/uppsrc/Painter/SvgBounds.cpp @@ -1,6 +1,6 @@ #include "Painter.h" -NAMESPACE_UPP +namespace Upp { #include "SvgInternal.h" @@ -202,4 +202,4 @@ void BoundsPainter::EndOp() sw.End(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Painter/SvgParser.cpp b/uppsrc/Painter/SvgParser.cpp index 58e33a484..a5ba45b71 100644 --- a/uppsrc/Painter/SvgParser.cpp +++ b/uppsrc/Painter/SvgParser.cpp @@ -2,7 +2,7 @@ #define LLOG(x) -NAMESPACE_UPP +namespace Upp { #include "SvgInternal.h" @@ -511,4 +511,4 @@ Image RenderSVGImage(Size sz, const char *svg) return RenderSVGImage(sz, svg, Callback2()); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Painter/SvgStyle.cpp b/uppsrc/Painter/SvgStyle.cpp index 14109e1f3..f23471315 100644 --- a/uppsrc/Painter/SvgStyle.cpp +++ b/uppsrc/Painter/SvgStyle.cpp @@ -2,7 +2,7 @@ #define LLOG(x) -NAMESPACE_UPP +namespace Upp { #include "SvgInternal.h" @@ -192,4 +192,4 @@ Xform2D SvgParser::Transform(const char *transform) return mx; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Painter/SvgUtil.cpp b/uppsrc/Painter/SvgUtil.cpp index 4887232a2..7fc243ac6 100644 --- a/uppsrc/Painter/SvgUtil.cpp +++ b/uppsrc/Painter/SvgUtil.cpp @@ -1,6 +1,6 @@ #include "Painter.h" -NAMESPACE_UPP +namespace Upp { #include "SvgInternal.h" @@ -224,4 +224,4 @@ Array GetTransformArgs(String str, const char *command) { return args; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Painter/Transformer.cpp b/uppsrc/Painter/Transformer.cpp index f8fbd8fac..0f0f6b9af 100644 --- a/uppsrc/Painter/Transformer.cpp +++ b/uppsrc/Painter/Transformer.cpp @@ -1,6 +1,6 @@ #include "Painter.h" -NAMESPACE_UPP +namespace Upp { void LinearPathConsumer::End() { @@ -21,4 +21,4 @@ void Transformer::Line(const Pointf& p) PutLine(xform.Transform(p)); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Painter/Xform2D.cpp b/uppsrc/Painter/Xform2D.cpp index f28d6e784..cc42d76c7 100644 --- a/uppsrc/Painter/Xform2D.cpp +++ b/uppsrc/Painter/Xform2D.cpp @@ -1,6 +1,6 @@ #include "Painter.h" -NAMESPACE_UPP +namespace Upp { Pointf Xform2D::Transform(const Pointf& f) const { @@ -111,4 +111,4 @@ Xform2D Inverse(const Xform2D& m) return r; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/PdfDraw/PdfDraw.cpp b/uppsrc/PdfDraw/PdfDraw.cpp index 8dc3bd688..d12bf4ddf 100644 --- a/uppsrc/PdfDraw/PdfDraw.cpp +++ b/uppsrc/PdfDraw/PdfDraw.cpp @@ -1,6 +1,6 @@ #include "PdfDraw.h" -NAMESPACE_UPP +namespace Upp { #include "ICCColorSpace.i" @@ -1069,4 +1069,4 @@ String PdfDraw::Finish() return out; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/PdfDraw/PdfDraw.h b/uppsrc/PdfDraw/PdfDraw.h index e77e16aee..47c92562b 100644 --- a/uppsrc/PdfDraw/PdfDraw.h +++ b/uppsrc/PdfDraw/PdfDraw.h @@ -5,7 +5,7 @@ #include -NAMESPACE_UPP +namespace Upp { class TTFReader { struct TTFStream { @@ -357,6 +357,6 @@ public: String Pdf(const Array& report, Size pagesize, int margin, bool pdfa = false); -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/PdfDraw/PdfReport.icpp b/uppsrc/PdfDraw/PdfReport.icpp index 6cec31237..0ab332ae3 100644 --- a/uppsrc/PdfDraw/PdfReport.icpp +++ b/uppsrc/PdfDraw/PdfReport.icpp @@ -1,6 +1,6 @@ #include "PdfDraw.h" -NAMESPACE_UPP +namespace Upp { String Pdf(const Array& report, Size sz, int margin, bool pdfa) { @@ -18,4 +18,4 @@ INITBLOCK SetDrawingToPdfFn(Pdf); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/PdfDraw/TTFReader.cpp b/uppsrc/PdfDraw/TTFReader.cpp index 7c6a0a27d..95eac8bba 100644 --- a/uppsrc/PdfDraw/TTFReader.cpp +++ b/uppsrc/PdfDraw/TTFReader.cpp @@ -1,6 +1,6 @@ #include "PdfDraw.h" -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // LOG(x) #define LDUMP(x) // LLOG(#x << " = " << x); @@ -308,4 +308,4 @@ TTFReader::~TTFReader() Free(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/PdfDraw/TTFStream.cpp b/uppsrc/PdfDraw/TTFStream.cpp index 878587b83..f892ac5b4 100644 --- a/uppsrc/PdfDraw/TTFStream.cpp +++ b/uppsrc/PdfDraw/TTFStream.cpp @@ -1,6 +1,6 @@ #include "PdfDraw.h" -NAMESPACE_UPP +namespace Upp { TTFReader::TTFStream& TTFReader::TTFStream::operator%(byte& q) { Raw(&q, 1); @@ -107,4 +107,4 @@ void TTFReader::TTFStreamIn::Raw(void *ptr, int count) { s += count; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/PdfDraw/TTFStruct.cpp b/uppsrc/PdfDraw/TTFStruct.cpp index 309ddf5f7..9804ff175 100644 --- a/uppsrc/PdfDraw/TTFStruct.cpp +++ b/uppsrc/PdfDraw/TTFStruct.cpp @@ -1,6 +1,6 @@ #include "PdfDraw.h" -NAMESPACE_UPP +namespace Upp { void TTFReader::Head::Serialize(TTFStream& s) { @@ -34,4 +34,4 @@ void TTFReader::Post::Serialize(TTFStream& s) % reserved % minMemType42 % maxMemType42 % minMemType1 % maxMemType1; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/PdfDraw/TTFSubset.cpp b/uppsrc/PdfDraw/TTFSubset.cpp index 6164db1eb..44265d62b 100644 --- a/uppsrc/PdfDraw/TTFSubset.cpp +++ b/uppsrc/PdfDraw/TTFSubset.cpp @@ -1,6 +1,6 @@ #include "PdfDraw.h" -NAMESPACE_UPP +namespace Upp { dword sCheckSum(const String& data) { @@ -204,4 +204,4 @@ String TTFReader::Subset(const Vector& chars, int first, bool os2) } } -END_UPP_NAMESPACE +} diff --git a/uppsrc/PostgreSQL/PostgreSQL.cpp b/uppsrc/PostgreSQL/PostgreSQL.cpp index 5425a6fc5..d3af7c8b4 100644 --- a/uppsrc/PostgreSQL/PostgreSQL.cpp +++ b/uppsrc/PostgreSQL/PostgreSQL.cpp @@ -12,7 +12,7 @@ #ifndef flagNOPOSTGRESQL -NAMESPACE_UPP +namespace Upp { enum PGSQL_StandardOid { PGSQL_BOOLOID = 16, @@ -725,6 +725,6 @@ Value PgSequence::Get() return sql[0]; } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/PostgreSQL/PostgreSQL.h b/uppsrc/PostgreSQL/PostgreSQL.h index 52383cae9..339bf6186 100644 --- a/uppsrc/PostgreSQL/PostgreSQL.h +++ b/uppsrc/PostgreSQL/PostgreSQL.h @@ -10,7 +10,7 @@ #include #endif -NAMESPACE_UPP +namespace Upp { // Postgre -> Value types // Bytea_v values are stored as bytea data, but recived as string type @@ -120,7 +120,7 @@ public: PgSequence() : seq(ssq) { session = NULL; } }; -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/Report/Report.cpp b/uppsrc/Report/Report.cpp index 1471cc192..114d0597d 100644 --- a/uppsrc/Report/Report.cpp +++ b/uppsrc/Report/Report.cpp @@ -1,6 +1,6 @@ #include "Report.h" -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // DLOG(x) @@ -198,4 +198,4 @@ bool Report::ChooseDefaultPrinter(const char *jobname) return true; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Report/Report.h b/uppsrc/Report/Report.h index e59b3811d..32f532f28 100644 --- a/uppsrc/Report/Report.h +++ b/uppsrc/Report/Report.h @@ -4,7 +4,7 @@ #include #include -NAMESPACE_UPP +namespace Upp { #define LAYOUTFILE #include @@ -159,6 +159,6 @@ bool Perform(Report& r, const char *name = t_("Report")); bool QtfReport(const String& qtf, const char *name = "", bool pagenumbers = false); bool QtfReport(Size pagesize, const String& qtf, const char *name = "", bool pagenumbers = false); -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/Report/ReportDlg.cpp b/uppsrc/Report/ReportDlg.cpp index ce4ba3efb..61bb0c201 100644 --- a/uppsrc/Report/ReportDlg.cpp +++ b/uppsrc/Report/ReportDlg.cpp @@ -1,6 +1,6 @@ #include "Report.h" -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // LOG(x) @@ -309,4 +309,4 @@ bool QtfReport(Size pagesize, const String& qtf, const char *name, bool pagenumb } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Report/ReportI.icpp b/uppsrc/Report/ReportI.icpp index deb6a3324..639cb2bb7 100644 --- a/uppsrc/Report/ReportI.icpp +++ b/uppsrc/Report/ReportI.icpp @@ -1,8 +1,8 @@ #include "Report.h" -NAMESPACE_UPP +namespace Upp { #define TFILE #include -END_UPP_NAMESPACE +} diff --git a/uppsrc/RichBook/RichBook.cpp b/uppsrc/RichBook/RichBook.cpp index 387af40a1..7879363b3 100644 --- a/uppsrc/RichBook/RichBook.cpp +++ b/uppsrc/RichBook/RichBook.cpp @@ -3,7 +3,7 @@ #include #include -NAMESPACE_UPP +namespace Upp { struct FieldTypeVarCls : public RichPara::FieldType { @@ -674,4 +674,4 @@ void HelpBookMenu(Bar& bar) bar.Add(t_("Save manual"), CtrlImg::save(), callback(&ManualMenu)); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/RichBook/RichBook.h b/uppsrc/RichBook/RichBook.h index c6ae31314..63630b6f7 100644 --- a/uppsrc/RichBook/RichBook.h +++ b/uppsrc/RichBook/RichBook.h @@ -3,7 +3,7 @@ #include -NAMESPACE_UPP +namespace Upp { RichPara::FieldType& FieldTypeVar(); Id FieldTypeVarID(); @@ -129,6 +129,6 @@ void CreateDefaultHTML(); void HelpBookMenu(Bar& bar); -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/RichBook/RichBook_init.icpp b/uppsrc/RichBook/RichBook_init.icpp index b674f63b5..96e3c053e 100644 --- a/uppsrc/RichBook/RichBook_init.icpp +++ b/uppsrc/RichBook/RichBook_init.icpp @@ -1,8 +1,8 @@ #include "RichBook.h" -NAMESPACE_UPP +namespace Upp { #define TFILE #include -END_UPP_NAMESPACE +} diff --git a/uppsrc/RichEdit/Clip.cpp b/uppsrc/RichEdit/Clip.cpp index 280f52bed..edbbd4624 100644 --- a/uppsrc/RichEdit/Clip.cpp +++ b/uppsrc/RichEdit/Clip.cpp @@ -1,6 +1,6 @@ #include "RichEdit.h" -NAMESPACE_UPP +namespace Upp { #define RTFS "Rich Text Format;text/rtf;application/rtf" @@ -288,4 +288,4 @@ void RichEdit::MiddleDown(Point p, dword flags) } } -END_UPP_NAMESPACE +} diff --git a/uppsrc/RichEdit/Cursor.cpp b/uppsrc/RichEdit/Cursor.cpp index 4c3befd8c..5df34e4e8 100644 --- a/uppsrc/RichEdit/Cursor.cpp +++ b/uppsrc/RichEdit/Cursor.cpp @@ -1,6 +1,6 @@ #include "RichEdit.h" -NAMESPACE_UPP +namespace Upp { void RichEdit::FinishNF() { @@ -450,4 +450,4 @@ void RichEdit::PrevPara() BeginPara(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/RichEdit/Editor.cpp b/uppsrc/RichEdit/Editor.cpp index b787b39e1..a8407a665 100644 --- a/uppsrc/RichEdit/Editor.cpp +++ b/uppsrc/RichEdit/Editor.cpp @@ -1,6 +1,6 @@ #include "RichEdit.h" -NAMESPACE_UPP +namespace Upp { bool FontHeight::Key(dword key, int count) { @@ -765,4 +765,4 @@ RichEditWithToolBar::RichEditWithToolBar() extended = true; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/RichEdit/Find.cpp b/uppsrc/RichEdit/Find.cpp index d259691cb..739af1971 100644 --- a/uppsrc/RichEdit/Find.cpp +++ b/uppsrc/RichEdit/Find.cpp @@ -1,6 +1,6 @@ #include -NAMESPACE_UPP +namespace Upp { void RichEdit::FindReplaceAddHistory() { if(!String(~findreplace.find).IsEmpty()) @@ -188,4 +188,4 @@ void RichEdit::OpenFindReplace() } } -END_UPP_NAMESPACE +} diff --git a/uppsrc/RichEdit/FormatDlg.cpp b/uppsrc/RichEdit/FormatDlg.cpp index 5118a58b2..3e82e8209 100644 --- a/uppsrc/RichEdit/FormatDlg.cpp +++ b/uppsrc/RichEdit/FormatDlg.cpp @@ -1,6 +1,6 @@ #include "RichEdit.h" -NAMESPACE_UPP +namespace Upp { RichPara::NumberFormat ParaFormatting::GetNumbering() { @@ -539,4 +539,4 @@ StyleManager::StyleManager() Setup(ff, UNIT_DOT); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/RichEdit/Formating.cpp b/uppsrc/RichEdit/Formating.cpp index cb0c7a951..091a1a6c2 100644 --- a/uppsrc/RichEdit/Formating.cpp +++ b/uppsrc/RichEdit/Formating.cpp @@ -1,6 +1,6 @@ #include "RichEdit.h" -NAMESPACE_UPP +namespace Upp { void RichEdit::ApplyFormat(dword charvalid, dword paravalid) { @@ -627,4 +627,4 @@ void RichEdit::AdjustObjectSize() } } -END_UPP_NAMESPACE +} diff --git a/uppsrc/RichEdit/HeaderFooter.cpp b/uppsrc/RichEdit/HeaderFooter.cpp index a2b9a80ca..4504efcf5 100644 --- a/uppsrc/RichEdit/HeaderFooter.cpp +++ b/uppsrc/RichEdit/HeaderFooter.cpp @@ -1,6 +1,6 @@ #include "RichEdit.h" -NAMESPACE_UPP +namespace Upp { struct RichEditHdrFtr : public RichEdit { ToolBar toolbar; @@ -152,4 +152,4 @@ bool EditRichHeaderFooter(String& header_qtf, String& footer_qtf) return false; } -END_UPP_NAMESPACE \ No newline at end of file +} \ No newline at end of file diff --git a/uppsrc/RichEdit/Kbd.cpp b/uppsrc/RichEdit/Kbd.cpp index 5d5285dc7..5022551fc 100644 --- a/uppsrc/RichEdit/Kbd.cpp +++ b/uppsrc/RichEdit/Kbd.cpp @@ -1,6 +1,6 @@ #include "RichEdit.h" -NAMESPACE_UPP +namespace Upp { bool HasNumbering(const RichPara::Format& f) { @@ -215,4 +215,4 @@ bool RichEdit::Key(dword key, int count) return true; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/RichEdit/Modify.cpp b/uppsrc/RichEdit/Modify.cpp index 0444ae48b..0a4107b8a 100644 --- a/uppsrc/RichEdit/Modify.cpp +++ b/uppsrc/RichEdit/Modify.cpp @@ -1,6 +1,6 @@ #include "RichEdit.h" -NAMESPACE_UPP +namespace Upp { void RichEdit::Filter(RichText& txt) {} @@ -450,4 +450,4 @@ void RichEdit::InsertLine() objectpos = -1; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/RichEdit/Mouse.cpp b/uppsrc/RichEdit/Mouse.cpp index e21eb0a67..1a69e6b90 100644 --- a/uppsrc/RichEdit/Mouse.cpp +++ b/uppsrc/RichEdit/Mouse.cpp @@ -1,6 +1,6 @@ #include "RichEdit.h" -NAMESPACE_UPP +namespace Upp { Size RichEdit::GetPhysicalSize(const RichObject& obj) { @@ -422,4 +422,4 @@ void RichEdit::LeftRepeat(Point p, dword flags) } } -END_UPP_NAMESPACE +} diff --git a/uppsrc/RichEdit/ParaFormat.cpp b/uppsrc/RichEdit/ParaFormat.cpp index 8d4e895c4..ce7e1a2ae 100644 --- a/uppsrc/RichEdit/ParaFormat.cpp +++ b/uppsrc/RichEdit/ParaFormat.cpp @@ -1,6 +1,6 @@ #include "RichEdit.h" -NAMESPACE_UPP +namespace Upp { struct ParaFormatDlg : public WithParaFormatLayout { ParaFormatting para; @@ -131,4 +131,4 @@ void RichEdit::ApplyStylesheet(const RichText& r) Finish(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/RichEdit/RichEdit.h b/uppsrc/RichEdit/RichEdit.h index 7405eb4c3..47a4a54f4 100644 --- a/uppsrc/RichEdit/RichEdit.h +++ b/uppsrc/RichEdit/RichEdit.h @@ -3,7 +3,7 @@ #include -NAMESPACE_UPP +namespace Upp { #define IMAGECLASS RichEditImg #define IMAGEFILE @@ -862,6 +862,6 @@ public: void AppendClipboard(RichText&& txt); -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/RichEdit/RichEdit.icpp b/uppsrc/RichEdit/RichEdit.icpp index b789cb65f..afeee889f 100644 --- a/uppsrc/RichEdit/RichEdit.icpp +++ b/uppsrc/RichEdit/RichEdit.icpp @@ -1,8 +1,8 @@ #include "RichEdit.h" -NAMESPACE_UPP +namespace Upp { #define TFILE #include -END_UPP_NAMESPACE +} diff --git a/uppsrc/RichEdit/Ruler.cpp b/uppsrc/RichEdit/Ruler.cpp index 861c95e71..b39600798 100644 --- a/uppsrc/RichEdit/Ruler.cpp +++ b/uppsrc/RichEdit/Ruler.cpp @@ -1,6 +1,6 @@ #include "RichEdit.h" -NAMESPACE_UPP +namespace Upp { #define IMAGECLASS RichEditImg #define IMAGEFILE @@ -216,4 +216,4 @@ void RichRuler::SetTabs(int pos, int size) } } -END_UPP_NAMESPACE +} diff --git a/uppsrc/RichEdit/Speller.cpp b/uppsrc/RichEdit/Speller.cpp index d1007dda4..31f6e9262 100644 --- a/uppsrc/RichEdit/Speller.cpp +++ b/uppsrc/RichEdit/Speller.cpp @@ -1,6 +1,6 @@ #include "RichEdit.h" -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // LOG(x) @@ -325,4 +325,4 @@ Bits RichEdit::SpellParagraph(const RichPara& para) return e; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/RichEdit/StyleKeys.cpp b/uppsrc/RichEdit/StyleKeys.cpp index 15625c6fa..24062abc4 100644 --- a/uppsrc/RichEdit/StyleKeys.cpp +++ b/uppsrc/RichEdit/StyleKeys.cpp @@ -1,6 +1,6 @@ #include "RichEdit.h" -NAMESPACE_UPP +namespace Upp { class StyleKeysDlg : public WithStyleKeysLayout { typedef StyleKeysDlg CLASSNAME; @@ -142,4 +142,4 @@ RichEdit::StyleKey::StyleKey() paper = Null; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/RichEdit/Table.cpp b/uppsrc/RichEdit/Table.cpp index e967ebc54..eeac24bd8 100644 --- a/uppsrc/RichEdit/Table.cpp +++ b/uppsrc/RichEdit/Table.cpp @@ -1,6 +1,6 @@ #include "RichEdit.h" -NAMESPACE_UPP +namespace Upp { void RichEdit::SaveTableFormat(int table) { @@ -385,4 +385,4 @@ void RichEdit::JoinCell() Move(text.GetCellPos(tablesel, cells.TopLeft()).pos); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/RichEdit/TableUndo.cpp b/uppsrc/RichEdit/TableUndo.cpp index 924382e23..15cb33a9f 100644 --- a/uppsrc/RichEdit/TableUndo.cpp +++ b/uppsrc/RichEdit/TableUndo.cpp @@ -1,6 +1,6 @@ #include "RichEdit.h" -NAMESPACE_UPP +namespace Upp { void RichEdit::UndoTableFormat::Apply(RichText& txt) { @@ -99,4 +99,4 @@ RichEdit::UndoTable::UndoTable(const RichText& txt, int tab) copy = txt.CopyTable(tab); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/RichEdit/Tool.cpp b/uppsrc/RichEdit/Tool.cpp index 5d8d4a6bd..ba33f35df 100644 --- a/uppsrc/RichEdit/Tool.cpp +++ b/uppsrc/RichEdit/Tool.cpp @@ -1,6 +1,6 @@ #include "RichEdit.h" -NAMESPACE_UPP +namespace Upp { void RichEdit::UserAction() { @@ -482,4 +482,4 @@ void RichEdit::DefaultBar(Bar& bar, bool extended) } } -END_UPP_NAMESPACE +} diff --git a/uppsrc/RichEdit/Undo.cpp b/uppsrc/RichEdit/Undo.cpp index 84d8e10cf..f2332bb8a 100644 --- a/uppsrc/RichEdit/Undo.cpp +++ b/uppsrc/RichEdit/Undo.cpp @@ -1,6 +1,6 @@ #include "RichEdit.h" -NAMESPACE_UPP +namespace Upp { void RichEdit::UndoInsert::Apply(RichText& txt) { @@ -86,4 +86,4 @@ RichEdit::UndoStyles::UndoStyles(const RichText& txt) styles <<= txt.GetStyles(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/RichEdit/UnitEdit.cpp b/uppsrc/RichEdit/UnitEdit.cpp index 1b9cd4a2a..d48188732 100644 --- a/uppsrc/RichEdit/UnitEdit.cpp +++ b/uppsrc/RichEdit/UnitEdit.cpp @@ -1,6 +1,6 @@ #include "RichEdit.h" -NAMESPACE_UPP +namespace Upp { double UnitMultiplier(int unit) { static double m[] = @@ -164,4 +164,4 @@ UnitEdit::UnitEdit() WithSgn(false); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/RichText/EncodeHTML.cpp b/uppsrc/RichText/EncodeHTML.cpp index 378e6e454..614208a93 100644 --- a/uppsrc/RichText/EncodeHTML.cpp +++ b/uppsrc/RichText/EncodeHTML.cpp @@ -1,6 +1,6 @@ #include "RichText.h" -NAMESPACE_UPP +namespace Upp { String HtmlFontStyle(Font f, Font base) { @@ -393,4 +393,4 @@ String AsCss(Index& ss) return css; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/RichText/EncodeQtf.cpp b/uppsrc/RichText/EncodeQtf.cpp index 07e9b33e1..b729e78b9 100644 --- a/uppsrc/RichText/EncodeQtf.cpp +++ b/uppsrc/RichText/EncodeQtf.cpp @@ -1,6 +1,6 @@ #include "RichText.h" -NAMESPACE_UPP +namespace Upp { extern Color (*QTFColor[])(); extern int QTFFontHeight[]; @@ -598,4 +598,4 @@ String AsQTF(const RichObject& obj) return AsQTF(AsRichText(obj), CHARSET_UTF8, QTF_NOSTYLES|QTF_BODY); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/RichText/Format.cpp b/uppsrc/RichText/Format.cpp index 36ddec41f..4ce2ee8a8 100644 --- a/uppsrc/RichText/Format.cpp +++ b/uppsrc/RichText/Format.cpp @@ -1,6 +1,6 @@ #include "RichText.h" -NAMESPACE_UPP +namespace Upp { void RichTxt::FormatInfo::Set(const RichPara::Format& fmt) { @@ -220,4 +220,4 @@ void RichTxt::FormatInfo::ApplyTo(RichPara::Format& fmt) const } } -END_UPP_NAMESPACE +} diff --git a/uppsrc/RichText/HeaderFooter.cpp b/uppsrc/RichText/HeaderFooter.cpp index c6f0b5432..cd0c8f5e2 100644 --- a/uppsrc/RichText/HeaderFooter.cpp +++ b/uppsrc/RichText/HeaderFooter.cpp @@ -1,6 +1,6 @@ #include "RichText.h" -NAMESPACE_UPP +namespace Upp { struct RichNumberField : RichPara::FieldType { virtual Array Evaluate(const String& param, VectorMap& vars, @@ -102,4 +102,4 @@ void RichTxt::SetFooterQtf(const char *qtf) r_type = ALL; } -END_UPP_NAMESPACE \ No newline at end of file +} \ No newline at end of file diff --git a/uppsrc/RichText/Object.cpp b/uppsrc/RichText/Object.cpp index 5883b0aa5..840506eb7 100644 --- a/uppsrc/RichText/Object.cpp +++ b/uppsrc/RichText/Object.cpp @@ -2,7 +2,7 @@ #define LLOG(x) DLOG(x) -NAMESPACE_UPP +namespace Upp { RichObjectType::RichObjectType() {} RichObjectType::~RichObjectType() {} @@ -481,4 +481,4 @@ INITBLOCK { RichObject::Register("PING", &Single()); }; -END_UPP_NAMESPACE +} diff --git a/uppsrc/RichText/ParaData.cpp b/uppsrc/RichText/ParaData.cpp index 109cc47de..1dbaec1b5 100644 --- a/uppsrc/RichText/ParaData.cpp +++ b/uppsrc/RichText/ParaData.cpp @@ -1,6 +1,6 @@ #include "RichText.h" -NAMESPACE_UPP +namespace Upp { StaticMutex RichPara::cache_lock; @@ -847,4 +847,4 @@ String RichPara::Format::ToString() const #endif -END_UPP_NAMESPACE +} diff --git a/uppsrc/RichText/ParaPaint.cpp b/uppsrc/RichText/ParaPaint.cpp index 93ef9eb2b..2613c20b2 100644 --- a/uppsrc/RichText/ParaPaint.cpp +++ b/uppsrc/RichText/ParaPaint.cpp @@ -1,6 +1,6 @@ #include "RichText.h" -NAMESPACE_UPP +namespace Upp { #define IMAGECLASS RichTextImg #define IMAGEFILE @@ -636,4 +636,4 @@ void RichPara::ApplyZoom(Zoom z) part[i].object.SetSize(z * part[i].object.GetSize()); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/RichText/ParaType.cpp b/uppsrc/RichText/ParaType.cpp index 80e3b3838..ba61d646f 100644 --- a/uppsrc/RichText/ParaType.cpp +++ b/uppsrc/RichText/ParaType.cpp @@ -1,6 +1,6 @@ #include "RichText.h" -NAMESPACE_UPP +namespace Upp { void RichPara::Smh(Lines& lines, HeightInfo *th, int cx) const { @@ -432,4 +432,4 @@ int RichPara::Lines::BodyHeight() const return sum; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/RichText/ParseQtf.cpp b/uppsrc/RichText/ParseQtf.cpp index 5662dc413..22361f8c1 100644 --- a/uppsrc/RichText/ParseQtf.cpp +++ b/uppsrc/RichText/ParseQtf.cpp @@ -1,6 +1,6 @@ #include "RichText.h" -NAMESPACE_UPP +namespace Upp { Color (*QTFColor[])() = { Black, LtGray, White, Red, Green, Blue, LtRed, WhiteGray, LtCyan, Yellow @@ -1079,4 +1079,4 @@ QtfRichObject::QtfRichObject(const RichObject& o) : obj(o) {} -END_UPP_NAMESPACE +} diff --git a/uppsrc/RichText/RichImage.icpp b/uppsrc/RichText/RichImage.icpp index 1c775f35a..c38eac693 100644 --- a/uppsrc/RichText/RichImage.icpp +++ b/uppsrc/RichText/RichImage.icpp @@ -1,6 +1,6 @@ #include "RichText.h" -NAMESPACE_UPP +namespace Upp { #ifdef NEWIMAGE @@ -313,4 +313,4 @@ INITBLOCK { #endif -END_UPP_NAMESPACE +} diff --git a/uppsrc/RichText/RichText.h b/uppsrc/RichText/RichText.h index eac15c11c..6a8b64a4e 100644 --- a/uppsrc/RichText/RichText.h +++ b/uppsrc/RichText/RichText.h @@ -4,7 +4,7 @@ #include #include -NAMESPACE_UPP +namespace Upp { class PasteClip; struct RichPara; @@ -524,6 +524,6 @@ Array RenderPages(const RichText& txt, Size pagesize = Size(3968, 6074) String Pdf(const RichText& txt, Size pagesize = Size(3968, 6074), int margin = 200, bool pdfa = false); -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/RichText/TableCell.cpp b/uppsrc/RichText/TableCell.cpp index d247e7649..c652aa725 100644 --- a/uppsrc/RichText/TableCell.cpp +++ b/uppsrc/RichText/TableCell.cpp @@ -1,6 +1,6 @@ #include "RichText.h" -NAMESPACE_UPP +namespace Upp { int LineZoom(Zoom z, int a) { @@ -247,4 +247,4 @@ RichCell::RichCell(const RichCell& src, int) text <<= src.text; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/RichText/TableData.cpp b/uppsrc/RichText/TableData.cpp index 668a649ff..e6d4dbc4a 100644 --- a/uppsrc/RichText/TableData.cpp +++ b/uppsrc/RichText/TableData.cpp @@ -1,6 +1,6 @@ #include "RichText.h" -NAMESPACE_UPP +namespace Upp { void RichTable::Invalidate() { @@ -588,4 +588,4 @@ RichTable::RichTable() Invalidate(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/RichText/TableLayout.cpp b/uppsrc/RichText/TableLayout.cpp index 3ac00d2f7..675ee1414 100644 --- a/uppsrc/RichText/TableLayout.cpp +++ b/uppsrc/RichText/TableLayout.cpp @@ -1,6 +1,6 @@ #include "RichText.h" -NAMESPACE_UPP +namespace Upp { bool RichTable::Reduce(RichContext& rc) const { @@ -174,4 +174,4 @@ RichTable::Layout RichTable::Realize(RichContext rc, int ny) const return tab; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/RichText/TablePaint.cpp b/uppsrc/RichText/TablePaint.cpp index 4dbcb6ed1..625680dc2 100644 --- a/uppsrc/RichText/TablePaint.cpp +++ b/uppsrc/RichText/TablePaint.cpp @@ -1,6 +1,6 @@ #include "RichText.h" -NAMESPACE_UPP +namespace Upp { RichTable::Format::Format() { @@ -402,4 +402,4 @@ void RichTable::ApplyZoom(Zoom z, const RichStyles& ostyle, const RichStyles& zs } } -END_UPP_NAMESPACE +} diff --git a/uppsrc/RichText/TextData.cpp b/uppsrc/RichText/TextData.cpp index 1395f8f44..785627ab1 100644 --- a/uppsrc/RichText/TextData.cpp +++ b/uppsrc/RichText/TextData.cpp @@ -1,6 +1,6 @@ #include "RichText.h" -NAMESPACE_UPP +namespace Upp { void RichText::CatPick(RichText&& p) { @@ -371,4 +371,4 @@ void RichTextLayoutTracer::EndTableRow(PageY y) {} void RichTextLayoutTracer::TableCell(const Rect& page, PageY y, int i, int j, const RichTable& table, PageY npy) {} void RichTextLayoutTracer::EndTableCell(PageY y) {} -END_UPP_NAMESPACE +} diff --git a/uppsrc/RichText/TextPaint.cpp b/uppsrc/RichText/TextPaint.cpp index 8ffee0404..e0def6e65 100644 --- a/uppsrc/RichText/TextPaint.cpp +++ b/uppsrc/RichText/TextPaint.cpp @@ -1,6 +1,6 @@ #include "RichText.h" -NAMESPACE_UPP +namespace Upp { PageY RichText::GetHeight(const Rect& page) const { @@ -197,4 +197,4 @@ void RichText::Paint(Draw& w, int x, int y, int cx) const Paint(Zoom(1, 1), w, x, y, cx); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/RichText/TextStyle.cpp b/uppsrc/RichText/TextStyle.cpp index ad5efd856..50ddb4c4e 100644 --- a/uppsrc/RichText/TextStyle.cpp +++ b/uppsrc/RichText/TextStyle.cpp @@ -1,6 +1,6 @@ #include "RichText.h" -NAMESPACE_UPP +namespace Upp { const RichStyle& RichStyle::GetDefault() { @@ -150,4 +150,4 @@ void RichText::OverrideStyles(const RichStyles& ms, bool matchname, bool addmis Update(op); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/RichText/TextTable.cpp b/uppsrc/RichText/TextTable.cpp index 09ead39ed..701741e02 100644 --- a/uppsrc/RichText/TextTable.cpp +++ b/uppsrc/RichText/TextTable.cpp @@ -1,6 +1,6 @@ #include "RichText.h" -NAMESPACE_UPP +namespace Upp { RichTable::Format RichText::GetTableFormat(int table) const { @@ -227,4 +227,4 @@ void RichText::ApplyTableFormatInfo(int table, const Rect& sel, const Rich RefreshAll(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/RichText/TxtData.cpp b/uppsrc/RichText/TxtData.cpp index 5d6c77c20..2395f4926 100644 --- a/uppsrc/RichText/TxtData.cpp +++ b/uppsrc/RichText/TxtData.cpp @@ -1,6 +1,6 @@ #include "RichText.h" -NAMESPACE_UPP +namespace Upp { void RichTxt::Para::Invalidate() { @@ -497,4 +497,4 @@ String RichCellPos::ToString() const #endif -END_UPP_NAMESPACE +} diff --git a/uppsrc/RichText/TxtOp.cpp b/uppsrc/RichText/TxtOp.cpp index 5340f4d85..54b6b95f1 100644 --- a/uppsrc/RichText/TxtOp.cpp +++ b/uppsrc/RichText/TxtOp.cpp @@ -1,6 +1,6 @@ #include "RichText.h" -NAMESPACE_UPP +namespace Upp { void RichTxt::GetAllLanguages(Index& all) const { @@ -357,4 +357,4 @@ void RichTxt::Normalize() } } -END_UPP_NAMESPACE +} diff --git a/uppsrc/RichText/TxtPaint.cpp b/uppsrc/RichText/TxtPaint.cpp index ab6b2316f..15ba83fa3 100644 --- a/uppsrc/RichText/TxtPaint.cpp +++ b/uppsrc/RichText/TxtPaint.cpp @@ -1,6 +1,6 @@ #include "RichText.h" -NAMESPACE_UPP +namespace Upp { int RichTxt::GetWidth(const RichStyles& st) const { @@ -369,4 +369,4 @@ void RichTxt::ApplyZoom(Zoom z, const RichStyles& ostyle, const RichStyles& zsty } } -END_UPP_NAMESPACE +} diff --git a/uppsrc/RichText/Util.cpp b/uppsrc/RichText/Util.cpp index 0d604ceb0..de79f3f93 100644 --- a/uppsrc/RichText/Util.cpp +++ b/uppsrc/RichText/Util.cpp @@ -1,6 +1,6 @@ #include "RichText.h" -NAMESPACE_UPP +namespace Upp { Draw& SimplePageDraw::Page(int) { @@ -186,4 +186,4 @@ String Pdf(const RichText& txt, Size pagesize, int margin, bool pdfa) : String(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/ScatterCtrl/PieCtrl.cpp b/uppsrc/ScatterCtrl/PieCtrl.cpp index 00fbeb196..a0a7bde3f 100644 --- a/uppsrc/ScatterCtrl/PieCtrl.cpp +++ b/uppsrc/ScatterCtrl/PieCtrl.cpp @@ -1,6 +1,6 @@ #include "PieCtrl.h" -NAMESPACE_UPP +namespace Upp { PieCtrl::PieCtrl() : copyRatio(1) { Transparent(); @@ -49,4 +49,4 @@ void PieCtrl::Paint(Draw& w) PaintPie(w, 1); } -END_UPP_NAMESPACE \ No newline at end of file +} \ No newline at end of file diff --git a/uppsrc/ScatterCtrl/PieCtrl.h b/uppsrc/ScatterCtrl/PieCtrl.h index df9cf1efe..a80b67144 100644 --- a/uppsrc/ScatterCtrl/PieCtrl.h +++ b/uppsrc/ScatterCtrl/PieCtrl.h @@ -4,7 +4,7 @@ #include #include -NAMESPACE_UPP +namespace Upp { class PieCtrl: public StaticRect, public PieDraw { @@ -41,7 +41,7 @@ public: PieCtrl& SetLegendHeight(const int& height) {PieDraw::SetLegendHeight(height); return *this;}; }; -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/ScatterCtrl/PopUpText.cpp b/uppsrc/ScatterCtrl/PopUpText.cpp index c79aab31a..d1a522916 100644 --- a/uppsrc/ScatterCtrl/PopUpText.cpp +++ b/uppsrc/ScatterCtrl/PopUpText.cpp @@ -1,6 +1,6 @@ #include "PopUpText.h" -NAMESPACE_UPP +namespace Upp { void PopUpInfo::Paint(Draw& w) { @@ -20,4 +20,4 @@ PopUpInfo::PopUpInfo(): color(SColorInfo()) opened = false; } -END_UPP_NAMESPACE \ No newline at end of file +} \ No newline at end of file diff --git a/uppsrc/ScatterCtrl/PopUpText.h b/uppsrc/ScatterCtrl/PopUpText.h index ece7ec57d..03bf6eb2e 100644 --- a/uppsrc/ScatterCtrl/PopUpText.h +++ b/uppsrc/ScatterCtrl/PopUpText.h @@ -3,7 +3,7 @@ #include -NAMESPACE_UPP +namespace Upp { class PopUpInfo : public StaticText { Color color; @@ -46,7 +46,7 @@ public: } }; -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/ScatterCtrl/Properties.cpp b/uppsrc/ScatterCtrl/Properties.cpp index a116dd63b..99b3471ab 100644 --- a/uppsrc/ScatterCtrl/Properties.cpp +++ b/uppsrc/ScatterCtrl/Properties.cpp @@ -1,6 +1,6 @@ #include "ScatterCtrl.h" -NAMESPACE_UPP +namespace Upp { #define IMAGECLASS ScatterImgP #define IMAGEFILE @@ -874,4 +874,4 @@ void ProcessingTab::OnFFT() tabFreq.comments.SetText(errText); } -END_UPP_NAMESPACE \ No newline at end of file +} \ No newline at end of file diff --git a/uppsrc/ScatterCtrl/ScatterCtrl.cpp b/uppsrc/ScatterCtrl/ScatterCtrl.cpp index b7ff77ca9..2508b6b95 100644 --- a/uppsrc/ScatterCtrl/ScatterCtrl.cpp +++ b/uppsrc/ScatterCtrl/ScatterCtrl.cpp @@ -1,6 +1,6 @@ #include "ScatterCtrl.h" -NAMESPACE_UPP +namespace Upp { #define IMAGECLASS ScatterImg #define IMAGEFILE @@ -668,4 +668,4 @@ ScatterCtrl::ScatterCtrl() : offset(10,12), copyRatio(1), isLeftDown(false) AddKeyBehavior(true, false, false, K_DOWN, true, ScatterCtrl::SCROLL_DOWN); } -END_UPP_NAMESPACE \ No newline at end of file +} \ No newline at end of file diff --git a/uppsrc/ScatterCtrl/ScatterCtrl.h b/uppsrc/ScatterCtrl/ScatterCtrl.h index e51b620fd..b3b7130b7 100644 --- a/uppsrc/ScatterCtrl/ScatterCtrl.h +++ b/uppsrc/ScatterCtrl/ScatterCtrl.h @@ -6,7 +6,7 @@ #include #include -NAMESPACE_UPP +namespace Upp { class EditDoubleLostFocus : public EditDouble { public: @@ -341,6 +341,6 @@ void ScatterCtrl::SetDrawing(T& w, const Size &size, int scale, bool ctrl) { } } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/ScatterCtrl/ScatterCtrlX.cpp b/uppsrc/ScatterCtrl/ScatterCtrlX.cpp index 4e3cedbfe..603b205e6 100644 --- a/uppsrc/ScatterCtrl/ScatterCtrlX.cpp +++ b/uppsrc/ScatterCtrl/ScatterCtrlX.cpp @@ -8,7 +8,7 @@ #include #include -NAMESPACE_UPP +namespace Upp { int GetKeyCodeX(int key) { _XDisplay *dpy = XOpenDisplay(NULL); @@ -26,6 +26,6 @@ int GetKeyCodeX(int key) { return key; } -END_UPP_NAMESPACE +} #endif \ No newline at end of file diff --git a/uppsrc/ScatterDraw/DataSource.cpp b/uppsrc/ScatterDraw/DataSource.cpp index 5b03b6628..560a575ae 100644 --- a/uppsrc/ScatterDraw/DataSource.cpp +++ b/uppsrc/ScatterDraw/DataSource.cpp @@ -3,7 +3,7 @@ using namespace Eigen; #include "ScatterDraw.h" -NAMESPACE_UPP +namespace Upp { #define Membercall(fun) (this->*fun) @@ -367,4 +367,4 @@ Vector DataSource::FFT(Getdatafun getdata, double tSample, bool frequenc } -END_UPP_NAMESPACE \ No newline at end of file +} \ No newline at end of file diff --git a/uppsrc/ScatterDraw/DataSource.h b/uppsrc/ScatterDraw/DataSource.h index 0395a645c..bb59d8037 100644 --- a/uppsrc/ScatterDraw/DataSource.h +++ b/uppsrc/ScatterDraw/DataSource.h @@ -1,7 +1,7 @@ #ifndef _ScatterDraw_DataSource_h_ #define _ScatterDraw_DataSource_h_ -NAMESPACE_UPP +namespace Upp { class DataSource { @@ -409,6 +409,6 @@ struct PointfLess { }; -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/ScatterDraw/Equation.cpp b/uppsrc/ScatterDraw/Equation.cpp index 7c05668cb..7198e39d3 100644 --- a/uppsrc/ScatterDraw/Equation.cpp +++ b/uppsrc/ScatterDraw/Equation.cpp @@ -2,7 +2,7 @@ #include -NAMESPACE_UPP +namespace Upp { using namespace Eigen; @@ -435,4 +435,4 @@ INITBLOCK { ExplicitEquation::Register("FourierEquation4"); } -END_UPP_NAMESPACE \ No newline at end of file +} \ No newline at end of file diff --git a/uppsrc/ScatterDraw/Equation.h b/uppsrc/ScatterDraw/Equation.h index ccc8cb1e6..00f9cdc48 100644 --- a/uppsrc/ScatterDraw/Equation.h +++ b/uppsrc/ScatterDraw/Equation.h @@ -1,7 +1,7 @@ #ifndef _ScatterDraw_Equation_h_ #define _ScatterDraw_Equation_h_ -NAMESPACE_UPP +namespace Upp { #define FormatCoeff(id, numDigits) (IsNull(numDigits) ? (String("C") + FormatInt(id)) : FormatDoubleFix(coeff[id], numDigits)) @@ -315,6 +315,6 @@ private: }; -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/ScatterDraw/PieDraw.cpp b/uppsrc/ScatterDraw/PieDraw.cpp index 3bcbea597..34347c722 100644 --- a/uppsrc/ScatterDraw/PieDraw.cpp +++ b/uppsrc/ScatterDraw/PieDraw.cpp @@ -1,6 +1,6 @@ #include "PieDraw.h" -NAMESPACE_UPP +namespace Upp { static void DrawPie(Draw& w, double c_x, double c_y, double r, int start, int alpha, int width = 0, @@ -212,4 +212,4 @@ PieDraw::PieDraw(): backColor(White), titleFont(StdFont(16)), titleColor(Black), PieDraw::~PieDraw(){} -END_UPP_NAMESPACE +} diff --git a/uppsrc/ScatterDraw/PieDraw.h b/uppsrc/ScatterDraw/PieDraw.h index 0304594d8..a431c341a 100644 --- a/uppsrc/ScatterDraw/PieDraw.h +++ b/uppsrc/ScatterDraw/PieDraw.h @@ -5,7 +5,7 @@ #include #include "DataSource.h" -NAMESPACE_UPP +namespace Upp { class PieDraw { public: @@ -90,6 +90,6 @@ private: }; -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/ScatterDraw/ScatterDraw.cpp b/uppsrc/ScatterDraw/ScatterDraw.cpp index 427f49702..b93084d5a 100644 --- a/uppsrc/ScatterDraw/ScatterDraw.cpp +++ b/uppsrc/ScatterDraw/ScatterDraw.cpp @@ -1,6 +1,6 @@ #include "ScatterDraw.h" -NAMESPACE_UPP +namespace Upp { ScatterDraw& ScatterDraw::SetColor(const Color& _color) { graphColor = _color; @@ -1830,4 +1830,4 @@ INITBLOCK { MarkPlot::Register("Bubble"); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/ScatterDraw/ScatterDraw.h b/uppsrc/ScatterDraw/ScatterDraw.h index c3a1bbebc..6cd701e6d 100644 --- a/uppsrc/ScatterDraw/ScatterDraw.h +++ b/uppsrc/ScatterDraw/ScatterDraw.h @@ -6,7 +6,7 @@ #include "DataSource.h" #include "Equation.h" -NAMESPACE_UPP +namespace Upp { #include "DrawingFunctions.h" #include "SeriesPlot.h" @@ -942,7 +942,7 @@ void ScatterDraw::Plot(T& w, const Size &size, int scale) w.End(); } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/Sql/ExportSch.cpp b/uppsrc/Sql/ExportSch.cpp index 5ae39b485..4297c6b55 100644 --- a/uppsrc/Sql/ExportSch.cpp +++ b/uppsrc/Sql/ExportSch.cpp @@ -1,6 +1,6 @@ #include "Sql.h" -NAMESPACE_UPP +namespace Upp { static String sPutId(const char *type, Index& id, String n, int w = 0) { @@ -98,4 +98,4 @@ String ExportIds(const String& database) } #endif -END_UPP_NAMESPACE +} diff --git a/uppsrc/Sql/IntroSch.cpp b/uppsrc/Sql/IntroSch.cpp index 66e76f83e..533ac5392 100644 --- a/uppsrc/Sql/IntroSch.cpp +++ b/uppsrc/Sql/IntroSch.cpp @@ -1,6 +1,6 @@ #include "Sql.h" -NAMESPACE_UPP +namespace Upp { struct SchTableInfo { Vector column; @@ -153,4 +153,4 @@ SqlBool FindSchJoin(const String& tables) return SqlBool::False(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Sql/MassInsert.cpp b/uppsrc/Sql/MassInsert.cpp index c280bfe1c..01c3037f9 100644 --- a/uppsrc/Sql/MassInsert.cpp +++ b/uppsrc/Sql/MassInsert.cpp @@ -1,6 +1,6 @@ #include "Sql.h" -NAMESPACE_UPP +namespace Upp { SqlMassInsert::~SqlMassInsert() { @@ -140,5 +140,5 @@ void SqlMassInsert::Flush() pos = 0; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Sql/S_info.cpp b/uppsrc/Sql/S_info.cpp index 1243c349c..0b89e8236 100644 --- a/uppsrc/Sql/S_info.cpp +++ b/uppsrc/Sql/S_info.cpp @@ -1,6 +1,6 @@ #include "Sql.h" -NAMESPACE_UPP +namespace Upp { void S_info_maker::Field(const char *name, Ref f, bool *b) { @@ -105,4 +105,4 @@ void S_info::Init() } } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Sql/Script.cpp b/uppsrc/Sql/Script.cpp index 0c8131dc9..67fcd0d64 100644 --- a/uppsrc/Sql/Script.cpp +++ b/uppsrc/Sql/Script.cpp @@ -1,6 +1,6 @@ #include "Sql.h" -NAMESPACE_UPP +namespace Upp { bool StdStatementExecutor::Execute(const String& stmt) { @@ -125,4 +125,4 @@ bool SqlPerformScript(const String& script, #endif -END_UPP_NAMESPACE +} diff --git a/uppsrc/Sql/Session.cpp b/uppsrc/Sql/Session.cpp index 2b5ef87d3..635a9abc3 100644 --- a/uppsrc/Sql/Session.cpp +++ b/uppsrc/Sql/Session.cpp @@ -1,6 +1,6 @@ #include "Sql.h" -NAMESPACE_UPP +namespace Upp { void SqlSession::Attach(Sql& sql, SqlConnection *con) { @@ -212,4 +212,4 @@ Sql& AppCursorR() return *empty; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Sql/Sql.cpp b/uppsrc/Sql/Sql.cpp index 9ee8de102..77430aaf5 100644 --- a/uppsrc/Sql/Sql.cpp +++ b/uppsrc/Sql/Sql.cpp @@ -1,6 +1,6 @@ #include "Sql.h" -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // DLOG(x) @@ -722,4 +722,4 @@ void operator*=(ValueMap& map, SqlSelect select) } #endif -END_UPP_NAMESPACE +} diff --git a/uppsrc/Sql/Sql.h b/uppsrc/Sql/Sql.h index 197123c98..b1a2299b0 100644 --- a/uppsrc/Sql/Sql.h +++ b/uppsrc/Sql/Sql.h @@ -3,7 +3,7 @@ #include -NAMESPACE_UPP +namespace Upp { #ifdef flagNOAPPSQL #define NOAPPSQL @@ -18,6 +18,6 @@ NAMESPACE_UPP #include "Sqls.h" #include "SqlSchema.h" -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/Sql/SqlBool.cpp b/uppsrc/Sql/SqlBool.cpp index b662d7370..2fa8a0f1d 100644 --- a/uppsrc/Sql/SqlBool.cpp +++ b/uppsrc/Sql/SqlBool.cpp @@ -1,6 +1,6 @@ #include "Sql.h" -NAMESPACE_UPP +namespace Upp { void SqlBool::SetTrue() { priority = TRUEVAL; @@ -155,4 +155,4 @@ SqlBool RightJoin(SqlId tab1, SqlId tab2, SqlId key) { return key.Of(tab1).Quoted() == SqlId(key.Of(tab2).Quoted() + "(+)"); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Sql/SqlCode.cpp b/uppsrc/Sql/SqlCode.cpp index 7d8319898..6419fe643 100644 --- a/uppsrc/Sql/SqlCode.cpp +++ b/uppsrc/Sql/SqlCode.cpp @@ -2,7 +2,7 @@ #define LTIMING(x) -NAMESPACE_UPP +namespace Upp { template String MakeSqlValue(int code, T& value) @@ -462,4 +462,4 @@ void SqlId::PutOf(String& s, const SqlId& b) const PutOf0(s, b); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Sql/SqlSchema.cpp b/uppsrc/Sql/SqlSchema.cpp index c9e9ea63c..526bf0665 100644 --- a/uppsrc/Sql/SqlSchema.cpp +++ b/uppsrc/Sql/SqlSchema.cpp @@ -1,6 +1,6 @@ #include "Sql.h" -NAMESPACE_UPP +namespace Upp { void SqlSchema::FlushColumn() { if(column.IsEmpty()) return; @@ -214,4 +214,4 @@ void operator*(SqlSchema& schema, const SqlInsert& insert) { << ";\n"; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Sql/SqlSet.cpp b/uppsrc/Sql/SqlSet.cpp index e45c1d74d..0869599c8 100644 --- a/uppsrc/Sql/SqlSet.cpp +++ b/uppsrc/Sql/SqlSet.cpp @@ -1,6 +1,6 @@ #include "Sql.h" -NAMESPACE_UPP +namespace Upp { SqlSet operator|(const SqlSet& s1, const SqlSet& s2) { if(s1.IsEmpty()) return s2; @@ -123,4 +123,4 @@ void FieldDumper::Field(const char *name, Ref f) s << name << " = " << Value(f); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Sql/SqlStatement.cpp b/uppsrc/Sql/SqlStatement.cpp index e7a9313db..53dd03825 100644 --- a/uppsrc/Sql/SqlStatement.cpp +++ b/uppsrc/Sql/SqlStatement.cpp @@ -1,6 +1,6 @@ #include "Sql.h" -NAMESPACE_UPP +namespace Upp { String SqlStatement::Get(int dialect) const { ASSERT(dialect == ORACLE || dialect == SQLITE3 || dialect == MY_SQL || dialect == MSSQL || @@ -682,4 +682,4 @@ Value SqlStatement::Fetch() const { #endif -END_UPP_NAMESPACE +} diff --git a/uppsrc/Sql/SqlVal.cpp b/uppsrc/Sql/SqlVal.cpp index 77eb7eb91..8c20b25d2 100644 --- a/uppsrc/Sql/SqlVal.cpp +++ b/uppsrc/Sql/SqlVal.cpp @@ -1,6 +1,6 @@ #include "Sql.h" -NAMESPACE_UPP +namespace Upp { SqlId SqlId::Of(const char *of) const { @@ -514,4 +514,4 @@ SqlVal SqlBinary(const String& data) return SqlBinary(~data, data.GetCount()); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Sql/util_td.cpp b/uppsrc/Sql/util_td.cpp index 40779510f..c259347c4 100644 --- a/uppsrc/Sql/util_td.cpp +++ b/uppsrc/Sql/util_td.cpp @@ -1,6 +1,6 @@ #include "Sql.h" -NAMESPACE_UPP +namespace Upp { void td_scalar(SqlSet& set, const String& prefix, const char *x) { set.Cat(SqlId(prefix + x)); @@ -56,4 +56,4 @@ String AsString(Fields a) return x.text; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/SqlCtrl/SqlArray.cpp b/uppsrc/SqlCtrl/SqlArray.cpp index 793980df7..7e6100b1b 100644 --- a/uppsrc/SqlCtrl/SqlArray.cpp +++ b/uppsrc/SqlCtrl/SqlArray.cpp @@ -1,6 +1,6 @@ #include "SqlCtrl.h" -NAMESPACE_UPP +namespace Upp { void SqlArray::Join(SqlId id, ArrayCtrl& master) { master.AddCtrlAt(0, *this); @@ -239,4 +239,4 @@ SqlArray::SqlArray() { updatekey = false; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/SqlCtrl/SqlConsole.cpp b/uppsrc/SqlCtrl/SqlConsole.cpp index d727dee27..691ad2fac 100644 --- a/uppsrc/SqlCtrl/SqlConsole.cpp +++ b/uppsrc/SqlCtrl/SqlConsole.cpp @@ -3,7 +3,7 @@ #include #include -NAMESPACE_UPP +namespace Upp { #define IMAGEFILE #define IMAGECLASS SqlConsoleImg @@ -639,4 +639,4 @@ bool IsSqlConsoleActive__() return dynamic_cast(Ctrl::GetActiveWindow()); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/SqlCtrl/SqlCtrl.cpp b/uppsrc/SqlCtrl/SqlCtrl.cpp index 6296f540f..6129fcbf0 100644 --- a/uppsrc/SqlCtrl/SqlCtrl.cpp +++ b/uppsrc/SqlCtrl/SqlCtrl.cpp @@ -1,6 +1,6 @@ #include "SqlCtrl.h" -NAMESPACE_UPP +namespace Upp { void SqlLoad(MapConvert& cv, Sql& sql) { cv.Clear(); @@ -194,4 +194,4 @@ bool SqlCtrls::Load(SqlId table, SqlBool set) } #endif -END_UPP_NAMESPACE +} diff --git a/uppsrc/SqlCtrl/SqlCtrl.h b/uppsrc/SqlCtrl/SqlCtrl.h index bbe95d5f9..376131b16 100644 --- a/uppsrc/SqlCtrl/SqlCtrl.h +++ b/uppsrc/SqlCtrl/SqlCtrl.h @@ -5,7 +5,7 @@ #include -NAMESPACE_UPP +namespace Upp { int SqlError(const char *text, const char *error, const char *statement, bool retry = false); int SqlError(const char *text, const SqlSession& session, bool retry = false); @@ -243,6 +243,6 @@ inline void SQLCommander() { SQLCommander(SQL.GetSession()); } #endif void SQLObjectTree(SqlSession& session APPSQLSESSION); -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/SqlCtrl/SqlCtrl_init.icpp b/uppsrc/SqlCtrl/SqlCtrl_init.icpp index 4fe48c456..5d89cb9cf 100644 --- a/uppsrc/SqlCtrl/SqlCtrl_init.icpp +++ b/uppsrc/SqlCtrl/SqlCtrl_init.icpp @@ -1,8 +1,8 @@ #include "SqlCtrl.h" -NAMESPACE_UPP +namespace Upp { #define TFILE #include -END_UPP_NAMESPACE +} diff --git a/uppsrc/SqlCtrl/SqlDetail.cpp b/uppsrc/SqlCtrl/SqlDetail.cpp index 569e4747c..c4ff41bd8 100644 --- a/uppsrc/SqlCtrl/SqlDetail.cpp +++ b/uppsrc/SqlCtrl/SqlDetail.cpp @@ -1,6 +1,6 @@ #include "SqlCtrl.h" -NAMESPACE_UPP +namespace Upp { SqlDetail::SqlDetail() { @@ -94,4 +94,4 @@ bool SqlDetail::Accept() } -END_UPP_NAMESPACE +} diff --git a/uppsrc/SqlCtrl/SqlDlg.cpp b/uppsrc/SqlCtrl/SqlDlg.cpp index 3b2d967ea..4361c8ab9 100644 --- a/uppsrc/SqlCtrl/SqlDlg.cpp +++ b/uppsrc/SqlCtrl/SqlDlg.cpp @@ -1,7 +1,7 @@ #include "SqlCtrl.h" #include "SqlDlg.h" -NAMESPACE_UPP +namespace Upp { int SqlError( #ifdef PLATFORM_WIN32 @@ -114,4 +114,4 @@ bool ErrorRollback(const char *emsg) { return ErrorRollback(SQL, emsg); } bool OkCommit(const char *emsg) { return OkCommit(SQL, emsg); } #endif -END_UPP_NAMESPACE +} diff --git a/uppsrc/SqlCtrl/SqlDlg.h b/uppsrc/SqlCtrl/SqlDlg.h index ee9a4de44..9caddb351 100644 --- a/uppsrc/SqlCtrl/SqlDlg.h +++ b/uppsrc/SqlCtrl/SqlDlg.h @@ -1,11 +1,11 @@ #ifndef _SqlCtrl_SqlDlg_h_ #define _SqlCtrl_SqlDlg_h_ -NAMESPACE_UPP +namespace Upp { #define LAYOUTFILE #include -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/SqlCtrl/SqlObjectTree.cpp b/uppsrc/SqlCtrl/SqlObjectTree.cpp index f54f8dca8..9f3aafa2d 100644 --- a/uppsrc/SqlCtrl/SqlObjectTree.cpp +++ b/uppsrc/SqlCtrl/SqlObjectTree.cpp @@ -1,7 +1,7 @@ #include "SqlCtrl.h" #include "SqlDlg.h" -NAMESPACE_UPP +namespace Upp { class DlgSqlExport : public WithSqlExportLayout { @@ -389,4 +389,4 @@ void SqlObjectTree::TableExport(String table_name) RunDlgSqlExport(cursor, "select * from " + schema + "." + table, table); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/TCore/CalcBasic.cpp b/uppsrc/TCore/CalcBasic.cpp index 28d62f3a0..5bf9fcff2 100644 --- a/uppsrc/TCore/CalcBasic.cpp +++ b/uppsrc/TCore/CalcBasic.cpp @@ -17,7 +17,7 @@ #include #endif -NAMESPACE_UPP +namespace Upp { void UseCalcBasic() {} // to bring in globally constructed objects @@ -1368,4 +1368,4 @@ FDECLP(upper, S, GroupString) FDECLP(lower, S, GroupString) FDECLP(ascii, S, GroupString) -END_UPP_NAMESPACE +} diff --git a/uppsrc/TCore/CalcBasic.h b/uppsrc/TCore/CalcBasic.h index eb09fe08f..47b286bb0 100644 --- a/uppsrc/TCore/CalcBasic.h +++ b/uppsrc/TCore/CalcBasic.h @@ -1,7 +1,7 @@ #ifndef __TCore_CalcBasic__ #define __TCore_CalcBasic__ -NAMESPACE_UPP +namespace Upp { String GroupComp(); String GroupBitOp(); @@ -14,6 +14,6 @@ String GroupConst(); String GroupTrans(); String GroupSystem(); -END_UPP_NAMESPACE +} #endif//__TCore_CalcBasic__ diff --git a/uppsrc/TCore/CalcNode.cpp b/uppsrc/TCore/CalcNode.cpp index 3a256331d..4eeab9640 100644 --- a/uppsrc/TCore/CalcNode.cpp +++ b/uppsrc/TCore/CalcNode.cpp @@ -3,7 +3,7 @@ #include "TCoreCalc.h" #pragma hdrstop -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // LOG(x) @@ -1752,4 +1752,4 @@ bool CalcParser::Force(int op, const char *expect) return false; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/TCore/CalcNode.h b/uppsrc/TCore/CalcNode.h index 9e5796a5b..6e6784ece 100644 --- a/uppsrc/TCore/CalcNode.h +++ b/uppsrc/TCore/CalcNode.h @@ -1,4 +1,4 @@ -NAMESPACE_UPP +namespace Upp { struct CalcPacket; class CalcNode; @@ -724,4 +724,4 @@ RegisterHelpTopicInfo("Calc$" topic, __FILE__, callback(&FGENID(chlt, SUBEXPAND( #define MDECLAP(id, x, group) MDECLTA(BTA0, "C" ASSTRING(id) ASSTRING(x), ASSTRING(id), group, COMBINE3(C, id, x)) #define MDECLAP0(id, x, group) MDECLTA(BTA1, "C" ASSTRING(id) ASSTRING(x), ASSTRING(id), group, COMBINE3(C, id, x)) -END_UPP_NAMESPACE +} diff --git a/uppsrc/TCore/CalcType.cpp b/uppsrc/TCore/CalcType.cpp index be2cb30a0..936e90fbd 100644 --- a/uppsrc/TCore/CalcType.cpp +++ b/uppsrc/TCore/CalcType.cpp @@ -1,7 +1,7 @@ #include "TCoreCalc.h" #pragma hdrstop -NAMESPACE_UPP +namespace Upp { String CalcTypeDescribeInt() { return t_("integer"); } @@ -85,4 +85,4 @@ bool CalcType::ValueTo(Value v) return !IsNumber(v) || (double)v != 0; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/TCore/CalcType.h b/uppsrc/TCore/CalcType.h index 653c215f6..d6d4b9dc8 100644 --- a/uppsrc/TCore/CalcType.h +++ b/uppsrc/TCore/CalcType.h @@ -1,4 +1,4 @@ -NAMESPACE_UPP +namespace Upp { class CalcTypeNameConvert { @@ -171,4 +171,4 @@ struct CalcPtrType template <> struct CalcType : public CalcPtrType {}; \ template <> struct CalcType : public CalcPtrType {}; -END_UPP_NAMESPACE +} diff --git a/uppsrc/TCore/TCoreCalc.h b/uppsrc/TCore/TCoreCalc.h index 9f02cce5d..a1919cc7f 100644 --- a/uppsrc/TCore/TCoreCalc.h +++ b/uppsrc/TCore/TCoreCalc.h @@ -5,7 +5,7 @@ #include "CalcType.h" #include "CalcNode.h" -NAMESPACE_UPP +namespace Upp { extern void UseCalcBasic(); @@ -19,6 +19,6 @@ String GroupArray(); String GroupConst(); String GroupTrans(); -END_UPP_NAMESPACE +} #endif//__TCoreCalc__ diff --git a/uppsrc/TCore/TCore_init.icpp b/uppsrc/TCore/TCore_init.icpp index 140d73ed8..62f047cfc 100644 --- a/uppsrc/TCore/TCore_init.icpp +++ b/uppsrc/TCore/TCore_init.icpp @@ -1,8 +1,8 @@ #include "TCore.h" -NAMESPACE_UPP +namespace Upp { #define TFILE #include -END_UPP_NAMESPACE +} diff --git a/uppsrc/TCore/database.cpp b/uppsrc/TCore/database.cpp index 037c4fc28..bb6253cee 100644 --- a/uppsrc/TCore/database.cpp +++ b/uppsrc/TCore/database.cpp @@ -1,7 +1,7 @@ #include "TCoreDb.h" #pragma hdrstop -NAMESPACE_UPP +namespace Upp { static String Format(const Vector& values) { @@ -2892,4 +2892,4 @@ bool DataBase::TryRemove(String n) return true; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/TCore/database.h b/uppsrc/TCore/database.h index 4b1be1660..4d45b2a40 100644 --- a/uppsrc/TCore/database.h +++ b/uppsrc/TCore/database.h @@ -1,4 +1,4 @@ -NAMESPACE_UPP +namespace Upp { #define CHECK_CACHE() // CheckCache() #define CHECK_BLOCK(block, index) // CheckBlock(block, index) @@ -967,4 +967,4 @@ protected: int block_level; }; -END_UPP_NAMESPACE +} diff --git a/uppsrc/TCore/datafile.cpp b/uppsrc/TCore/datafile.cpp index 9893b246d..dacd96e25 100644 --- a/uppsrc/TCore/datafile.cpp +++ b/uppsrc/TCore/datafile.cpp @@ -1,6 +1,6 @@ #include "TCoreDb.h" -NAMESPACE_UPP +namespace Upp { static const char tag[] = "CDF: Cybex Data File version 1.0.\r\n" @@ -1221,4 +1221,4 @@ void DataFile::DumpObjects(const Vector& list, bool dump_data) } } -END_UPP_NAMESPACE +} diff --git a/uppsrc/TCore/datafile.h b/uppsrc/TCore/datafile.h index 5b9549f80..7a2cbbd98 100644 --- a/uppsrc/TCore/datafile.h +++ b/uppsrc/TCore/datafile.h @@ -1,6 +1,6 @@ // #define CDB_DEBUG // comment this macro to turn various error checking options off -NAMESPACE_UPP +namespace Upp { #ifdef CDB_DEBUG #define CHECK_INTEGRITY() CheckIntegrity() @@ -223,4 +223,4 @@ inline void CopyBackward(T *dst, const T *src, const T *lim) { *--dst = *--src; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/TCore/datatest.cpp b/uppsrc/TCore/datatest.cpp index 47d0cf939..cd14b549b 100644 --- a/uppsrc/TCore/datatest.cpp +++ b/uppsrc/TCore/datatest.cpp @@ -1,6 +1,6 @@ #include "TCoreDb.h" -NAMESPACE_UPP +namespace Upp { static String GetRandomString(int maxlength = 50000, int minlength = 0) { @@ -669,4 +669,4 @@ void DataBase::FullTest() StructuredTest(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/TCore/globcfg.cpp b/uppsrc/TCore/globcfg.cpp index aa042bfca..74d396fb7 100644 --- a/uppsrc/TCore/globcfg.cpp +++ b/uppsrc/TCore/globcfg.cpp @@ -1,6 +1,6 @@ #include "TCore.h" -NAMESPACE_UPP +namespace Upp { ConfigHeading::ConfigHeading() { @@ -136,4 +136,4 @@ Configuration& Configuration::Main() return main_configuration; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/TCore/globcfg.h b/uppsrc/TCore/globcfg.h index 0de1d5a9e..6cdf2b96b 100644 --- a/uppsrc/TCore/globcfg.h +++ b/uppsrc/TCore/globcfg.h @@ -1,4 +1,4 @@ -NAMESPACE_UPP +namespace Upp { class Configuration; class ConfigItem; @@ -103,4 +103,4 @@ protected: bool item_error; }; -END_UPP_NAMESPACE +} diff --git a/uppsrc/TCore/help.cpp b/uppsrc/TCore/help.cpp index c62ca0909..39b21834e 100644 --- a/uppsrc/TCore/help.cpp +++ b/uppsrc/TCore/help.cpp @@ -1,6 +1,6 @@ #include "TCore.h" -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // RLOG(x) #define LDUMP(x) // RDUMP(x) @@ -632,4 +632,4 @@ void HelpInit::Run() m.Clear(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/TCore/help.h b/uppsrc/TCore/help.h index 688d86664..1cbc13a92 100644 --- a/uppsrc/TCore/help.h +++ b/uppsrc/TCore/help.h @@ -1,4 +1,4 @@ -NAMESPACE_UPP +namespace Upp { class HelpInit { @@ -136,4 +136,4 @@ RegisterHelpTopicInfo(ASSTRING(cls), __FILE__, callback(&COMBINE(cls, HelpTitleP #define HELP_TEXT(text) << text #define HELP_END ); -END_UPP_NAMESPACE +} diff --git a/uppsrc/TCore/nls_bw.h b/uppsrc/TCore/nls_bw.h index 76840750e..6a58be6c5 100644 --- a/uppsrc/TCore/nls_bw.h +++ b/uppsrc/TCore/nls_bw.h @@ -1,4 +1,4 @@ -NAMESPACE_UPP +namespace Upp { extern int NlsDefaultCodePage; @@ -90,4 +90,4 @@ private: const byte *cvt; }; -END_UPP_NAMESPACE +} diff --git a/uppsrc/TCore/service/service.cpp b/uppsrc/TCore/service/service.cpp index 8155207dc..9074f473c 100644 --- a/uppsrc/TCore/service/service.cpp +++ b/uppsrc/TCore/service/service.cpp @@ -15,7 +15,7 @@ #include #endif -NAMESPACE_UPP +namespace Upp { volatile bool service_stopped = false; volatile bool service_paused = false; @@ -276,6 +276,6 @@ void RunServiceDispatcher(String service_name_) return; } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/TCore/service/service.h b/uppsrc/TCore/service/service.h index ff8a5ef8e..4cfa0fdf3 100644 --- a/uppsrc/TCore/service/service.h +++ b/uppsrc/TCore/service/service.h @@ -8,7 +8,7 @@ extern bool InitService(); // implemented by main program extern void RunService(); // implemented by main program -NAMESPACE_UPP +namespace Upp { extern volatile bool service_stopped; extern volatile bool service_paused; @@ -18,7 +18,7 @@ bool InstallService(String name, String display_name, String& cmdline, String& s bool UninstallService(String name, String& status); void RunServiceDispatcher(String service_name); -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/TCore/setop.h b/uppsrc/TCore/setop.h index af009fb85..25fc2e933 100644 --- a/uppsrc/TCore/setop.h +++ b/uppsrc/TCore/setop.h @@ -1,4 +1,4 @@ -NAMESPACE_UPP +namespace Upp { enum SetOpCode { @@ -183,4 +183,4 @@ template T SetAnd (const T& set1, const T& set2) { return SetAnd(se template T SetSub (const T& set1, const T& set2) { return SetSub(set1.Begin(), set1.End(), set2.Begin(), set2.End()); } template T SetXor (const T& set1, const T& set2) { return SetXor(set1.Begin(), set1.End(), set2.Begin(), set2.End()); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/TCore/template.h b/uppsrc/TCore/template.h index 367a7806c..fc9f1787c 100644 --- a/uppsrc/TCore/template.h +++ b/uppsrc/TCore/template.h @@ -1,4 +1,4 @@ -NAMESPACE_UPP +namespace Upp { /* TRC 2/12/2003: obsoleted by Fidler's callback1 template @@ -582,4 +582,4 @@ class VirtualValueArray : public VirtualStdSegtorArray { }; -END_UPP_NAMESPACE +} diff --git a/uppsrc/TCore/util.cpp b/uppsrc/TCore/util.cpp index b8d3e9866..b9149c660 100644 --- a/uppsrc/TCore/util.cpp +++ b/uppsrc/TCore/util.cpp @@ -11,7 +11,7 @@ #include #endif -NAMESPACE_UPP +namespace Upp { void WeakBase::Chk() const { @@ -1361,4 +1361,4 @@ double XmlDouble(XmlParser& xml) return ScanDouble(xml.ReadTextE()); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/TCore/util.h b/uppsrc/TCore/util.h index ce5b18311..88a708210 100644 --- a/uppsrc/TCore/util.h +++ b/uppsrc/TCore/util.h @@ -1,4 +1,4 @@ -NAMESPACE_UPP +namespace Upp { #ifdef COMPILER_MSC typedef __int64 longlong_t; @@ -292,4 +292,4 @@ bool XmlBool(XmlParser& xml); int XmlInt(XmlParser& xml); double XmlDouble(XmlParser& xml); -END_UPP_NAMESPACE +} diff --git a/uppsrc/TCore/xmlparse.cpp b/uppsrc/TCore/xmlparse.cpp index 24deae006..87e166a74 100644 --- a/uppsrc/TCore/xmlparse.cpp +++ b/uppsrc/TCore/xmlparse.cpp @@ -1,7 +1,7 @@ #include "TCore.h" #pragma hdrstop -NAMESPACE_UPP +namespace Upp { String XMLTag::ToString() const { @@ -481,4 +481,4 @@ Xmls XmlsComment(const char *text) return out; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/TCore/xmlparse.h b/uppsrc/TCore/xmlparse.h index 925ff5d6d..0a753448c 100644 --- a/uppsrc/TCore/xmlparse.h +++ b/uppsrc/TCore/xmlparse.h @@ -1,7 +1,7 @@ #ifndef _TCore_xmlparse_h_ #define _TCore_xmlparse_h_ -NAMESPACE_UPP +namespace Upp { inline bool CheckXml(const char *s) { return *s == '<' && s[1] == '?' && s[2] == 'x' && s[3] == 'm' && s[4] == 'l'; } @@ -196,6 +196,6 @@ inline XmlsTag& operator %= (XmlsTag& tag, const XmlsTag& s) { tag.Combi inline Xmls operator % (const XmlsTag& tag, String s) { return tag.ApplyTo(s, true); } inline Xmls operator % (const XmlsTag& tag, const char *s) { return tag.ApplyTo(s, true); } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/TCtrlLib/Calc/CalcGuiType.cpp b/uppsrc/TCtrlLib/Calc/CalcGuiType.cpp index b2a52948c..2e9813d59 100644 --- a/uppsrc/TCtrlLib/Calc/CalcGuiType.cpp +++ b/uppsrc/TCtrlLib/Calc/CalcGuiType.cpp @@ -2,7 +2,7 @@ #pragma hdrstop #pragma BLITZ_APPROVE -NAMESPACE_UPP +namespace Upp { void UseCalcGuiType() {} @@ -74,4 +74,4 @@ FDECLP0(rect, P, &GroupGeom) FDECLP0(rect, PP, &GroupGeom) FDECLP0(text, R, &GroupString) -END_UPP_NAMESPACE +} diff --git a/uppsrc/TCtrlLib/Calc/CalcGuiType.h b/uppsrc/TCtrlLib/Calc/CalcGuiType.h index fac311276..c035ae6eb 100644 --- a/uppsrc/TCtrlLib/Calc/CalcGuiType.h +++ b/uppsrc/TCtrlLib/Calc/CalcGuiType.h @@ -1,7 +1,7 @@ ////////////////////////////////////////////////////////////////////// // CalcGuiType: gui-oriented calc types. -NAMESPACE_UPP +namespace Upp { void UseCalcGuiType(); @@ -12,4 +12,4 @@ template <> struct CalcType : public CalcRawNullType {}; template <> struct CalcType : public CalcRawNullType {}; template <> struct CalcType : public CalcRawNullType {}; -END_UPP_NAMESPACE +} diff --git a/uppsrc/TCtrlLib/Calc/CalcHelp.cpp b/uppsrc/TCtrlLib/Calc/CalcHelp.cpp index cedab3b61..c3eeb8d1b 100644 --- a/uppsrc/TCtrlLib/Calc/CalcHelp.cpp +++ b/uppsrc/TCtrlLib/Calc/CalcHelp.cpp @@ -1,7 +1,7 @@ #include "TCtrlLibCalc.h" #pragma hdrstop -NAMESPACE_UPP +namespace Upp { void UseHelpCalc() {} @@ -322,4 +322,4 @@ STATIC_HELP(CalcIndex, s_(CalcIndexHelpTopic), ) */ -END_UPP_NAMESPACE +} diff --git a/uppsrc/TCtrlLib/Calc/DlgCalc.cpp b/uppsrc/TCtrlLib/Calc/DlgCalc.cpp index f0b85ef8f..02a0bb638 100644 --- a/uppsrc/TCtrlLib/Calc/DlgCalc.cpp +++ b/uppsrc/TCtrlLib/Calc/DlgCalc.cpp @@ -1,7 +1,7 @@ #include "TCtrlLibCalc.h" #pragma hdrstop -NAMESPACE_UPP +namespace Upp { #define LAYOUTFILE #include @@ -86,4 +86,4 @@ void DlgCalc::CmdStore() calc_context->Set(~stdlg.var, result_val, true); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/TCtrlLib/Calc/TCtrlLibCalc.h b/uppsrc/TCtrlLib/Calc/TCtrlLibCalc.h index 0e8e75a3f..37fa7ad87 100644 --- a/uppsrc/TCtrlLib/Calc/TCtrlLibCalc.h +++ b/uppsrc/TCtrlLib/Calc/TCtrlLibCalc.h @@ -5,7 +5,7 @@ #include #include "CalcGuiType.h" -NAMESPACE_UPP +namespace Upp { void RunDlgCalc(CalcContext& context); @@ -18,6 +18,6 @@ HelpCalcMap GetHelpCalcGroup(const String& groupname); void AddHelpCalcGroups(DropList& dest, const String& prefix = "@"); void AddHelpCalcGroup(DropList& dest, const String& group); -END_UPP_NAMESPACE +} #endif//__TCtrlLibCalc__ diff --git a/uppsrc/TCtrlLib/Calc/TCtrlLibCalc_init.icpp b/uppsrc/TCtrlLib/Calc/TCtrlLibCalc_init.icpp index 1b4ba69f3..0c6b23507 100644 --- a/uppsrc/TCtrlLib/Calc/TCtrlLibCalc_init.icpp +++ b/uppsrc/TCtrlLib/Calc/TCtrlLibCalc_init.icpp @@ -1,8 +1,8 @@ #include "TCtrlLibCalc.h" -NAMESPACE_UPP +namespace Upp { #define TFILE #include -END_UPP_NAMESPACE +} diff --git a/uppsrc/TCtrlLib/CtrlArray.cpp b/uppsrc/TCtrlLib/CtrlArray.cpp index 54c8d9b1b..293d87882 100644 --- a/uppsrc/TCtrlLib/CtrlArray.cpp +++ b/uppsrc/TCtrlLib/CtrlArray.cpp @@ -3,7 +3,7 @@ #include "CtrlArray.h" -NAMESPACE_UPP +namespace Upp { CtrlArray::Item::Item() { @@ -336,4 +336,4 @@ void CtrlArray::OnDown(int index) } } -END_UPP_NAMESPACE +} diff --git a/uppsrc/TCtrlLib/CtrlArray.h b/uppsrc/TCtrlLib/CtrlArray.h index b8870abbd..b570d9198 100644 --- a/uppsrc/TCtrlLib/CtrlArray.h +++ b/uppsrc/TCtrlLib/CtrlArray.h @@ -1,7 +1,7 @@ #ifndef __TCtrlLib_CtrlArray__ #define __TCtrlLib_CtrlArray__ -NAMESPACE_UPP +namespace Upp { class CtrlArray : public Ctrl { @@ -117,6 +117,6 @@ private: bool moving; }; -END_UPP_NAMESPACE +} #endif//__TCtrlLib_CtrlArray__ diff --git a/uppsrc/TCtrlLib/DocMgr.cpp b/uppsrc/TCtrlLib/DocMgr.cpp index 9adb9c2a2..297e1d70f 100644 --- a/uppsrc/TCtrlLib/DocMgr.cpp +++ b/uppsrc/TCtrlLib/DocMgr.cpp @@ -1,7 +1,7 @@ #include #pragma hdrstop -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // LOG(x) @@ -1440,4 +1440,4 @@ DocCtrl *DocPokus::CreateDoc() } #endif -END_UPP_NAMESPACE +} diff --git a/uppsrc/TCtrlLib/DocMgr.h b/uppsrc/TCtrlLib/DocMgr.h index 958b8e5d9..c5ece7d8f 100644 --- a/uppsrc/TCtrlLib/DocMgr.h +++ b/uppsrc/TCtrlLib/DocMgr.h @@ -1,4 +1,4 @@ -NAMESPACE_UPP +namespace Upp { #define LAYOUTFILE #include @@ -394,4 +394,4 @@ public: }; #endif -END_UPP_NAMESPACE +} diff --git a/uppsrc/TCtrlLib/Help/DlgFormula.cpp b/uppsrc/TCtrlLib/Help/DlgFormula.cpp index 716e2d9f6..d37745a58 100644 --- a/uppsrc/TCtrlLib/Help/DlgFormula.cpp +++ b/uppsrc/TCtrlLib/Help/DlgFormula.cpp @@ -4,7 +4,7 @@ #include -NAMESPACE_UPP +namespace Upp { #define LAYOUTFILE #include @@ -211,4 +211,4 @@ void DlgFormula::OnOperChar(char c) { } -END_UPP_NAMESPACE +} diff --git a/uppsrc/TCtrlLib/Help/DlgHelpView.cpp b/uppsrc/TCtrlLib/Help/DlgHelpView.cpp index 8c0806088..5d9700ab7 100644 --- a/uppsrc/TCtrlLib/Help/DlgHelpView.cpp +++ b/uppsrc/TCtrlLib/Help/DlgHelpView.cpp @@ -4,7 +4,7 @@ #include -NAMESPACE_UPP +namespace Upp { #define LAYOUTFILE #include @@ -808,4 +808,4 @@ void DlgHelpLang::OnLangFileBrowse() } } -END_UPP_NAMESPACE +} diff --git a/uppsrc/TCtrlLib/Help/DlgShot.cpp b/uppsrc/TCtrlLib/Help/DlgShot.cpp index 72565f08c..628e52af9 100644 --- a/uppsrc/TCtrlLib/Help/DlgShot.cpp +++ b/uppsrc/TCtrlLib/Help/DlgShot.cpp @@ -3,7 +3,7 @@ #include -NAMESPACE_UPP +namespace Upp { #define LAYOUTFILE #include @@ -448,4 +448,4 @@ void DlgShot::OnEditCtrlAttr() } } -END_UPP_NAMESPACE +} diff --git a/uppsrc/TCtrlLib/Help/TCtrlLibHelp.h b/uppsrc/TCtrlLib/Help/TCtrlLibHelp.h index c31387ab2..fa7cb2dfb 100644 --- a/uppsrc/TCtrlLib/Help/TCtrlLibHelp.h +++ b/uppsrc/TCtrlLib/Help/TCtrlLibHelp.h @@ -6,7 +6,7 @@ #include #include "helputil.h" -NAMESPACE_UPP +namespace Upp { //RichObjectType *RichObjectTypeDialogHelp(); RichObjectType *RichObjectTypeDrawing(); @@ -37,6 +37,6 @@ void OpenHelpTopicIndex(String topic = Null, bool index = false); Callback1& HelpTopicBookMenu(); Callback1& HelpTopicOnlineToc(); -END_UPP_NAMESPACE +} #endif//__TCtrlLibHelp__ diff --git a/uppsrc/TCtrlLib/Help/helpgen.cpp b/uppsrc/TCtrlLib/Help/helpgen.cpp index b7e5e64a0..372722308 100644 --- a/uppsrc/TCtrlLib/Help/helpgen.cpp +++ b/uppsrc/TCtrlLib/Help/helpgen.cpp @@ -1,7 +1,7 @@ #include "TCtrlLibHelp.h" #pragma hdrstop -NAMESPACE_UPP +namespace Upp { void RegisterHelpStdItems() {} @@ -232,4 +232,4 @@ static void sBookExpand(String& qtf) RegisterHelpTopicSys("book_expand", "", callback(&sBookExpand)); -END_UPP_NAMESPACE +} diff --git a/uppsrc/TCtrlLib/Help/helputil.cpp b/uppsrc/TCtrlLib/Help/helputil.cpp index 9dd75d2c9..326021ebd 100644 --- a/uppsrc/TCtrlLib/Help/helputil.cpp +++ b/uppsrc/TCtrlLib/Help/helputil.cpp @@ -5,7 +5,7 @@ #include #include -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // RLOG(x) @@ -1911,4 +1911,4 @@ String CreateHelpRTF() } -END_UPP_NAMESPACE +} diff --git a/uppsrc/TCtrlLib/Help/helputil.h b/uppsrc/TCtrlLib/Help/helputil.h index 289b59dc5..7a3bebcd3 100644 --- a/uppsrc/TCtrlLib/Help/helputil.h +++ b/uppsrc/TCtrlLib/Help/helputil.h @@ -1,4 +1,4 @@ -NAMESPACE_UPP +namespace Upp { inline String HelpDPPStyle() { return HelpHostDPP("style"); } inline String HelpDPPTopics() { return HelpHostDPP("topics"); } @@ -126,4 +126,4 @@ private: void *context; }; -END_UPP_NAMESPACE +} diff --git a/uppsrc/TCtrlLib/Help/richform.cpp b/uppsrc/TCtrlLib/Help/richform.cpp index 0c41e1f84..d21ab4d66 100644 --- a/uppsrc/TCtrlLib/Help/richform.cpp +++ b/uppsrc/TCtrlLib/Help/richform.cpp @@ -3,7 +3,7 @@ #include -NAMESPACE_UPP +namespace Upp { struct RichObjectTypeFormulaCls : public RichObjectType { @@ -119,4 +119,4 @@ void RichObjectTypeFormulaCls::DefaultAction(RichObject& ex) const } } -END_UPP_NAMESPACE +} diff --git a/uppsrc/TCtrlLib/OldTreeCtrl.cpp b/uppsrc/TCtrlLib/OldTreeCtrl.cpp index d65f85139..2f1da1292 100644 --- a/uppsrc/TCtrlLib/OldTreeCtrl.cpp +++ b/uppsrc/TCtrlLib/OldTreeCtrl.cpp @@ -6,7 +6,7 @@ #include "OldTreeCtrl.h" -NAMESPACE_UPP +namespace Upp { #define IMAGECLASS OldTreeCtrlImg #define IMAGEFILE @@ -1466,4 +1466,4 @@ void OldTreeCtrl::ScCursor(Point pt) scroll = pt; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/TCtrlLib/OldTreeCtrl.h b/uppsrc/TCtrlLib/OldTreeCtrl.h index e91e59ccb..464bbcaf7 100644 --- a/uppsrc/TCtrlLib/OldTreeCtrl.h +++ b/uppsrc/TCtrlLib/OldTreeCtrl.h @@ -1,7 +1,7 @@ #ifndef __INCLUDE_CTRL_TREECTRL_H__ #define __INCLUDE_CTRL_TREECTRL_H__ -NAMESPACE_UPP +namespace Upp { class OldTreeEdit; class OldTreeCursor; @@ -462,6 +462,6 @@ protected: char drag_state; // 0 = off, 1 = on, 2 = possible }; -END_UPP_NAMESPACE +} #endif//__INCLUDE_CTRL_TREECTRL_H__ diff --git a/uppsrc/TCtrlLib/Ruler.cpp b/uppsrc/TCtrlLib/Ruler.cpp index 8bc5dcfe6..6782410e3 100644 --- a/uppsrc/TCtrlLib/Ruler.cpp +++ b/uppsrc/TCtrlLib/Ruler.cpp @@ -1,6 +1,6 @@ #include "TCtrlLib.h" -NAMESPACE_UPP +namespace Upp { RulerCtrl::RulerCtrl() { @@ -368,4 +368,4 @@ int RulerCtrl::GetStdWidth() return 22; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/TCtrlLib/Ruler.h b/uppsrc/TCtrlLib/Ruler.h index a67130f64..f4357e750 100644 --- a/uppsrc/TCtrlLib/Ruler.h +++ b/uppsrc/TCtrlLib/Ruler.h @@ -1,4 +1,4 @@ -NAMESPACE_UPP +namespace Upp { class RulerCtrl : public FrameCtrl { @@ -112,4 +112,4 @@ private: class HRulerCtrl : public RulerCtrl { public: HRulerCtrl() { Horz(); } }; class VRulerCtrl : public RulerCtrl { public: VRulerCtrl() { Vert(); } }; -END_UPP_NAMESPACE +} diff --git a/uppsrc/TCtrlLib/TCtrlImg.cpp b/uppsrc/TCtrlLib/TCtrlImg.cpp index 05985e51d..59188bfdb 100644 --- a/uppsrc/TCtrlLib/TCtrlImg.cpp +++ b/uppsrc/TCtrlLib/TCtrlImg.cpp @@ -4,8 +4,8 @@ #endif//COMPILER_MSC #include "TCtrlImg.h" -NAMESPACE_UPP +namespace Upp { #define IMAGECLASS TCtrlImg #define IMAGEFILE #include -END_UPP_NAMESPACE +} diff --git a/uppsrc/TCtrlLib/TCtrlImg.h b/uppsrc/TCtrlLib/TCtrlImg.h index 0e70cd7c7..e4e4f1d66 100644 --- a/uppsrc/TCtrlLib/TCtrlImg.h +++ b/uppsrc/TCtrlLib/TCtrlImg.h @@ -1,12 +1,12 @@ #ifndef __TCtrlLib_TCtrlImg__ #define __TCtrlLib_TCtrlImg__ -NAMESPACE_UPP +namespace Upp { #define IMAGECLASS TCtrlImg #define IMAGEFILE #include -END_UPP_NAMESPACE +} #endif//__TCtrlLib_TCtrlImg__ diff --git a/uppsrc/TCtrlLib/TCtrlLib_init.icpp b/uppsrc/TCtrlLib/TCtrlLib_init.icpp index 7b6a55b75..2d2cd8d68 100644 --- a/uppsrc/TCtrlLib/TCtrlLib_init.icpp +++ b/uppsrc/TCtrlLib/TCtrlLib_init.icpp @@ -1,8 +1,8 @@ #include "TCtrlLib.h" -NAMESPACE_UPP +namespace Upp { #define TFILE #include -END_UPP_NAMESPACE +} diff --git a/uppsrc/TCtrlLib/template.h b/uppsrc/TCtrlLib/template.h index 47e5baa51..cd1c0db78 100644 --- a/uppsrc/TCtrlLib/template.h +++ b/uppsrc/TCtrlLib/template.h @@ -1,4 +1,4 @@ -NAMESPACE_UPP +namespace Upp { /* obsoleted by Fidler's StoreAsString template @@ -284,4 +284,4 @@ bool WithBar::Key(dword key, int repcnt) return MenuBar::Scan(WhenBar, key) || T::Key(key, repcnt); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/TCtrlLib/util.cpp b/uppsrc/TCtrlLib/util.cpp index bddad1811..729eea791 100644 --- a/uppsrc/TCtrlLib/util.cpp +++ b/uppsrc/TCtrlLib/util.cpp @@ -9,7 +9,7 @@ #ifdef PLATFORM_WIN32 #include -NAMESPACE_UPP +namespace Upp { void DropFilesRegister(HWND hwnd) { @@ -832,4 +832,4 @@ bool ShowErrorFocus(bool cond, const char *text, Ctrl& focus) return true; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/TCtrlLib/util.h b/uppsrc/TCtrlLib/util.h index 3d7ca0335..bccfeadbc 100644 --- a/uppsrc/TCtrlLib/util.h +++ b/uppsrc/TCtrlLib/util.h @@ -1,4 +1,4 @@ -NAMESPACE_UPP +namespace Upp { #define ASSERT_INDEX(arrayctrl, index) ASSERT(arrayctrl.GetIndexCount() == index) @@ -553,4 +553,4 @@ Vector DropFilesGetList(WPARAM hdrop); bool ShowErrorFocus(bool cond, const char *text, Ctrl& focus); -END_UPP_NAMESPACE +} diff --git a/uppsrc/TDraw/formula.cpp b/uppsrc/TDraw/formula.cpp index 6d6c615ba..1ac724dbc 100644 --- a/uppsrc/TDraw/formula.cpp +++ b/uppsrc/TDraw/formula.cpp @@ -3,7 +3,7 @@ #include "formula.h" -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // RLOG(x) #define LDUMP(x) // RDUMP(x) @@ -1416,4 +1416,4 @@ void AppMain() } #endif -END_UPP_NAMESPACE +} diff --git a/uppsrc/TDraw/formula.h b/uppsrc/TDraw/formula.h index 6e152193a..9dde5c5a4 100644 --- a/uppsrc/TDraw/formula.h +++ b/uppsrc/TDraw/formula.h @@ -1,7 +1,7 @@ #ifndef __TDraw_formula__ #define __TDraw_formula__ -NAMESPACE_UPP +namespace Upp { inline int Percent(int p, int q) { return p * q / 100; } enum FORMSYMBOL @@ -262,6 +262,6 @@ private: const Display& StdFormulaDisplay(); -END_UPP_NAMESPACE +} #endif//__TDraw_formula__ diff --git a/uppsrc/TDraw/util.cpp b/uppsrc/TDraw/util.cpp index ef4dc1626..dd7a65d96 100644 --- a/uppsrc/TDraw/util.cpp +++ b/uppsrc/TDraw/util.cpp @@ -9,7 +9,7 @@ enum { DOC_SCREEN_ZOOM = 140 }; #endif -NAMESPACE_UPP +namespace Upp { #ifdef SYSTEMDRAW @@ -1480,4 +1480,4 @@ PrinterInfo::PrinterInfo() #endif } -END_UPP_NAMESPACE +} diff --git a/uppsrc/TDraw/util.h b/uppsrc/TDraw/util.h index 2bc3da8c8..2684ab94f 100644 --- a/uppsrc/TDraw/util.h +++ b/uppsrc/TDraw/util.h @@ -1,4 +1,4 @@ -NAMESPACE_UPP +namespace Upp { static const int DOTS_PER_METER_INT = 23622; static const double DOTS_PER_METER_DBL = 600e3 / 25.4; @@ -194,4 +194,4 @@ private: int GdiGetFreeSpace(); #endif -END_UPP_NAMESPACE +} diff --git a/uppsrc/TSql/Ctrl/DlgLogin.cpp b/uppsrc/TSql/Ctrl/DlgLogin.cpp index c4aa5b776..62a109c0f 100644 --- a/uppsrc/TSql/Ctrl/DlgLogin.cpp +++ b/uppsrc/TSql/Ctrl/DlgLogin.cpp @@ -4,7 +4,7 @@ #include "TSqlCtrl.h" #pragma hdrstop -NAMESPACE_UPP +namespace Upp { String Garble(const char *s) { @@ -273,4 +273,4 @@ bool DlgLogin::StdSetPassword(SqlSession& session, String new_pwd) return cursor.Execute(cmd); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/TSql/Ctrl/DlgLogin.h b/uppsrc/TSql/Ctrl/DlgLogin.h index ed0916b48..1a19632af 100644 --- a/uppsrc/TSql/Ctrl/DlgLogin.h +++ b/uppsrc/TSql/Ctrl/DlgLogin.h @@ -1,7 +1,7 @@ #ifndef __TSql_Ctrl_DlgLogin_h__ #define __TSql_Ctrl_DlgLogin_h__ -NAMESPACE_UPP +namespace Upp { #define LAYOUTFILE #include @@ -45,6 +45,6 @@ protected: STYLE style; }; -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/TSql/Ctrl/TSqlCtrl.icpp b/uppsrc/TSql/Ctrl/TSqlCtrl.icpp index 94d299011..0b02ae520 100644 --- a/uppsrc/TSql/Ctrl/TSqlCtrl.icpp +++ b/uppsrc/TSql/Ctrl/TSqlCtrl.icpp @@ -1,9 +1,9 @@ #include "TSqlCtrl.h" #pragma hdrstop -NAMESPACE_UPP +namespace Upp { #define TFILE #include -END_UPP_NAMESPACE +} diff --git a/uppsrc/TSql/TSql_init.icpp b/uppsrc/TSql/TSql_init.icpp index 15f297eee..a4cdcdd6b 100644 --- a/uppsrc/TSql/TSql_init.icpp +++ b/uppsrc/TSql/TSql_init.icpp @@ -1,8 +1,8 @@ #include "TSql.h" -NAMESPACE_UPP +namespace Upp { #define TFILE #include -END_UPP_NAMESPACE +} diff --git a/uppsrc/TSql/dict.cpp b/uppsrc/TSql/dict.cpp index 43a1666ea..8662cdccd 100644 --- a/uppsrc/TSql/dict.cpp +++ b/uppsrc/TSql/dict.cpp @@ -4,7 +4,7 @@ #include "TSql.h" #pragma hdrstop -NAMESPACE_UPP +namespace Upp { #ifndef NOAPPSQL int SqlUserGetRightsTo(const char* table) @@ -528,4 +528,4 @@ unsigned GetHashValue(const SqlAnyColumn& t) return GetHashValue(static_cast(t)) ^ GetHashValue(t.column); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/TSql/dict.h b/uppsrc/TSql/dict.h index d23a016f8..4ffe52ac2 100644 --- a/uppsrc/TSql/dict.h +++ b/uppsrc/TSql/dict.h @@ -9,7 +9,7 @@ // if(UserCanRead[Write]("ADRESA"[ADRESA])) // ... -NAMESPACE_UPP +namespace Upp { enum // rights { @@ -227,4 +227,4 @@ inline SqlIndexMap& operator << (SqlIndexMap& map, const char* table) { map.Add( unsigned GetHashValue(const SqlAnyTable& table); unsigned GetHashValue(const SqlAnyColumn& column); -END_UPP_NAMESPACE +} diff --git a/uppsrc/TSql/template.h b/uppsrc/TSql/template.h index 4070411c5..2bfea2637 100644 --- a/uppsrc/TSql/template.h +++ b/uppsrc/TSql/template.h @@ -1,7 +1,7 @@ ////////////////////////////////////////////////////////////////////// // sql/template: SQL templates. -NAMESPACE_UPP +namespace Upp { void __sqltempl__instantiation__(Gate2); // a weird compiler bug @@ -161,4 +161,4 @@ SqlSelect SelectSchemaWhere(SqlBool cond = true, T * = 0) return Select(T::ColumnSet()).FromSchema(SqlCol(T::TableName)).Where(cond); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/TSql/util.cpp b/uppsrc/TSql/util.cpp index 3ec418056..df29ca78c 100644 --- a/uppsrc/TSql/util.cpp +++ b/uppsrc/TSql/util.cpp @@ -8,7 +8,7 @@ #define GENID CPPID #include -NAMESPACE_UPP +namespace Upp { extern const char *txtFnTSqlTemplateFetchSeqKeyNull() { return t_("Table '%s', column '%s': NULL value requested."); } extern const char *txtFnTSqlTemplateFetchSeqNotFound() { return t_("Row '%s' not found (table '%s', column '%s')."); } @@ -814,4 +814,4 @@ SqlBool GetYearDayRange(const SqlVal& date, Date min, Date max) return result; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/TSql/util.h b/uppsrc/TSql/util.h index b2d075d9b..fe3dee849 100644 --- a/uppsrc/TSql/util.h +++ b/uppsrc/TSql/util.h @@ -1,4 +1,4 @@ -NAMESPACE_UPP +namespace Upp { void __sqltempl__instantiation__(Gate2); // a weird compiler bug @@ -140,4 +140,4 @@ String GetYearDayIndex(Date date); SqlVal GetYearDayIndex(const SqlVal& date); SqlBool GetYearDayRange(const SqlVal& date, Date min, Date max); -END_UPP_NAMESPACE +} diff --git a/uppsrc/TabBar/FileTabs.cpp b/uppsrc/TabBar/FileTabs.cpp index 9aabb4cb1..84e2827e4 100644 --- a/uppsrc/TabBar/FileTabs.cpp +++ b/uppsrc/TabBar/FileTabs.cpp @@ -1,6 +1,6 @@ #include "TabBar.h" -NAMESPACE_UPP +namespace Upp { String FileTabs::GetFileGroup(const String &file) { @@ -181,4 +181,4 @@ extcolor(IsDark(SColorFace()) ? Blend(White, LtBlue) : LtBlue) } -END_UPP_NAMESPACE +} diff --git a/uppsrc/TabBar/TabBar.cpp b/uppsrc/TabBar/TabBar.cpp index 6be84d4de..e1ce47b53 100644 --- a/uppsrc/TabBar/TabBar.cpp +++ b/uppsrc/TabBar/TabBar.cpp @@ -7,7 +7,7 @@ #define IMAGEFILE #include -NAMESPACE_UPP +namespace Upp { // AlignedFrame void AlignedFrame::FrameLayout(Rect &r) @@ -2675,4 +2675,4 @@ CH_STYLE(TabBar, Style, StyleDefault) DefaultGroupSeparators(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/TabBar/TabBar.h b/uppsrc/TabBar/TabBar.h index 474cd985b..1e66f8dbe 100644 --- a/uppsrc/TabBar/TabBar.h +++ b/uppsrc/TabBar/TabBar.h @@ -7,7 +7,7 @@ #define IMAGEFILE #include -NAMESPACE_UPP +namespace Upp { //#define TABBAR_DEBUG @@ -540,6 +540,6 @@ public: #include "FileTabs.h" #include "TabBarCtrl.h" -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/TabBar/TabBarCtrl.cpp b/uppsrc/TabBar/TabBarCtrl.cpp index 816d4cc8e..059711a11 100644 --- a/uppsrc/TabBar/TabBarCtrl.cpp +++ b/uppsrc/TabBar/TabBarCtrl.cpp @@ -1,6 +1,6 @@ #include "TabBar.h" -NAMESPACE_UPP +namespace Upp { TabBarCtrl& TabBarCtrl::AddCtrl(Ctrl &ctrl, Value key, Value value, Image icon, String group, bool make_active) { @@ -107,4 +107,4 @@ void TabBarCtrl::TabClosed(Value key) ctrls.RemoveKey(key); } -END_UPP_NAMESPACE \ No newline at end of file +} \ No newline at end of file diff --git a/uppsrc/Turtle/ChSysInit.cpp b/uppsrc/Turtle/ChSysInit.cpp index def0a57e1..8f21ea754 100644 --- a/uppsrc/Turtle/ChSysInit.cpp +++ b/uppsrc/Turtle/ChSysInit.cpp @@ -2,7 +2,7 @@ #ifdef GUI_TURTLE -NAMESPACE_UPP +namespace Upp { void ChSysInit() { @@ -16,6 +16,6 @@ void ChHostSkin() ChSysInit(); } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/Turtle/Clip.cpp b/uppsrc/Turtle/Clip.cpp index fa19cee0e..01a5f6c54 100644 --- a/uppsrc/Turtle/Clip.cpp +++ b/uppsrc/Turtle/Clip.cpp @@ -2,7 +2,7 @@ #ifdef GUI_TURTLE -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // LOG(x) @@ -233,6 +233,6 @@ Vector GetFiles(PasteClip& clip) return f; } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/Turtle/Ctrl.cpp b/uppsrc/Turtle/Ctrl.cpp index 2daeb0588..f7b7e8d91 100644 --- a/uppsrc/Turtle/Ctrl.cpp +++ b/uppsrc/Turtle/Ctrl.cpp @@ -4,7 +4,7 @@ #define LLOG(x) // DLOG(x) -NAMESPACE_UPP +namespace Upp { void Ctrl::GuiPlatformConstruct() { @@ -68,6 +68,6 @@ String Ctrl::Name() const { return Name0(); } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/Turtle/DnD.cpp b/uppsrc/Turtle/DnD.cpp index 216323ee0..d251a335d 100644 --- a/uppsrc/Turtle/DnD.cpp +++ b/uppsrc/Turtle/DnD.cpp @@ -2,7 +2,7 @@ #ifdef GUI_TURTLE -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // DLOG(x) @@ -145,6 +145,6 @@ int Ctrl::DoDragAndDrop(const char *fmts, const Image& sample, dword actions, void Ctrl::SetSelectionSource(const char *fmts) {} -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/Turtle/Draw.cpp b/uppsrc/Turtle/Draw.cpp index 280299f71..1b01c873c 100644 --- a/uppsrc/Turtle/Draw.cpp +++ b/uppsrc/Turtle/Draw.cpp @@ -4,7 +4,7 @@ #define LLOG(x) // LOG(x) -NAMESPACE_UPP +namespace Upp { void SystemDraw::PutRect(const Rect& r, Color color) { @@ -37,6 +37,6 @@ void SystemDraw::PutRect(const Rect& r, Color color) pos = p; } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/Turtle/DrawDragRect.cpp b/uppsrc/Turtle/DrawDragRect.cpp index 0fe266259..7d75cb611 100644 --- a/uppsrc/Turtle/DrawDragRect.cpp +++ b/uppsrc/Turtle/DrawDragRect.cpp @@ -2,7 +2,7 @@ #ifdef GUI_TURTLE -NAMESPACE_UPP +namespace Upp { struct DrawDragRectInfo { Rect rect1, rect2, clip; @@ -72,6 +72,6 @@ void FinishDragRect(Ctrl& q) { } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/Turtle/Event.cpp b/uppsrc/Turtle/Event.cpp index a0dcb2450..2c28c4903 100644 --- a/uppsrc/Turtle/Event.cpp +++ b/uppsrc/Turtle/Event.cpp @@ -2,7 +2,7 @@ #ifdef GUI_TURTLE -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // LLOG(x) #define LDUMP(x) // RDUMP(x) @@ -429,6 +429,6 @@ void Ctrl::EventLoop(Ctrl *ctrl) LLOG(LOG_END << "Leaving event loop "); } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/Turtle/Gui.h b/uppsrc/Turtle/Gui.h index 4c94007a9..1b063d15e 100644 --- a/uppsrc/Turtle/Gui.h +++ b/uppsrc/Turtle/Gui.h @@ -1,6 +1,6 @@ #define GUI_TURTLE -NAMESPACE_UPP +namespace Upp { class SystemDraw : public Draw { public: @@ -321,7 +321,7 @@ public: ~ImageDraw(); }; -END_UPP_NAMESPACE +} #define GUIPLATFORM_KEYCODES_INCLUDE "Win32Keys.h" @@ -339,13 +339,13 @@ END_UPP_NAMESPACE #define GUIPLATFORM_TOPWINDOW_DECLS_INCLUDE "Win32Top.h" -NAMESPACE_UPP +namespace Upp { inline unsigned GetHashValue(const HWND& hwnd) { return (unsigned)(intptr_t)hwnd; } -END_UPP_NAMESPACE +} #ifdef PLATFORM_WIN32 #ifndef PLATFORM_WINCE diff --git a/uppsrc/Turtle/Image.cpp b/uppsrc/Turtle/Image.cpp index e3c6f570c..6968def94 100644 --- a/uppsrc/Turtle/Image.cpp +++ b/uppsrc/Turtle/Image.cpp @@ -2,7 +2,7 @@ #ifdef GUI_TURTLE -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // LOG(x) #define LTIMING(x) // RTIMING(x) @@ -130,6 +130,6 @@ STD_CURSOR(SizeBottom, 14) STD_CURSOR(SizeBottomRight, 15) STD_CURSOR(Hand, 16) -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/Turtle/Local.h b/uppsrc/Turtle/Local.h index f1511f677..32d036ec2 100644 --- a/uppsrc/Turtle/Local.h +++ b/uppsrc/Turtle/Local.h @@ -2,7 +2,7 @@ #ifdef GUI_TURTLE -NAMESPACE_UPP +namespace Upp { class TopWindowFrame : public Ctrl { public: @@ -58,6 +58,6 @@ public: TopWindowFrame(); }; -END_UPP_NAMESPACE +} #endif \ No newline at end of file diff --git a/uppsrc/Turtle/Output.cpp b/uppsrc/Turtle/Output.cpp index e51b2ad27..fd0dd3341 100644 --- a/uppsrc/Turtle/Output.cpp +++ b/uppsrc/Turtle/Output.cpp @@ -2,7 +2,7 @@ #ifdef GUI_TURTLE -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // LLOG(x) #define LDUMP(x) // RDUMP(x) @@ -176,6 +176,6 @@ void Ctrl::DoPaint() } } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/Turtle/Server.cpp b/uppsrc/Turtle/Server.cpp index aa37eb4cd..f5d47942d 100644 --- a/uppsrc/Turtle/Server.cpp +++ b/uppsrc/Turtle/Server.cpp @@ -8,7 +8,7 @@ #ifdef GUI_TURTLE -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // DLOG(x) #define LDUMP(x) // DDUMP(x) @@ -149,6 +149,6 @@ bool Ctrl::StartSession() Callback Ctrl::WhenDisconnect; -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/Turtle/Stream.cpp b/uppsrc/Turtle/Stream.cpp index 2802ac6a3..a452d9599 100644 --- a/uppsrc/Turtle/Stream.cpp +++ b/uppsrc/Turtle/Stream.cpp @@ -2,7 +2,7 @@ #ifdef GUI_TURTLE -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // LLOG(x) #define LDUMP(x) // RDUMP(x) @@ -29,6 +29,6 @@ String TurtleStream::FlushStream() return s; } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/Turtle/Top.cpp b/uppsrc/Turtle/Top.cpp index c72b59bc2..aab1f9459 100644 --- a/uppsrc/Turtle/Top.cpp +++ b/uppsrc/Turtle/Top.cpp @@ -2,7 +2,7 @@ #ifdef GUI_TURTLE -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // LOG(x) @@ -149,6 +149,6 @@ void TopWindow::SerializePlacement(Stream& s, bool reminimize) GuiLock __; } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/Turtle/TopFrame.cpp b/uppsrc/Turtle/TopFrame.cpp index 842388d09..1e09de1a5 100644 --- a/uppsrc/Turtle/TopFrame.cpp +++ b/uppsrc/Turtle/TopFrame.cpp @@ -2,7 +2,7 @@ #ifdef GUI_TURTLE -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // LOG(x) #define LDUMP(x) //DDUMP(x) @@ -231,6 +231,6 @@ Image TopWindowFrame::CursorImage(Point p, dword) return GetDragImage(HasCapture() ? dir : GetDragMode(p)); } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/Turtle/Turtle.h b/uppsrc/Turtle/Turtle.h index b167973f3..ff172f356 100644 --- a/uppsrc/Turtle/Turtle.h +++ b/uppsrc/Turtle/Turtle.h @@ -8,7 +8,7 @@ #include #endif -NAMESPACE_UPP +namespace Upp { #define IMAGECLASS FBImg #define IMAGEFILE @@ -135,6 +135,6 @@ public: ~PrinterJob() {} }; -END_UPP_NAMESPACE +} #define GUIPLATFORM_INCLUDE_AFTER diff --git a/uppsrc/Turtle/Wnd.cpp b/uppsrc/Turtle/Wnd.cpp index 1636c3fcd..6b727aa25 100644 --- a/uppsrc/Turtle/Wnd.cpp +++ b/uppsrc/Turtle/Wnd.cpp @@ -2,7 +2,7 @@ #ifdef GUI_TURTLE -NAMESPACE_UPP +namespace Upp { #define LLOG(x) //LOG(x) #define LDUMP(x) //DDUMP(x) @@ -450,6 +450,6 @@ void Ctrl::SysEndLoop() { } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/Web/SSL/WebSSL.h b/uppsrc/Web/SSL/WebSSL.h index 603401fe1..fa8cd9b05 100644 --- a/uppsrc/Web/SSL/WebSSL.h +++ b/uppsrc/Web/SSL/WebSSL.h @@ -9,7 +9,7 @@ #include #include -NAMESPACE_UPP +namespace Upp { void *SSLAlloc(size_t size); void SSLFree(void *ptr); @@ -190,7 +190,7 @@ private: bool ProxyConnect(); }; -END_UPP_NAMESPACE +} #endif//flagNOSSL diff --git a/uppsrc/Web/SSL/httpscli.cpp b/uppsrc/Web/SSL/httpscli.cpp index e63aa8bf9..2185a3565 100644 --- a/uppsrc/Web/SSL/httpscli.cpp +++ b/uppsrc/Web/SSL/httpscli.cpp @@ -2,7 +2,7 @@ #include "WebSSL.h" -NAMESPACE_UPP +namespace Upp { extern bool HttpClient_Trace__; @@ -123,6 +123,6 @@ bool HttpsClient::CreateClientSocket() return true; } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/Web/SSL/util.cpp b/uppsrc/Web/SSL/util.cpp index b6178935b..d992c7376 100644 --- a/uppsrc/Web/SSL/util.cpp +++ b/uppsrc/Web/SSL/util.cpp @@ -5,7 +5,7 @@ #include -NAMESPACE_UPP +namespace Upp { #define LOG_UPP_SSL_MALLOC 0 @@ -600,6 +600,6 @@ bool SSLSecureSocket(Socket& socket) } -END_UPP_NAMESPACE +} #endif//flagNOSSL diff --git a/uppsrc/Web/ScgiServer.cpp b/uppsrc/Web/ScgiServer.cpp index aa0fdd123..22a1ad42b 100644 --- a/uppsrc/Web/ScgiServer.cpp +++ b/uppsrc/Web/ScgiServer.cpp @@ -2,7 +2,7 @@ #include "Web.h" -NAMESPACE_UPP +namespace Upp { bool run = true; @@ -90,4 +90,4 @@ void ScgiServer::Run(int listenCount) Process(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Web/Web.h b/uppsrc/Web/Web.h index cc6bf3db5..7a32713bb 100644 --- a/uppsrc/Web/Web.h +++ b/uppsrc/Web/Web.h @@ -21,7 +21,7 @@ typedef int socklen_t; #error Unsupported platform #endif//PLATFORM switch -NAMESPACE_UPP +namespace Upp { #include "util.h" #include "html.h" @@ -34,6 +34,6 @@ NAMESPACE_UPP #include "sproc.h" #include "ScgiServer.h" -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/Web/Web_init.icpp b/uppsrc/Web/Web_init.icpp index 5d9f295f1..cafb38a4b 100644 --- a/uppsrc/Web/Web_init.icpp +++ b/uppsrc/Web/Web_init.icpp @@ -1,8 +1,8 @@ #include "Web.h" -NAMESPACE_UPP +namespace Upp { #define TFILE #include -END_UPP_NAMESPACE +} diff --git a/uppsrc/Web/auth.cpp b/uppsrc/Web/auth.cpp index 269420769..e62ab9817 100644 --- a/uppsrc/Web/auth.cpp +++ b/uppsrc/Web/auth.cpp @@ -1,6 +1,6 @@ #include "Web.h" -NAMESPACE_UPP +namespace Upp { enum { EXPIRE = 60 * 30 }; // 30 minutes inactivity expires token @@ -286,4 +286,4 @@ String WebUser::Login(const HttpQuery& map, String& args, const char *iname, boo ////////////////////////////////////////////////////////////////////// -END_UPP_NAMESPACE +} diff --git a/uppsrc/Web/html.cpp b/uppsrc/Web/html.cpp index 0c858c176..b2b807f80 100644 --- a/uppsrc/Web/html.cpp +++ b/uppsrc/Web/html.cpp @@ -1,6 +1,6 @@ #include "Web.h" -NAMESPACE_UPP +namespace Upp { String ToHtml(const char *s) { @@ -612,4 +612,4 @@ HtmlTag HtmlFntSize(int size) return HtmlTag("span").Attr("style", Sprintf("font-size: %dpt", size)); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Web/httpcli.cpp b/uppsrc/Web/httpcli.cpp index 0535849e7..2579f0a82 100644 --- a/uppsrc/Web/httpcli.cpp +++ b/uppsrc/Web/httpcli.cpp @@ -1,6 +1,6 @@ #include "Web.h" -NAMESPACE_UPP +namespace Upp { bool HttpClient_Trace__; @@ -634,4 +634,4 @@ String HttpClientGet(String url, String *server_headers, String *error, return HttpClientGet(url, Null, Null, Null, server_headers, error, progress, timeout, max_redirect, retries); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Web/httpcli_old.cpp b/uppsrc/Web/httpcli_old.cpp index 0adacb5ae..7b098b106 100644 --- a/uppsrc/Web/httpcli_old.cpp +++ b/uppsrc/Web/httpcli_old.cpp @@ -1,7 +1,7 @@ #include "Web.h" #pragma hdrstop -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // RLOG(x) #define LLOGBLOCK(x) // RLOGBLOCK(x) @@ -418,4 +418,4 @@ String HttpClientGet(String url, String *server_headers, String *error, return HttpClientGet(url, Null, Null, Null, server_headers, error, progress, timeout, max_redirect, retries); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Web/httpsrv.cpp b/uppsrc/Web/httpsrv.cpp index 1d6ffa93f..1e47503e0 100644 --- a/uppsrc/Web/httpsrv.cpp +++ b/uppsrc/Web/httpsrv.cpp @@ -1,6 +1,6 @@ #include "Web.h" -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // RLOG(x) @@ -987,4 +987,4 @@ String GetHttpErrorPage(HttpQuery query, String err, bool show_query) return HtmlTitlePage(t_("Web server error"), body); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Web/md5.cpp b/uppsrc/Web/md5.cpp index 3ef22cb9b..f90e14e18 100644 --- a/uppsrc/Web/md5.cpp +++ b/uppsrc/Web/md5.cpp @@ -1,6 +1,6 @@ #include "Web.h" -NAMESPACE_UPP +namespace Upp { String MD5Digest(const char *text, int length) { @@ -9,4 +9,4 @@ String MD5Digest(const char *text, int length) return String(digest, 16); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Web/smtp.cpp b/uppsrc/Web/smtp.cpp index a3c4082ad..c6a462771 100644 --- a/uppsrc/Web/smtp.cpp +++ b/uppsrc/Web/smtp.cpp @@ -1,6 +1,6 @@ #include "Web.h" -NAMESPACE_UPP +namespace Upp { //#define SMTP_DEBUG // uncomment this line to turn on LOG-based SMTP emulation //#define SMTP_LOG // uncomment this line to turn on command-line based logging of SMTP communication @@ -439,4 +439,4 @@ SmtpMail& SmtpMail::New() return *this; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Web/socket.cpp b/uppsrc/Web/socket.cpp index a6144fd0d..865a2e520 100644 --- a/uppsrc/Web/socket.cpp +++ b/uppsrc/Web/socket.cpp @@ -4,7 +4,7 @@ #include #endif -NAMESPACE_UPP +namespace Upp { #define FAKEERROR 0 #define FAKESLOWLINE 0 // 57600 // Bd fake line speed, 0 = off @@ -885,4 +885,4 @@ void SocketEvent::Select(Socket& socket, int fd_flags) #endif -END_UPP_NAMESPACE +} diff --git a/uppsrc/Web/sproc.cpp b/uppsrc/Web/sproc.cpp index fd6bf432c..8edc03ab1 100644 --- a/uppsrc/Web/sproc.cpp +++ b/uppsrc/Web/sproc.cpp @@ -7,7 +7,7 @@ #include #endif -NAMESPACE_UPP +namespace Upp { /* Mirek:unused static void WriteLog(const String& s) @@ -631,4 +631,4 @@ One StartProcess(const char *cmdline, const char *envptr, int time return rsp.Detach(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/Web/util.cpp b/uppsrc/Web/util.cpp index 484536d90..ef61905c9 100644 --- a/uppsrc/Web/util.cpp +++ b/uppsrc/Web/util.cpp @@ -1,6 +1,6 @@ #include "Web.h" -NAMESPACE_UPP +namespace Upp { String FormatIP(dword _ip) { @@ -761,4 +761,4 @@ String HttpQuery::ToString() const return out; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/XmlRpc/Client.cpp b/uppsrc/XmlRpc/Client.cpp index a33acb865..3dbb99b05 100644 --- a/uppsrc/XmlRpc/Client.cpp +++ b/uppsrc/XmlRpc/Client.cpp @@ -2,7 +2,7 @@ #define LLOG(x) // LOG(x) -NAMESPACE_UPP +namespace Upp { static bool sLogRpcCalls; @@ -118,4 +118,4 @@ void XmlRpcCall::ClearError() error.Clear(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/XmlRpc/Server.cpp b/uppsrc/XmlRpc/Server.cpp index 57756e117..72c0762bf 100644 --- a/uppsrc/XmlRpc/Server.cpp +++ b/uppsrc/XmlRpc/Server.cpp @@ -3,7 +3,7 @@ #define LLOG(x) // DLOG(x) -NAMESPACE_UPP +namespace Upp { int CharFilterNoCr(int c) { @@ -72,4 +72,4 @@ bool XmlRpcServer(int port, const char *group) } } -END_UPP_NAMESPACE +} diff --git a/uppsrc/XmlRpc/XmlRpc.h b/uppsrc/XmlRpc/XmlRpc.h index 9d5c9f9e1..a048d5100 100644 --- a/uppsrc/XmlRpc/XmlRpc.h +++ b/uppsrc/XmlRpc/XmlRpc.h @@ -4,7 +4,7 @@ #include #include -NAMESPACE_UPP +namespace Upp { bool XmlRpcPerform(Socket& http, const char *group); bool XmlRpcServer(int port = 80, const char *group = NULL); @@ -78,6 +78,6 @@ void LogXmlRpcCalls(bool b = true); int CharFilterNoCr(int c); -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/art/BlueBar/BlueBar.h b/uppsrc/art/BlueBar/BlueBar.h index 3477ab4d6..39c86a3f9 100644 --- a/uppsrc/art/BlueBar/BlueBar.h +++ b/uppsrc/art/BlueBar/BlueBar.h @@ -3,12 +3,12 @@ #include -NAMESPACE_UPP +namespace Upp { void InstallBlueToolBar(); void InstallBlueMenuBar(); void InstallBlueBar(); -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/art/BlueBar/BlueSkin.cpp b/uppsrc/art/BlueBar/BlueSkin.cpp index 0c7590376..d88640878 100644 --- a/uppsrc/art/BlueBar/BlueSkin.cpp +++ b/uppsrc/art/BlueBar/BlueSkin.cpp @@ -1,6 +1,6 @@ #include "BlueBar.h" -NAMESPACE_UPP +namespace Upp { #define IMAGECLASS BlueImg #define IMAGEFILE @@ -53,4 +53,4 @@ void InstallBlueBar() InstallBlueToolBar(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/ide/Android/Adb.cpp b/uppsrc/ide/Android/Adb.cpp index e898f9b5a..bc7dc91cf 100644 --- a/uppsrc/ide/Android/Adb.cpp +++ b/uppsrc/ide/Android/Adb.cpp @@ -1,6 +1,6 @@ #include "Android.h" -NAMESPACE_UPP +namespace Upp { Adb::Adb(const String& path) : path(path) { @@ -69,4 +69,4 @@ String Adb::MakeGetAllProcessesCmd() const return MakeCmd() + " shell ps"; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/ide/Android/Android.cpp b/uppsrc/ide/Android/Android.cpp index 273cb5551..288435788 100644 --- a/uppsrc/ide/Android/Android.cpp +++ b/uppsrc/ide/Android/Android.cpp @@ -1,6 +1,6 @@ #include "Android.h" -NAMESPACE_UPP +namespace Upp { String Android::GetScriptExt() { @@ -91,4 +91,4 @@ String Android::FindLongestVersion(const Vector& versions) return longest; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/ide/Android/Android.h b/uppsrc/ide/Android/Android.h index 663e567f7..ffa83749a 100644 --- a/uppsrc/ide/Android/Android.h +++ b/uppsrc/ide/Android/Android.h @@ -7,7 +7,7 @@ #include "Executables.h" #include "Devices.h" -NAMESPACE_UPP +namespace Upp { class Android { public: @@ -157,6 +157,6 @@ private: }; -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/ide/Android/AndroidManifest.cpp b/uppsrc/ide/Android/AndroidManifest.cpp index 853a09777..ee7cfb4d9 100644 --- a/uppsrc/ide/Android/AndroidManifest.cpp +++ b/uppsrc/ide/Android/AndroidManifest.cpp @@ -1,6 +1,6 @@ #include "Android.h" -NAMESPACE_UPP +namespace Upp { AndroidManifest::AndroidManifest() { @@ -12,4 +12,4 @@ AndroidManifest::~AndroidManifest() } -END_UPP_NAMESPACE +} diff --git a/uppsrc/ide/Android/AndroidNDK.cpp b/uppsrc/ide/Android/AndroidNDK.cpp index 0bdd28384..de4618eaa 100644 --- a/uppsrc/ide/Android/AndroidNDK.cpp +++ b/uppsrc/ide/Android/AndroidNDK.cpp @@ -1,6 +1,6 @@ #include "Android.h" -NAMESPACE_UPP +namespace Upp { String AndroidNDK::GetDownloadUrl() { @@ -158,4 +158,4 @@ String AndroidNDK::GetCppIncludeDir(const String& cppRuntime) const return ""; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/ide/Android/AndroidSDK.cpp b/uppsrc/ide/Android/AndroidSDK.cpp index fca2c94fc..86fe04c71 100644 --- a/uppsrc/ide/Android/AndroidSDK.cpp +++ b/uppsrc/ide/Android/AndroidSDK.cpp @@ -2,7 +2,7 @@ #include -NAMESPACE_UPP +namespace Upp { String AndroidSDK::GetDownloadUrl() { @@ -241,4 +241,4 @@ String AndroidSDK::ToolsDir() const // --------------------------------------------------------------- -END_UPP_NAMESPACE +} diff --git a/uppsrc/ide/Android/Apk.cpp b/uppsrc/ide/Android/Apk.cpp index ac4b40215..ade20ab20 100644 --- a/uppsrc/ide/Android/Apk.cpp +++ b/uppsrc/ide/Android/Apk.cpp @@ -1,6 +1,6 @@ #include "Android.h" -NAMESPACE_UPP +namespace Upp { Apk::Apk(const String& path, const AndroidSDK& androidSDK) { @@ -53,4 +53,4 @@ String Apk::FindBadgeTagValue(const String& badge, const String& tag) const return tagValue; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/ide/Android/Devices.h b/uppsrc/ide/Android/Devices.h index 0ca4957ff..1c88e3ff2 100644 --- a/uppsrc/ide/Android/Devices.h +++ b/uppsrc/ide/Android/Devices.h @@ -3,7 +3,7 @@ #include -NAMESPACE_UPP +namespace Upp { class AndroidDevice : public Moveable { public: @@ -61,6 +61,6 @@ private: Size size; }; -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/ide/Android/Executables.h b/uppsrc/ide/Android/Executables.h index c95668e13..119587b87 100644 --- a/uppsrc/ide/Android/Executables.h +++ b/uppsrc/ide/Android/Executables.h @@ -5,7 +5,7 @@ #include -NAMESPACE_UPP +namespace Upp { class LogCat; @@ -71,6 +71,6 @@ private: int jobs; }; -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/ide/Android/LogCat.cpp b/uppsrc/ide/Android/LogCat.cpp index 9da5886cd..0574aaddd 100644 --- a/uppsrc/ide/Android/LogCat.cpp +++ b/uppsrc/ide/Android/LogCat.cpp @@ -1,6 +1,6 @@ #include "Executables.h" -NAMESPACE_UPP +namespace Upp { LogCat::LogCat() { @@ -26,4 +26,4 @@ String LogCat::MakeCmdByTag(const Adb& adb, const String& packageName) const return adb.MakeCmd() + " " + MakeCmdByTag(packageName); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/ide/Android/NDKBuild.cpp b/uppsrc/ide/Android/NDKBuild.cpp index c908c76a6..ec2be943d 100644 --- a/uppsrc/ide/Android/NDKBuild.cpp +++ b/uppsrc/ide/Android/NDKBuild.cpp @@ -1,6 +1,6 @@ #include "Executables.h" -NAMESPACE_UPP +namespace Upp { NDKBuild::NDKBuild(const String& path) { @@ -24,4 +24,4 @@ String NDKBuild::MakeCmd() const return cmd; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/ide/Builders/Android.h b/uppsrc/ide/Builders/Android.h index d062fa9a8..f894c6646 100644 --- a/uppsrc/ide/Builders/Android.h +++ b/uppsrc/ide/Builders/Android.h @@ -3,7 +3,7 @@ #include -NAMESPACE_UPP +namespace Upp { class AndroidProject { public: @@ -152,6 +152,6 @@ private: Vector importedModules; }; -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/ide/Builders/AndroidApplicationMakeFile.cpp b/uppsrc/ide/Builders/AndroidApplicationMakeFile.cpp index 41b94d71c..5b112eaed 100644 --- a/uppsrc/ide/Builders/AndroidApplicationMakeFile.cpp +++ b/uppsrc/ide/Builders/AndroidApplicationMakeFile.cpp @@ -1,6 +1,6 @@ #include "Android.h" -NAMESPACE_UPP +namespace Upp { AndroidApplicationMakeFile::AndroidApplicationMakeFile() { @@ -102,4 +102,4 @@ void AndroidApplicationMakeFile::AppendToolchain(String& makeFile) const AndroidMakeFile::AppendString(makeFile, toolchain, "NDK_TOOLCHAIN_VERSION"); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/ide/Builders/AndroidMakeFile.cpp b/uppsrc/ide/Builders/AndroidMakeFile.cpp index 21e8d45b6..5509ec55e 100644 --- a/uppsrc/ide/Builders/AndroidMakeFile.cpp +++ b/uppsrc/ide/Builders/AndroidMakeFile.cpp @@ -1,6 +1,6 @@ #include "Android.h" -NAMESPACE_UPP +namespace Upp { void AndroidMakeFile::AppendString(String& makeFile, const String& variable, @@ -95,4 +95,4 @@ void AndroidMakeFile::AppendImportedModules(String& makeFile) const makeFile << "$(call import-module, " << importedModules[i] << ")\n"; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/ide/Builders/AndroidModuleMakeFile.cpp b/uppsrc/ide/Builders/AndroidModuleMakeFile.cpp index ef17dda1d..4ddaf911e 100644 --- a/uppsrc/ide/Builders/AndroidModuleMakeFile.cpp +++ b/uppsrc/ide/Builders/AndroidModuleMakeFile.cpp @@ -1,6 +1,6 @@ #include "Android.h" -NAMESPACE_UPP +namespace Upp { AndroidModuleMakeFile::AndroidModuleMakeFile() { @@ -150,4 +150,4 @@ void AndroidModuleMakeFile::AppendModules(String& makeFile) const } } -END_UPP_NAMESPACE +} diff --git a/uppsrc/ide/Builders/AndroidProject.cpp b/uppsrc/ide/Builders/AndroidProject.cpp index 361590c6f..562201bba 100644 --- a/uppsrc/ide/Builders/AndroidProject.cpp +++ b/uppsrc/ide/Builders/AndroidProject.cpp @@ -1,6 +1,6 @@ #include "Android.h" -NAMESPACE_UPP +namespace Upp { AndroidProject::AndroidProject() { @@ -106,4 +106,4 @@ bool AndroidProject::HasDir() const return !dir.IsEmpty(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/ide/Builders/Blitz.cpp b/uppsrc/ide/Builders/Blitz.cpp index 60e90036c..4eb512f42 100644 --- a/uppsrc/ide/Builders/Blitz.cpp +++ b/uppsrc/ide/Builders/Blitz.cpp @@ -1,6 +1,6 @@ #include "Builders.h" -NAMESPACE_UPP +namespace Upp { String BlitzBaseFile() { @@ -99,4 +99,4 @@ Blitz BlitzBuilderComponent::MakeBlitzStep(Vector& sfile, Vector return b; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/ide/Builders/BuilderComponents.h b/uppsrc/ide/Builders/BuilderComponents.h index 1e955af01..0fc50fbd9 100644 --- a/uppsrc/ide/Builders/BuilderComponents.h +++ b/uppsrc/ide/Builders/BuilderComponents.h @@ -3,7 +3,7 @@ #include -NAMESPACE_UPP +namespace Upp { class BuilderComponent { public: @@ -39,6 +39,6 @@ public: const char *objext, const Index& noblitz); }; -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/ide/Java/Java.cpp b/uppsrc/ide/Java/Java.cpp index 1597448b9..ec8ddde58 100644 --- a/uppsrc/ide/Java/Java.cpp +++ b/uppsrc/ide/Java/Java.cpp @@ -1,6 +1,6 @@ #include "Java.h" -NAMESPACE_UPP +namespace Upp { String Java::GetDelimiter() { @@ -11,4 +11,4 @@ String Java::GetDelimiter() #endif } -END_UPP_NAMESPACE +} diff --git a/uppsrc/ide/Java/Java.h b/uppsrc/ide/Java/Java.h index 237f5f049..ba15cfd1b 100644 --- a/uppsrc/ide/Java/Java.h +++ b/uppsrc/ide/Java/Java.h @@ -5,7 +5,7 @@ #include -NAMESPACE_UPP +namespace Upp { class Java { public: @@ -52,6 +52,6 @@ private: String path; }; -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/ide/Java/Jdk.cpp b/uppsrc/ide/Java/Jdk.cpp index 50bb12574..8ab8dd23d 100644 --- a/uppsrc/ide/Java/Jdk.cpp +++ b/uppsrc/ide/Java/Jdk.cpp @@ -1,6 +1,6 @@ #include "Java.h" -NAMESPACE_UPP +namespace Upp { String Jdk::GetDownloadUrl() { @@ -29,4 +29,4 @@ bool Jdk::Validate() const return true; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/ide/MethodsCtrls.h b/uppsrc/ide/MethodsCtrls.h index 6cc9e8781..1672d6337 100644 --- a/uppsrc/ide/MethodsCtrls.h +++ b/uppsrc/ide/MethodsCtrls.h @@ -3,7 +3,7 @@ #include -NAMESPACE_UPP +namespace Upp { class TextOption : public Option { public: @@ -17,6 +17,6 @@ public: virtual Value GetData() const; }; -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/ide/SrcUpdater/Wizard.h b/uppsrc/ide/SrcUpdater/Wizard.h index 95f8320fe..c96e1d9fa 100644 --- a/uppsrc/ide/SrcUpdater/Wizard.h +++ b/uppsrc/ide/SrcUpdater/Wizard.h @@ -2,7 +2,7 @@ #define _SourceUpdater_Wizard_h_ #include -NAMESPACE_UPP +namespace Upp { struct NullStep : public ParentCtrl { static Size GetLayoutSize() { @@ -138,5 +138,5 @@ WIZMEM(void)::Cancel(){ #undef MAP_FN_ON_STEPS #undef MAP_FN2_ON_STEPS -END_UPP_NAMESPACE; +}; #endif diff --git a/uppsrc/plugin/DroidFonts/DroidFonts.icpp b/uppsrc/plugin/DroidFonts/DroidFonts.icpp index 5098f4607..86d338d8c 100644 --- a/uppsrc/plugin/DroidFonts/DroidFonts.icpp +++ b/uppsrc/plugin/DroidFonts/DroidFonts.icpp @@ -2,7 +2,7 @@ #include "DroidFonts.brc" -NAMESPACE_UPP +namespace Upp { INITBLOCK { SetMemoryFont(Font::SANSSERIF, Font_DroidSans, Font_DroidSans_length); @@ -14,4 +14,4 @@ INITBLOCK { SetMemoryFont(Font::MONOSPACE, Font_DroidSansMono, Font_DroidSansMono_length); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/plugin/Eigen/Eigen.h b/uppsrc/plugin/Eigen/Eigen.h index 7acec6dbf..e56b06abf 100644 --- a/uppsrc/plugin/Eigen/Eigen.h +++ b/uppsrc/plugin/Eigen/Eigen.h @@ -24,7 +24,7 @@ #include #include -NAMESPACE_UPP +namespace Upp { using namespace Eigen; @@ -195,6 +195,6 @@ void Serialize(Stream& stream, Eigen::Matrix &vec) { } } -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/plugin/FT_fontsys/FT_fontsys.cpp b/uppsrc/plugin/FT_fontsys/FT_fontsys.cpp index 7491190be..2bee596fa 100644 --- a/uppsrc/plugin/FT_fontsys/FT_fontsys.cpp +++ b/uppsrc/plugin/FT_fontsys/FT_fontsys.cpp @@ -7,7 +7,7 @@ #define LLOG(x) // DLOG(x) #define LTIMING(x) // TIMING(x) -NAMESPACE_UPP +namespace Upp { struct FtFontStyle { String path; @@ -418,4 +418,4 @@ void RenderCharacterSys(FontGlyphConsumer& sw, double x, double y, int ch, Font RenderOutline(face->glyph->outline, sw, x, y + fnt.GetAscent()); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/plugin/FT_fontsys/FT_fontsys.h b/uppsrc/plugin/FT_fontsys/FT_fontsys.h index c7a099eee..8187097f4 100644 --- a/uppsrc/plugin/FT_fontsys/FT_fontsys.h +++ b/uppsrc/plugin/FT_fontsys/FT_fontsys.h @@ -3,7 +3,7 @@ #include -NAMESPACE_UPP +namespace Upp { enum FtStyle { FtBOLD = 1, @@ -13,6 +13,6 @@ enum FtStyle { void SetFileFont(int face, const char *path, dword style = 0); void SetMemoryFont(int face, const byte *data, int size, dword style = 0); -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/plugin/bmp/Bmp.cpp b/uppsrc/plugin/bmp/Bmp.cpp index 59e6e1ee0..4a8f23221 100644 --- a/uppsrc/plugin/bmp/Bmp.cpp +++ b/uppsrc/plugin/bmp/Bmp.cpp @@ -1,6 +1,6 @@ #include "bmp.h" -NAMESPACE_UPP +namespace Upp { #include "bmphdr.h" @@ -284,4 +284,4 @@ BMPRaster::~BMPRaster() { } -END_UPP_NAMESPACE +} diff --git a/uppsrc/plugin/bmp/BmpReg.icpp b/uppsrc/plugin/bmp/BmpReg.icpp index c58c5bc91..e01f03a88 100644 --- a/uppsrc/plugin/bmp/BmpReg.icpp +++ b/uppsrc/plugin/bmp/BmpReg.icpp @@ -1,9 +1,9 @@ #include "bmp.h" -NAMESPACE_UPP +namespace Upp { INITBLOCK { StreamRaster::Register(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/plugin/bmp/BmpWrite.cpp b/uppsrc/plugin/bmp/BmpWrite.cpp index b9fa29700..c826f7e38 100644 --- a/uppsrc/plugin/bmp/BmpWrite.cpp +++ b/uppsrc/plugin/bmp/BmpWrite.cpp @@ -1,6 +1,6 @@ #include "bmp.h" -NAMESPACE_UPP +namespace Upp { #include "bmphdr.h" @@ -84,4 +84,4 @@ void BMPEncoder::WriteLineRaw(const byte *s) GetStream().Put(scanline, row_bytes); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/plugin/bmp/Icon.cpp b/uppsrc/plugin/bmp/Icon.cpp index 50e2df444..baec2b88e 100644 --- a/uppsrc/plugin/bmp/Icon.cpp +++ b/uppsrc/plugin/bmp/Icon.cpp @@ -1,6 +1,6 @@ #include "bmp.h" -NAMESPACE_UPP +namespace Upp { #include "bmphdr.h" @@ -205,4 +205,4 @@ String WriteIcon(const Vector& icons, int flags) return out; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/plugin/bmp/bmp.h b/uppsrc/plugin/bmp/bmp.h index 6269f0a77..b1c7afbac 100644 --- a/uppsrc/plugin/bmp/bmp.h +++ b/uppsrc/plugin/bmp/bmp.h @@ -3,7 +3,7 @@ #include -NAMESPACE_UPP +namespace Upp { class BMPRaster : public StreamRaster { Size size; @@ -63,6 +63,6 @@ enum { Vector ReadIcon(String data); String WriteIcon(const Vector& icons, int flags = WI_COLOR); -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/plugin/bz2/bz2.h b/uppsrc/plugin/bz2/bz2.h index e02714c06..d8caf3fc9 100644 --- a/uppsrc/plugin/bz2/bz2.h +++ b/uppsrc/plugin/bz2/bz2.h @@ -1,7 +1,7 @@ #ifndef __Plugin_BZ2__ #define __Plugin_BZ2__ -NAMESPACE_UPP +namespace Upp { String BZ2Compress(String s, Gate2 progress = false); String BZ2Decompress(String s, Gate2 progress = false); @@ -9,6 +9,6 @@ String BZ2Decompress(Stream& stream, Gate2 progress = false); void BZ2Compress(Stream& out, Stream& in, Gate2 progress = false); void BZ2Decompress(Stream& out, Stream& in, Gate2 progress = false); -END_UPP_NAMESPACE +} #endif//__Plugin_Z__ diff --git a/uppsrc/plugin/bz2/bz2upp.cpp b/uppsrc/plugin/bz2/bz2upp.cpp index 362f255d5..01908b39d 100644 --- a/uppsrc/plugin/bz2/bz2upp.cpp +++ b/uppsrc/plugin/bz2/bz2upp.cpp @@ -7,7 +7,7 @@ #include #endif -NAMESPACE_UPP +namespace Upp { static void* bzalloc_new(void *opaque, int items, int size) { @@ -217,4 +217,4 @@ void BZ2Compress(Stream& out, Stream& in, Gate2 progress) out.SetError(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/plugin/dbf/dbf.cpp b/uppsrc/plugin/dbf/dbf.cpp index 53f23aeef..3a12d23b7 100644 --- a/uppsrc/plugin/dbf/dbf.cpp +++ b/uppsrc/plugin/dbf/dbf.cpp @@ -1,6 +1,6 @@ #include "dbf.h" -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // LOG(x) #define LTIMING(x) // RTIMING(x) @@ -987,4 +987,4 @@ Value DbfStream::GetItemEmpty(int i) const return Value(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/plugin/dbf/dbf.h b/uppsrc/plugin/dbf/dbf.h index 3bd2a9e9e..fc421b60d 100644 --- a/uppsrc/plugin/dbf/dbf.h +++ b/uppsrc/plugin/dbf/dbf.h @@ -3,7 +3,7 @@ #include -NAMESPACE_UPP +namespace Upp { #define DBFCOL(x) (#x, x) @@ -147,6 +147,6 @@ protected: byte version; }; -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/plugin/ftp/ftp.cpp b/uppsrc/plugin/ftp/ftp.cpp index 1029b01bd..9e8dfcd25 100644 --- a/uppsrc/plugin/ftp/ftp.cpp +++ b/uppsrc/plugin/ftp/ftp.cpp @@ -1,7 +1,7 @@ #include "ftp.h" #include "lib/ftplib.h" -NAMESPACE_UPP +namespace Upp { #define LLOGBLOCK(x) // LOGBLOCK(x) #define LLOG(x) // DLOG(x) @@ -307,4 +307,4 @@ String FtpClientGet(String url, String *error) return data; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/plugin/ftp/ftp.h b/uppsrc/plugin/ftp/ftp.h index efa467f65..6fd614fad 100644 --- a/uppsrc/plugin/ftp/ftp.h +++ b/uppsrc/plugin/ftp/ftp.h @@ -5,7 +5,7 @@ typedef struct NetBuf netbuf; -NAMESPACE_UPP +namespace Upp { class FtpClient { public: @@ -56,6 +56,6 @@ private: String FtpClientGet(String url, String *error = NULL); -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/plugin/gif/gif.h b/uppsrc/plugin/gif/gif.h index db19555fa..2c7e2b93a 100644 --- a/uppsrc/plugin/gif/gif.h +++ b/uppsrc/plugin/gif/gif.h @@ -4,7 +4,7 @@ #include -NAMESPACE_UPP +namespace Upp { class GIFRaster : public StreamRaster { public: @@ -56,6 +56,6 @@ private: String comment; }; -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/plugin/gif/gif.icpp b/uppsrc/plugin/gif/gif.icpp index e767f9ccc..0bf319080 100644 --- a/uppsrc/plugin/gif/gif.icpp +++ b/uppsrc/plugin/gif/gif.icpp @@ -1,9 +1,9 @@ #include "gif.h" -NAMESPACE_UPP +namespace Upp { INITBLOCK { StreamRaster::Register(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/plugin/gif/gifupp.cpp b/uppsrc/plugin/gif/gifupp.cpp index 55c168cf2..b59c452cf 100644 --- a/uppsrc/plugin/gif/gifupp.cpp +++ b/uppsrc/plugin/gif/gifupp.cpp @@ -1,7 +1,7 @@ #include "gif.h" -NAMESPACE_UPP +namespace Upp { struct GifGlobalInfo // information about gif file { @@ -975,4 +975,4 @@ void GIFEncoder::WriteLineRaw(const byte *s) data->WriteLineRaw(s); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/plugin/jpg/jpg.h b/uppsrc/plugin/jpg/jpg.h index 0aa149152..a78f1c6a7 100644 --- a/uppsrc/plugin/jpg/jpg.h +++ b/uppsrc/plugin/jpg/jpg.h @@ -3,7 +3,7 @@ #include -NAMESPACE_UPP +namespace Upp { class JPGRaster : public StreamRaster { public: @@ -44,6 +44,6 @@ private: int quality; }; -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/plugin/jpg/jpgreg.icpp b/uppsrc/plugin/jpg/jpgreg.icpp index 36a5c3dfa..698348a57 100644 --- a/uppsrc/plugin/jpg/jpgreg.icpp +++ b/uppsrc/plugin/jpg/jpgreg.icpp @@ -1,9 +1,9 @@ #include "jpg.h" -NAMESPACE_UPP +namespace Upp { INITBLOCK { StreamRaster::Register(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/plugin/jpg/jpgupp.cpp b/uppsrc/plugin/jpg/jpgupp.cpp index fd3a744ea..53fdbdf62 100644 --- a/uppsrc/plugin/jpg/jpgupp.cpp +++ b/uppsrc/plugin/jpg/jpgupp.cpp @@ -12,7 +12,7 @@ extern "C" { #undef XINT32 -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // LOG(x) @@ -703,4 +703,4 @@ Image JPGRaster::GetExifThumbnail() return StreamRaster::LoadStringAny(ss); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/plugin/lzma/lzma.cpp b/uppsrc/plugin/lzma/lzma.cpp index 05b9fd419..c135581d0 100644 --- a/uppsrc/plugin/lzma/lzma.cpp +++ b/uppsrc/plugin/lzma/lzma.cpp @@ -5,7 +5,7 @@ #include "lib/LzmaDec.h" #include "lib/LzmaEnc.h" -NAMESPACE_UPP +namespace Upp { static voidpf lzma_alloc_new(void *, size_t size) { voidpf t = new byte[size]; @@ -279,4 +279,4 @@ bool LZMADecompressFile(const char *srcfile, Gate2 progress) return LZMADecompressFile(dstfile, srcfile, progress); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/plugin/lzma/lzma.h b/uppsrc/plugin/lzma/lzma.h index 2a3a3de30..a65da1778 100644 --- a/uppsrc/plugin/lzma/lzma.h +++ b/uppsrc/plugin/lzma/lzma.h @@ -3,7 +3,7 @@ #include -NAMESPACE_UPP +namespace Upp { int64 LZMACompress(Stream& out, Stream& in, int64 size, Gate2 progress = false, int lvl = 6); int64 LZMACompress(Stream& out, Stream& in, Gate2 progress = false, int lvl = 6); @@ -19,6 +19,6 @@ bool LZMACompressFile(const char *srcfile, Gate2 progress, int l bool LZMADecompressFile(const char *dstfile, const char *srcfile, Gate2 progress = false); bool LZMADecompressFile(const char *srcfile, Gate2 progress); -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/plugin/ndisasm/ndisasm.h b/uppsrc/plugin/ndisasm/ndisasm.h index 16cfd605c..e5756c4bf 100644 --- a/uppsrc/plugin/ndisasm/ndisasm.h +++ b/uppsrc/plugin/ndisasm/ndisasm.h @@ -1,13 +1,13 @@ #ifndef _plugin_ndisasm_ndisasm_h_ #define _plugin_ndisasm_ndisasm_h_ -NAMESPACE_UPP +namespace Upp { static const int NDISASM_INSN_MAX = 32; // one instruction can't be longer than this static const int NDISASM_OUTBUF_SIZE = 256; // maximum length of disassembly output int NDisassemble(char *output, const byte *data, uint64 offset, bool x64 = false); // returns instruction length -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/plugin/ndisasm/ndisupp.cpp b/uppsrc/plugin/ndisasm/ndisupp.cpp index a24d0f45d..9ec27d0ab 100644 --- a/uppsrc/plugin/ndisasm/ndisupp.cpp +++ b/uppsrc/plugin/ndisasm/ndisupp.cpp @@ -12,7 +12,7 @@ extern "C" { #include "lib/disasm.h" } -NAMESPACE_UPP +namespace Upp { int NDisassemble(char *output, const byte *data, uint64 offset, bool x64)// returns instruction length { @@ -36,4 +36,4 @@ CONSOLE_APP_MAIN } #endif -END_UPP_NAMESPACE +} diff --git a/uppsrc/plugin/pcre/Pcre.h b/uppsrc/plugin/pcre/Pcre.h index 3e1057b33..4d9e7c849 100644 --- a/uppsrc/plugin/pcre/Pcre.h +++ b/uppsrc/plugin/pcre/Pcre.h @@ -9,10 +9,10 @@ #include "lib/pcre.h" -NAMESPACE_UPP +namespace Upp { #include "RegExp.h" -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/plugin/pcre/RegExp.cpp b/uppsrc/plugin/pcre/RegExp.cpp index a975b4278..99704b769 100644 --- a/uppsrc/plugin/pcre/RegExp.cpp +++ b/uppsrc/plugin/pcre/RegExp.cpp @@ -1,6 +1,6 @@ #include "Pcre.h" -NAMESPACE_UPP +namespace Upp { RegExp::RegExp(int options) @@ -398,4 +398,4 @@ int RegExp::ReplaceGlobal(String& t, Callback1&> cbr) } -END_UPP_NAMESPACE +} diff --git a/uppsrc/plugin/pcx/pcx.cpp b/uppsrc/plugin/pcx/pcx.cpp index d3c22243d..c3a0400a1 100644 --- a/uppsrc/plugin/pcx/pcx.cpp +++ b/uppsrc/plugin/pcx/pcx.cpp @@ -1,6 +1,6 @@ #include "pcx.h" -NAMESPACE_UPP +namespace Upp { static Size GetDotSize(Size pixel_size, int xpm, int ypm) { @@ -178,4 +178,4 @@ const RasterFormat *PCXRaster::GetFormat() return &fmt; } -END_UPP_NAMESPACE +} diff --git a/uppsrc/plugin/pcx/pcx.h b/uppsrc/plugin/pcx/pcx.h index fea7087c0..ef2fd732b 100644 --- a/uppsrc/plugin/pcx/pcx.h +++ b/uppsrc/plugin/pcx/pcx.h @@ -3,7 +3,7 @@ #include -NAMESPACE_UPP +namespace Upp { #include "pcxhdr.h" @@ -28,6 +28,6 @@ public: virtual const RasterFormat *GetFormat(); }; -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/plugin/pcx/pcxreg.icpp b/uppsrc/plugin/pcx/pcxreg.icpp index 82459384e..0d9138d6e 100644 --- a/uppsrc/plugin/pcx/pcxreg.icpp +++ b/uppsrc/plugin/pcx/pcxreg.icpp @@ -1,9 +1,9 @@ #include "pcx.h" -NAMESPACE_UPP +namespace Upp { INITBLOCK { StreamRaster::Register(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/plugin/png/png.h b/uppsrc/plugin/png/png.h index 059e4e039..f703201db 100644 --- a/uppsrc/plugin/png/png.h +++ b/uppsrc/plugin/png/png.h @@ -3,7 +3,7 @@ #include -NAMESPACE_UPP +namespace Upp { class PNGRaster : public StreamRaster { class Data; @@ -45,6 +45,6 @@ private: bool interlace; }; -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/plugin/png/pngreg.icpp b/uppsrc/plugin/png/pngreg.icpp index dc1ef44e2..cd66a3fcd 100644 --- a/uppsrc/plugin/png/pngreg.icpp +++ b/uppsrc/plugin/png/pngreg.icpp @@ -1,9 +1,9 @@ #include "png.h" -NAMESPACE_UPP +namespace Upp { INITBLOCK { StreamRaster::Register(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/plugin/png/pngupp.cpp b/uppsrc/plugin/png/pngupp.cpp index 4bc34e60a..085933478 100644 --- a/uppsrc/plugin/png/pngupp.cpp +++ b/uppsrc/plugin/png/pngupp.cpp @@ -7,7 +7,7 @@ #include #include "png.h" -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // LOG(x) @@ -514,4 +514,4 @@ void PNGEncoder::WriteLineRaw(const byte *s) data->WriteLineRaw(s); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/plugin/ppm/ppm.cpp b/uppsrc/plugin/ppm/ppm.cpp index b4d8d1c9d..b8237a03e 100644 --- a/uppsrc/plugin/ppm/ppm.cpp +++ b/uppsrc/plugin/ppm/ppm.cpp @@ -1,6 +1,6 @@ #include "ppm.h" -NAMESPACE_UPP +namespace Upp { PPMRaster::PPMRaster() { @@ -104,4 +104,4 @@ PPMRaster::~PPMRaster() { } -END_UPP_NAMESPACE +} diff --git a/uppsrc/plugin/ppm/ppm.h b/uppsrc/plugin/ppm/ppm.h index 139a3b530..ef6d67cdd 100644 --- a/uppsrc/plugin/ppm/ppm.h +++ b/uppsrc/plugin/ppm/ppm.h @@ -3,7 +3,7 @@ #include -NAMESPACE_UPP +namespace Upp { class PPMRaster : public StreamRaster { Size size; @@ -33,6 +33,6 @@ public: virtual void WriteLineRaw(const byte *data); }; -END_UPP_NAMESPACE +} #endif \ No newline at end of file diff --git a/uppsrc/plugin/ppm/ppmenc.cpp b/uppsrc/plugin/ppm/ppmenc.cpp index d38774f28..fb993c021 100644 --- a/uppsrc/plugin/ppm/ppmenc.cpp +++ b/uppsrc/plugin/ppm/ppmenc.cpp @@ -1,6 +1,6 @@ #include "ppm.h" -NAMESPACE_UPP +namespace Upp { int PPMEncoder::GetPaletteCount() { @@ -19,4 +19,4 @@ void PPMEncoder::WriteLineRaw(const byte *data) GetStream().Put(data, size.cx * 3); } -END_UPP_NAMESPACE \ No newline at end of file +} \ No newline at end of file diff --git a/uppsrc/plugin/ppm/ppmref.icpp b/uppsrc/plugin/ppm/ppmref.icpp index b0876c2e0..c0b30d645 100644 --- a/uppsrc/plugin/ppm/ppmref.icpp +++ b/uppsrc/plugin/ppm/ppmref.icpp @@ -1,9 +1,9 @@ #include "ppm.h" -NAMESPACE_UPP +namespace Upp { INITBLOCK { StreamRaster::Register(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/plugin/sqlite3/Sqlite3.h b/uppsrc/plugin/sqlite3/Sqlite3.h index a5bee4985..8a08cbeb0 100644 --- a/uppsrc/plugin/sqlite3/Sqlite3.h +++ b/uppsrc/plugin/sqlite3/Sqlite3.h @@ -3,7 +3,7 @@ #include -NAMESPACE_UPP +namespace Upp { // Deprecated, use SqlPerformScript instead @@ -67,6 +67,6 @@ public: ~Sqlite3Session(); }; -END_UPP_NAMESPACE +} #endif diff --git a/uppsrc/plugin/sqlite3/Sqlite3upp.cpp b/uppsrc/plugin/sqlite3/Sqlite3upp.cpp index a482e5007..5308fe948 100644 --- a/uppsrc/plugin/sqlite3/Sqlite3upp.cpp +++ b/uppsrc/plugin/sqlite3/Sqlite3upp.cpp @@ -3,7 +3,7 @@ #include "lib/sqlite3.h" #include "Sqlite3.h" -NAMESPACE_UPP +namespace Upp { #define LLOG(x) // LOG(x) @@ -564,4 +564,4 @@ bool Sqlite3PerformScript(const String& txt, StatementExecutor& se, Gate2(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/plugin/tif/tifupp.cpp b/uppsrc/plugin/tif/tifupp.cpp index 6820205cc..4d1d9dc28 100644 --- a/uppsrc/plugin/tif/tifupp.cpp +++ b/uppsrc/plugin/tif/tifupp.cpp @@ -13,7 +13,7 @@ // #define DBGALLOC 1 -NAMESPACE_UPP +namespace Upp { #if DBGALLOC double total_allocated = 0, total_freed = 0; @@ -1314,4 +1314,4 @@ void TIFEncoder::WriteLineRaw(const byte *s) data->WriteLineRaw(s); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/plugin/zip/UnZip.cpp b/uppsrc/plugin/zip/UnZip.cpp index 81a322805..4b9bbaa4a 100644 --- a/uppsrc/plugin/zip/UnZip.cpp +++ b/uppsrc/plugin/zip/UnZip.cpp @@ -1,6 +1,6 @@ #include "zip.h" -NAMESPACE_UPP +namespace Upp { void UnZip::ReadDir() { @@ -160,4 +160,4 @@ UnZip::UnZip() UnZip::~UnZip() {} -END_UPP_NAMESPACE +} diff --git a/uppsrc/plugin/zip/UnZipUtil.cpp b/uppsrc/plugin/zip/UnZipUtil.cpp index a4b0c1d42..489d9d075 100644 --- a/uppsrc/plugin/zip/UnZipUtil.cpp +++ b/uppsrc/plugin/zip/UnZipUtil.cpp @@ -1,6 +1,6 @@ #include "zip.h" -NAMESPACE_UPP +namespace Upp { bool FileUnZip::Create(const char *name) { @@ -22,4 +22,4 @@ void StringUnZip::Create(const String& s) UnZip::Create(zip); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/plugin/zip/Zip.cpp b/uppsrc/plugin/zip/Zip.cpp index 5dbc07453..71d9696d6 100644 --- a/uppsrc/plugin/zip/Zip.cpp +++ b/uppsrc/plugin/zip/Zip.cpp @@ -1,6 +1,6 @@ #include "zip.h" -NAMESPACE_UPP +namespace Upp { void Zip::WriteFolder(const char *path, Time tm) { @@ -256,4 +256,4 @@ String StringZip::Finish() return zip.GetResult(); } -END_UPP_NAMESPACE +} diff --git a/uppsrc/plugin/zip/zip.h b/uppsrc/plugin/zip/zip.h index 8e9689e40..af37f4614 100644 --- a/uppsrc/plugin/zip/zip.h +++ b/uppsrc/plugin/zip/zip.h @@ -3,7 +3,7 @@ #include -NAMESPACE_UPP +namespace Upp { class UnZip { struct File : Moveable { @@ -162,6 +162,6 @@ public: StringZip() { Create(); } }; -END_UPP_NAMESPACE +} #endif