Skip to content

Generate static members initializers into the declaration #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
martonmiklos wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Generate static members initializers into the declaration #49

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 4 additions & 13 deletions code_generation/printer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,9 +267,10 @@ QString Printer::Private::classHeader(const Class &classObject, bool publicMembe
if (v.isStatic())
decl += "static ";

decl += formatType(v.type());

decl += v.name() + ';';
if (!v.isStatic() && v.initializer().isEmpty())
decl += v.name() + ';';
else
decl += v.name() + " = " + v.initializer() + ';';

code += decl;
}
Expand Down Expand Up @@ -361,16 +362,6 @@ QString Printer::Private::classImplementation(const Class &classObject, bool nes
&& f.name() == classObject.name()) {
inits.append(classObject.dPointerName() + "(new PrivateDPtr)");
}
if (!classObject.useDPointer() && f.name() == classObject.name()
&& f.arguments().isEmpty()) {
// Default constructor: add initializers for variables
for (itV = vars.constBegin(); itV != vars.constEnd(); ++itV) {
const MemberVariable v = *itV;
if (!v.initializer().isEmpty()) {
inits.append(v.name() + '(' + v.initializer() + ')');
}
}
}

if (!inits.isEmpty()) {
code.indent();
Expand Down