[umbrello] [Bug 73847] support for UML tagged values

[Oliver Kellogg]

https://bugs.kde.org/show_bug.cgi?id=73847

--- Comment #24 from Oliver Kellogg <okellogg at users.sourceforge.net> ---
Git commit 4fa1d9994d0b64172800f4fb3c20c6a61ae09195 by Oliver Kellogg.
Committed on 10/10/2020 at 10:40.
Pushed by okellogg into branch 'master'.

Preparation for reverting commit 92d13fb required by planned changes:

umbrello/uml1model/package.{h,cpp}
- At function addObject add argument interactOnConflict of type bool
  defaulting to true.  If interactOnConflict is passed in false and
  pObject's name is already present in the package's contained objects
  then the function returns false without opening a dialog asking the
  user to provide a different name.

umbrello/codeimport/import_utils.cpp
- In function remapUMLEnum,
  - reduce indentation by returning early in case (ns == 0);
  - for adding `e' to currentScope->containedObjects() call
    currentScope->addObject(e, false).

umbrello/codeimport/javaimport.cpp
- In function parseStmt handling of keywords "class" / "interface", for
  adding m_klass to currentScope->containedObjects() call
  currentScope()->addObject(m_klass, false).

M  +26   -21   umbrello/codeimport/import_utils.cpp
M  +3    -3    umbrello/codeimport/javaimport.cpp
M  +23   -5    umbrello/uml1model/package.cpp
M  +1    -1    umbrello/uml1model/package.h

https://invent.kde.org/sdk/umbrello/commit/4fa1d9994d0b64172800f4fb3c20c6a61ae09195

-- 
You are receiving this mail because:
You are the assignee for the bug.