lp://staging/~kubuntu-members/umbrello/4.11

Branch merges

This import branch has no branches proposed for merge into it.

No branches dependent on this one.

Related source package recipes

1 recipe using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

3948. By Ralf Habacker on 2014-01-22

Support hex digits in numeric literals.

BUG:330296
FIXED-IN:4.11.6
(cherry picked from commit a10b8924ae6935df7b6c8dc5907ff3a6a45bef7e)

Conflicts:
 umbrello/codeimport/kdevcppparser/lexer.cpp
 umbrello/codeimport/kdevcppparser/preprocesslexer.cpp
 umbrello/codeimport/kdevcppparser/preprocesslexer.h

3947. By Ralf Habacker on 2014-01-22

Evaluate macro expressions.

BUG:160287
FIXED-IN:4.11.6
(cherry picked from commit ba07c01dea08c011393237a8d3e9ebc0a0604dc0)

Conflicts:
 umbrello/codeimport/kdevcppparser/preprocesslexer.h

3946. By Ralf Habacker on 2014-01-22

Fix Q_OBJECT macro parse error.

BUG:216935
FIXED-IN:4.11.6
(cherry picked from commit fa356a629dbef8b352d9d3d71a5df830454a7c38)

3945. By Ralf Habacker on 2014-01-12

Disable undo while code importing to not pollute the undo stack.

CCBUG: 329648
(cherry picked from commit fd26bdd22cff46d765300f6e5dec005a240e5405)

3944. By Ralf Habacker on 2014-01-12

Made 'Enable/Disable Undo' setting real working.

CCBUG: 329648
(cherry picked from commit 1281519196b65fd226b8812972cf6df8e9acd4be)

Conflicts:
 umbrello/listpopupmenu.cpp
 umbrello/uml.cpp

3943. By Joris Steyn <email address hidden> on 2014-01-01

Better fix for attribute creation crash

Previous fix was faulty. The problem occurs when an object is looked up with an
empty name. Instead of not finding an object, umldoc can return an arbitrary
association object instead, resulting in problems in Import_Utils.

This change prevents calling Import_Utils with an empty typeName, so when an
attribute is created without specifying a type, the default behaviour of
creating a new class with Object_Factory is triggered - which handles this case
well.

BUG: 225290

3942. By Joris Steyn <email address hidden> on 2014-01-01

Revert "Fix crash when adding attribute"

This reverts commit ca2ac6f54ac3030589836eb284bd21dd16d6f3a7.

3941. By Joris Steyn <email address hidden> on 2013-12-30

Fix crash when adding attribute

There was an obscure crash in the code generator triggered by Import_Utils. It
tried to add the attribute to the logical view, explicitly setting ot_Attribute
prevents this behaviour.

BUG: 225290

3940. By Raphael Kubo da Costa <email address hidden> on 2013-12-25

Get rid of the PositionFilename typedef and use QString directly.

After the previous commit simplified PositionFilename and changed it into a
QString typedef, we can now safely remove it and use QString directly.

Doing so allows us to avoid some needless conversions and possibly makes the
code easier to follow.

Reviewed-by: Andi Fischer <email address hidden>
(cherry picked from commit 039b0221189cdded492c00ab355ecbd0b4e7c275)

3939. By Raphael Kubo da Costa <email address hidden> on 2013-12-25

kdevcppparser: Replace PositionFilename with a typedef to QString.

The C++ standard (98, 03 and 11) states that std::basic_string is supposed
to work only with POD-like types, which is not the case for QChar.

GCC's libstdc++'s std::basic_string implementation, though, does not use any
features present only in POD types, so the previous behavior of using
std::basic_string<QChar> has worked for most people using Linux, and some
workarounds were present for other compilers such as SunPro CC and MSVC.

Instead of adding yet another workaround to get things working with clang
with libc++, try to fix the problem in a different way by getting rid of the
need for std::basic_string in position.h altogether and using a plain
QString instead.

std::basic_string was used only to store the name of the source file being
processed, which was originally a QString anyway, so we can avoid the
QString -> std::basic_string -> QString conversions, as well as the need to
have a full-fledged PositionFilename class with a toString() method that
performed this conversion.

It also allows us to remove the MSVC/SunPro workarounds from the code and
the build system.

Reviewed-by: Andi Fischer <email address hidden>
(cherry picked from commit 6bce76a6b91aaf11082743a9ca8493e43c3d9dcc)

Conflicts:
 umbrello/codeimport/kdevcppparser/position.h