Hello community, here is the log from the commit of package umbrello for openSUSE:Factory checked in at 2016-10-18 10:42:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/umbrello (Old) and /work/SRC/openSUSE:Factory/.umbrello.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "umbrello" Changes: -------- --- /work/SRC/openSUSE:Factory/umbrello/umbrello.changes 2016-09-24 15:27:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.umbrello.new/umbrello.changes 2016-10-18 10:42:34.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Oct 11 21:10:11 UTC 2016 - [email protected] + +- KDE Applications 16.08.2 +https://www.kde.org/announcements/announce-applications-16.08.2.php + +------------------------------------------------------------------- Old: ---- umbrello-16.08.1.tar.xz New: ---- umbrello-16.08.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ umbrello.spec ++++++ --- /var/tmp/diff_new_pack.NhqgT9/_old 2016-10-18 10:42:35.000000000 +0200 +++ /var/tmp/diff_new_pack.NhqgT9/_new 2016-10-18 10:42:35.000000000 +0200 @@ -24,7 +24,7 @@ License: GPL-2.0 and GFDL-1.2 Group: Development/Tools/Other Url: http://www.kde.org/ -Version: 16.08.1 +Version: 16.08.2 Release: 0 Source0: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ umbrello-16.08.1.tar.xz -> umbrello-16.08.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-16.08.1/CMakeLists.txt new/umbrello-16.08.2/CMakeLists.txt --- old/umbrello-16.08.1/CMakeLists.txt 2016-09-05 10:35:13.000000000 +0200 +++ new/umbrello-16.08.2/CMakeLists.txt 2016-10-07 01:13:32.000000000 +0200 @@ -3,7 +3,7 @@ # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "16") set (KDE_APPLICATIONS_VERSION_MINOR "08") -set (KDE_APPLICATIONS_VERSION_MICRO "1") +set (KDE_APPLICATIONS_VERSION_MICRO "2") set(UMBRELLO_VERSION_MAJOR "2") MATH(EXPR UMBRELLO_VERSION_MINOR "12+${KDE_APPLICATIONS_VERSION_MINOR}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-16.08.1/umbrello/codeimport/javaimport.cpp new/umbrello-16.08.2/umbrello/codeimport/javaimport.cpp --- old/umbrello-16.08.1/umbrello/codeimport/javaimport.cpp 2016-09-05 10:35:13.000000000 +0200 +++ new/umbrello-16.08.2/umbrello/codeimport/javaimport.cpp 2016-10-07 01:13:32.000000000 +0200 @@ -159,6 +159,12 @@ baseClassName.remove(QLatin1Char('[')); baseClassName.remove(QLatin1Char(']')); + // remove template class name so that the class itself can be resolved + int index = baseClassName.indexOf(QLatin1Char('<')); + if (index != -1) { + baseClassName = baseClassName.remove(index, baseClassName.size()-index); + } + // java has a few implicit imports. Most relevant for this is the // current package, which is in the same directory as the current file // being parsed diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-16.08.1/umbrello/umllistviewitem.cpp new/umbrello-16.08.2/umbrello/umllistviewitem.cpp --- old/umbrello-16.08.1/umbrello/umllistviewitem.cpp 2016-09-05 10:35:13.000000000 +0200 +++ new/umbrello-16.08.2/umbrello/umllistviewitem.cpp 2016-10-07 01:13:32.000000000 +0200 @@ -342,7 +342,7 @@ UMLObject::ObjectType ot = m_object->baseType(); QString modelObjText = m_object->name(); if (Model_Utils::isClassifierListitem(ot)) { - UMLClassifierListItem *pNarrowed = static_cast<UMLClassifierListItem*>(m_object); + UMLClassifierListItem *pNarrowed = static_cast<UMLClassifierListItem*>(m_object.data()); modelObjText = pNarrowed->toString(Uml::SignatureType::SigNoVis); } setText(modelObjText); @@ -509,7 +509,7 @@ cancelRenameWithMsg(); return; } - UMLOperation *op = static_cast<UMLOperation*>(m_object); + UMLOperation *op = static_cast<UMLOperation*>(m_object.data()); UMLClassifier *parent = static_cast<UMLClassifier *>(op->parent()); Model_Utils::OpDescriptor od; Model_Utils::Parse_Status st = Model_Utils::parseOperation(newText, od, parent); @@ -572,7 +572,7 @@ return; } UMLApp::app()->executeCommand(new Uml::CmdRenameUMLObject(m_object, nt.m_name)); - UMLAttribute *pAtt = static_cast<UMLAttribute*>(m_object); + UMLAttribute *pAtt = static_cast<UMLAttribute*>(m_object.data()); pAtt->setType(nt.m_type); pAtt->setVisibility(vis); pAtt->setParmKind(nt.m_direction); @@ -607,7 +607,7 @@ } UMLApp::app()->executeCommand(new Uml::CmdRenameUMLObject(m_object, name)); - UMLEntityConstraint* uec = static_cast<UMLEntityConstraint*>(m_object); + UMLEntityConstraint* uec = static_cast<UMLEntityConstraint*>(m_object.data()); m_label = uec->toString(Uml::SignatureType::SigNoVis); } else { KMessageBox::error(0, @@ -633,7 +633,7 @@ return; } UMLApp::app()->executeCommand(new Uml::CmdRenameUMLObject(m_object, nt.m_name)); - UMLTemplate *tmpl = static_cast<UMLTemplate*>(m_object); + UMLTemplate *tmpl = static_cast<UMLTemplate*>(m_object.data()); tmpl->setType(nt.m_type); m_label = tmpl->toString(Uml::SignatureType::SigNoVis); } else { @@ -892,7 +892,7 @@ if (m_type != lvt_View) itemElement.setAttribute(QLatin1String("label"), text(0)); } else if (m_object->baseType() == UMLObject::ot_Folder) { - extFolder = static_cast<UMLFolder*>(m_object); + extFolder = static_cast<UMLFolder*>(m_object.data()); if (!extFolder->folderFile().isEmpty()) { itemElement.setAttribute(QLatin1String("open"), QLatin1String("0")); qElement.appendChild(itemElement); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-16.08.1/umbrello/umllistviewitem.h new/umbrello-16.08.2/umbrello/umllistviewitem.h --- old/umbrello-16.08.1/umbrello/umllistviewitem.h 2016-09-05 10:35:13.000000000 +0200 +++ new/umbrello-16.08.2/umbrello/umllistviewitem.h 2016-10-07 01:13:32.000000000 +0200 @@ -17,6 +17,7 @@ #include <QDomDocument> #include <QDomElement> #include <QMap> +#include <QPointer> #include <QTreeWidget> // forward declarations @@ -170,7 +171,7 @@ ListViewType m_type; Uml::ID::Type m_id; - UMLObject * m_object; + QPointer<UMLObject> m_object; QString m_label; ChildObjectMap m_comap; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-16.08.1/umbrello/umlmodel/association.cpp new/umbrello-16.08.2/umbrello/umlmodel/association.cpp --- old/umbrello-16.08.1/umbrello/umlmodel/association.cpp 2016-09-05 10:35:13.000000000 +0200 +++ new/umbrello-16.08.2/umbrello/umlmodel/association.cpp 2016-10-07 01:13:32.000000000 +0200 @@ -238,7 +238,7 @@ m_AssocType == Uml::AssociationType::Category2Parent) { QString general = element.attribute(QLatin1String("general")); if (!general.isEmpty()) { - UMLClassifier *owningClassifier = dynamic_cast<UMLClassifier*>(m_pUMLPackage); + UMLClassifier *owningClassifier = dynamic_cast<UMLClassifier*>(m_pUMLPackage.data()); if (owningClassifier == NULL){ uWarning() << "Cannot load UML2 generalization: m_pUMLPackage is expected " << "to be the owning classifier (=client)"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-16.08.1/umbrello/umlmodel/umlobject.h new/umbrello-16.08.2/umbrello/umlmodel/umlobject.h --- old/umbrello-16.08.1/umbrello/umlmodel/umlobject.h 2016-09-05 10:35:13.000000000 +0200 +++ new/umbrello-16.08.2/umbrello/umlmodel/umlobject.h 2016-10-07 01:13:32.000000000 +0200 @@ -171,7 +171,7 @@ Uml::ID::Type m_nId; ///< object's id QString m_Doc; ///< object's documentation - UMLPackage* m_pUMLPackage; ///< package the object belongs to if applicable + QPointer<UMLPackage> m_pUMLPackage; ///< package the object belongs to if applicable QPointer<UMLStereotype> m_pStereotype; ///< stereotype of the object if applicable QString m_name; ///< objects name ObjectType m_BaseType; ///< objects type
