From d9ac7d7fe04880b8eda8e288a6409788cbeddafe Mon Sep 17 00:00:00 2001 From: cxl Date: Mon, 13 Mar 2017 11:13:35 +0000 Subject: [PATCH] .cosmetics git-svn-id: svn://ultimatepp.org/upp/trunk@10940 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/Core/XML.h | 2 +- uppsrc/CtrlCore/lay.h | 6 +++--- uppsrc/CtrlLib/key_source.h | 2 +- uppsrc/RichText/RichText.h | 2 +- uppsrc/ide/Core/Core.h | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/uppsrc/Core/XML.h b/uppsrc/Core/XML.h index f23de82b3..c66f31a1e 100644 --- a/uppsrc/Core/XML.h +++ b/uppsrc/Core/XML.h @@ -225,7 +225,7 @@ public: void Shrink(); - rval_default(XmlNode) + rval_default(XmlNode); XmlNode(const XmlNode& n, int); diff --git a/uppsrc/CtrlCore/lay.h b/uppsrc/CtrlCore/lay.h index 946a454b2..5b4f18102 100644 --- a/uppsrc/CtrlCore/lay.h +++ b/uppsrc/CtrlCore/lay.h @@ -29,7 +29,7 @@ #define LAYOUT(nm, x, y) template inline void SetLayout_##nm(T& parent, bool add = false, bool show = false) { #define UNTYPED(var, param) parent.var.param; if(add) parent.Add(parent.var); if(show) parent.var.Show(); #define ITEM(clss, var, param) UNTYPED(var, param); -#define END_LAYOUT }; +#define END_LAYOUT } #include LAYOUTFILE @@ -41,7 +41,7 @@ #define LAYOUT(nm, x, y) template inline void SetLayout_##nm(T& ctrl, D& parent, bool add = false, bool show = false) { #define UNTYPED(var, param) parent.var.param; if(add) ctrl.Add(parent.var); if(show) parent.var.Show(); #define ITEM(clss, var, param) UNTYPED(var, param); -#define END_LAYOUT }; +#define END_LAYOUT } #include LAYOUTFILE @@ -55,7 +55,7 @@ parent.LayoutId(#nm); #define UNTYPED(var, param) uts.var.param; uts.var.LayoutId(#var); parent.Add(uts.var); #define ITEM(clss, var, param) layout.var.param; layout.var.LayoutId(#var); parent.Add(layout.var); -#define END_LAYOUT }; +#define END_LAYOUT } #include LAYOUTFILE diff --git a/uppsrc/CtrlLib/key_source.h b/uppsrc/CtrlLib/key_source.h index b01b3574d..63f5a4a23 100644 --- a/uppsrc/CtrlLib/key_source.h +++ b/uppsrc/CtrlLib/key_source.h @@ -29,7 +29,7 @@ INITBLOCK { #undef KEY2 #ifdef KEYNAMESPACE -}; +} #endif #include diff --git a/uppsrc/RichText/RichText.h b/uppsrc/RichText/RichText.h index b7a5491ef..1221f5c84 100644 --- a/uppsrc/RichText/RichText.h +++ b/uppsrc/RichText/RichText.h @@ -10,7 +10,7 @@ namespace Upp { #define IMAGEFILE #include -INITIALIZE(RichImage) +INITIALIZE(RichImage); class PasteClip; struct RichPara; diff --git a/uppsrc/ide/Core/Core.h b/uppsrc/ide/Core/Core.h index eadeb084b..27a1c9a3e 100644 --- a/uppsrc/ide/Core/Core.h +++ b/uppsrc/ide/Core/Core.h @@ -32,7 +32,7 @@ struct Ide; namespace Upp { class Ctrl; class Image; -}; +} class IdeContext {