From be3bb0287dc5e55e4c6d47c3535133c201c7b5eb Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Wed, 9 Sep 2015 22:19:13 +0000
Subject: [PATCH] ide: cpp: layouts now not listing dv___ members #1260

git-svn-id: svn://ultimatepp.org/upp/trunk@8912 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/ide/Assist.cpp      | 2 +-
 uppsrc/ide/Browser/Lay.cpp | 7 ++++---
 uppsrc/ide/OutputMode.cpp  | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/uppsrc/ide/Assist.cpp b/uppsrc/ide/Assist.cpp
index 66b072410..b55d5c02b 100644
--- a/uppsrc/ide/Assist.cpp
+++ b/uppsrc/ide/Assist.cpp
@@ -363,7 +363,7 @@ bool AssistEditor::IncludeAssist()
 			dir.Cat(p.GetChar());
 		if(dir.GetCount() && (p.Char('/') || p.Char('\\'))) {
 			if(include_path.GetCount())
-				include_path << '/'; 
+				include_path << '/';
 			include_path << dir;
 		}
 		else
diff --git a/uppsrc/ide/Browser/Lay.cpp b/uppsrc/ide/Browser/Lay.cpp
index 1eda06cd7..7afbcfdc2 100644
--- a/uppsrc/ide/Browser/Lay.cpp
+++ b/uppsrc/ide/Browser/Lay.cpp
@@ -53,10 +53,11 @@ String PreprocessLayFile(const char *fn)
 					p.PassChar('(');
 					if(p.IsId()) {
 						String type = p.ReadIdt();
-						if(strncmp(type, "dv___", 5)) {
+						p.PassChar(',');
+						String name = p.ReadId();
+						if(!name.StartsWith("dv___")) {
 							r << '\t' << type;
-							p.PassChar(',');
-							r << ' ' << p.ReadId() << ";";
+							r << ' ' << name << ";";
 						}
 					}
 				}
diff --git a/uppsrc/ide/OutputMode.cpp b/uppsrc/ide/OutputMode.cpp
index 8a4fb5ce4..949bd7558 100644
--- a/uppsrc/ide/OutputMode.cpp
+++ b/uppsrc/ide/OutputMode.cpp
@@ -13,7 +13,7 @@ void TargetMode::Serialize(Stream& s)
 	s % target_override % target;
 	if(ver < 3) {
 		int dummy;
-	 	s % dummy;
+		s % dummy;
 	}
 	if(ver < 1) {
 		String dummy;