Hello community, here is the log from the commit of package umbrello for openSUSE:Factory checked in at 2016-01-28 17:22:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-01-10 13:07:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.umbrello.new/umbrello.changes 2016-01-28 17:22:28.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Jan 9 18:37:24 UTC 2016 - [email protected] + +- Update to KDE Applications 15.12.1 + * KDE Applications 15.12.1 + * https://www.kde.org/announcements/announce-applications-15.12.1.php + * boo#961265 + + +------------------------------------------------------------------- Old: ---- umbrello-15.12.0.tar.xz New: ---- umbrello-15.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ umbrello.spec ++++++ --- /var/tmp/diff_new_pack.BZH4wd/_old 2016-01-28 17:22:29.000000000 +0100 +++ /var/tmp/diff_new_pack.BZH4wd/_new 2016-01-28 17:22:29.000000000 +0100 @@ -24,7 +24,7 @@ License: GPL-2.0 and GFDL-1.2 Group: Development/Tools/Other Url: http://www.kde.org/ -Version: 15.12.0 +Version: 15.12.1 Release: 0 Source0: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ umbrello-15.12.0.tar.xz -> umbrello-15.12.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-15.12.0/.arcconfig new/umbrello-15.12.1/.arcconfig --- old/umbrello-15.12.0/.arcconfig 1970-01-01 01:00:00.000000000 +0100 +++ new/umbrello-15.12.1/.arcconfig 2016-01-07 00:18:00.000000000 +0100 @@ -0,0 +1,4 @@ +{ + "phabricator.uri" : "https://phabricator.kde.org/project/profile/60/";, + "history.immutable" : true +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-15.12.0/.reviewboardrc new/umbrello-15.12.1/.reviewboardrc --- old/umbrello-15.12.0/.reviewboardrc 1970-01-01 01:00:00.000000000 +0100 +++ new/umbrello-15.12.1/.reviewboardrc 2016-01-07 00:18:00.000000000 +0100 @@ -0,0 +1,3 @@ +REPOSITORY = "git://anongit.kde.org/umbrello" +REVIEWBOARD_URL = "https://git.reviewboard.kde.org"; +TARGET_GROUPS = "umbrello" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-15.12.0/CMakeLists.txt new/umbrello-15.12.1/CMakeLists.txt --- old/umbrello-15.12.0/CMakeLists.txt 2015-12-09 08:17:56.000000000 +0100 +++ new/umbrello-15.12.1/CMakeLists.txt 2016-01-07 00:18:00.000000000 +0100 @@ -3,7 +3,7 @@ # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "15") set (KDE_APPLICATIONS_VERSION_MINOR "12") -set (KDE_APPLICATIONS_VERSION_MICRO "0") +set (KDE_APPLICATIONS_VERSION_MICRO "1") set(UMBRELLO_VERSION_MAJOR "2") set(UMBRELLO_VERSION_MINOR "18") @@ -180,6 +180,7 @@ message(STATUS "Using automoc4 version ${AUTOMOC4_VERSION}") message(STATUS "Using cmake version ${CMAKE_VERSION}") +message(STATUS "Using Qt version ${QT_MIN_VERSION}") find_package(LibXslt) set_package_properties(LibXslt PROPERTIES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-15.12.0/umbrello/basictypes.h new/umbrello-15.12.1/umbrello/basictypes.h --- old/umbrello-15.12.0/umbrello/basictypes.h 2015-12-09 08:17:56.000000000 +0100 +++ new/umbrello-15.12.1/umbrello/basictypes.h 2016-01-07 00:18:00.000000000 +0100 @@ -339,4 +339,14 @@ } // end namespace Uml +static inline QString toString(Uml::ProgrammingLanguage::Enum lang) +{ + return Uml::ProgrammingLanguage::toString(lang); +} + +static inline QString toString(Uml::Visibility::Enum visibility) +{ + return Uml::Visibility::toString(visibility); +} + #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-15.12.0/umbrello/codegenerators/python/pythonwriter.cpp new/umbrello-15.12.1/umbrello/codegenerators/python/pythonwriter.cpp --- old/umbrello-15.12.0/umbrello/codegenerators/python/pythonwriter.cpp 2015-12-09 08:17:56.000000000 +0100 +++ new/umbrello-15.12.1/umbrello/codegenerators/python/pythonwriter.cpp 2016-01-07 00:18:00.000000000 +0100 @@ -24,6 +24,7 @@ #include <QFile> #include <QRegExp> +#include <QTextCodec> #include <QTextStream> static const char *reserved_words[] = { @@ -219,6 +220,7 @@ h<<str<<m_endl; } + h << "# coding=" << h.codec()->name() << m_endl; // generate import statement for superclasses and take packages into account str = cleanName(c->name()); QString pkg = cleanName(c->package()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-15.12.0/umbrello/dialogs/classpropertiesdialog.cpp new/umbrello-15.12.1/umbrello/dialogs/classpropertiesdialog.cpp --- old/umbrello-15.12.0/umbrello/dialogs/classpropertiesdialog.cpp 2015-12-09 08:17:56.000000000 +0100 +++ new/umbrello-15.12.1/umbrello/dialogs/classpropertiesdialog.cpp 2016-01-07 00:18:00.000000000 +0100 @@ -94,6 +94,7 @@ if (w->baseType() == WidgetBase::wt_Class || w->baseType() == WidgetBase::wt_Interface + || w->baseType() == WidgetBase::wt_Enum || w->baseType() == WidgetBase::wt_Package) { setupPages(true); } else if (w->baseType() == WidgetBase::wt_Component) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-15.12.0/umbrello/dialogs/pages/classgeneralpage.cpp new/umbrello-15.12.1/umbrello/dialogs/pages/classgeneralpage.cpp --- old/umbrello-15.12.0/umbrello/dialogs/pages/classgeneralpage.cpp 2015-12-09 08:17:56.000000000 +0100 +++ new/umbrello-15.12.1/umbrello/dialogs/pages/classgeneralpage.cpp 2016-01-07 00:18:00.000000000 +0100 @@ -110,7 +110,7 @@ ++row; } - if (t == UMLObject::ot_Class || t == UMLObject::ot_Interface) { + if (t == UMLObject::ot_Class || t == UMLObject::ot_Interface || t == UMLObject::ot_Enum) { m_packageWidget = new UMLPackageWidget(m_pObject); m_packageWidget->addToLayout(m_pNameLayout, row); ++row; @@ -282,7 +282,7 @@ if (m_pObject) { UMLObject::ObjectType t = m_pObject->baseType(); - if (t == UMLObject::ot_Class || t == UMLObject::ot_Interface) { + if (t == UMLObject::ot_Class || t == UMLObject::ot_Interface || t == UMLObject::ot_Enum) { m_packageWidget->apply(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-15.12.0/umbrello/dialogs/widgets/resolutionwidget.h new/umbrello-15.12.1/umbrello/dialogs/widgets/resolutionwidget.h --- old/umbrello-15.12.0/umbrello/dialogs/widgets/resolutionwidget.h 2015-12-09 08:17:56.000000000 +0100 +++ new/umbrello-15.12.1/umbrello/dialogs/widgets/resolutionwidget.h 2016-01-07 00:18:00.000000000 +0100 @@ -31,7 +31,7 @@ { Q_OBJECT public: - ResolutionWidget(QWidget *parent = 0); + explicit ResolutionWidget(QWidget *parent = 0); void addToLayout(QHBoxLayout *layout); float currentResolution(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-15.12.0/umbrello/dialogs/widgets/umlpackagewidget.h new/umbrello-15.12.1/umbrello/dialogs/widgets/umlpackagewidget.h --- old/umbrello-15.12.0/umbrello/dialogs/widgets/umlpackagewidget.h 2015-12-09 08:17:56.000000000 +0100 +++ new/umbrello-15.12.1/umbrello/dialogs/widgets/umlpackagewidget.h 2016-01-07 00:18:00.000000000 +0100 @@ -24,7 +24,7 @@ { Q_OBJECT public: - UMLPackageWidget(UMLObject *o, QWidget *parent = 0); + explicit UMLPackageWidget(UMLObject *o, QWidget *parent = 0); ~UMLPackageWidget(); void addToLayout(QGridLayout *layout, int row); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-15.12.0/umbrello/main.cpp new/umbrello-15.12.1/umbrello/main.cpp --- old/umbrello-15.12.0/umbrello/main.cpp 2015-12-09 08:17:56.000000000 +0100 +++ new/umbrello-15.12.1/umbrello/main.cpp 2016-01-07 00:18:00.000000000 +0100 @@ -26,7 +26,6 @@ #include <kconfig.h> #include <KLocalizedString> #include <ktip.h> -#include <kwindowsystem.h> #if QT_VERSION >= 0x050000 #include <QApplication> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-15.12.0/umbrello/pics/global/CMakeLists.txt new/umbrello-15.12.1/umbrello/pics/global/CMakeLists.txt --- old/umbrello-15.12.0/umbrello/pics/global/CMakeLists.txt 2015-12-09 08:17:56.000000000 +0100 +++ new/umbrello-15.12.1/umbrello/pics/global/CMakeLists.txt 2016-01-07 00:18:00.000000000 +0100 @@ -1,5 +1,5 @@ if(NOT BUILD_KF5) - kde4_install_icons(${ICON_INSTALL_DIR}) + add_subdirectory(kde4) else() ecm_install_icons( ICONS 16-apps-umbrello.png diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-15.12.0/umbrello/pics/global/kde4/CMakeLists.txt new/umbrello-15.12.1/umbrello/pics/global/kde4/CMakeLists.txt --- old/umbrello-15.12.0/umbrello/pics/global/kde4/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/umbrello-15.12.1/umbrello/pics/global/kde4/CMakeLists.txt 2016-01-07 00:18:00.000000000 +0100 @@ -0,0 +1,3 @@ +if(NOT BUILD_KF5) + kde4_install_icons(${ICON_INSTALL_DIR}) +endif() Files old/umbrello-15.12.0/umbrello/pics/global/kde4/hi128-apps-umbrello.png and new/umbrello-15.12.1/umbrello/pics/global/kde4/hi128-apps-umbrello.png differ Files old/umbrello-15.12.0/umbrello/pics/global/kde4/hi16-apps-umbrello.png and new/umbrello-15.12.1/umbrello/pics/global/kde4/hi16-apps-umbrello.png differ Files old/umbrello-15.12.0/umbrello/pics/global/kde4/hi16-mimetypes-application-x-uml.png and new/umbrello-15.12.1/umbrello/pics/global/kde4/hi16-mimetypes-application-x-uml.png differ Files old/umbrello-15.12.0/umbrello/pics/global/kde4/hi22-apps-umbrello.png and new/umbrello-15.12.1/umbrello/pics/global/kde4/hi22-apps-umbrello.png differ Files old/umbrello-15.12.0/umbrello/pics/global/kde4/hi32-apps-umbrello.png and new/umbrello-15.12.1/umbrello/pics/global/kde4/hi32-apps-umbrello.png differ Files old/umbrello-15.12.0/umbrello/pics/global/kde4/hi32-mimetypes-application-x-uml.png and new/umbrello-15.12.1/umbrello/pics/global/kde4/hi32-mimetypes-application-x-uml.png differ Files old/umbrello-15.12.0/umbrello/pics/global/kde4/hi48-apps-umbrello.png and new/umbrello-15.12.1/umbrello/pics/global/kde4/hi48-apps-umbrello.png differ Files old/umbrello-15.12.0/umbrello/pics/global/kde4/hi64-apps-umbrello.png and new/umbrello-15.12.1/umbrello/pics/global/kde4/hi64-apps-umbrello.png differ Files old/umbrello-15.12.0/umbrello/pics/global/kde4/hisc-apps-umbrello.svgz and new/umbrello-15.12.1/umbrello/pics/global/kde4/hisc-apps-umbrello.svgz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-15.12.0/umbrello/stereotypesmodel.h new/umbrello-15.12.1/umbrello/stereotypesmodel.h --- old/umbrello-15.12.0/umbrello/stereotypesmodel.h 2015-12-09 08:17:56.000000000 +0100 +++ new/umbrello-15.12.1/umbrello/stereotypesmodel.h 2016-01-07 00:18:00.000000000 +0100 @@ -25,7 +25,7 @@ { Q_OBJECT public: - StereotypesModel(UMLStereotypeList *stereotypes); + explicit StereotypesModel(UMLStereotypeList *stereotypes); int rowCount(const QModelIndex &parent) const; int columnCount(const QModelIndex &parent) const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-15.12.0/umbrello/umlmodel/association.cpp new/umbrello-15.12.1/umbrello/umlmodel/association.cpp --- old/umbrello-15.12.0/umbrello/umlmodel/association.cpp 2015-12-09 08:17:56.000000000 +0100 +++ new/umbrello-15.12.1/umbrello/umlmodel/association.cpp 2016-01-07 00:18:00.000000000 +0100 @@ -118,13 +118,17 @@ string += m_pRole[RoleType::A]->object()->name(); string += QLatin1Char(':'); string += m_pRole[RoleType::A]->name(); + } else { + string += QLatin1String("null"); } - string += QLatin1Char(':') + Uml::AssociationType::toStringI18n(m_AssocType) + QLatin1Char(':'); + string += QLatin1Char(' ') + Uml::AssociationType::toStringI18n(m_AssocType) + QLatin1Char(' '); if(m_pRole[RoleType::B]) { string += m_pRole[RoleType::B]->object()->name(); string += QLatin1Char(':'); string += m_pRole[RoleType::B]->name(); + } else { + string += QLatin1String("null"); } return string; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-15.12.0/umbrello/umlviewimageexportermodel.h new/umbrello-15.12.1/umbrello/umlviewimageexportermodel.h --- old/umbrello-15.12.0/umbrello/umlviewimageexportermodel.h 2015-12-09 08:17:56.000000000 +0100 +++ new/umbrello-15.12.1/umbrello/umlviewimageexportermodel.h 2016-01-07 00:18:00.000000000 +0100 @@ -40,7 +40,7 @@ static QString imageTypeToMimeType(const QString& imageType); static QString mimeTypeToImageType(const QString& mimeType); - UMLViewImageExporterModel(float resolution = 0.0); + explicit UMLViewImageExporterModel(float resolution = 0.0); virtual ~UMLViewImageExporterModel(); #if QT_VERSION >= 0x050000 QString exportView(UMLScene* scene, const QString &imageType, const QUrl &url) const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-15.12.0/umbrello/umlwidgets/associationwidget.cpp new/umbrello-15.12.1/umbrello/umlwidgets/associationwidget.cpp --- old/umbrello-15.12.0/umbrello/umlwidgets/associationwidget.cpp 2015-12-09 08:17:56.000000000 +0100 +++ new/umbrello-15.12.1/umbrello/umlwidgets/associationwidget.cpp 2016-01-07 00:18:00.000000000 +0100 @@ -1544,6 +1544,7 @@ { QString string; static const QChar colon(QLatin1Char(':')); + static const QChar space(QLatin1Char(' ')); if (widgetForRole(RoleType::A)) { string = widgetForRole(RoleType::A)->name(); @@ -1553,9 +1554,9 @@ if (m_role[RoleType::A].roleWidget) { string += m_role[RoleType::A].roleWidget->text(); } - string.append(colon); + string.append(space); string.append(Uml::AssociationType::toStringI18n(associationType())); - string.append(colon); + string.append(space); if (widgetForRole(RoleType::B)) { string += widgetForRole(RoleType::B)->name(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-15.12.0/unittests/TEST_cppwriter.cpp new/umbrello-15.12.1/unittests/TEST_cppwriter.cpp --- old/umbrello-15.12.0/unittests/TEST_cppwriter.cpp 2015-12-09 08:17:56.000000000 +0100 +++ new/umbrello-15.12.1/unittests/TEST_cppwriter.cpp 2016-01-07 00:18:00.000000000 +0100 @@ -41,7 +41,7 @@ { CppWriter* cpp = new CppWriter(); Uml::ProgrammingLanguage::Enum lang = cpp->language(); - QCOMPARE(lang, Uml::ProgrammingLanguage::Cpp); + QVERIFY(lang == Uml::ProgrammingLanguage::Cpp); } void TEST_cppwriter::test_writeClass() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-15.12.0/unittests/TEST_pythonwriter.cpp new/umbrello-15.12.1/unittests/TEST_pythonwriter.cpp --- old/umbrello-15.12.0/unittests/TEST_pythonwriter.cpp 2015-12-09 08:17:56.000000000 +0100 +++ new/umbrello-15.12.1/unittests/TEST_pythonwriter.cpp 2016-01-07 00:18:00.000000000 +0100 @@ -41,7 +41,7 @@ { PythonWriter* py = new PythonWriter(); Uml::ProgrammingLanguage::Enum lang = py->language(); - QCOMPARE(lang, Uml::ProgrammingLanguage::Python); + QVERIFY(lang == Uml::ProgrammingLanguage::Python); } void TEST_pythonwriter::test_writeClass() @@ -51,6 +51,7 @@ UMLAttribute* attr; attr = c->createAttribute("name_"); attr = c->createAttribute("address_"); + c->addAttribute(attr); py->writeClass(c); // does the just created file exist? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-15.12.0/unittests/TEST_umlobject.cpp new/umbrello-15.12.1/unittests/TEST_umlobject.cpp --- old/umbrello-15.12.0/unittests/TEST_umlobject.cpp 2015-12-09 08:17:56.000000000 +0100 +++ new/umbrello-15.12.1/unittests/TEST_umlobject.cpp 2016-01-07 00:18:00.000000000 +0100 @@ -200,15 +200,15 @@ void TEST_UMLObject::test_setVisibility() { UMLObject a("Test A"); - QCOMPARE(a.visibility(), Uml::Visibility::Public); + QVERIFY(a.visibility() == Uml::Visibility::Public); a.setVisibilityCmd(Uml::Visibility::Protected); - QCOMPARE(a.visibility(), Uml::Visibility::Protected); + QVERIFY(a.visibility() == Uml::Visibility::Protected); a.setVisibilityCmd(Uml::Visibility::Private); - QCOMPARE(a.visibility(), Uml::Visibility::Private); + QVERIFY(a.visibility() == Uml::Visibility::Private); a.setVisibilityCmd(Uml::Visibility::Implementation); - QCOMPARE(a.visibility(), Uml::Visibility::Implementation); + QVERIFY(a.visibility() == Uml::Visibility::Implementation); a.setVisibilityCmd(Uml::Visibility::FromParent); - QCOMPARE(a.visibility(), Uml::Visibility::FromParent); + QVERIFY(a.visibility() == Uml::Visibility::FromParent); } void TEST_UMLObject::test_toString()
