github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-06-11 22:03:53 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: CLASSNAME removed from code generators

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@15421 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2020-11-15 00:42:19 +00:00
parent 3d5d5e3a8f
commit 77416e4cee
2 changed files with 2 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
uppsrc/ide/Insert.cpp
View file

@ -272,14 +272,6 @@ void Ide::InsertMenu(Bar& bar)
}
}
}
if(editfile.GetCount()) {
ParserContext ctx;
editor.Context(ctx, editor.GetCursor());
if(!IsNull(ctx.current_scope) && ctx.current_scope != "::" && !ctx.IsInBody()) {
String s = "typedef " + ctx.current_scope + " CLASSNAME;";
bar.Add(s, THISBACK1(InsertText, s));
}
}
bar.Add("Insert file path..", THISBACK1(InsertFilePath, false));
bar.Add("Insert file path as C string..", THISBACK1(InsertFilePath, true));
bar.Add("Insert clipboard as..", [=] { InsertAs(); });

9
uppsrc/ide/LayDes/visgen.cpp
View file

@ -91,22 +91,18 @@ void VisGenDlg::Refresh()
if(layout.item[i].type == "Button" && findarg(bn, "cancel", "ok", "exit") < 0) {
String mn = IdInitCaps(bn);
mn.Replace("_", "");
if(b1.GetCount() == 0)
b1 = "\n";
if(b2.GetCount() == 0)
b2 = "\n";
b1 << '\t' << "void " << mn << "();\n";
b2 << '\t' << bn << " << [=] { " << mn << "(); };\n";
b3 << '\n' << "void " << n << "::" << mn << "()\n{\n}\n";
}
}
if(b1.GetCount())
b1 << "\n";
}
if(q == 0) {
s << "class " << n << " : public With" << layout.name << "<TopWindow> {\n"
<< "\ttypedef " << n << " CLASSNAME;\n"
<< b1
<< "\n"
<< "public:\n"
<< "\t" << n << "();\n"
<< "};\n"
@ -121,7 +117,6 @@ void VisGenDlg::Refresh()
else
if(q == 1) {
s << "struct " << n << " : With" << layout.name << "<TopWindow> {\n"
<< "\ttypedef " << n << " CLASSNAME;\n"
<< b1
<< "\t" << n << "();\n"
<< "};\n"