diff --git a/desktop/kde/applications/artikulate/actions.py b/desktop/kde/applications/artikulate/actions.py index 4a392f0771..ee66e7061b 100755 --- a/desktop/kde/applications/artikulate/actions.py +++ b/desktop/kde/applications/artikulate/actions.py @@ -5,15 +5,18 @@ # See the file http://www.gnu.org/licenses/gpl.txt from pisi.actionsapi import pisitools -from pisi.actionsapi import kde5 +from pisi.actionsapi import cmaketools +from pisi.actionsapi import kde6 def setup(): - kde5.configure() + cmaketools.configure("-B build -DBUILD_TESTING=OFF \ + -DKDE_INSTALL_LIBDIR=lib \ + -DCMAKE_INSTALL_PREFIX=/usr") def build(): - kde5.make() + kde6.make() def install(): - kde5.install() + kde6.install() pisitools.dodoc("COPYING*") diff --git a/desktop/kde/applications/artikulate/pspec.xml b/desktop/kde/applications/artikulate/pspec.xml index b25d10dcc3..518a87f04e 100755 --- a/desktop/kde/applications/artikulate/pspec.xml +++ b/desktop/kde/applications/artikulate/pspec.xml @@ -1,3 +1,4 @@ + @@ -11,60 +12,64 @@ GPLv2 LGPLv3 FDLv1.2 - artikulate + artikulate5 app:gui desktop.kde.edu Improve your pronunciation by listening to native speakers - Artikulate, Improve your pronunciation by listening to native speakers. - mirrors://kde/stable/release-service/23.08.5/src/artikulate-23.08.5.tar.xz + artikulate5, Improve your pronunciation by listening to native speakers. + mirrors://kde/stable/release-service/24.12.1/src/artikulate-24.12.1.tar.xz boost-devel cmake extra-cmake-modules - kdoctools-devel - ki18n - kcrash-devel + kdoctools5-devel + ki18n5-devel + kcrash5-devel libgcc - kconfig-devel - kirigami-devel - kxmlgui-devel - qt5-base-devel - knewstuff-devel - kcoreaddons-devel - kdeclarative-devel + kconfig5-devel + kirigami5-devel + kxmlgui5-devel + qt6-base-devel + knewstuff5-devel + kcoreaddons5-devel + kdeclarative5-devel qt5-gstreamer-devel - kconfigwidgets-devel - kwidgetsaddons-devel + kconfigwidgets5-devel + kwidgetsaddons5-devel qt5-declarative-devel - qt5-xmlpatterns-devel qt5-sql-postgresql qt5-sql-mysql qt5-sql-odbc qt5-sql-sqlite qt5-multimedia-devel + qt5-xmlpatterns-devel - artikulate + artikulate5 - ki18n - kcrash - kirigami + ki18n5 + kcrash5 + kirigami5 libgcc - kconfig - kxmlgui - karchive - qt5-base - knewstuff - kcoreaddons - kdeclarative + kconfig5 + kxmlgui5 + karchive5 + knewstuff5 + kcoreaddons5 + kdeclarative5 qt5-gstreamer - kconfigwidgets - kwidgetsaddons + kconfigwidgets5 + kwidgetsaddons5 + kdoctools5 qt5-declarative - qt5-xmlpatterns + qt5-sql-postgresql + qt5-sql-mysql + qt5-sql-odbc + qt5-sql-sqlite qt5-multimedia + qt5-xmlpatterns /etc @@ -73,400 +78,18 @@ /usr/bin /usr/share + + artikulate-kf6 + - - 2024-02-17 - 23.08.5 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2023-12-07 - 23.08.4 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2023-10-27 - 23.08.2 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2023-09-14 - 23.08.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2023-06-08 - 23.04.2 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2023-05-11 - 23.04.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2023-04-20 - 23.04.0 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2023-03-03 - 22.12.3 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2023-01-05 - 22.12.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2022-12-08 - 22.12.0 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2022-11-05 - 22.08.3 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2022-09-24 - 22.08.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2022-07-15 - 22.04.3 - Version bump. - Kamil Atlı - suvari@pisilinux.org - - - 2022-06-21 - 22.04.2 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2022-05-17 - 22.04.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2022-05-07 - 22.04.0 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2022-02-26 - 21.12.2 - Version bump. - Kamil Atlı - suvari@pisilinux.org - - - 2022-01-10 - 21.12.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2021-10-15 - 21.08.2 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2021-09-13 - 21.08.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2021-06-16 - 21.04.2 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2021-05-09 - 21.04.0 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2021-03-10 - 20.12.3 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2020-09-13 - 20.08.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2020-06-11 - 20.04.2 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2020-05-06 - 20.04.0 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2020-03-30 - 19.12.3 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2020-02-02 - 19.12.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2019-09-15 - 19.08.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2019-07-23 - 19.04.3 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2019-04-18 - 19.04.0 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2019-03-11 - 18.12.3 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2019-02-08 - 18.12.2 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2019-01-12 - 18.12.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2018-12-26 - 18.12.0 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2018-11-08 - 18.08.3 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2018-10-18 - 18.08.2 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2018-08-11 - 18.04.1 - Rebuild - Ertuğrul Erata - ertugrulerata@gmail.com - - - 2018-05-11 - 18.04.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2018-04-25 - 18.04.0 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2018-03-22 - 17.12.3 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2018-02-03 - 17.12.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2017-12-15 - 17.12.0 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2017-11-11 - 17.08.3 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2017-10-14 - 17.08.2 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2017-09-14 - 17.08.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2017-07-17 - 17.04.3 - Version bump - Ali Algul - aligulle3801@gmail.com - - - 2017-06-29 - 17.04.2 - Version bump. - Kamil Atlı - suvari@pisilinux.org - - - 2017-03-03 - 16.12.0 - Rebuild for new Toolchain. - Stefan Gronewold(groni) - groni@pisilinux.org - - - 2016-12-21 - 16.12.0 - Version bump. - Stefan Gronewold(groni) - groni@pisilinux.org - - - 2016-11-27 - 16.08.3 - Version bump. - Stefan Gronewold(groni) - groni@pisilinux.org - - - 2016-10-22 - 16.08.2 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilnux.org - - - 2016-10-20 - 16.08.1 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilnux.org - - - 2016-07-31 - 16.04.3 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2016-05-19 - 16.04.0 - Version bump. - Burak Ertürk - burakerturk@pisilinux.org - - - 2016-03-20 - 15.12.3 + + 2025-01-10 + 24.12.1 First release - Yusuf Aydemir - yusuf.aydemir@pisilinux.org + Pisi Linux Community + admin@pisilinux.org diff --git a/desktop/kde/applications/artikulate/translations.xml b/desktop/kde/applications/artikulate/translations.xml index 22fa288a3a..c4ce3b05d5 100755 --- a/desktop/kde/applications/artikulate/translations.xml +++ b/desktop/kde/applications/artikulate/translations.xml @@ -1,8 +1,8 @@ - artikulate + artikulate5 Improve your pronunciation by listening to native speakers - Artikulate, Improve your pronunciation by listening to native speakers. + artikulate5, Improve your pronunciation by listening to native speakers. - \ No newline at end of file + diff --git a/desktop/kde/applications/kig/actions.py b/desktop/kde/applications/kig/actions.py index f53e168fd9..9c77d63c17 100755 --- a/desktop/kde/applications/kig/actions.py +++ b/desktop/kde/applications/kig/actions.py @@ -5,16 +5,18 @@ # See the file http://www.gnu.org/licenses/gpl.txt from pisi.actionsapi import pisitools +from pisi.actionsapi import kde6 from pisi.actionsapi import kde5 def setup(): + # kde6.configure() kde5.configure() def build(): - kde5.make() + kde6.make() def install(): - kde5.install() + kde6.install() pisitools.dodoc("LICENSES/*") diff --git a/desktop/kde/applications/kig/pspec.xml b/desktop/kde/applications/kig/pspec.xml index 475a5b6947..0690a8dad7 100755 --- a/desktop/kde/applications/kig/pspec.xml +++ b/desktop/kde/applications/kig/pspec.xml @@ -1,3 +1,4 @@ + @@ -9,455 +10,72 @@ admins@pisilinux.org GPLv2 - kig + kig5 app:gui desktop.kde.edu An interactive geometry application - Kig is an application for interactive geometry. - mirrors://kde/stable/release-service/23.08.5/src/kig-23.08.5.tar.xz + kig5 is an application for interactive geometry. + mirrors://kde/stable/release-service/24.12.1/src/kig-24.12.1.tar.xz - qt5-base-devel - qt5-svg-devel boost-devel - ktexteditor-devel - kdoctools-devel - kemoticons-devel - kitemmodels-devel - qt5-xmlpatterns-devel + ktexteditor5-devel + kdoctools5-devel + kitemmodels5-devel gettext-devel pkgconfig - kcrash-devel - karchive-devel + kcrash5-devel + karchive5-devel extra-cmake-modules + qt5-base-devel + qt5-svg-devel + qt5-xmlpatterns-devel kig - qt5-base boost - kcrash - ktexteditor + kcrash5 + ktexteditor5 + ki18n5 + kparts5 + kiconthemes5 + kconfigwidgets5 + karchive5 + kxmlgui5 + kitemmodels5 + libgcc + kservice5 + kcompletion5 + kcoreaddons5 + kwidgetsaddons5 + kconfig5 + boost-python3 + qt5-base qt5-xmlpatterns qt5-svg - ki18n - kparts - ktexteditor - kiconthemes - kconfigwidgets - karchive - kxmlgui - kitemmodels - libgcc - kservice - kcompletion - kcoreaddons - kwidgetsaddons - kconfig /usr/lib - /usr/lib/qt5 + /usr/lib/qt6 /usr/share/man /usr/share/doc /usr/bin /usr/share + + kig-kf6 + - - 2024-02-17 - 23.08.5 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2023-12-07 - 23.08.4 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2023-10-27 - 23.08.2 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2023-09-14 - 23.08.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2023-06-08 - 23.04.2 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2023-05-11 - 23.04.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2023-04-20 - 23.04.0 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2023-03-03 - 22.12.3 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2023-01-05 - 22.12.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2022-12-08 - 22.12.0 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2022-11-06 - 22.08.3 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2022-09-24 - 22.08.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2022-07-15 - 22.04.3 - Version bump. - Kamil Atlı - suvari@pisilinux.org - - - 2022-06-21 - 22.04.2 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2022-05-17 - 22.04.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2022-05-07 - 22.04.0 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2022-02-26 - 21.12.2 - Version bump. - Kamil Atlı - suvari@pisilinux.org - - - 2022-01-10 - 21.12.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2021-10-15 - 21.08.2 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2021-09-13 - 21.08.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2021-06-16 - 21.04.2 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2021-05-09 - 21.04.0 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2021-03-10 - 20.12.3 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2020-09-13 - 20.08.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2020-06-11 - 20.04.2 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2020-05-06 - 20.04.0 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2020-03-30 - 19.12.3 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2020-02-02 - 19.12.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2019-09-15 - 19.08.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2019-07-23 - 19.04.3 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2019-04-18 - 19.04.0 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2019-03-11 - 18.12.3 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2019-02-08 - 18.12.2 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2019-01-12 - 18.12.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2018-12-26 - 18.12.0 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2018-11-08 - 18.08.3 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2018-10-18 - 18.08.2 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2018-08-11 - 18.04.1 - Rebuild - Ertuğrul Erata - ertugrulerata@gmail.com - - - 2018-05-11 - 18.04.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2018-04-25 - 18.04.0 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2018-03-22 - 17.12.3 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2018-02-03 - 17.12.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2017-12-15 - 17.12.0 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2017-11-11 - 17.08.3 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2017-10-14 - 17.08.2 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2017-09-14 - 17.08.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2017-07-17 - 17.04.3 - Version bump - Ali Algul - aligulle3801@gmail.com - - - 2017-06-29 - 17.04.2 - Version bump. - Kamil Atlı - suvari@pisilinux.org - - - 2017-03-09 - 16.12.0 - Rebuild for new Toolchain. - Stefan Gronewold(groni) - groni@pisilinux.org - - - 2016-12-23 - 16.12.0 - Version bump. - Stefan Gronewold(groni) - groni@pisilinux.org - - - 2016-11-27 - 16.08.3 - Version bump. - Stefan Gronewold(groni) - groni@pisilinux.org - - - 2016-10-22 - 16.08.2 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilnux.org - - - 2016-10-20 - 16.08.1 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilnux.org - - - 2016-07-31 - 16.04.3 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2016-05-19 - 16.04.0 - Version bump. - Burak Ertürk - burakerturk@pisilinux.org - - - 2016-03-24 - 15.12.3 + + 2025-01-10 + 24.12.1 First release - Yusuf Aydemir - yusuf.aydemir@pisilinux.org + Pisi Linux Community + admin@pisilinux.org diff --git a/desktop/kde/applications/kig/translations.xml b/desktop/kde/applications/kig/translations.xml index 781546a83c..42f3cfec88 100755 --- a/desktop/kde/applications/kig/translations.xml +++ b/desktop/kde/applications/kig/translations.xml @@ -1,8 +1,8 @@ - kig + kig5 Bir etkileşimli geometri uygulaması - Kig, bir etkileşimli geometri uygulamasıdır. + kig5, bir etkileşimli geometri uygulamasıdır. - \ No newline at end of file + diff --git a/desktop/kde/applications/kross-interpreters/actions.py b/desktop/kde/applications/kross-interpreters/actions.py index cc2fb72193..1b5de4643d 100755 --- a/desktop/kde/applications/kross-interpreters/actions.py +++ b/desktop/kde/applications/kross-interpreters/actions.py @@ -5,15 +5,17 @@ # See the file http://www.gnu.org/licenses/gpl.txt from pisi.actionsapi import pisitools +from pisi.actionsapi import kde6 from pisi.actionsapi import kde5 def setup(): + # kde6.configure() kde5.configure() def build(): - kde5.make() + kde6.make() def install(): - kde5.install() + kde6.install() - pisitools.dodoc("COPYING") \ No newline at end of file + pisitools.dodoc("COPYING") diff --git a/desktop/kde/applications/kross-interpreters/pspec.xml b/desktop/kde/applications/kross-interpreters/pspec.xml index 5d63e0e5ef..0ed8d29823 100755 --- a/desktop/kde/applications/kross-interpreters/pspec.xml +++ b/desktop/kde/applications/kross-interpreters/pspec.xml @@ -1,3 +1,4 @@ + @@ -11,21 +12,21 @@ LGPLv2 app:gui desktop.kde.bindings - Kross interpreter plugins for programming languages - Language interpreters to enable in-process scripting with Kross. - mirrors://kde/stable/release-service/23.08.5/src/kross-interpreters-23.08.5.tar.xz + kross5 interpreter plugins for programming languages + Language interpreters to enable in-process scripting with kross5. + mirrors://kde/stable/release-service/24.12.1/src/kross-interpreters-24.12.1.tar.xz - qt5-base-devel extra-cmake-modules - kdoctools-devel - - kross-devel - kdesignerplugin - kemoticons-devel - kitemmodels-devel - kinit-devel - kunitconversion-devel + kdoctools5-devel + kross5-devel + kdesignerplugin5 + kemoticons5-devel + kitemmodels5-devel + kinit5-devel + kunitconversion5-devel python-devel + ruby-devel + qt5-base-devel @@ -35,414 +36,26 @@ qt5-base libgcc python - kross + kross5 + ruby /usr/lib - /usr/lib/qt5 + /usr/lib/qt6 /usr/share/doc + + kross-interpreters-kf6 + - - 2024-02-17 - 23.08.5 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2023-12-07 - 23.08.4 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2023-10-27 - 23.08.2 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2023-09-14 - 23.08.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2023-06-08 - 23.04.2 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2023-05-11 - 23.04.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2023-04-20 - 23.04.0 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2023-03-03 - 22.12.3 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2023-01-05 - 22.12.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2022-12-08 - 22.12.0 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2022-11-05 - 22.08.3 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2022-09-24 - 22.08.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2022-07-15 - 22.04.3 - Version bump. - Kamil Atlı - suvari@pisilinux.org - - - 2022-06-21 - 22.04.2 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2022-05-17 - 22.04.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2022-05-07 - 22.04.0 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2022-02-26 - 21.12.2 - Version bump. - Kamil Atlı - suvari@pisilinux.org - - - 2022-01-10 - 21.12.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2021-10-15 - 21.08.2 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2021-09-13 - 21.08.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2021-06-16 - 21.04.2 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2021-05-09 - 21.04.0 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2021-03-10 - 20.12.3 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2020-09-13 - 20.08.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2020-06-11 - 20.04.2 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2020-05-06 - 20.04.0 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2020-03-30 - 19.12.3 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2020-02-02 - 19.12.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2019-09-15 - 19.08.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2019-07-23 - 19.04.3 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2019-04-18 - 19.04.0 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2019-03-11 - 18.12.3 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2019-02-08 - 18.12.2 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2019-01-12 - 18.12.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2018-12-26 - 18.12.0 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2018-12-12 - 18.08.3 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2018-11-08 - 18.08.3 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2018-10-18 - 18.08.2 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2018-08-11 - 18.04.1 - Rebuild - Ertuğrul Erata - ertugrulerata@gmail.com - - - 2018-05-11 - 18.04.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2018-04-25 - 18.04.0 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2018-03-22 - 17.12.3 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2018-02-03 - 17.12.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2017-12-15 - 17.12.0 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2017-11-11 - 17.08.3 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2017-10-14 - 17.08.2 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2017-09-14 - 17.08.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2017-07-17 - 17.04.3 - Version bump - Ali Algul - aligulle3801@gmail.com - - - 2017-06-29 - 17.04.2 - Version bump. - Kamil Atlı - suvari@pisilinux.org - - - 2017-03-03 - 16.12.0 - Rebuild for new Toolchain. - Stefan Gronewold(groni) - groni@pisilinux.org - - - 2016-12-21 - 16.12.0 - Version bump. - Stefan Gronewold(groni) - groni@pisilinux.org - - - 2016-11-27 - 16.08.3 - Version bump. - Stefan Gronewold(groni) - groni@pisilinux.org - - - 2016-10-22 - 16.08.2 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilnux.org - - - 2016-10-20 - 16.08.1 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilnux.org - - - 2016-07-31 - 16.04.3 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2016-05-19 - 16.04.0 - Version bump. - Burak Ertürk - burakerturk@pisilinux.org - - - 2016-03-20 - 15.12.3 + + 2025-01-10 + 24.12.1 First release - Yusuf Aydemir - yusuf.aydemir@pisilinux.org + Pisi Linux Community + admin@pisilinux.org diff --git a/desktop/kde/applications/rocs/actions.py b/desktop/kde/applications/rocs/actions.py index eae8d4247d..3041ee41e3 100755 --- a/desktop/kde/applications/rocs/actions.py +++ b/desktop/kde/applications/rocs/actions.py @@ -5,15 +5,17 @@ # See the file http://www.gnu.org/licenses/gpl.txt from pisi.actionsapi import pisitools +from pisi.actionsapi import kde6 from pisi.actionsapi import kde5 def setup(): + # kde6.configure() kde5.configure() def build(): - kde5.make() + kde6.make() def install(): - kde5.install() + kde6.install() pisitools.dodoc("LICENSES/*") diff --git a/desktop/kde/applications/rocs/pspec.xml b/desktop/kde/applications/rocs/pspec.xml index 1b033536e6..1b69fbb5f2 100755 --- a/desktop/kde/applications/rocs/pspec.xml +++ b/desktop/kde/applications/rocs/pspec.xml @@ -1,3 +1,4 @@ + @@ -11,71 +12,70 @@ LGPLv2 app:gui desktop.kde.edu - Rocs Graph Theory - Rocs aims to be a Graph Theory IDE for helping professors to show the results of a graph algorithm and also helping students to do the algorithms. Rocs has a scripting module, done in Qt Script, that interacts with the drawn graph and every change in the graph with the script is reflected on the drawn one.. - mirrors://kde/stable/release-service/23.08.5/src/rocs-23.08.5.tar.xz + rocs5 Graph Theory + rocs5 aims to be a Graph Theory IDE for helping professors to show the results of a graph algorithm and also helping students to do the algorithms. rocs5 has a scripting module, done in Qt Script, that interacts with the drawn graph and every change in the graph with the script is reflected on the drawn one.. + mirrors://kde/stable/release-service/24.12.1/src/rocs-24.12.1.tar.xz + kdoctools5-devel + kdeclarative5-devel + ki18n5-devel + gettext-devel + kitemviews5-devel + ktexteditor5-devel + kxmlgui5-devel + kconfig5-devel + karchive5-devel + kcompletion5-devel + kcoreaddons5-devel + kconfigwidgets5-devel + kwidgetsaddons5-devel + grantlee-qt5-devel + boost-devel + extra-cmake-modules + qt5-svg-devel qt5-base-devel qt5-declarative-devel - qt5-webkit-devel qt5-base-devel qt5-xmlpatterns-devel qt5-script-devel - extra-cmake-modules - kdoctools-devel - kdeclarative-devel - ki18n-devel - gettext-devel - kitemviews-devel - ktexteditor-devel - kxmlgui-devel - kconfig-devel - karchive-devel - kcompletion-devel - kcoreaddons-devel - kconfigwidgets-devel - kwidgetsaddons-devel - cmake qt5-location-devel - grantlee-qt5-devel - boost-devel - qt5-svg-devel rocs + grantlee-qt5 + kdeclarative5 + ktexteditor5 + kparts5 + libgcc + ki18n5 + kconfig5 + karchive5 + kcompletion5 + kcoreaddons5 + ktextwidgets5 + kconfigwidgets5 + kwidgetsaddons5 + kxmlgui5 + kitemviews5 qt5-base qt5-script qt5-declarative qt5-xmlpatterns - qt5-webkit - qt5-svg - grantlee-qt5 - kdeclarative - ktexteditor - kparts - libgcc - ki18n - kconfig - karchive - kcompletion - kcoreaddons - ktextwidgets - kconfigwidgets - kwidgetsaddons - kxmlgui - kitemviews /usr/bin /usr/share /usr/lib - /usr/lib/qt5 + /usr/lib/qt6 /usr/share/doc + + rocs-kf6 + @@ -88,393 +88,18 @@ /usr/include /usr/lib/cmake + + rocs-kf6-devel + - - 2024-02-17 - 23.08.5 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2023-12-07 - 23.08.4 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2023-10-27 - 23.08.2 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2023-09-14 - 23.08.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2023-06-08 - 23.04.2 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2023-05-11 - 23.04.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2023-04-20 - 23.04.0 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2023-03-03 - 22.12.3 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2023-01-05 - 22.12.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2022-12-08 - 22.12.0 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2022-11-06 - 22.08.3 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2022-09-24 - 22.08.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2022-07-15 - 22.04.3 - Version bump. - Kamil Atlı - suvari@pisilinux.org - - - 2022-06-21 - 22.04.2 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2022-05-17 - 22.04.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2022-05-07 - 22.04.0 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2022-02-26 - 21.12.2 - Version bump. - Kamil Atlı - suvari@pisilinux.org - - - 2022-01-10 - 21.12.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2021-10-15 - 21.08.2 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2021-09-13 - 21.08.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2021-06-16 - 21.04.2 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2021-05-09 - 21.04.0 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2021-03-10 - 20.12.3 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2020-09-13 - 20.08.1 - Version bump - Mustafa Cinasal - muscnsl@gmail.com - - - 2020-06-11 - 20.04.2 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2020-05-06 - 20.04.0 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2020-03-30 - 19.12.3 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2020-02-02 - 19.12.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2019-09-15 - 19.08.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2019-07-23 - 19.04.3 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2019-04-18 - 19.04.0 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2019-03-11 - 18.12.3 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2019-02-08 - 18.12.2 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2019-01-12 - 18.12.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2018-12-26 - 18.12.0 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2018-11-08 - 18.08.3 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2018-10-18 - 18.08.2 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2018-08-11 - 18.04.1 - Rebuild - Ertuğrul Erata - ertugrulerata@gmail.com - - - 2018-05-11 - 18.04.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2018-04-25 - 18.04.0 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2018-03-22 - 17.12.3 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2018-02-03 - 17.12.1 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2017-12-15 - 17.12.0 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2017-11-11 - 17.08.3 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2017-10-16 - 17.08.2 - Version bump - Mustafa Cinasal - muscnsl@gmail.com - - - 2017-09-14 - 17.08.1 - Version bump - Mustafa Cinasal - muscnsl@gmail.com - - - 2017-07-17 - 17.04.3 - Version bump - Ali Algul - aligulle3801@gmail.com - - - 2017-07-01 - 17.04.2 - Version bump. - Kamil Atlı - suvari@pisilinux.org - - - 2017-03-08 - 16.12.0 - Rebuild for new Toolchain. - Stefan Gronewold(groni) - groni@pisilinux.org - - - 2016-12-22 - 16.12.0 - Version bump. - Stefan Gronewold(groni) - groni@pisilinux.org - - - 2016-10-22 - 16.08.2 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilnux.org - - - 2016-10-20 - 16.08.1 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilnux.org - - - 2016-07-31 - 16.04.3 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2016-05-19 - 16.04.0 - Version bump. - Burak Ertürk - burakerturk@pisilinux.org - - - 2016-03-20 - 15.12.3 + + 2025-01-09 + 24.12.1 First release - Yusuf Aydemir - yusuf.aydemir@pisilinux.org + Pisi Linux Community + admin@pisilinux.org diff --git a/desktop/kde/applications/umbrello/actions.py b/desktop/kde/applications/umbrello/actions.py index c2fa753f3c..2ef8b2024a 100755 --- a/desktop/kde/applications/umbrello/actions.py +++ b/desktop/kde/applications/umbrello/actions.py @@ -6,18 +6,20 @@ from pisi.actionsapi import shelltools from pisi.actionsapi import pisitools +from pisi.actionsapi import kde6 from pisi.actionsapi import kde5 from pisi.actionsapi import get NoStrip=["/usr/share"] def setup(): - kde5.configure("-DBUILD_KF5=ON") + # kde6.configure() + kde5.configure() def build(): - kde5.make() + kde6.make() def install(): - kde5.install() + kde6.install() pisitools.dodoc("COPYING*", "AUTHORS", "CODING-STYLE", "ChangeLog", "README", "THANKS", "TODO") diff --git a/desktop/kde/applications/umbrello/files/upstream.patch b/desktop/kde/applications/umbrello/files/upstream.patch index 9aa2960641..fa05851179 100755 --- a/desktop/kde/applications/umbrello/files/upstream.patch +++ b/desktop/kde/applications/umbrello/files/upstream.patch @@ -1,20 +1,20 @@ -diff -Nuar umbrello-15.08.1.orig/CMakeLists.txt umbrello-15.08.1/CMakeLists.txt ---- umbrello-15.08.1.orig/CMakeLists.txt 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/CMakeLists.txt 2015-10-08 11:48:59.471089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/CMakeLists.txt umbrello-kf6-15.08.1/CMakeLists.txt +--- umbrello-kf6-15.08.1.orig/CMakeLists.txt 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/CMakeLists.txt 2015-10-08 11:48:59.471089026 +0300 @@ -6,8 +6,8 @@ set (KDE_APPLICATIONS_VERSION_MICRO "1") - set(UMBRELLO_VERSION_MAJOR "2") --set(UMBRELLO_VERSION_MINOR "17") --set(UMBRELLO_VERSION_PATCH ${KDE_APPLICATIONS_VERSION_MICRO}) -+set(UMBRELLO_VERSION_MINOR "18") -+set(UMBRELLO_VERSION_PATCH "99") + set(umbrello-kf6_VERSION_MAJOR "2") +-set(umbrello-kf6_VERSION_MINOR "17") +-set(umbrello-kf6_VERSION_PATCH ${KDE_APPLICATIONS_VERSION_MICRO}) ++set(umbrello-kf6_VERSION_MINOR "18") ++set(umbrello-kf6_VERSION_PATCH "99") option(BUILD_KF5 "Build for KDE Frameworks 5" OFF) -diff -Nuar umbrello-15.08.1.orig/umbrello/actor.cpp umbrello-15.08.1/umbrello/actor.cpp ---- umbrello-15.08.1.orig/umbrello/actor.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/actor.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/actor.cpp umbrello-kf6-15.08.1/umbrello/actor.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/actor.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/actor.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,67 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -23,7 +23,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/actor.cpp umbrello-15.08.1/umbrello/ac - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#include "actor.h" @@ -83,9 +83,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/actor.cpp umbrello-15.08.1/umbrello/ac - return true; -} - -diff -Nuar umbrello-15.08.1.orig/umbrello/actor.h umbrello-15.08.1/umbrello/actor.h ---- umbrello-15.08.1.orig/umbrello/actor.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/actor.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/actor.h umbrello-kf6-15.08.1/umbrello/actor.h +--- umbrello-kf6-15.08.1.orig/umbrello/actor.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/actor.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,44 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -94,7 +94,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/actor.h umbrello-15.08.1/umbrello/acto - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef ACTOR_H @@ -111,7 +111,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/actor.h umbrello-15.08.1/umbrello/acto - * @short Information for a non-graphical UML Actor. - * @author Paul Hensgen - * @see UMLCanvasObject -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class UMLActor : public UMLCanvasObject -{ @@ -131,9 +131,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/actor.h umbrello-15.08.1/umbrello/acto -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/artifact.cpp umbrello-15.08.1/umbrello/artifact.cpp ---- umbrello-15.08.1.orig/umbrello/artifact.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/artifact.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/artifact.cpp umbrello-kf6-15.08.1/umbrello/artifact.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/artifact.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/artifact.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,90 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -142,7 +142,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/artifact.cpp umbrello-15.08.1/umbrello - * (at your option) any later version. * - * * - * copyright (C) 2003-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#include "artifact.h" @@ -225,9 +225,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/artifact.cpp umbrello-15.08.1/umbrello - return m_drawAsType; -} - -diff -Nuar umbrello-15.08.1.orig/umbrello/artifact.h umbrello-15.08.1/umbrello/artifact.h ---- umbrello-15.08.1.orig/umbrello/artifact.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/artifact.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/artifact.h umbrello-kf6-15.08.1/umbrello/artifact.h +--- umbrello-kf6-15.08.1.orig/umbrello/artifact.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/artifact.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,66 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -236,7 +236,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/artifact.h umbrello-15.08.1/umbrello/a - * (at your option) any later version. * - * * - * copyright (C) 2003-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef ARTIFACT_H @@ -253,7 +253,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/artifact.h umbrello-15.08.1/umbrello/a - * @short Non-graphical information for a Artifact. - * @author Jonathan Riddell - * @see UMLCanvasObject -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class UMLArtifact : public UMLPackage -{ @@ -295,9 +295,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/artifact.h umbrello-15.08.1/umbrello/a -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/association.cpp umbrello-15.08.1/umbrello/association.cpp ---- umbrello-15.08.1.orig/umbrello/association.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/association.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/association.cpp umbrello-kf6-15.08.1/umbrello/association.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/association.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/association.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,742 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -306,7 +306,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/association.cpp umbrello-15.08.1/umbre - * (at your option) any later version. * - * * - * copyright (C) 2003-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header @@ -602,7 +602,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/association.cpp umbrello-15.08.1/umbre - continue; - } - // Since we know for sure that we're dealing with a non -- // umbrello file, use deferred resolution unconditionally. +- // umbrello-kf6 file, use deferred resolution unconditionally. - if (UMLDoc::tagEq(tag, QLatin1String("child")) || - UMLDoc::tagEq(tag, QLatin1String("subtype")) || - UMLDoc::tagEq(tag, QLatin1String("client"))) { @@ -1041,9 +1041,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/association.cpp umbrello-15.08.1/umbre - m_pRole[RoleType::B] = new UMLRole (this, roleBObj, RoleType::B); -} - -diff -Nuar umbrello-15.08.1.orig/umbrello/association.h umbrello-15.08.1/umbrello/association.h ---- umbrello-15.08.1.orig/umbrello/association.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/association.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/association.h umbrello-kf6-15.08.1/umbrello/association.h +--- umbrello-kf6-15.08.1.orig/umbrello/association.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/association.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,102 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -1052,7 +1052,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/association.h umbrello-15.08.1/umbrell - * (at your option) any later version. * - * * - * copyright (C) 2003-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef ASSOCIATION_H @@ -1074,7 +1074,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/association.h umbrello-15.08.1/umbrell - * @short Sets up association information. - * @author Oliver Kellogg - * @see UMLObject -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class UMLAssociation : public UMLObject -{ @@ -1147,9 +1147,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/association.h umbrello-15.08.1/umbrell -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/attribute.cpp umbrello-15.08.1/umbrello/attribute.cpp ---- umbrello-15.08.1.orig/umbrello/attribute.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/attribute.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/attribute.cpp umbrello-kf6-15.08.1/umbrello/attribute.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/attribute.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/attribute.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,424 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -1158,7 +1158,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/attribute.cpp umbrello-15.08.1/umbrell - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header @@ -1575,9 +1575,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/attribute.cpp umbrello-15.08.1/umbrell - return templateParamList; -} - -diff -Nuar umbrello-15.08.1.orig/umbrello/attribute.h umbrello-15.08.1/umbrello/attribute.h ---- umbrello-15.08.1.orig/umbrello/attribute.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/attribute.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/attribute.h umbrello-kf6-15.08.1/umbrello/attribute.h +--- umbrello-kf6-15.08.1.orig/umbrello/attribute.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/attribute.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,84 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -1586,7 +1586,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/attribute.h umbrello-15.08.1/umbrello/ - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef ATTRIBUTE_H @@ -1603,7 +1603,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/attribute.h umbrello-15.08.1/umbrello/ - * @short Sets up attribute information. - * @author Paul Hensgen - * @see UMLObject -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class UMLAttribute : public UMLClassifierListItem -{ @@ -1663,9 +1663,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/attribute.h umbrello-15.08.1/umbrello/ -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/category.cpp umbrello-15.08.1/umbrello/category.cpp ---- umbrello-15.08.1.orig/umbrello/category.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/category.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/category.cpp umbrello-kf6-15.08.1/umbrello/category.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/category.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/category.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,101 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -1674,7 +1674,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/category.cpp umbrello-15.08.1/umbrello - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#include "category.h" @@ -1768,9 +1768,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/category.cpp umbrello-15.08.1/umbrello - emitModified(); -} - -diff -Nuar umbrello-15.08.1.orig/umbrello/category.h umbrello-15.08.1/umbrello/category.h ---- umbrello-15.08.1.orig/umbrello/category.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/category.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/category.h umbrello-kf6-15.08.1/umbrello/category.h +--- umbrello-kf6-15.08.1.orig/umbrello/category.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/category.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,62 +0,0 @@ -/*************************************************************************** - * * @@ -1780,7 +1780,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/category.h umbrello-15.08.1/umbrello/c - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef CATEGORY_H @@ -1797,7 +1797,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/category.h umbrello-15.08.1/umbrello/c - * @short Information for a non-graphical UML Category. - * @author Sharan Rao - * @see UMLCanvasObject -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class UMLCategory : public UMLCanvasObject { - Q_OBJECT @@ -1834,9 +1834,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/category.h umbrello-15.08.1/umbrello/c -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/checkconstraint.cpp umbrello-15.08.1/umbrello/checkconstraint.cpp ---- umbrello-15.08.1.orig/umbrello/checkconstraint.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/checkconstraint.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/checkconstraint.cpp umbrello-kf6-15.08.1/umbrello/checkconstraint.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/checkconstraint.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/checkconstraint.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,160 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -1845,7 +1845,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/checkconstraint.cpp umbrello-15.08.1/u - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -//own header @@ -1998,9 +1998,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/checkconstraint.cpp umbrello-15.08.1/u - m_CheckCondition.clear(); -} - -diff -Nuar umbrello-15.08.1.orig/umbrello/checkconstraint.h umbrello-15.08.1/umbrello/checkconstraint.h ---- umbrello-15.08.1.orig/umbrello/checkconstraint.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/checkconstraint.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/checkconstraint.h umbrello-kf6-15.08.1/umbrello/checkconstraint.h +--- umbrello-kf6-15.08.1.orig/umbrello/checkconstraint.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/checkconstraint.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,71 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -2009,7 +2009,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/checkconstraint.h umbrello-15.08.1/umb - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef CHECKCONSTRAINT_H @@ -2024,7 +2024,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/checkconstraint.h umbrello-15.08.1/umb - * @short Sets up Check Constraint information for UMLEntities. - * @author Sharan Rao - * @see UMLObject UMLClassifierListItem UMLEntityConstraint -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class UMLCheckConstraint : public UMLEntityConstraint -{ @@ -2073,9 +2073,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/checkconstraint.h umbrello-15.08.1/umb -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/classifier.cpp umbrello-15.08.1/umbrello/classifier.cpp ---- umbrello-15.08.1.orig/umbrello/classifier.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/classifier.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/classifier.cpp umbrello-kf6-15.08.1/umbrello/classifier.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/classifier.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/classifier.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,1631 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -2084,7 +2084,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/classifier.cpp umbrello-15.08.1/umbrel - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ -#include "classifier.h" - @@ -3708,9 +3708,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/classifier.cpp umbrello-15.08.1/umbrel -*/ - - -diff -Nuar umbrello-15.08.1.orig/umbrello/classifier.h umbrello-15.08.1/umbrello/classifier.h ---- umbrello-15.08.1.orig/umbrello/classifier.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/classifier.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/classifier.h umbrello-kf6-15.08.1/umbrello/classifier.h +--- umbrello-kf6-15.08.1.orig/umbrello/classifier.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/classifier.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,199 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -3719,7 +3719,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/classifier.h umbrello-15.08.1/umbrello - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ -#ifndef CLASSIFIER_H -#define CLASSIFIER_H @@ -3748,7 +3748,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/classifier.h umbrello-15.08.1/umbrello - * - * @short Information for a non-graphical Concept/Class. - * @author Paul Hensgen -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class UMLClassifier : public UMLPackage -{ @@ -3911,9 +3911,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/classifier.h umbrello-15.08.1/umbrello -}; - -#endif // CLASSIFIER_H -diff -Nuar umbrello-15.08.1.orig/umbrello/classifierlistitem.cpp umbrello-15.08.1/umbrello/classifierlistitem.cpp ---- umbrello-15.08.1.orig/umbrello/classifierlistitem.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/classifierlistitem.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/classifierlistitem.cpp umbrello-kf6-15.08.1/umbrello/classifierlistitem.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/classifierlistitem.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/classifierlistitem.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,159 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -3922,7 +3922,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/classifierlistitem.cpp umbrello-15.08. - * (at your option) any later version. * - * * - * copyright (C) 2003-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header @@ -4074,9 +4074,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/classifierlistitem.cpp umbrello-15.08. - UMLObject::emitModified(); -} - -diff -Nuar umbrello-15.08.1.orig/umbrello/classifierlistitem.h umbrello-15.08.1/umbrello/classifierlistitem.h ---- umbrello-15.08.1.orig/umbrello/classifierlistitem.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/classifierlistitem.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/classifierlistitem.h umbrello-kf6-15.08.1/umbrello/classifierlistitem.h +--- umbrello-kf6-15.08.1.orig/umbrello/classifierlistitem.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/classifierlistitem.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,58 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -4085,7 +4085,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/classifierlistitem.h umbrello-15.08.1/ - * (at your option) any later version. * - * * - * copyright (C) 2003-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef CLASSIFIERLISTITEM_H @@ -4104,7 +4104,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/classifierlistitem.h umbrello-15.08.1/ - * - * @short A base class for classifier list items (e.g. attributes) - * @author Jonathan Riddell -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class UMLClassifierListItem : public UMLObject -{ @@ -4136,9 +4136,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/classifierlistitem.h umbrello-15.08.1/ -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/CMakeLists.txt umbrello-15.08.1/umbrello/CMakeLists.txt ---- umbrello-15.08.1.orig/umbrello/CMakeLists.txt 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/CMakeLists.txt 2015-10-08 11:48:59.486089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/CMakeLists.txt umbrello-kf6-15.08.1/umbrello/CMakeLists.txt +--- umbrello-kf6-15.08.1.orig/umbrello/CMakeLists.txt 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/CMakeLists.txt 2015-10-08 11:48:59.486089026 +0300 @@ -56,7 +56,8 @@ ${CMAKE_CURRENT_SOURCE_DIR}/docgenerators/ ${CMAKE_CURRENT_SOURCE_DIR}/finder/ @@ -4278,7 +4278,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/CMakeLists.txt umbrello-15.08.1/umbrel + umlmodel/uniqueconstraint.cpp +) - set(umbrellobase_SRCS + set(umbrello-kf6base_SRCS - actor.cpp - artifact.cpp - association.cpp @@ -4356,12 +4356,12 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/CMakeLists.txt umbrello-15.08.1/umbrel - ${libwidgets_SRCS} + ${libuml_SRCS} + ${libumlwidgets_SRCS} - ${umbrellobase_SRCS} + ${umbrello-kf6base_SRCS} ) -diff -Nuar umbrello-15.08.1.orig/umbrello/component.cpp umbrello-15.08.1/umbrello/component.cpp ---- umbrello-15.08.1.orig/umbrello/component.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/component.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/component.cpp umbrello-kf6-15.08.1/umbrello/component.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/component.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/component.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,127 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -4370,7 +4370,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/component.cpp umbrello-15.08.1/umbrell - * (at your option) any later version. * - * * - * copyright (C) 2003-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header @@ -4452,7 +4452,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/component.cpp umbrello-15.08.1/umbrell - continue; - if (UMLDoc::tagEq(type, QLatin1String("Namespace.ownedElement")) || - UMLDoc::tagEq(type, QLatin1String("Namespace.contents"))) { -- //CHECK: Umbrello currently assumes that nested elements +- //CHECK: umbrello-kf6 currently assumes that nested elements - // are ownedElements anyway. - // Therefore these tags are not further interpreted. - if (! load(tempElement)) @@ -4490,9 +4490,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/component.cpp umbrello-15.08.1/umbrell - return m_executable; -} - -diff -Nuar umbrello-15.08.1.orig/umbrello/component.h umbrello-15.08.1/umbrello/component.h ---- umbrello-15.08.1.orig/umbrello/component.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/component.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/component.h umbrello-kf6-15.08.1/umbrello/component.h +--- umbrello-kf6-15.08.1.orig/umbrello/component.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/component.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,48 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -4501,7 +4501,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/component.h umbrello-15.08.1/umbrello/ - * (at your option) any later version. * - * * - * copyright (C) 2003-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef COMPONENT_H @@ -4518,7 +4518,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/component.h umbrello-15.08.1/umbrello/ - * @short Non-graphical information for a Component. - * @author Jonathan Riddell - * @see UMLCanvasObject -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class UMLComponent : public UMLPackage -{ @@ -4542,9 +4542,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/component.h umbrello-15.08.1/umbrello/ -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/dialogs/notedialog.cpp umbrello-15.08.1/umbrello/dialogs/notedialog.cpp ---- umbrello-15.08.1.orig/umbrello/dialogs/notedialog.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/dialogs/notedialog.cpp 2015-10-08 11:48:59.497089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/dialogs/notedialog.cpp umbrello-kf6-15.08.1/umbrello/dialogs/notedialog.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/dialogs/notedialog.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/dialogs/notedialog.cpp 2015-10-08 11:48:59.497089026 +0300 @@ -36,6 +36,7 @@ QVBoxLayout *layout = new QVBoxLayout(frame); layout->addWidget(m_docWidget, 10); @@ -4553,9 +4553,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/dialogs/notedialog.cpp umbrello-15.08. } /** -diff -Nuar umbrello-15.08.1.orig/umbrello/dialogs/widgets/documentationwidget.cpp umbrello-15.08.1/umbrello/dialogs/widgets/documentationwidget.cpp ---- umbrello-15.08.1.orig/umbrello/dialogs/widgets/documentationwidget.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/dialogs/widgets/documentationwidget.cpp 2015-10-08 11:48:59.499089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/dialogs/widgets/documentationwidget.cpp umbrello-kf6-15.08.1/umbrello/dialogs/widgets/documentationwidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/dialogs/widgets/documentationwidget.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/dialogs/widgets/documentationwidget.cpp 2015-10-08 11:48:59.499089026 +0300 @@ -67,6 +67,8 @@ m_editField->setLineWrapMode(QTextEdit::WidgetWidth); m_editField->setWordWrapMode(QTextOption::WordWrap); @@ -4565,9 +4565,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/dialogs/widgets/documentationwidget.cp QHBoxLayout *layout = new QHBoxLayout(m_box); layout->addWidget(m_editField); layout->setMargin(fontMetrics().height()); -diff -Nuar umbrello-15.08.1.orig/umbrello/docwindow.cpp umbrello-15.08.1/umbrello/docwindow.cpp ---- umbrello-15.08.1.orig/umbrello/docwindow.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/docwindow.cpp 2015-10-08 11:48:59.499089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/docwindow.cpp umbrello-kf6-15.08.1/umbrello/docwindow.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/docwindow.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/docwindow.cpp 2015-10-08 11:48:59.499089026 +0300 @@ -91,6 +91,7 @@ statusLayout->addWidget(m_modifiedWidget, 0, 5, 1, 1); m_docTE = new KTextEdit(this); @@ -4583,9 +4583,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/docwindow.cpp umbrello-15.08.1/umbrell + m_docTE->setFocus(); } -diff -Nuar umbrello-15.08.1.orig/umbrello/entityattribute.cpp umbrello-15.08.1/umbrello/entityattribute.cpp ---- umbrello-15.08.1.orig/umbrello/entityattribute.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/entityattribute.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/entityattribute.cpp umbrello-kf6-15.08.1/umbrello/entityattribute.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/entityattribute.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/entityattribute.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,280 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -4594,7 +4594,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/entityattribute.cpp umbrello-15.08.1/u - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header @@ -4867,9 +4867,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/entityattribute.cpp umbrello-15.08.1/u - return dialog.exec(); -} - -diff -Nuar umbrello-15.08.1.orig/umbrello/entityattribute.h umbrello-15.08.1/umbrello/entityattribute.h ---- umbrello-15.08.1.orig/umbrello/entityattribute.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/entityattribute.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/entityattribute.h umbrello-kf6-15.08.1/umbrello/entityattribute.h +--- umbrello-kf6-15.08.1.orig/umbrello/entityattribute.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/entityattribute.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,85 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -4878,7 +4878,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/entityattribute.h umbrello-15.08.1/umb - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef ENTITYATTRIBUTE_H @@ -4893,7 +4893,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/entityattribute.h umbrello-15.08.1/umb - * - * @short Sets up entityattribute information. - * @author Jonathan Riddell -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class UMLEntityAttribute : public UMLAttribute -{ @@ -4956,9 +4956,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/entityattribute.h umbrello-15.08.1/umb -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/entityconstraint.cpp umbrello-15.08.1/umbrello/entityconstraint.cpp ---- umbrello-15.08.1.orig/umbrello/entityconstraint.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/entityconstraint.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/entityconstraint.cpp umbrello-kf6-15.08.1/umbrello/entityconstraint.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/entityconstraint.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/entityconstraint.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,76 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -4967,7 +4967,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/entityconstraint.cpp umbrello-15.08.1/ - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -//own header @@ -5036,9 +5036,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/entityconstraint.cpp umbrello-15.08.1/ -} - - -diff -Nuar umbrello-15.08.1.orig/umbrello/entityconstraint.h umbrello-15.08.1/umbrello/entityconstraint.h ---- umbrello-15.08.1.orig/umbrello/entityconstraint.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/entityconstraint.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/entityconstraint.h umbrello-kf6-15.08.1/umbrello/entityconstraint.h +--- umbrello-kf6-15.08.1.orig/umbrello/entityconstraint.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/entityconstraint.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,49 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -5047,7 +5047,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/entityconstraint.h umbrello-15.08.1/um - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef ENTITYCONSTRAINT_H @@ -5063,7 +5063,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/entityconstraint.h umbrello-15.08.1/um - * @short Sets up entity constraint information. - * @author Sharan Rao - * @see UMLObject UMLClassifierListItem -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class UMLEntityConstraint : public UMLClassifierListItem -{ @@ -5089,9 +5089,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/entityconstraint.h umbrello-15.08.1/um -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/entity.cpp umbrello-15.08.1/umbrello/entity.cpp ---- umbrello-15.08.1.orig/umbrello/entity.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/entity.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/entity.cpp umbrello-kf6-15.08.1/umbrello/entity.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/entity.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/entity.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,719 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -5100,7 +5100,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/entity.cpp umbrello-15.08.1/umbrello/e - * (at your option) any later version. * - * * - * copyright (C) 2003-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header @@ -5812,9 +5812,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/entity.cpp umbrello-15.08.1/umbrello/e - return pObject; -} - -diff -Nuar umbrello-15.08.1.orig/umbrello/entity.h umbrello-15.08.1/umbrello/entity.h ---- umbrello-15.08.1.orig/umbrello/entity.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/entity.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/entity.h umbrello-kf6-15.08.1/umbrello/entity.h +--- umbrello-kf6-15.08.1.orig/umbrello/entity.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/entity.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,108 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -5823,7 +5823,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/entity.h umbrello-15.08.1/umbrello/ent - * (at your option) any later version. * - * * - * copyright (C) 2003-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef ENTITY_H @@ -5847,7 +5847,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/entity.h umbrello-15.08.1/umbrello/ent - * - * @short Non-graphical Information for an Entity. - * @author Jonathan Riddell -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class UMLEntity : public UMLClassifier -{ @@ -5924,9 +5924,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/entity.h umbrello-15.08.1/umbrello/ent - -#endif // ENTITY_H - -diff -Nuar umbrello-15.08.1.orig/umbrello/enum.cpp umbrello-15.08.1/umbrello/enum.cpp ---- umbrello-15.08.1.orig/umbrello/enum.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/enum.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/enum.cpp umbrello-kf6-15.08.1/umbrello/enum.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/enum.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/enum.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,302 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -5935,7 +5935,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/enum.cpp umbrello-15.08.1/umbrello/enu - * (at your option) any later version. * - * * - * copyright (C) 2003-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header @@ -6230,9 +6230,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/enum.cpp umbrello-15.08.1/umbrello/enu - return pObject; -} - -diff -Nuar umbrello-15.08.1.orig/umbrello/enum.h umbrello-15.08.1/umbrello/enum.h ---- umbrello-15.08.1.orig/umbrello/enum.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/enum.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/enum.h umbrello-kf6-15.08.1/umbrello/enum.h +--- umbrello-kf6-15.08.1.orig/umbrello/enum.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/enum.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,72 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -6241,7 +6241,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/enum.h umbrello-15.08.1/umbrello/enum. - * (at your option) any later version. * - * * - * copyright (C) 2003-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef ENUM_H @@ -6259,7 +6259,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/enum.h umbrello-15.08.1/umbrello/enum. - * - * @short Non-graphical Information for an Enum. - * @author Jonathan Riddell -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class UMLEnum : public UMLClassifier -{ @@ -6306,9 +6306,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/enum.h umbrello-15.08.1/umbrello/enum. - -#endif // ENUM_H - -diff -Nuar umbrello-15.08.1.orig/umbrello/enumliteral.cpp umbrello-15.08.1/umbrello/enumliteral.cpp ---- umbrello-15.08.1.orig/umbrello/enumliteral.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/enumliteral.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/enumliteral.cpp umbrello-kf6-15.08.1/umbrello/enumliteral.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/enumliteral.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/enumliteral.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,126 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -6317,7 +6317,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/enumliteral.cpp umbrello-15.08.1/umbre - * (at your option) any later version. * - * * - * copyright (C) 2003-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#include "enumliteral.h" @@ -6436,9 +6436,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/enumliteral.cpp umbrello-15.08.1/umbre - return false; - } -} -diff -Nuar umbrello-15.08.1.orig/umbrello/enumliteral.h umbrello-15.08.1/umbrello/enumliteral.h ---- umbrello-15.08.1.orig/umbrello/enumliteral.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/enumliteral.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/enumliteral.h umbrello-kf6-15.08.1/umbrello/enumliteral.h +--- umbrello-kf6-15.08.1.orig/umbrello/enumliteral.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/enumliteral.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,49 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -6447,7 +6447,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/enumliteral.h umbrello-15.08.1/umbrell - * (at your option) any later version. * - * * - * copyright (C) 2003-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef ENUMLITERAL_H @@ -6462,7 +6462,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/enumliteral.h umbrello-15.08.1/umbrell - * @short Sets up attribute information. - * @author Paul Hensgen - * @see UMLObject -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class UMLEnumLiteral : public UMLClassifierListItem -{ @@ -6489,9 +6489,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/enumliteral.h umbrello-15.08.1/umbrell -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/folder.cpp umbrello-15.08.1/umbrello/folder.cpp ---- umbrello-15.08.1.orig/umbrello/folder.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/folder.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/folder.cpp umbrello-kf6-15.08.1/umbrello/folder.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/folder.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/folder.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,558 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -6500,7 +6500,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/folder.cpp umbrello-15.08.1/umbrello/f - * (at your option) any later version. * - * * - * copyright (C) 2006-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header @@ -6785,7 +6785,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/folder.cpp umbrello-15.08.1/umbrello/f - pView->umlScene()->saveToXMI(qDoc, diagramsElement); - } - QDomElement extension = qDoc.createElement(QLatin1String("XMI.extension")); -- extension.setAttribute(QLatin1String("xmi.extender"), QLatin1String("umbrello")); +- extension.setAttribute(QLatin1String("xmi.extender"), QLatin1String("umbrello-kf6")); - extension.appendChild(diagramsElement); - qElement.appendChild(extension); - } @@ -6840,7 +6840,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/folder.cpp umbrello-15.08.1/umbrello/f - // Okay, external file is writable. Wrap up main file. - QDomElement folderElement = UMLObject::save(QLatin1String("UML:Package"), qDoc); - QDomElement extension = qDoc.createElement(QLatin1String("XMI.extension")); -- extension.setAttribute(QLatin1String("xmi.extender"), QLatin1String("umbrello")); +- extension.setAttribute(QLatin1String("xmi.extender"), QLatin1String("umbrello-kf6")); - QDomElement fileElement = qDoc.createElement(QLatin1String("external_file")); - fileElement.setAttribute(QLatin1String("name"), m_folderFile); - extension.appendChild(fileElement); @@ -6962,7 +6962,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/folder.cpp umbrello-15.08.1/umbrello/f - continue; - if (UMLDoc::tagEq(type, QLatin1String("Namespace.ownedElement")) || - UMLDoc::tagEq(type, QLatin1String("Namespace.contents"))) { -- //CHECK: Umbrello currently assumes that nested elements +- //CHECK: umbrello-kf6 currently assumes that nested elements - // are ownedElements anyway. - // Therefore these tags are not further interpreted. - if (! load(tempElement)) { @@ -7051,9 +7051,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/folder.cpp umbrello-15.08.1/umbrello/f - return out.space(); -} - -diff -Nuar umbrello-15.08.1.orig/umbrello/folder.h umbrello-15.08.1/umbrello/folder.h ---- umbrello-15.08.1.orig/umbrello/folder.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/folder.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/folder.h umbrello-kf6-15.08.1/umbrello/folder.h +--- umbrello-kf6-15.08.1.orig/umbrello/folder.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/folder.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,92 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -7062,7 +7062,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/folder.h umbrello-15.08.1/umbrello/fol - * (at your option) any later version. * - * * - * copyright (C) 2006-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef UMLFOLDER_H @@ -7084,7 +7084,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/folder.h umbrello-15.08.1/umbrello/fol - * - * @short Non-graphical management of objects and diagrams of a Folder - * @author Oliver Kellogg -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - * - * TODO: This whole class needs a relook regarding view/scene. - */ @@ -7147,9 +7147,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/folder.h umbrello-15.08.1/umbrello/fol -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/foreignkeyconstraint.cpp umbrello-15.08.1/umbrello/foreignkeyconstraint.cpp ---- umbrello-15.08.1.orig/umbrello/foreignkeyconstraint.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/foreignkeyconstraint.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/foreignkeyconstraint.cpp umbrello-kf6-15.08.1/umbrello/foreignkeyconstraint.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/foreignkeyconstraint.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/foreignkeyconstraint.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,444 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -7158,7 +7158,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/foreignkeyconstraint.cpp umbrello-15.0 - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -//own header @@ -7595,9 +7595,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/foreignkeyconstraint.cpp umbrello-15.0 - m_UpdateAction = uda; -} - -diff -Nuar umbrello-15.08.1.orig/umbrello/foreignkeyconstraint.h umbrello-15.08.1/umbrello/foreignkeyconstraint.h ---- umbrello-15.08.1.orig/umbrello/foreignkeyconstraint.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/foreignkeyconstraint.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/foreignkeyconstraint.h umbrello-kf6-15.08.1/umbrello/foreignkeyconstraint.h +--- umbrello-kf6-15.08.1.orig/umbrello/foreignkeyconstraint.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/foreignkeyconstraint.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,120 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -7606,7 +7606,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/foreignkeyconstraint.h umbrello-15.08. - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef FOREIGNKEYCONSTRAINT_H @@ -7628,7 +7628,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/foreignkeyconstraint.h umbrello-15.08. - * @short Sets up Foreign Key entity constraint information. - * @author Sharan Rao - * @see UMLObject UMLClassifierListItem UMLEntityConstraint -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class UMLForeignKeyConstraint : public UMLEntityConstraint -{ @@ -7719,9 +7719,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/foreignkeyconstraint.h umbrello-15.08. -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/listpopupmenu.cpp umbrello-15.08.1/umbrello/listpopupmenu.cpp ---- umbrello-15.08.1.orig/umbrello/listpopupmenu.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/listpopupmenu.cpp 2015-10-08 11:48:59.500089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/listpopupmenu.cpp umbrello-kf6-15.08.1/umbrello/listpopupmenu.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/listpopupmenu.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/listpopupmenu.cpp 2015-10-08 11:48:59.500089026 +0300 @@ -1195,7 +1195,6 @@ void ListPopupMenu::makeClassifierShowPopup(ClassifierWidget *c) { @@ -7762,9 +7762,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/listpopupmenu.cpp umbrello-15.08.1/umb addMenu(show); } -diff -Nuar umbrello-15.08.1.orig/umbrello/node.cpp umbrello-15.08.1/umbrello/node.cpp ---- umbrello-15.08.1.orig/umbrello/node.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/node.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/node.cpp umbrello-kf6-15.08.1/umbrello/node.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/node.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/node.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,68 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -7773,7 +7773,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/node.cpp umbrello-15.08.1/umbrello/nod - * (at your option) any later version. * - * * - * copyright (C) 2003-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#include "node.h" @@ -7834,9 +7834,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/node.cpp umbrello-15.08.1/umbrello/nod - return true; -} - -diff -Nuar umbrello-15.08.1.orig/umbrello/node.h umbrello-15.08.1/umbrello/node.h ---- umbrello-15.08.1.orig/umbrello/node.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/node.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/node.h umbrello-kf6-15.08.1/umbrello/node.h +--- umbrello-kf6-15.08.1.orig/umbrello/node.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/node.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,46 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -7845,7 +7845,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/node.h umbrello-15.08.1/umbrello/node. - * (at your option) any later version. * - * * - * copyright (C) 2003-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef NODE_H @@ -7861,7 +7861,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/node.h umbrello-15.08.1/umbrello/node. - * @short Non-graphical information for a Node. - * @author Jonathan Riddell - * @see UMLCanvasObject -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class UMLNode : public UMLCanvasObject -{ @@ -7884,9 +7884,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/node.h umbrello-15.08.1/umbrello/node. -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/operation.cpp umbrello-15.08.1/umbrello/operation.cpp ---- umbrello-15.08.1.orig/umbrello/operation.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/operation.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/operation.cpp umbrello-kf6-15.08.1/umbrello/operation.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/operation.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/operation.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,611 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -7895,7 +7895,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/operation.cpp umbrello-15.08.1/umbrell - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header @@ -7923,7 +7923,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/operation.cpp umbrello-15.08.1/umbrell -/** - * Constructs an UMLOperation. - * Not intended for general use: The operation is not tied in with -- * umbrello's Qt signalling for object creation. +- * umbrello-kf6's Qt signalling for object creation. - * If you want to create an Operation use the method in UMLDoc instead. - * - * @param parent the parent to this operation @@ -7950,7 +7950,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/operation.cpp umbrello-15.08.1/umbrell -/** - * Constructs an UMLOperation. - * Not intended for general use: The operation is not tied in with -- * umbrello's Qt signalling for object creation. +- * umbrello-kf6's Qt signalling for object creation. - * If you want to create an Operation use the method in UMLDoc instead. - * - * @param parent the parent to this operation @@ -8499,9 +8499,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/operation.cpp umbrello-15.08.1/umbrell - return true; -} - -diff -Nuar umbrello-15.08.1.orig/umbrello/operation.h umbrello-15.08.1/umbrello/operation.h ---- umbrello-15.08.1.orig/umbrello/operation.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/operation.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/operation.h umbrello-kf6-15.08.1/umbrello/operation.h +--- umbrello-kf6-15.08.1.orig/umbrello/operation.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/operation.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,84 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -8510,7 +8510,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/operation.h umbrello-15.08.1/umbrello/ - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef OPERATION_H @@ -8524,7 +8524,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/operation.h umbrello-15.08.1/umbrello/ -/** - * This class represents an operation in the UML model. - * -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class UMLOperation : public UMLClassifierListItem -{ @@ -8587,34 +8587,34 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/operation.h umbrello-15.08.1/umbrello/ -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/org.kde.umbrello.appdata.xml umbrello-15.08.1/umbrello/org.kde.umbrello.appdata.xml ---- umbrello-15.08.1.orig/umbrello/org.kde.umbrello.appdata.xml 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/org.kde.umbrello.appdata.xml 2015-10-08 11:48:59.501089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/org.kde.umbrello-kf6.appdata.xml umbrello-kf6-15.08.1/umbrello/org.kde.umbrello-kf6.appdata.xml +--- umbrello-kf6-15.08.1.orig/umbrello/org.kde.umbrello-kf6.appdata.xml 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/org.kde.umbrello-kf6.appdata.xml 2015-10-08 11:48:59.501089026 +0300 @@ -0,0 +1,136 @@ + + -+ org.kde.umbrello.desktop ++ org.kde.umbrello-kf6.desktop + CC0-1.0 + GPL-2.0+ -+ Umbrello -+ Umbrello -+ Umbrello -+ Umbrello -+ Umbrello -+ Umbrello -+ Umbrello -+ Umbrello -+ Umbrello -+ Umbrello -+ Umbrello -+ Umbrello -+ Umbrello -+ Umbrello -+ Umbrello -+ Umbrello -+ Umbrello -+ Umbrello -+ xxUmbrelloxx ++ umbrello-kf6 ++ umbrello-kf6 ++ umbrello-kf6 ++ umbrello-kf6 ++ umbrello-kf6 ++ umbrello-kf6 ++ umbrello-kf6 ++ umbrello-kf6 ++ umbrello-kf6 ++ umbrello-kf6 ++ umbrello-kf6 ++ umbrello-kf6 ++ umbrello-kf6 ++ umbrello-kf6 ++ umbrello-kf6 ++ umbrello-kf6 ++ umbrello-kf6 ++ umbrello-kf6 ++ xxumbrello-kf6xx + UML Modeller + Modelador UML + UML modelář @@ -8636,26 +8636,26 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/org.kde.umbrello.appdata.xml umbrello- + xxUML Modellerxx + +

-+ Umbrello is a Unified Modelling Language (UML) modelling tool and code generator. ++ umbrello-kf6 is a Unified Modelling Language (UML) modelling tool and code generator. + It can create diagrams of software and other systems in the industry-standard UML format, and can also generate code from UML diagrams + in a variety of programming languages. +

-+

L'Umbrello és una eina de modelatge de Llenguatge Unificat de Modelatge (UML) i generador de codi. Pot crear diagrames de programari i altres sistemes en el format UML estàndard de la indústria, i també pot generar codi des de diagrames UML en diversos llenguatges de programació.

-+

Umbrello is a Unified Modelling Language (UML) modelling tool and code generator. It can create diagrams of software and other systems in the industry-standard UML format, and can also generate code from UML diagrams in a variety of programming languages.

-+

Umbrello es una herramienta de modelado y de generación de código para el lenguaje unificado de modelado (UML). Puede crear diagramas de software y de otros sistemas en el formato estándar de la industria UML, además de generar código a partir de diagramas UML en diversos lenguajes de programación.

-+

Umbrello on unifitseeritud modelleerimiskeele UML modelleerimistööriist ja koodi genereerija. See võib luua tarkvara ja muude süsteemide skeeme standardses UML-vormingus, samuti genereerida UML-skeemide põhjal koodi mitmes programmeerimiskeeles.

-+

Umbrello on UML-mallinnusohjelma. Umbrellolla voi luoda kaavioita ohjelmistoista ja muista järjestelmistä käyttäen standardia UML-muotoa. Sillä voi myös luoda koodin UML-kaavioiden perusteella useille ohjelmointikielille.

-+

Umbrello é unha ferramenta de modelaxe e xerador de código baseado na linguaxe de modelaxe UML. Pode crear diagramas de software e doutros sistemas usando o formato estándar da industria, UML, e pode tamén xerar código a partir de diagramas UML en varios linguaxes de programación.

-+

Umbrello è uno strumento per diagrammi UML e un generatore di codice. Può creare diagrammi di software e altri sistemi nello standard industriale UML, e può anche generare codice partendo dai diagrammi UML in diversi linguaggi di programmazione.

-+

Umbrello is een Unified Modelling Language (UML) hulpmiddel voor modellering en generator van code. Het kan diagrammen van software en andere systemen maken in het industrie-standaard UML-formaat en kan ook code genereren uit UML diagrammen in een verscheidenheid van programmeertalen.

-+

Umbrello jest Unified Modelling Language (UML) (z ang. Językiem do Jednolitego Modelowania) i generatorem kodu. Może tworzyć diagramy oprogramowania i innych systemów w formacie standardu przemysłowego UML, a także generować kod z diagramów UML w wielu językach programowania.

-+

O Umbrello é uma ferramenta de modelação em UML (Unified Modelling Language) e gerador de código. Poderá criar diagramas de aplicações e outros sistemas, usando o formato-padrão da indústria UML, podendo também gerar código a partir de diagramas UML, numa grande variedade de linguagens de programação.

-+

Umbrello é uma ferramenta de modelação de UML (Unified Modelling Language) e gerador de código. Ele pode criar diagramas de softwares e outros sistemas, usando o formato de UML padrão da indústria, assim como gerar código a partir de diagramas UML, em uma grande variedade de linguagens de programação.

-+

Umbrello je nástroj na modelovania v UML a generátor kódu. Dokáže vytvárať diagramy softvéru a iných systémov v priemyselnom štandarde UML a tiež generovať kód z UML diagramov v množstve programovacích jazykov.

-+

Umbrello je orodje za modeliranje v poenotenem jeziku za modeliranje (UML) in ustvarjalnik kode. Ustvari lahko diagrame programov in drugih sistemov v industrijski standardizirani obliki UML, iz diagramov UML pa lahko ustvari tudi kodo v različnih programskih jezikih.

-+

Umbrello är ett modelleringsverktyg för Unified Modelling Language och kodgenerator. Det kan skapa diagram av programvara och andra system med industristandardformatet UML, och kan också skapa kod från UML-diagram på ett antal olika programspråk.

-+

Umbrello — засіб моделювання уніфікованою мовою моделювання (UML) та інструмент для створення шаблонів коду. Програма здатна створювати діаграми систем програмного забезпечення та інших систем у стандартному форматі UML та реалізовувати діаграми UML у програмному коді багатьма мовами програмування.

-+

xxUmbrello is a Unified Modelling Language (UML) modelling tool and code generator. It can create diagrams of software and other systems in the industry-standard UML format, and can also generate code from UML diagrams in a variety of programming languages.xx

++

L'umbrello-kf6 és una eina de modelatge de Llenguatge Unificat de Modelatge (UML) i generador de codi. Pot crear diagrames de programari i altres sistemes en el format UML estàndard de la indústria, i també pot generar codi des de diagrames UML en diversos llenguatges de programació.

++

umbrello-kf6 is a Unified Modelling Language (UML) modelling tool and code generator. It can create diagrams of software and other systems in the industry-standard UML format, and can also generate code from UML diagrams in a variety of programming languages.

++

umbrello-kf6 es una herramienta de modelado y de generación de código para el lenguaje unificado de modelado (UML). Puede crear diagramas de software y de otros sistemas en el formato estándar de la industria UML, además de generar código a partir de diagramas UML en diversos lenguajes de programación.

++

umbrello-kf6 on unifitseeritud modelleerimiskeele UML modelleerimistööriist ja koodi genereerija. See võib luua tarkvara ja muude süsteemide skeeme standardses UML-vormingus, samuti genereerida UML-skeemide põhjal koodi mitmes programmeerimiskeeles.

++

umbrello-kf6 on UML-mallinnusohjelma. umbrello-kf6lla voi luoda kaavioita ohjelmistoista ja muista järjestelmistä käyttäen standardia UML-muotoa. Sillä voi myös luoda koodin UML-kaavioiden perusteella useille ohjelmointikielille.

++

umbrello-kf6 é unha ferramenta de modelaxe e xerador de código baseado na linguaxe de modelaxe UML. Pode crear diagramas de software e doutros sistemas usando o formato estándar da industria, UML, e pode tamén xerar código a partir de diagramas UML en varios linguaxes de programación.

++

umbrello-kf6 è uno strumento per diagrammi UML e un generatore di codice. Può creare diagrammi di software e altri sistemi nello standard industriale UML, e può anche generare codice partendo dai diagrammi UML in diversi linguaggi di programmazione.

++

umbrello-kf6 is een Unified Modelling Language (UML) hulpmiddel voor modellering en generator van code. Het kan diagrammen van software en andere systemen maken in het industrie-standaard UML-formaat en kan ook code genereren uit UML diagrammen in een verscheidenheid van programmeertalen.

++

umbrello-kf6 jest Unified Modelling Language (UML) (z ang. Językiem do Jednolitego Modelowania) i generatorem kodu. Może tworzyć diagramy oprogramowania i innych systemów w formacie standardu przemysłowego UML, a także generować kod z diagramów UML w wielu językach programowania.

++

O umbrello-kf6 é uma ferramenta de modelação em UML (Unified Modelling Language) e gerador de código. Poderá criar diagramas de aplicações e outros sistemas, usando o formato-padrão da indústria UML, podendo também gerar código a partir de diagramas UML, numa grande variedade de linguagens de programação.

++

umbrello-kf6 é uma ferramenta de modelação de UML (Unified Modelling Language) e gerador de código. Ele pode criar diagramas de softwares e outros sistemas, usando o formato de UML padrão da indústria, assim como gerar código a partir de diagramas UML, em uma grande variedade de linguagens de programação.

++

umbrello-kf6 je nástroj na modelovania v UML a generátor kódu. Dokáže vytvárať diagramy softvéru a iných systémov v priemyselnom štandarde UML a tiež generovať kód z UML diagramov v množstve programovacích jazykov.

++

umbrello-kf6 je orodje za modeliranje v poenotenem jeziku za modeliranje (UML) in ustvarjalnik kode. Ustvari lahko diagrame programov in drugih sistemov v industrijski standardizirani obliki UML, iz diagramov UML pa lahko ustvari tudi kodo v različnih programskih jezikih.

++

umbrello-kf6 är ett modelleringsverktyg för Unified Modelling Language och kodgenerator. Det kan skapa diagram av programvara och andra system med industristandardformatet UML, och kan också skapa kod från UML-diagram på ett antal olika programspråk.

++

umbrello-kf6 — засіб моделювання уніфікованою мовою моделювання (UML) та інструмент для створення шаблонів коду. Програма здатна створювати діаграми систем програмного забезпечення та інших систем у стандартному форматі UML та реалізовувати діаграми UML у програмному коді багатьма мовами програмування.

++

xxumbrello-kf6 is a Unified Modelling Language (UML) modelling tool and code generator. It can create diagrams of software and other systems in the industry-standard UML format, and can also generate code from UML diagrams in a variety of programming languages.xx

+

Features:

+

Característiques:

+

Vlastnosti:

@@ -8714,22 +8714,22 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/org.kde.umbrello.appdata.xml umbrello- +
  • xxSeveral type of diagrams supported: use case, class, sequence, collaboration, state, activity, component, deployment, entity relationshipxx
    • + +     -+ http://umbrello.kde.org -+ https://bugs.kde.org/enter_bug.cgi?format=guided&product=umbrello ++ http://umbrello-kf6.kde.org ++ https://bugs.kde.org/enter_bug.cgi?format=guided&product=umbrello-kf6 + http://docs.kde.org/stable/en/kdesdk/umbrello/index.html + + -+ http://kde.org/images/screenshots/umbrello.png ++ http://kde.org/images/screenshots/umbrello-kf6.png + + + KDE + -+ umbrello ++ umbrello-kf6 + +     -diff -Nuar umbrello-15.08.1.orig/umbrello/package.cpp umbrello-15.08.1/umbrello/package.cpp ---- umbrello-15.08.1.orig/umbrello/package.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/package.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/package.cpp umbrello-kf6-15.08.1/umbrello/package.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/package.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/package.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,461 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -8738,7 +8738,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/package.cpp umbrello-15.08.1/umbrello/ - * (at your option) any later version. * - * * - * copyright (C) 2003-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header file @@ -9168,7 +9168,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/package.cpp umbrello-15.08.1/umbrello/ - if (UMLDoc::tagEq(type, QLatin1String("Namespace.ownedElement")) || - UMLDoc::tagEq(type, QLatin1String("Element.ownedElement")) || // Embarcadero's Describe - UMLDoc::tagEq(type, QLatin1String("Namespace.contents"))) { -- //CHECK: Umbrello currently assumes that nested elements +- //CHECK: umbrello-kf6 currently assumes that nested elements - // are ownedElements anyway. - // Therefore these tags are not further interpreted. - if (! load(tempElement)) @@ -9192,9 +9192,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/package.cpp umbrello-15.08.1/umbrello/ - return true; -} - -diff -Nuar umbrello-15.08.1.orig/umbrello/package.h umbrello-15.08.1/umbrello/package.h ---- umbrello-15.08.1.orig/umbrello/package.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/package.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/package.h umbrello-kf6-15.08.1/umbrello/package.h +--- umbrello-kf6-15.08.1.orig/umbrello/package.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/package.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,79 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -9203,7 +9203,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/package.h umbrello-15.08.1/umbrello/pa - * (at your option) any later version. * - * * - * copyright (C) 2003-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef PACKAGE_H @@ -9225,7 +9225,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/package.h umbrello-15.08.1/umbrello/pa - * @short Non-graphical information for a Package. - * @author Jonathan Riddell - * @see UMLCanvasObject -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class UMLPackage : public UMLCanvasObject -{ @@ -9275,9 +9275,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/package.h umbrello-15.08.1/umbrello/pa -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/port.cpp umbrello-15.08.1/umbrello/port.cpp ---- umbrello-15.08.1.orig/umbrello/port.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/port.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/port.cpp umbrello-kf6-15.08.1/umbrello/port.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/port.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/port.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,68 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -9286,7 +9286,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/port.cpp umbrello-15.08.1/umbrello/por - * (at your option) any later version. * - * * - * copyright (C) 2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#include "port.h" @@ -9347,9 +9347,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/port.cpp umbrello-15.08.1/umbrello/por - return true; -} - -diff -Nuar umbrello-15.08.1.orig/umbrello/port.h umbrello-15.08.1/umbrello/port.h ---- umbrello-15.08.1.orig/umbrello/port.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/port.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/port.h umbrello-kf6-15.08.1/umbrello/port.h +--- umbrello-kf6-15.08.1.orig/umbrello/port.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/port.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,46 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -9358,7 +9358,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/port.h umbrello-15.08.1/umbrello/port. - * (at your option) any later version. * - * * - * copyright (C) 2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef PORT_H @@ -9374,7 +9374,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/port.h umbrello-15.08.1/umbrello/port. - * @short Non-graphical information for a Port. - * @author Oliver Kellogg - * @see UMLCanvasObject -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class UMLPort : public UMLCanvasObject -{ @@ -9397,9 +9397,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/port.h umbrello-15.08.1/umbrello/port. -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/stereotype.cpp umbrello-15.08.1/umbrello/stereotype.cpp ---- umbrello-15.08.1.orig/umbrello/stereotype.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/stereotype.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/stereotype.cpp umbrello-kf6-15.08.1/umbrello/stereotype.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/stereotype.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/stereotype.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,164 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -9408,7 +9408,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/stereotype.cpp umbrello-15.08.1/umbrel - * (at your option) any later version. * - * * - * copyright (C) 2003-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header @@ -9565,9 +9565,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/stereotype.cpp umbrello-15.08.1/umbrel - else - return UMLObject::name(); -} -diff -Nuar umbrello-15.08.1.orig/umbrello/stereotype.h umbrello-15.08.1/umbrello/stereotype.h ---- umbrello-15.08.1.orig/umbrello/stereotype.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/stereotype.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/stereotype.h umbrello-kf6-15.08.1/umbrello/stereotype.h +--- umbrello-kf6-15.08.1.orig/umbrello/stereotype.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/stereotype.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,71 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -9576,7 +9576,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/stereotype.h umbrello-15.08.1/umbrello - * (at your option) any later version. * - * * - * copyright (C) 2003-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef STEREOTYPE_H @@ -9606,7 +9606,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/stereotype.h umbrello-15.08.1/umbrello - * @short Sets up stereotype information. - * @author Jonathan Riddell - * @author Oliver Kellogg -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class UMLStereotype : public UMLObject -{ @@ -9640,9 +9640,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/stereotype.h umbrello-15.08.1/umbrello -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/stereotypesmodel.cpp umbrello-15.08.1/umbrello/stereotypesmodel.cpp ---- umbrello-15.08.1.orig/umbrello/stereotypesmodel.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/stereotypesmodel.cpp 2015-10-08 11:48:59.505089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/stereotypesmodel.cpp umbrello-kf6-15.08.1/umbrello/stereotypesmodel.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/stereotypesmodel.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/stereotypesmodel.cpp 2015-10-08 11:48:59.505089026 +0300 @@ -0,0 +1,121 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -9651,7 +9651,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/stereotypesmodel.cpp umbrello-15.08.1/ + * (at your option) any later version. * + * * + * copyright (C) 2015 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#include "stereotypesmodel.h" @@ -9765,9 +9765,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/stereotypesmodel.cpp umbrello-15.08.1/ + QModelIndex mi = createIndex(index,0); + emit dataChanged(mi, mi); +} -diff -Nuar umbrello-15.08.1.orig/umbrello/stereotypesmodel.h umbrello-15.08.1/umbrello/stereotypesmodel.h ---- umbrello-15.08.1.orig/umbrello/stereotypesmodel.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/stereotypesmodel.h 2015-10-08 11:48:59.505089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/stereotypesmodel.h umbrello-kf6-15.08.1/umbrello/stereotypesmodel.h +--- umbrello-kf6-15.08.1.orig/umbrello/stereotypesmodel.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/stereotypesmodel.h 2015-10-08 11:48:59.505089026 +0300 @@ -0,0 +1,47 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -9776,7 +9776,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/stereotypesmodel.h umbrello-15.08.1/um + * (at your option) any later version. * + * * + * copyright (C) 2015 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef STEREOTYPESMODEL_H @@ -9816,9 +9816,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/stereotypesmodel.h umbrello-15.08.1/um +}; + +#endif // STEREOTYPESMODEL_H -diff -Nuar umbrello-15.08.1.orig/umbrello/stereotypeswindow.cpp umbrello-15.08.1/umbrello/stereotypeswindow.cpp ---- umbrello-15.08.1.orig/umbrello/stereotypeswindow.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/stereotypeswindow.cpp 2015-10-08 11:48:59.506089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/stereotypeswindow.cpp umbrello-kf6-15.08.1/umbrello/stereotypeswindow.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/stereotypeswindow.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/stereotypeswindow.cpp 2015-10-08 11:48:59.506089026 +0300 @@ -0,0 +1,72 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -9827,7 +9827,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/stereotypeswindow.cpp umbrello-15.08.1 + * (at your option) any later version. * + * * + * copyright (C) 2015 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#include "stereotypeswindow.h" @@ -9892,9 +9892,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/stereotypeswindow.cpp umbrello-15.08.1 + s->showPropertiesDialog(this); + } +} -diff -Nuar umbrello-15.08.1.orig/umbrello/stereotypeswindow.h umbrello-15.08.1/umbrello/stereotypeswindow.h ---- umbrello-15.08.1.orig/umbrello/stereotypeswindow.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/stereotypeswindow.h 2015-10-08 11:48:59.506089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/stereotypeswindow.h umbrello-kf6-15.08.1/umbrello/stereotypeswindow.h +--- umbrello-kf6-15.08.1.orig/umbrello/stereotypeswindow.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/stereotypeswindow.h 2015-10-08 11:48:59.506089026 +0300 @@ -0,0 +1,38 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -9903,7 +9903,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/stereotypeswindow.h umbrello-15.08.1/u + * (at your option) any later version. * + * * + * copyright (C) 2015 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef STEREOTYPESWINDOW_H @@ -9934,9 +9934,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/stereotypeswindow.h umbrello-15.08.1/u +}; + +#endif // STEREOTYPESWINDOW_H -diff -Nuar umbrello-15.08.1.orig/umbrello/template.cpp umbrello-15.08.1/umbrello/template.cpp ---- umbrello-15.08.1.orig/umbrello/template.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/template.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/template.cpp umbrello-kf6-15.08.1/umbrello/template.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/template.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/template.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,146 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -9945,7 +9945,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/template.cpp umbrello-15.08.1/umbrello - * (at your option) any later version. * - * * - * copyright (C) 2003-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header @@ -10084,9 +10084,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/template.cpp umbrello-15.08.1/umbrello - UMLTemplateDialog dialog(parent, this); - return dialog.exec(); -} -diff -Nuar umbrello-15.08.1.orig/umbrello/template.h umbrello-15.08.1/umbrello/template.h ---- umbrello-15.08.1.orig/umbrello/template.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/template.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/template.h umbrello-kf6-15.08.1/umbrello/template.h +--- umbrello-kf6-15.08.1.orig/umbrello/template.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/template.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,57 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -10095,7 +10095,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/template.h umbrello-15.08.1/umbrello/t - * (at your option) any later version. * - * * - * copyright (C) 2003-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef TEMPLATE_H @@ -10111,7 +10111,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/template.h umbrello-15.08.1/umbrello/t - * @short Sets up template information. - * @author Jonathan Riddell - * @see UMLObject -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class UMLTemplate : public UMLClassifierListItem -{ @@ -10145,9 +10145,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/template.h umbrello-15.08.1/umbrello/t -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umbrelloui.rc umbrello-15.08.1/umbrello/umbrelloui.rc ---- umbrello-15.08.1.orig/umbrello/umbrelloui.rc 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/umbrelloui.rc 2015-10-08 11:48:59.506089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umbrello-kf6ui.rc umbrello-kf6-15.08.1/umbrello/umbrello-kf6ui.rc +--- umbrello-kf6-15.08.1.orig/umbrello/umbrello-kf6ui.rc 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/umbrello-kf6ui.rc 2015-10-08 11:48:59.506089026 +0300 @@ -85,6 +85,7 @@ @@ -10156,9 +10156,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umbrelloui.rc umbrello-15.08.1/umbrell -diff -Nuar umbrello-15.08.1.orig/umbrello/umlappprivate.h umbrello-15.08.1/umbrello/umlappprivate.h ---- umbrello-15.08.1.orig/umbrello/umlappprivate.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/umlappprivate.h 2015-10-08 11:48:59.506089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlappprivate.h umbrello-kf6-15.08.1/umbrello/umlappprivate.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlappprivate.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/umlappprivate.h 2015-10-08 11:48:59.506089026 +0300 @@ -15,8 +15,11 @@ #include "finddialog.h" #include "findresults.h" @@ -10168,9 +10168,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlappprivate.h umbrello-15.08.1/umbre // kde includes +#include +#include - #include - #include - #include + #include + #include + #include @@ -43,16 +46,18 @@ { Q_OBJECT @@ -10183,9 +10183,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlappprivate.h umbrello-15.08.1/umbre + KToggleAction *viewStereotypesWindow; + StereotypesWindow *stereotypesWindow; - KTextEditor::Editor *editor; - KTextEditor::View *view; - KTextEditor::Document *document; + ktexteditor-kf6::Editor *editor; + ktexteditor-kf6::View *view; + ktexteditor-kf6::Document *document; - explicit UMLAppPrivate(QWidget *_parent) + explicit UMLAppPrivate(UMLApp *_parent) @@ -10211,9 +10211,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlappprivate.h umbrello-15.08.1/umbre }; #endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlassociationlist.h umbrello-15.08.1/umbrello/umlassociationlist.h ---- umbrello-15.08.1.orig/umbrello/umlassociationlist.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/umlassociationlist.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlassociationlist.h umbrello-kf6-15.08.1/umbrello/umlassociationlist.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlassociationlist.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/umlassociationlist.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,23 +0,0 @@ -/*************************************************************************** - * * @@ -10223,7 +10223,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlassociationlist.h umbrello-15.08.1/ - * (at your option) any later version. * - * * - * copyright (C) 2004-2007 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef UMLASSOCIATIONLIST_H @@ -10238,9 +10238,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlassociationlist.h umbrello-15.08.1/ -typedef QListIterator UMLAssociationListIt; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlattributelist.cpp umbrello-15.08.1/umbrello/umlattributelist.cpp ---- umbrello-15.08.1.orig/umbrello/umlattributelist.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/umlattributelist.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlattributelist.cpp umbrello-kf6-15.08.1/umbrello/umlattributelist.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlattributelist.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/umlattributelist.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,61 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -10249,7 +10249,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlattributelist.cpp umbrello-15.08.1/ - * (at your option) any later version. * - * * - * copyright (C) 2004-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#include "umlattributelist.h" @@ -10303,9 +10303,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlattributelist.cpp umbrello-15.08.1/ - copyInto(clone); - return clone; -} -diff -Nuar umbrello-15.08.1.orig/umbrello/umlattributelist.h umbrello-15.08.1/umbrello/umlattributelist.h ---- umbrello-15.08.1.orig/umbrello/umlattributelist.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/umlattributelist.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlattributelist.h umbrello-kf6-15.08.1/umbrello/umlattributelist.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlattributelist.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/umlattributelist.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,42 +0,0 @@ -/*************************************************************************** - * * @@ -10315,7 +10315,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlattributelist.h umbrello-15.08.1/um - * (at your option) any later version. * - * * - * copyright (C) 2004-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef UMLATTRIBUTELIST_H @@ -10349,9 +10349,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlattributelist.h umbrello-15.08.1/um - - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlcanvasobject.cpp umbrello-15.08.1/umbrello/umlcanvasobject.cpp ---- umbrello-15.08.1.orig/umbrello/umlcanvasobject.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/umlcanvasobject.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlcanvasobject.cpp umbrello-kf6-15.08.1/umbrello/umlcanvasobject.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlcanvasobject.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/umlcanvasobject.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,464 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -10360,7 +10360,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlcanvasobject.cpp umbrello-15.08.1/u - * (at your option) any later version. * - * * - * copyright (C) 2003-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header @@ -10817,9 +10817,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlcanvasobject.cpp umbrello-15.08.1/u - return overallSuccess; -} - -diff -Nuar umbrello-15.08.1.orig/umbrello/umlcanvasobject.h umbrello-15.08.1/umbrello/umlcanvasobject.h ---- umbrello-15.08.1.orig/umbrello/umlcanvasobject.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/umlcanvasobject.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlcanvasobject.h umbrello-kf6-15.08.1/umbrello/umlcanvasobject.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlcanvasobject.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/umlcanvasobject.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,108 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -10828,7 +10828,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlcanvasobject.h umbrello-15.08.1/umb - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef CANVASOBJECT_H @@ -10851,7 +10851,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlcanvasobject.h umbrello-15.08.1/umb - * @short Non-graphical information for a UMLCanvasObject. - * @author Jonathan Riddell - * @see UMLObject -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class UMLCanvasObject : public UMLObject -{ @@ -10929,9 +10929,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlcanvasobject.h umbrello-15.08.1/umb -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlclassifierlist.h umbrello-15.08.1/umbrello/umlclassifierlist.h ---- umbrello-15.08.1.orig/umbrello/umlclassifierlist.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/umlclassifierlist.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlclassifierlist.h umbrello-kf6-15.08.1/umbrello/umlclassifierlist.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlclassifierlist.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/umlclassifierlist.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,22 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -10940,7 +10940,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlclassifierlist.h umbrello-15.08.1/u - * (at your option) any later version. * - * * - * copyright (C) 2003-2010 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef UMLCLASSIFIERLIST_H @@ -10955,9 +10955,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlclassifierlist.h umbrello-15.08.1/u -typedef QListIterator UMLClassifierListIt; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlclassifierlistitemlist.cpp umbrello-15.08.1/umbrello/umlclassifierlistitemlist.cpp ---- umbrello-15.08.1.orig/umbrello/umlclassifierlistitemlist.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/umlclassifierlistitemlist.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlclassifierlistitemlist.cpp umbrello-kf6-15.08.1/umbrello/umlclassifierlistitemlist.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlclassifierlistitemlist.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/umlclassifierlistitemlist.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,60 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -10966,7 +10966,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlclassifierlistitemlist.cpp umbrello - * (at your option) any later version. * - * * - * copyright (C) 2004-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#include "umlclassifierlistitemlist.h" @@ -11019,9 +11019,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlclassifierlistitemlist.cpp umbrello - copyInto(clone); - return clone; -} -diff -Nuar umbrello-15.08.1.orig/umbrello/umlclassifierlistitemlist.h umbrello-15.08.1/umbrello/umlclassifierlistitemlist.h ---- umbrello-15.08.1.orig/umbrello/umlclassifierlistitemlist.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/umlclassifierlistitemlist.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlclassifierlistitemlist.h umbrello-kf6-15.08.1/umbrello/umlclassifierlistitemlist.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlclassifierlistitemlist.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/umlclassifierlistitemlist.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,41 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -11030,7 +11030,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlclassifierlistitemlist.h umbrello-1 - * (at your option) any later version. * - * * - * copyright (C) 2004-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef UMLCLASSIFIERLISTITEMLIST_H @@ -11064,9 +11064,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlclassifierlistitemlist.h umbrello-1 -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/uml.cpp umbrello-15.08.1/umbrello/uml.cpp ---- umbrello-15.08.1.orig/umbrello/uml.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/uml.cpp 2015-10-08 11:48:59.506089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/uml.cpp umbrello-kf6-15.08.1/umbrello/uml.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/uml.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/uml.cpp 2015-10-08 11:48:59.506089026 +0300 @@ -240,15 +240,15 @@ delete m_clipTimer; delete m_copyTimer; @@ -11095,9 +11095,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/uml.cpp umbrello-15.08.1/umbrello/uml. // create the tree viewer m_listDock = new QDockWidget(i18n("&Tree View"), this); m_listDock->setObjectName(QLatin1String("TreeViewDock")); -diff -Nuar umbrello-15.08.1.orig/umbrello/umldoc.cpp umbrello-15.08.1/umbrello/umldoc.cpp ---- umbrello-15.08.1.orig/umbrello/umldoc.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/umldoc.cpp 2015-10-08 11:48:59.506089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umldoc.cpp umbrello-kf6-15.08.1/umbrello/umldoc.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umldoc.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/umldoc.cpp 2015-10-08 11:48:59.506089026 +0300 @@ -44,6 +44,7 @@ #include "umlscene.h" #include "version.h" @@ -11105,7 +11105,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umldoc.cpp umbrello-15.08.1/umbrello/u +#include "stereotypesmodel.h" // kde includes - #include + #include @@ -113,7 +114,8 @@ m_nViewID(Uml::ID::None), m_bTypesAreResolved(true), @@ -11188,9 +11188,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umldoc.cpp umbrello-15.08.1/umbrello/u /** * Ensures the XMI file is a valid UML file. * Currently only checks for metamodel=UML. -diff -Nuar umbrello-15.08.1.orig/umbrello/umldoc.h umbrello-15.08.1/umbrello/umldoc.h ---- umbrello-15.08.1.orig/umbrello/umldoc.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/umldoc.h 2015-10-08 11:48:59.506089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umldoc.h umbrello-kf6-15.08.1/umbrello/umldoc.h +--- umbrello-kf6-15.08.1.orig/umbrello/umldoc.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/umldoc.h 2015-10-08 11:48:59.506089026 +0300 @@ -48,6 +48,7 @@ class QPrinter; @@ -11217,9 +11217,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umldoc.h umbrello-15.08.1/umbrello/uml public slots: void slotRemoveUMLObject(UMLObject*o); void slotAutoSave(); -diff -Nuar umbrello-15.08.1.orig/umbrello/umlentityattributelist.cpp umbrello-15.08.1/umbrello/umlentityattributelist.cpp ---- umbrello-15.08.1.orig/umbrello/umlentityattributelist.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/umlentityattributelist.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlentityattributelist.cpp umbrello-kf6-15.08.1/umbrello/umlentityattributelist.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlentityattributelist.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/umlentityattributelist.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,60 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -11228,7 +11228,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlentityattributelist.cpp umbrello-15 - * (at your option) any later version. * - * * - * copyright (C) 2004-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#include "umlentityattributelist.h" @@ -11281,9 +11281,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlentityattributelist.cpp umbrello-15 - copyInto(clone); - return clone; -} -diff -Nuar umbrello-15.08.1.orig/umbrello/umlentityattributelist.h umbrello-15.08.1/umbrello/umlentityattributelist.h ---- umbrello-15.08.1.orig/umbrello/umlentityattributelist.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/umlentityattributelist.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlentityattributelist.h umbrello-kf6-15.08.1/umbrello/umlentityattributelist.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlentityattributelist.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/umlentityattributelist.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,41 +0,0 @@ -/*************************************************************************** - * * @@ -11293,7 +11293,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlentityattributelist.h umbrello-15.0 - * (at your option) any later version. * - * * - * copyright (C) 2004-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef UMLENTITYATTRIBUTELIST_H @@ -11326,9 +11326,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlentityattributelist.h umbrello-15.0 - - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlentityconstraintlist.cpp umbrello-15.08.1/umbrello/umlentityconstraintlist.cpp ---- umbrello-15.08.1.orig/umbrello/umlentityconstraintlist.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/umlentityconstraintlist.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlentityconstraintlist.cpp umbrello-kf6-15.08.1/umbrello/umlentityconstraintlist.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlentityconstraintlist.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/umlentityconstraintlist.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,60 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -11337,7 +11337,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlentityconstraintlist.cpp umbrello-1 - * (at your option) any later version. * - * * - * copyright (C) 2004-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#include "umlentityconstraintlist.h" @@ -11390,9 +11390,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlentityconstraintlist.cpp umbrello-1 - copyInto(clone); - return clone; -} -diff -Nuar umbrello-15.08.1.orig/umbrello/umlentityconstraintlist.h umbrello-15.08.1/umbrello/umlentityconstraintlist.h ---- umbrello-15.08.1.orig/umbrello/umlentityconstraintlist.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/umlentityconstraintlist.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlentityconstraintlist.h umbrello-kf6-15.08.1/umbrello/umlentityconstraintlist.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlentityconstraintlist.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/umlentityconstraintlist.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,43 +0,0 @@ -/*************************************************************************** - * * @@ -11402,7 +11402,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlentityconstraintlist.h umbrello-15. - * (at your option) any later version. * - * * - * copyright (C) 2004-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef UMLENTITYCONSTRAINTLIST_H @@ -11437,9 +11437,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlentityconstraintlist.h umbrello-15. - - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlentitylist.h umbrello-15.08.1/umbrello/umlentitylist.h ---- umbrello-15.08.1.orig/umbrello/umlentitylist.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/umlentitylist.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlentitylist.h umbrello-kf6-15.08.1/umbrello/umlentitylist.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlentitylist.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/umlentitylist.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,22 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -11448,7 +11448,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlentitylist.h umbrello-15.08.1/umbre - * (at your option) any later version. * - * * - * copyright (C) 2003-2010 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef UMLENTITYLIST_H @@ -11463,9 +11463,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlentitylist.h umbrello-15.08.1/umbre -typedef QListIterator UMLEntityListIt; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlenumliterallist.h umbrello-15.08.1/umbrello/umlenumliterallist.h ---- umbrello-15.08.1.orig/umbrello/umlenumliterallist.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/umlenumliterallist.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlenumliterallist.h umbrello-kf6-15.08.1/umbrello/umlenumliterallist.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlenumliterallist.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/umlenumliterallist.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,23 +0,0 @@ -/*************************************************************************** - * * @@ -11475,7 +11475,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlenumliterallist.h umbrello-15.08.1/ - * (at your option) any later version. * - * * - * copyright (C) 2004-2007 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef UMLENUMLITERALLIST_H @@ -11490,9 +11490,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlenumliterallist.h umbrello-15.08.1/ -typedef QListIterator UMLEnumLiteralListIt; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umllistview.cpp umbrello-15.08.1/umbrello/umllistview.cpp ---- umbrello-15.08.1.orig/umbrello/umllistview.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/umllistview.cpp 2015-10-08 11:48:59.506089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umllistview.cpp umbrello-kf6-15.08.1/umbrello/umllistview.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umllistview.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/umllistview.cpp 2015-10-08 11:48:59.506089026 +0300 @@ -2161,6 +2161,11 @@ QString name = classifier->uniqChildName(objectType); UMLObject* object = Object_Factory::createChildObject(classifier, objectType, name); @@ -11505,9 +11505,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umllistview.cpp umbrello-15.08.1/umbre // Handle primary key constraints (mark the unique constraint as PK on // the parent entity) if (type == UMLListViewItem::lvt_PrimaryKeyConstraint) { -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/actor.cpp umbrello-15.08.1/umbrello/umlmodel/actor.cpp ---- umbrello-15.08.1.orig/umbrello/umlmodel/actor.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/actor.cpp 2015-10-08 11:48:59.506089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/actor.cpp umbrello-kf6-15.08.1/umbrello/umlmodel/actor.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/actor.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/actor.cpp 2015-10-08 11:48:59.506089026 +0300 @@ -0,0 +1,67 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -11516,7 +11516,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/actor.cpp umbrello-15.08.1/um + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#include "actor.h" @@ -11576,9 +11576,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/actor.cpp umbrello-15.08.1/um + return true; +} + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/actor.h umbrello-15.08.1/umbrello/umlmodel/actor.h ---- umbrello-15.08.1.orig/umbrello/umlmodel/actor.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/actor.h 2015-10-08 11:48:59.506089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/actor.h umbrello-kf6-15.08.1/umbrello/umlmodel/actor.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/actor.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/actor.h 2015-10-08 11:48:59.506089026 +0300 @@ -0,0 +1,44 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -11587,7 +11587,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/actor.h umbrello-15.08.1/umbr + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef ACTOR_H @@ -11604,7 +11604,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/actor.h umbrello-15.08.1/umbr + * @short Information for a non-graphical UML Actor. + * @author Paul Hensgen + * @see UMLCanvasObject -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class UMLActor : public UMLCanvasObject +{ @@ -11624,9 +11624,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/actor.h umbrello-15.08.1/umbr +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/artifact.cpp umbrello-15.08.1/umbrello/umlmodel/artifact.cpp ---- umbrello-15.08.1.orig/umbrello/umlmodel/artifact.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/artifact.cpp 2015-10-08 11:48:59.506089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/artifact.cpp umbrello-kf6-15.08.1/umbrello/umlmodel/artifact.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/artifact.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/artifact.cpp 2015-10-08 11:48:59.506089026 +0300 @@ -0,0 +1,90 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -11635,7 +11635,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/artifact.cpp umbrello-15.08.1 + * (at your option) any later version. * + * * + * copyright (C) 2003-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#include "artifact.h" @@ -11718,9 +11718,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/artifact.cpp umbrello-15.08.1 + return m_drawAsType; +} + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/artifact.h umbrello-15.08.1/umbrello/umlmodel/artifact.h ---- umbrello-15.08.1.orig/umbrello/umlmodel/artifact.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/artifact.h 2015-10-08 11:48:59.506089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/artifact.h umbrello-kf6-15.08.1/umbrello/umlmodel/artifact.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/artifact.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/artifact.h 2015-10-08 11:48:59.506089026 +0300 @@ -0,0 +1,66 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -11729,7 +11729,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/artifact.h umbrello-15.08.1/u + * (at your option) any later version. * + * * + * copyright (C) 2003-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef ARTIFACT_H @@ -11746,7 +11746,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/artifact.h umbrello-15.08.1/u + * @short Non-graphical information for a Artifact. + * @author Jonathan Riddell + * @see UMLCanvasObject -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class UMLArtifact : public UMLPackage +{ @@ -11788,9 +11788,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/artifact.h umbrello-15.08.1/u +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/association.cpp umbrello-15.08.1/umbrello/umlmodel/association.cpp ---- umbrello-15.08.1.orig/umbrello/umlmodel/association.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/association.cpp 2015-10-08 11:48:59.506089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/association.cpp umbrello-kf6-15.08.1/umbrello/umlmodel/association.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/association.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/association.cpp 2015-10-08 11:48:59.506089026 +0300 @@ -0,0 +1,742 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -11799,7 +11799,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/association.cpp umbrello-15.0 + * (at your option) any later version. * + * * + * copyright (C) 2003-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header @@ -12095,7 +12095,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/association.cpp umbrello-15.0 + continue; + } + // Since we know for sure that we're dealing with a non -+ // umbrello file, use deferred resolution unconditionally. ++ // umbrello-kf6 file, use deferred resolution unconditionally. + if (UMLDoc::tagEq(tag, QLatin1String("child")) || + UMLDoc::tagEq(tag, QLatin1String("subtype")) || + UMLDoc::tagEq(tag, QLatin1String("client"))) { @@ -12534,9 +12534,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/association.cpp umbrello-15.0 + m_pRole[RoleType::B] = new UMLRole (this, roleBObj, RoleType::B); +} + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/association.h umbrello-15.08.1/umbrello/umlmodel/association.h ---- umbrello-15.08.1.orig/umbrello/umlmodel/association.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/association.h 2015-10-08 11:48:59.506089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/association.h umbrello-kf6-15.08.1/umbrello/umlmodel/association.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/association.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/association.h 2015-10-08 11:48:59.506089026 +0300 @@ -0,0 +1,102 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -12545,7 +12545,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/association.h umbrello-15.08. + * (at your option) any later version. * + * * + * copyright (C) 2003-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef ASSOCIATION_H @@ -12567,7 +12567,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/association.h umbrello-15.08. + * @short Sets up association information. + * @author Oliver Kellogg + * @see UMLObject -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class UMLAssociation : public UMLObject +{ @@ -12640,9 +12640,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/association.h umbrello-15.08. +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/attribute.cpp umbrello-15.08.1/umbrello/umlmodel/attribute.cpp ---- umbrello-15.08.1.orig/umbrello/umlmodel/attribute.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/attribute.cpp 2015-10-08 11:48:59.506089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/attribute.cpp umbrello-kf6-15.08.1/umbrello/umlmodel/attribute.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/attribute.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/attribute.cpp 2015-10-08 11:48:59.506089026 +0300 @@ -0,0 +1,424 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -12651,7 +12651,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/attribute.cpp umbrello-15.08. + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header @@ -13068,9 +13068,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/attribute.cpp umbrello-15.08. + return templateParamList; +} + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/attribute.h umbrello-15.08.1/umbrello/umlmodel/attribute.h ---- umbrello-15.08.1.orig/umbrello/umlmodel/attribute.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/attribute.h 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/attribute.h umbrello-kf6-15.08.1/umbrello/umlmodel/attribute.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/attribute.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/attribute.h 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,84 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -13079,7 +13079,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/attribute.h umbrello-15.08.1/ + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef ATTRIBUTE_H @@ -13096,7 +13096,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/attribute.h umbrello-15.08.1/ + * @short Sets up attribute information. + * @author Paul Hensgen + * @see UMLObject -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class UMLAttribute : public UMLClassifierListItem +{ @@ -13156,9 +13156,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/attribute.h umbrello-15.08.1/ +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/category.cpp umbrello-15.08.1/umbrello/umlmodel/category.cpp ---- umbrello-15.08.1.orig/umbrello/umlmodel/category.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/category.cpp 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/category.cpp umbrello-kf6-15.08.1/umbrello/umlmodel/category.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/category.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/category.cpp 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,101 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -13167,7 +13167,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/category.cpp umbrello-15.08.1 + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#include "category.h" @@ -13261,9 +13261,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/category.cpp umbrello-15.08.1 + emitModified(); +} + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/category.h umbrello-15.08.1/umbrello/umlmodel/category.h ---- umbrello-15.08.1.orig/umbrello/umlmodel/category.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/category.h 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/category.h umbrello-kf6-15.08.1/umbrello/umlmodel/category.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/category.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/category.h 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,62 @@ +/*************************************************************************** + * * @@ -13273,7 +13273,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/category.h umbrello-15.08.1/u + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef CATEGORY_H @@ -13290,7 +13290,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/category.h umbrello-15.08.1/u + * @short Information for a non-graphical UML Category. + * @author Sharan Rao + * @see UMLCanvasObject -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class UMLCategory : public UMLCanvasObject { + Q_OBJECT @@ -13327,9 +13327,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/category.h umbrello-15.08.1/u +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/checkconstraint.cpp umbrello-15.08.1/umbrello/umlmodel/checkconstraint.cpp ---- umbrello-15.08.1.orig/umbrello/umlmodel/checkconstraint.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/checkconstraint.cpp 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/checkconstraint.cpp umbrello-kf6-15.08.1/umbrello/umlmodel/checkconstraint.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/checkconstraint.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/checkconstraint.cpp 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,160 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -13338,7 +13338,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/checkconstraint.cpp umbrello- + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +//own header @@ -13491,9 +13491,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/checkconstraint.cpp umbrello- + m_CheckCondition.clear(); +} + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/checkconstraint.h umbrello-15.08.1/umbrello/umlmodel/checkconstraint.h ---- umbrello-15.08.1.orig/umbrello/umlmodel/checkconstraint.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/checkconstraint.h 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/checkconstraint.h umbrello-kf6-15.08.1/umbrello/umlmodel/checkconstraint.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/checkconstraint.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/checkconstraint.h 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,71 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -13502,7 +13502,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/checkconstraint.h umbrello-15 + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef CHECKCONSTRAINT_H @@ -13517,7 +13517,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/checkconstraint.h umbrello-15 + * @short Sets up Check Constraint information for UMLEntities. + * @author Sharan Rao + * @see UMLObject UMLClassifierListItem UMLEntityConstraint -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class UMLCheckConstraint : public UMLEntityConstraint +{ @@ -13566,9 +13566,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/checkconstraint.h umbrello-15 +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/classifier.cpp umbrello-15.08.1/umbrello/umlmodel/classifier.cpp ---- umbrello-15.08.1.orig/umbrello/umlmodel/classifier.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/classifier.cpp 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/classifier.cpp umbrello-kf6-15.08.1/umbrello/umlmodel/classifier.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/classifier.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/classifier.cpp 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,1631 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -13577,7 +13577,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/classifier.cpp umbrello-15.08 + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ +#include "classifier.h" + @@ -15201,9 +15201,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/classifier.cpp umbrello-15.08 +*/ + + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/classifier.h umbrello-15.08.1/umbrello/umlmodel/classifier.h ---- umbrello-15.08.1.orig/umbrello/umlmodel/classifier.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/classifier.h 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/classifier.h umbrello-kf6-15.08.1/umbrello/umlmodel/classifier.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/classifier.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/classifier.h 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,199 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -15212,7 +15212,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/classifier.h umbrello-15.08.1 + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ +#ifndef CLASSIFIER_H +#define CLASSIFIER_H @@ -15241,7 +15241,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/classifier.h umbrello-15.08.1 + * + * @short Information for a non-graphical Concept/Class. + * @author Paul Hensgen -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class UMLClassifier : public UMLPackage +{ @@ -15404,9 +15404,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/classifier.h umbrello-15.08.1 +}; + +#endif // CLASSIFIER_H -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/classifierlistitem.cpp umbrello-15.08.1/umbrello/umlmodel/classifierlistitem.cpp ---- umbrello-15.08.1.orig/umbrello/umlmodel/classifierlistitem.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/classifierlistitem.cpp 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/classifierlistitem.cpp umbrello-kf6-15.08.1/umbrello/umlmodel/classifierlistitem.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/classifierlistitem.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/classifierlistitem.cpp 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,159 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -15415,7 +15415,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/classifierlistitem.cpp umbrel + * (at your option) any later version. * + * * + * copyright (C) 2003-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header @@ -15567,9 +15567,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/classifierlistitem.cpp umbrel + UMLObject::emitModified(); +} + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/classifierlistitem.h umbrello-15.08.1/umbrello/umlmodel/classifierlistitem.h ---- umbrello-15.08.1.orig/umbrello/umlmodel/classifierlistitem.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/classifierlistitem.h 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/classifierlistitem.h umbrello-kf6-15.08.1/umbrello/umlmodel/classifierlistitem.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/classifierlistitem.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/classifierlistitem.h 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,58 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -15578,7 +15578,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/classifierlistitem.h umbrello + * (at your option) any later version. * + * * + * copyright (C) 2003-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef CLASSIFIERLISTITEM_H @@ -15597,7 +15597,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/classifierlistitem.h umbrello + * + * @short A base class for classifier list items (e.g. attributes) + * @author Jonathan Riddell -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class UMLClassifierListItem : public UMLObject +{ @@ -15629,9 +15629,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/classifierlistitem.h umbrello +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/component.cpp umbrello-15.08.1/umbrello/umlmodel/component.cpp ---- umbrello-15.08.1.orig/umbrello/umlmodel/component.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/component.cpp 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/component.cpp umbrello-kf6-15.08.1/umbrello/umlmodel/component.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/component.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/component.cpp 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,127 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -15640,7 +15640,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/component.cpp umbrello-15.08. + * (at your option) any later version. * + * * + * copyright (C) 2003-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header @@ -15722,7 +15722,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/component.cpp umbrello-15.08. + continue; + if (UMLDoc::tagEq(type, QLatin1String("Namespace.ownedElement")) || + UMLDoc::tagEq(type, QLatin1String("Namespace.contents"))) { -+ //CHECK: Umbrello currently assumes that nested elements ++ //CHECK: umbrello-kf6 currently assumes that nested elements + // are ownedElements anyway. + // Therefore these tags are not further interpreted. + if (! load(tempElement)) @@ -15760,9 +15760,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/component.cpp umbrello-15.08. + return m_executable; +} + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/component.h umbrello-15.08.1/umbrello/umlmodel/component.h ---- umbrello-15.08.1.orig/umbrello/umlmodel/component.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/component.h 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/component.h umbrello-kf6-15.08.1/umbrello/umlmodel/component.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/component.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/component.h 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,48 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -15771,7 +15771,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/component.h umbrello-15.08.1/ + * (at your option) any later version. * + * * + * copyright (C) 2003-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef COMPONENT_H @@ -15788,7 +15788,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/component.h umbrello-15.08.1/ + * @short Non-graphical information for a Component. + * @author Jonathan Riddell + * @see UMLCanvasObject -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class UMLComponent : public UMLPackage +{ @@ -15812,9 +15812,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/component.h umbrello-15.08.1/ +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/entityattribute.cpp umbrello-15.08.1/umbrello/umlmodel/entityattribute.cpp ---- umbrello-15.08.1.orig/umbrello/umlmodel/entityattribute.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/entityattribute.cpp 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/entityattribute.cpp umbrello-kf6-15.08.1/umbrello/umlmodel/entityattribute.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/entityattribute.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/entityattribute.cpp 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,280 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -15823,7 +15823,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/entityattribute.cpp umbrello- + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header @@ -16096,9 +16096,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/entityattribute.cpp umbrello- + return dialog.exec(); +} + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/entityattribute.h umbrello-15.08.1/umbrello/umlmodel/entityattribute.h ---- umbrello-15.08.1.orig/umbrello/umlmodel/entityattribute.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/entityattribute.h 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/entityattribute.h umbrello-kf6-15.08.1/umbrello/umlmodel/entityattribute.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/entityattribute.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/entityattribute.h 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,85 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -16107,7 +16107,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/entityattribute.h umbrello-15 + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef ENTITYATTRIBUTE_H @@ -16122,7 +16122,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/entityattribute.h umbrello-15 + * + * @short Sets up entityattribute information. + * @author Jonathan Riddell -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class UMLEntityAttribute : public UMLAttribute +{ @@ -16185,9 +16185,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/entityattribute.h umbrello-15 +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/entityconstraint.cpp umbrello-15.08.1/umbrello/umlmodel/entityconstraint.cpp ---- umbrello-15.08.1.orig/umbrello/umlmodel/entityconstraint.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/entityconstraint.cpp 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/entityconstraint.cpp umbrello-kf6-15.08.1/umbrello/umlmodel/entityconstraint.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/entityconstraint.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/entityconstraint.cpp 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,76 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -16196,7 +16196,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/entityconstraint.cpp umbrello + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +//own header @@ -16265,9 +16265,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/entityconstraint.cpp umbrello +} + + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/entityconstraint.h umbrello-15.08.1/umbrello/umlmodel/entityconstraint.h ---- umbrello-15.08.1.orig/umbrello/umlmodel/entityconstraint.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/entityconstraint.h 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/entityconstraint.h umbrello-kf6-15.08.1/umbrello/umlmodel/entityconstraint.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/entityconstraint.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/entityconstraint.h 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,49 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -16276,7 +16276,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/entityconstraint.h umbrello-1 + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef ENTITYCONSTRAINT_H @@ -16292,7 +16292,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/entityconstraint.h umbrello-1 + * @short Sets up entity constraint information. + * @author Sharan Rao + * @see UMLObject UMLClassifierListItem -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class UMLEntityConstraint : public UMLClassifierListItem +{ @@ -16318,9 +16318,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/entityconstraint.h umbrello-1 +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/entity.cpp umbrello-15.08.1/umbrello/umlmodel/entity.cpp ---- umbrello-15.08.1.orig/umbrello/umlmodel/entity.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/entity.cpp 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/entity.cpp umbrello-kf6-15.08.1/umbrello/umlmodel/entity.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/entity.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/entity.cpp 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,719 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -16329,7 +16329,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/entity.cpp umbrello-15.08.1/u + * (at your option) any later version. * + * * + * copyright (C) 2003-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header @@ -17041,9 +17041,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/entity.cpp umbrello-15.08.1/u + return pObject; +} + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/entity.h umbrello-15.08.1/umbrello/umlmodel/entity.h ---- umbrello-15.08.1.orig/umbrello/umlmodel/entity.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/entity.h 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/entity.h umbrello-kf6-15.08.1/umbrello/umlmodel/entity.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/entity.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/entity.h 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,108 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -17052,7 +17052,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/entity.h umbrello-15.08.1/umb + * (at your option) any later version. * + * * + * copyright (C) 2003-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef ENTITY_H @@ -17076,7 +17076,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/entity.h umbrello-15.08.1/umb + * + * @short Non-graphical Information for an Entity. + * @author Jonathan Riddell -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class UMLEntity : public UMLClassifier +{ @@ -17153,9 +17153,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/entity.h umbrello-15.08.1/umb + +#endif // ENTITY_H + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/enum.cpp umbrello-15.08.1/umbrello/umlmodel/enum.cpp ---- umbrello-15.08.1.orig/umbrello/umlmodel/enum.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/enum.cpp 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/enum.cpp umbrello-kf6-15.08.1/umbrello/umlmodel/enum.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/enum.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/enum.cpp 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,302 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -17164,7 +17164,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/enum.cpp umbrello-15.08.1/umb + * (at your option) any later version. * + * * + * copyright (C) 2003-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header @@ -17459,9 +17459,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/enum.cpp umbrello-15.08.1/umb + return pObject; +} + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/enum.h umbrello-15.08.1/umbrello/umlmodel/enum.h ---- umbrello-15.08.1.orig/umbrello/umlmodel/enum.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/enum.h 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/enum.h umbrello-kf6-15.08.1/umbrello/umlmodel/enum.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/enum.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/enum.h 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,72 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -17470,7 +17470,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/enum.h umbrello-15.08.1/umbre + * (at your option) any later version. * + * * + * copyright (C) 2003-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef ENUM_H @@ -17488,7 +17488,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/enum.h umbrello-15.08.1/umbre + * + * @short Non-graphical Information for an Enum. + * @author Jonathan Riddell -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class UMLEnum : public UMLClassifier +{ @@ -17535,9 +17535,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/enum.h umbrello-15.08.1/umbre + +#endif // ENUM_H + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/enumliteral.cpp umbrello-15.08.1/umbrello/umlmodel/enumliteral.cpp ---- umbrello-15.08.1.orig/umbrello/umlmodel/enumliteral.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/enumliteral.cpp 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/enumliteral.cpp umbrello-kf6-15.08.1/umbrello/umlmodel/enumliteral.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/enumliteral.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/enumliteral.cpp 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,126 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -17546,7 +17546,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/enumliteral.cpp umbrello-15.0 + * (at your option) any later version. * + * * + * copyright (C) 2003-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#include "enumliteral.h" @@ -17665,9 +17665,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/enumliteral.cpp umbrello-15.0 + return false; + } +} -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/enumliteral.h umbrello-15.08.1/umbrello/umlmodel/enumliteral.h ---- umbrello-15.08.1.orig/umbrello/umlmodel/enumliteral.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/enumliteral.h 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/enumliteral.h umbrello-kf6-15.08.1/umbrello/umlmodel/enumliteral.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/enumliteral.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/enumliteral.h 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,49 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -17676,7 +17676,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/enumliteral.h umbrello-15.08. + * (at your option) any later version. * + * * + * copyright (C) 2003-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef ENUMLITERAL_H @@ -17691,7 +17691,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/enumliteral.h umbrello-15.08. + * @short Sets up attribute information. + * @author Paul Hensgen + * @see UMLObject -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class UMLEnumLiteral : public UMLClassifierListItem +{ @@ -17718,9 +17718,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/enumliteral.h umbrello-15.08. +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/folder.cpp umbrello-15.08.1/umbrello/umlmodel/folder.cpp ---- umbrello-15.08.1.orig/umbrello/umlmodel/folder.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/folder.cpp 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/folder.cpp umbrello-kf6-15.08.1/umbrello/umlmodel/folder.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/folder.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/folder.cpp 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,558 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -17729,7 +17729,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/folder.cpp umbrello-15.08.1/u + * (at your option) any later version. * + * * + * copyright (C) 2006-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header @@ -18014,7 +18014,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/folder.cpp umbrello-15.08.1/u + pView->umlScene()->saveToXMI(qDoc, diagramsElement); + } + QDomElement extension = qDoc.createElement(QLatin1String("XMI.extension")); -+ extension.setAttribute(QLatin1String("xmi.extender"), QLatin1String("umbrello")); ++ extension.setAttribute(QLatin1String("xmi.extender"), QLatin1String("umbrello-kf6")); + extension.appendChild(diagramsElement); + qElement.appendChild(extension); + } @@ -18069,7 +18069,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/folder.cpp umbrello-15.08.1/u + // Okay, external file is writable. Wrap up main file. + QDomElement folderElement = UMLObject::save(QLatin1String("UML:Package"), qDoc); + QDomElement extension = qDoc.createElement(QLatin1String("XMI.extension")); -+ extension.setAttribute(QLatin1String("xmi.extender"), QLatin1String("umbrello")); ++ extension.setAttribute(QLatin1String("xmi.extender"), QLatin1String("umbrello-kf6")); + QDomElement fileElement = qDoc.createElement(QLatin1String("external_file")); + fileElement.setAttribute(QLatin1String("name"), m_folderFile); + extension.appendChild(fileElement); @@ -18191,7 +18191,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/folder.cpp umbrello-15.08.1/u + continue; + if (UMLDoc::tagEq(type, QLatin1String("Namespace.ownedElement")) || + UMLDoc::tagEq(type, QLatin1String("Namespace.contents"))) { -+ //CHECK: Umbrello currently assumes that nested elements ++ //CHECK: umbrello-kf6 currently assumes that nested elements + // are ownedElements anyway. + // Therefore these tags are not further interpreted. + if (! load(tempElement)) { @@ -18280,9 +18280,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/folder.cpp umbrello-15.08.1/u + return out.space(); +} + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/folder.h umbrello-15.08.1/umbrello/umlmodel/folder.h ---- umbrello-15.08.1.orig/umbrello/umlmodel/folder.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/folder.h 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/folder.h umbrello-kf6-15.08.1/umbrello/umlmodel/folder.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/folder.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/folder.h 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,92 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -18291,7 +18291,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/folder.h umbrello-15.08.1/umb + * (at your option) any later version. * + * * + * copyright (C) 2006-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef UMLFOLDER_H @@ -18313,7 +18313,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/folder.h umbrello-15.08.1/umb + * + * @short Non-graphical management of objects and diagrams of a Folder + * @author Oliver Kellogg -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + * + * TODO: This whole class needs a relook regarding view/scene. + */ @@ -18376,9 +18376,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/folder.h umbrello-15.08.1/umb +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/foreignkeyconstraint.cpp umbrello-15.08.1/umbrello/umlmodel/foreignkeyconstraint.cpp ---- umbrello-15.08.1.orig/umbrello/umlmodel/foreignkeyconstraint.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/foreignkeyconstraint.cpp 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/foreignkeyconstraint.cpp umbrello-kf6-15.08.1/umbrello/umlmodel/foreignkeyconstraint.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/foreignkeyconstraint.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/foreignkeyconstraint.cpp 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,444 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -18387,7 +18387,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/foreignkeyconstraint.cpp umbr + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +//own header @@ -18824,9 +18824,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/foreignkeyconstraint.cpp umbr + m_UpdateAction = uda; +} + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/foreignkeyconstraint.h umbrello-15.08.1/umbrello/umlmodel/foreignkeyconstraint.h ---- umbrello-15.08.1.orig/umbrello/umlmodel/foreignkeyconstraint.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/foreignkeyconstraint.h 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/foreignkeyconstraint.h umbrello-kf6-15.08.1/umbrello/umlmodel/foreignkeyconstraint.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/foreignkeyconstraint.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/foreignkeyconstraint.h 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,120 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -18835,7 +18835,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/foreignkeyconstraint.h umbrel + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef FOREIGNKEYCONSTRAINT_H @@ -18857,7 +18857,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/foreignkeyconstraint.h umbrel + * @short Sets up Foreign Key entity constraint information. + * @author Sharan Rao + * @see UMLObject UMLClassifierListItem UMLEntityConstraint -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class UMLForeignKeyConstraint : public UMLEntityConstraint +{ @@ -18948,9 +18948,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/foreignkeyconstraint.h umbrel +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/node.cpp umbrello-15.08.1/umbrello/umlmodel/node.cpp ---- umbrello-15.08.1.orig/umbrello/umlmodel/node.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/node.cpp 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/node.cpp umbrello-kf6-15.08.1/umbrello/umlmodel/node.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/node.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/node.cpp 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,68 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -18959,7 +18959,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/node.cpp umbrello-15.08.1/umb + * (at your option) any later version. * + * * + * copyright (C) 2003-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#include "node.h" @@ -19020,9 +19020,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/node.cpp umbrello-15.08.1/umb + return true; +} + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/node.h umbrello-15.08.1/umbrello/umlmodel/node.h ---- umbrello-15.08.1.orig/umbrello/umlmodel/node.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/node.h 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/node.h umbrello-kf6-15.08.1/umbrello/umlmodel/node.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/node.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/node.h 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,46 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -19031,7 +19031,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/node.h umbrello-15.08.1/umbre + * (at your option) any later version. * + * * + * copyright (C) 2003-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef NODE_H @@ -19047,7 +19047,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/node.h umbrello-15.08.1/umbre + * @short Non-graphical information for a Node. + * @author Jonathan Riddell + * @see UMLCanvasObject -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class UMLNode : public UMLCanvasObject +{ @@ -19070,9 +19070,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/node.h umbrello-15.08.1/umbre +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/operation.cpp umbrello-15.08.1/umbrello/umlmodel/operation.cpp ---- umbrello-15.08.1.orig/umbrello/umlmodel/operation.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/operation.cpp 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/operation.cpp umbrello-kf6-15.08.1/umbrello/umlmodel/operation.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/operation.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/operation.cpp 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,611 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -19081,7 +19081,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/operation.cpp umbrello-15.08. + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header @@ -19109,7 +19109,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/operation.cpp umbrello-15.08. +/** + * Constructs an UMLOperation. + * Not intended for general use: The operation is not tied in with -+ * umbrello's Qt signalling for object creation. ++ * umbrello-kf6's Qt signalling for object creation. + * If you want to create an Operation use the method in UMLDoc instead. + * + * @param parent the parent to this operation @@ -19136,7 +19136,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/operation.cpp umbrello-15.08. +/** + * Constructs an UMLOperation. + * Not intended for general use: The operation is not tied in with -+ * umbrello's Qt signalling for object creation. ++ * umbrello-kf6's Qt signalling for object creation. + * If you want to create an Operation use the method in UMLDoc instead. + * + * @param parent the parent to this operation @@ -19685,9 +19685,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/operation.cpp umbrello-15.08. + return true; +} + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/operation.h umbrello-15.08.1/umbrello/umlmodel/operation.h ---- umbrello-15.08.1.orig/umbrello/umlmodel/operation.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/operation.h 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/operation.h umbrello-kf6-15.08.1/umbrello/umlmodel/operation.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/operation.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/operation.h 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,84 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -19696,7 +19696,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/operation.h umbrello-15.08.1/ + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef OPERATION_H @@ -19710,7 +19710,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/operation.h umbrello-15.08.1/ +/** + * This class represents an operation in the UML model. + * -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class UMLOperation : public UMLClassifierListItem +{ @@ -19773,9 +19773,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/operation.h umbrello-15.08.1/ +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/package.cpp umbrello-15.08.1/umbrello/umlmodel/package.cpp ---- umbrello-15.08.1.orig/umbrello/umlmodel/package.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/package.cpp 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/package.cpp umbrello-kf6-15.08.1/umbrello/umlmodel/package.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/package.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/package.cpp 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,461 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -19784,7 +19784,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/package.cpp umbrello-15.08.1/ + * (at your option) any later version. * + * * + * copyright (C) 2003-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header file @@ -20214,7 +20214,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/package.cpp umbrello-15.08.1/ + if (UMLDoc::tagEq(type, QLatin1String("Namespace.ownedElement")) || + UMLDoc::tagEq(type, QLatin1String("Element.ownedElement")) || // Embarcadero's Describe + UMLDoc::tagEq(type, QLatin1String("Namespace.contents"))) { -+ //CHECK: Umbrello currently assumes that nested elements ++ //CHECK: umbrello-kf6 currently assumes that nested elements + // are ownedElements anyway. + // Therefore these tags are not further interpreted. + if (! load(tempElement)) @@ -20238,9 +20238,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/package.cpp umbrello-15.08.1/ + return true; +} + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/package.h umbrello-15.08.1/umbrello/umlmodel/package.h ---- umbrello-15.08.1.orig/umbrello/umlmodel/package.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/package.h 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/package.h umbrello-kf6-15.08.1/umbrello/umlmodel/package.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/package.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/package.h 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,79 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -20249,7 +20249,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/package.h umbrello-15.08.1/um + * (at your option) any later version. * + * * + * copyright (C) 2003-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef PACKAGE_H @@ -20271,7 +20271,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/package.h umbrello-15.08.1/um + * @short Non-graphical information for a Package. + * @author Jonathan Riddell + * @see UMLCanvasObject -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class UMLPackage : public UMLCanvasObject +{ @@ -20321,9 +20321,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/package.h umbrello-15.08.1/um +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/port.cpp umbrello-15.08.1/umbrello/umlmodel/port.cpp ---- umbrello-15.08.1.orig/umbrello/umlmodel/port.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/port.cpp 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/port.cpp umbrello-kf6-15.08.1/umbrello/umlmodel/port.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/port.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/port.cpp 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,68 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -20332,7 +20332,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/port.cpp umbrello-15.08.1/umb + * (at your option) any later version. * + * * + * copyright (C) 2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#include "port.h" @@ -20393,9 +20393,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/port.cpp umbrello-15.08.1/umb + return true; +} + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/port.h umbrello-15.08.1/umbrello/umlmodel/port.h ---- umbrello-15.08.1.orig/umbrello/umlmodel/port.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/port.h 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/port.h umbrello-kf6-15.08.1/umbrello/umlmodel/port.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/port.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/port.h 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,46 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -20404,7 +20404,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/port.h umbrello-15.08.1/umbre + * (at your option) any later version. * + * * + * copyright (C) 2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef PORT_H @@ -20420,7 +20420,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/port.h umbrello-15.08.1/umbre + * @short Non-graphical information for a Port. + * @author Oliver Kellogg + * @see UMLCanvasObject -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class UMLPort : public UMLCanvasObject +{ @@ -20443,9 +20443,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/port.h umbrello-15.08.1/umbre +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/stereotype.cpp umbrello-15.08.1/umbrello/umlmodel/stereotype.cpp ---- umbrello-15.08.1.orig/umbrello/umlmodel/stereotype.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/stereotype.cpp 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/stereotype.cpp umbrello-kf6-15.08.1/umbrello/umlmodel/stereotype.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/stereotype.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/stereotype.cpp 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,165 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -20454,7 +20454,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/stereotype.cpp umbrello-15.08 + * (at your option) any later version. * + * * + * copyright (C) 2003-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header @@ -20612,9 +20612,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/stereotype.cpp umbrello-15.08 + else + return UMLObject::name(); +} -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/stereotype.h umbrello-15.08.1/umbrello/umlmodel/stereotype.h ---- umbrello-15.08.1.orig/umbrello/umlmodel/stereotype.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/stereotype.h 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/stereotype.h umbrello-kf6-15.08.1/umbrello/umlmodel/stereotype.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/stereotype.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/stereotype.h 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,71 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -20623,7 +20623,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/stereotype.h umbrello-15.08.1 + * (at your option) any later version. * + * * + * copyright (C) 2003-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef STEREOTYPE_H @@ -20653,7 +20653,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/stereotype.h umbrello-15.08.1 + * @short Sets up stereotype information. + * @author Jonathan Riddell + * @author Oliver Kellogg -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class UMLStereotype : public UMLObject +{ @@ -20687,9 +20687,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/stereotype.h umbrello-15.08.1 +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/template.cpp umbrello-15.08.1/umbrello/umlmodel/template.cpp ---- umbrello-15.08.1.orig/umbrello/umlmodel/template.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/template.cpp 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/template.cpp umbrello-kf6-15.08.1/umbrello/umlmodel/template.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/template.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/template.cpp 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,146 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -20698,7 +20698,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/template.cpp umbrello-15.08.1 + * (at your option) any later version. * + * * + * copyright (C) 2003-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header @@ -20837,9 +20837,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/template.cpp umbrello-15.08.1 + UMLTemplateDialog dialog(parent, this); + return dialog.exec(); +} -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/template.h umbrello-15.08.1/umbrello/umlmodel/template.h ---- umbrello-15.08.1.orig/umbrello/umlmodel/template.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/template.h 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/template.h umbrello-kf6-15.08.1/umbrello/umlmodel/template.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/template.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/template.h 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,57 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -20848,7 +20848,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/template.h umbrello-15.08.1/u + * (at your option) any later version. * + * * + * copyright (C) 2003-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef TEMPLATE_H @@ -20864,7 +20864,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/template.h umbrello-15.08.1/u + * @short Sets up template information. + * @author Jonathan Riddell + * @see UMLObject -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class UMLTemplate : public UMLClassifierListItem +{ @@ -20898,9 +20898,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/template.h umbrello-15.08.1/u +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlassociationlist.h umbrello-15.08.1/umbrello/umlmodel/umlassociationlist.h ---- umbrello-15.08.1.orig/umbrello/umlmodel/umlassociationlist.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/umlassociationlist.h 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/umlassociationlist.h umbrello-kf6-15.08.1/umbrello/umlmodel/umlassociationlist.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/umlassociationlist.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/umlassociationlist.h 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,23 @@ +/*************************************************************************** + * * @@ -20910,7 +20910,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlassociationlist.h umbrello + * (at your option) any later version. * + * * + * copyright (C) 2004-2007 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef UMLASSOCIATIONLIST_H @@ -20925,9 +20925,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlassociationlist.h umbrello +typedef QListIterator UMLAssociationListIt; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlattributelist.cpp umbrello-15.08.1/umbrello/umlmodel/umlattributelist.cpp ---- umbrello-15.08.1.orig/umbrello/umlmodel/umlattributelist.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/umlattributelist.cpp 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/umlattributelist.cpp umbrello-kf6-15.08.1/umbrello/umlmodel/umlattributelist.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/umlattributelist.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/umlattributelist.cpp 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,61 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -20936,7 +20936,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlattributelist.cpp umbrello + * (at your option) any later version. * + * * + * copyright (C) 2004-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#include "umlattributelist.h" @@ -20990,9 +20990,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlattributelist.cpp umbrello + copyInto(clone); + return clone; +} -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlattributelist.h umbrello-15.08.1/umbrello/umlmodel/umlattributelist.h ---- umbrello-15.08.1.orig/umbrello/umlmodel/umlattributelist.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/umlattributelist.h 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/umlattributelist.h umbrello-kf6-15.08.1/umbrello/umlmodel/umlattributelist.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/umlattributelist.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/umlattributelist.h 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,42 @@ +/*************************************************************************** + * * @@ -21002,7 +21002,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlattributelist.h umbrello-1 + * (at your option) any later version. * + * * + * copyright (C) 2004-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef UMLATTRIBUTELIST_H @@ -21036,9 +21036,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlattributelist.h umbrello-1 + + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlcanvasobject.cpp umbrello-15.08.1/umbrello/umlmodel/umlcanvasobject.cpp ---- umbrello-15.08.1.orig/umbrello/umlmodel/umlcanvasobject.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/umlcanvasobject.cpp 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/umlcanvasobject.cpp umbrello-kf6-15.08.1/umbrello/umlmodel/umlcanvasobject.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/umlcanvasobject.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/umlcanvasobject.cpp 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,464 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -21047,7 +21047,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlcanvasobject.cpp umbrello- + * (at your option) any later version. * + * * + * copyright (C) 2003-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header @@ -21504,9 +21504,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlcanvasobject.cpp umbrello- + return overallSuccess; +} + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlcanvasobject.h umbrello-15.08.1/umbrello/umlmodel/umlcanvasobject.h ---- umbrello-15.08.1.orig/umbrello/umlmodel/umlcanvasobject.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/umlcanvasobject.h 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/umlcanvasobject.h umbrello-kf6-15.08.1/umbrello/umlmodel/umlcanvasobject.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/umlcanvasobject.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/umlcanvasobject.h 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,108 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -21515,7 +21515,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlcanvasobject.h umbrello-15 + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef CANVASOBJECT_H @@ -21538,7 +21538,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlcanvasobject.h umbrello-15 + * @short Non-graphical information for a UMLCanvasObject. + * @author Jonathan Riddell + * @see UMLObject -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class UMLCanvasObject : public UMLObject +{ @@ -21616,9 +21616,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlcanvasobject.h umbrello-15 +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlclassifierlist.h umbrello-15.08.1/umbrello/umlmodel/umlclassifierlist.h ---- umbrello-15.08.1.orig/umbrello/umlmodel/umlclassifierlist.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/umlclassifierlist.h 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/umlclassifierlist.h umbrello-kf6-15.08.1/umbrello/umlmodel/umlclassifierlist.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/umlclassifierlist.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/umlclassifierlist.h 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,22 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -21627,7 +21627,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlclassifierlist.h umbrello- + * (at your option) any later version. * + * * + * copyright (C) 2003-2010 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef UMLCLASSIFIERLIST_H @@ -21642,9 +21642,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlclassifierlist.h umbrello- +typedef QListIterator UMLClassifierListIt; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlclassifierlistitemlist.cpp umbrello-15.08.1/umbrello/umlmodel/umlclassifierlistitemlist.cpp ---- umbrello-15.08.1.orig/umbrello/umlmodel/umlclassifierlistitemlist.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/umlclassifierlistitemlist.cpp 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/umlclassifierlistitemlist.cpp umbrello-kf6-15.08.1/umbrello/umlmodel/umlclassifierlistitemlist.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/umlclassifierlistitemlist.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/umlclassifierlistitemlist.cpp 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,60 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -21653,7 +21653,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlclassifierlistitemlist.cpp + * (at your option) any later version. * + * * + * copyright (C) 2004-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#include "umlclassifierlistitemlist.h" @@ -21706,9 +21706,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlclassifierlistitemlist.cpp + copyInto(clone); + return clone; +} -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlclassifierlistitemlist.h umbrello-15.08.1/umbrello/umlmodel/umlclassifierlistitemlist.h ---- umbrello-15.08.1.orig/umbrello/umlmodel/umlclassifierlistitemlist.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/umlclassifierlistitemlist.h 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/umlclassifierlistitemlist.h umbrello-kf6-15.08.1/umbrello/umlmodel/umlclassifierlistitemlist.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/umlclassifierlistitemlist.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/umlclassifierlistitemlist.h 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,41 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -21717,7 +21717,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlclassifierlistitemlist.h u + * (at your option) any later version. * + * * + * copyright (C) 2004-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef UMLCLASSIFIERLISTITEMLIST_H @@ -21751,9 +21751,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlclassifierlistitemlist.h u +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlentityattributelist.cpp umbrello-15.08.1/umbrello/umlmodel/umlentityattributelist.cpp ---- umbrello-15.08.1.orig/umbrello/umlmodel/umlentityattributelist.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/umlentityattributelist.cpp 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/umlentityattributelist.cpp umbrello-kf6-15.08.1/umbrello/umlmodel/umlentityattributelist.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/umlentityattributelist.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/umlentityattributelist.cpp 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,60 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -21762,7 +21762,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlentityattributelist.cpp um + * (at your option) any later version. * + * * + * copyright (C) 2004-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#include "umlentityattributelist.h" @@ -21815,9 +21815,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlentityattributelist.cpp um + copyInto(clone); + return clone; +} -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlentityattributelist.h umbrello-15.08.1/umbrello/umlmodel/umlentityattributelist.h ---- umbrello-15.08.1.orig/umbrello/umlmodel/umlentityattributelist.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/umlentityattributelist.h 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/umlentityattributelist.h umbrello-kf6-15.08.1/umbrello/umlmodel/umlentityattributelist.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/umlentityattributelist.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/umlentityattributelist.h 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,41 @@ +/*************************************************************************** + * * @@ -21827,7 +21827,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlentityattributelist.h umbr + * (at your option) any later version. * + * * + * copyright (C) 2004-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef UMLENTITYATTRIBUTELIST_H @@ -21860,9 +21860,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlentityattributelist.h umbr + + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlentityconstraintlist.cpp umbrello-15.08.1/umbrello/umlmodel/umlentityconstraintlist.cpp ---- umbrello-15.08.1.orig/umbrello/umlmodel/umlentityconstraintlist.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/umlentityconstraintlist.cpp 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/umlentityconstraintlist.cpp umbrello-kf6-15.08.1/umbrello/umlmodel/umlentityconstraintlist.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/umlentityconstraintlist.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/umlentityconstraintlist.cpp 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,60 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -21871,7 +21871,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlentityconstraintlist.cpp u + * (at your option) any later version. * + * * + * copyright (C) 2004-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#include "umlentityconstraintlist.h" @@ -21924,9 +21924,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlentityconstraintlist.cpp u + copyInto(clone); + return clone; +} -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlentityconstraintlist.h umbrello-15.08.1/umbrello/umlmodel/umlentityconstraintlist.h ---- umbrello-15.08.1.orig/umbrello/umlmodel/umlentityconstraintlist.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/umlentityconstraintlist.h 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/umlentityconstraintlist.h umbrello-kf6-15.08.1/umbrello/umlmodel/umlentityconstraintlist.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/umlentityconstraintlist.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/umlentityconstraintlist.h 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,43 @@ +/*************************************************************************** + * * @@ -21936,7 +21936,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlentityconstraintlist.h umb + * (at your option) any later version. * + * * + * copyright (C) 2004-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef UMLENTITYCONSTRAINTLIST_H @@ -21971,9 +21971,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlentityconstraintlist.h umb + + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlentitylist.h umbrello-15.08.1/umbrello/umlmodel/umlentitylist.h ---- umbrello-15.08.1.orig/umbrello/umlmodel/umlentitylist.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/umlentitylist.h 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/umlentitylist.h umbrello-kf6-15.08.1/umbrello/umlmodel/umlentitylist.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/umlentitylist.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/umlentitylist.h 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,22 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -21982,7 +21982,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlentitylist.h umbrello-15.0 + * (at your option) any later version. * + * * + * copyright (C) 2003-2010 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef UMLENTITYLIST_H @@ -21997,9 +21997,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlentitylist.h umbrello-15.0 +typedef QListIterator UMLEntityListIt; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlenumliterallist.h umbrello-15.08.1/umbrello/umlmodel/umlenumliterallist.h ---- umbrello-15.08.1.orig/umbrello/umlmodel/umlenumliterallist.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/umlenumliterallist.h 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/umlenumliterallist.h umbrello-kf6-15.08.1/umbrello/umlmodel/umlenumliterallist.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/umlenumliterallist.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/umlenumliterallist.h 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,23 @@ +/*************************************************************************** + * * @@ -22009,7 +22009,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlenumliterallist.h umbrello + * (at your option) any later version. * + * * + * copyright (C) 2004-2007 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef UMLENUMLITERALLIST_H @@ -22024,9 +22024,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlenumliterallist.h umbrello +typedef QListIterator UMLEnumLiteralListIt; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlobject.cpp umbrello-15.08.1/umbrello/umlmodel/umlobject.cpp ---- umbrello-15.08.1.orig/umbrello/umlmodel/umlobject.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/umlobject.cpp 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/umlobject.cpp umbrello-kf6-15.08.1/umbrello/umlmodel/umlobject.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/umlobject.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/umlobject.cpp 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,1157 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -22035,7 +22035,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlobject.cpp umbrello-15.08. + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header @@ -22278,7 +22278,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlobject.cpp umbrello-15.08. + //don't compare IDs, these are program specific and + //don't mean the objects are the same + //***** CHECK: Who put in this comment? What was the reason? -+ //***** Currently some operator== in umbrello compare the IDs ++ //***** Currently some operator== in umbrello-kf6 compare the IDs + //***** while others don't. + + if (m_name != rhs.m_name) @@ -22768,7 +22768,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlobject.cpp umbrello-15.08. + << ", using secondary fallback " << m_SecondaryFallback; +#endif + m_SecondaryId = m_SecondaryFallback; -+ // Assume we're dealing with the older Umbrello format where ++ // Assume we're dealing with the older umbrello-kf6 format where + // the type name was saved in the "type" attribute rather + // than the xmi.id of the model object of the attribute type. + m_pSecondary = pDoc->findUMLObject(m_SecondaryId, ot_UMLObject, this); @@ -22952,14 +22952,14 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlobject.cpp umbrello-15.08. + m_name = element.attribute(QLatin1String("name")); + QString id = Model_Utils::getXmiId(element); + if (id.isEmpty() || id == QLatin1String("-1")) { -+ // Before version 1.4, Umbrello did not save the xmi.id of UMLRole objects. ++ // Before version 1.4, umbrello-kf6 did not save the xmi.id of UMLRole objects. + // Some tools (such as Embarcadero's) do not have an xmi.id on all attributes. + m_nId = UniqueID::gen(); + uWarning() << m_name << ": xmi.id not present, generating a new one"; + } else { + Uml::ID::Type nId = Uml::ID::fromString(id); + if (m_BaseType == ot_Role) { -+ // Some older Umbrello versions had a problem with xmi.id's ++ // Some older umbrello-kf6 versions had a problem with xmi.id's + // of other objects being reused for the UMLRole, see e.g. + // attachment 21179 at http://bugs.kde.org/147988 . + // If the xmi.id is already being used then we generate a new one. @@ -23185,9 +23185,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlobject.cpp umbrello-15.08. + return out.space(); +} + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlobject.h umbrello-15.08.1/umbrello/umlmodel/umlobject.h ---- umbrello-15.08.1.orig/umbrello/umlmodel/umlobject.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/umlobject.h 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/umlobject.h umbrello-kf6-15.08.1/umbrello/umlmodel/umlobject.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/umlobject.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/umlobject.h 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,198 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -23196,7 +23196,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlobject.h umbrello-15.08.1/ + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef UMLOBJECT_H @@ -23228,7 +23228,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlobject.h umbrello-15.08.1/ + * + * @short The base class for UML objects. + * @author Paul Hensgen -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class UMLObject : public QObject +{ @@ -23387,9 +23387,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlobject.h umbrello-15.08.1/ +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlobjectlist.cpp umbrello-15.08.1/umbrello/umlmodel/umlobjectlist.cpp ---- umbrello-15.08.1.orig/umbrello/umlmodel/umlobjectlist.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/umlobjectlist.cpp 2015-10-08 11:48:59.507089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/umlobjectlist.cpp umbrello-kf6-15.08.1/umbrello/umlmodel/umlobjectlist.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/umlobjectlist.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/umlobjectlist.cpp 2015-10-08 11:48:59.507089026 +0300 @@ -0,0 +1,53 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -23398,7 +23398,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlobjectlist.cpp umbrello-15 + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#include "umlobjectlist.h" @@ -23444,9 +23444,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlobjectlist.cpp umbrello-15 + copyInto(clone); + return clone; +} -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlobjectlist.h umbrello-15.08.1/umbrello/umlmodel/umlobjectlist.h ---- umbrello-15.08.1.orig/umbrello/umlmodel/umlobjectlist.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/umlobjectlist.h 2015-10-08 11:48:59.508089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/umlobjectlist.h umbrello-kf6-15.08.1/umbrello/umlmodel/umlobjectlist.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/umlobjectlist.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/umlobjectlist.h 2015-10-08 11:48:59.508089026 +0300 @@ -0,0 +1,40 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -23456,7 +23456,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlobjectlist.h umbrello-15.0 + * * + * copyright (C) 2001 Gustavo Madrigal gmadrigal@nextphere.com * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef UMLOBJECTLIST_H @@ -23488,9 +23488,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlobjectlist.h umbrello-15.0 +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umloperationlist.h umbrello-15.08.1/umbrello/umlmodel/umloperationlist.h ---- umbrello-15.08.1.orig/umbrello/umlmodel/umloperationlist.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/umloperationlist.h 2015-10-08 11:48:59.508089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/umloperationlist.h umbrello-kf6-15.08.1/umbrello/umlmodel/umloperationlist.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/umloperationlist.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/umloperationlist.h 2015-10-08 11:48:59.508089026 +0300 @@ -0,0 +1,23 @@ +/*************************************************************************** + * * @@ -23500,7 +23500,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umloperationlist.h umbrello-1 + * (at your option) any later version. * + * * + * copyright (C) 2003-2007 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef UMLOPERATIONLIST_H @@ -23515,9 +23515,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umloperationlist.h umbrello-1 +typedef QListIterator UMLOperationListIt; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlpackagelist.h umbrello-15.08.1/umbrello/umlmodel/umlpackagelist.h ---- umbrello-15.08.1.orig/umbrello/umlmodel/umlpackagelist.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/umlpackagelist.h 2015-10-08 11:48:59.508089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/umlpackagelist.h umbrello-kf6-15.08.1/umbrello/umlmodel/umlpackagelist.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/umlpackagelist.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/umlpackagelist.h 2015-10-08 11:48:59.508089026 +0300 @@ -0,0 +1,22 @@ +/*************************************************************************** + * * @@ -23527,7 +23527,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlpackagelist.h umbrello-15. + * (at your option) any later version. * + * * + * copyright (C) 2003-2007 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef UMLPACKAGELIST_H @@ -23541,9 +23541,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlpackagelist.h umbrello-15. +typedef QListIterator UMLPackageListIt; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlrole.cpp umbrello-15.08.1/umbrello/umlmodel/umlrole.cpp ---- umbrello-15.08.1.orig/umbrello/umlmodel/umlrole.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/umlrole.cpp 2015-10-08 11:48:59.508089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/umlrole.cpp umbrello-kf6-15.08.1/umbrello/umlmodel/umlrole.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/umlrole.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/umlrole.cpp 2015-10-08 11:48:59.508089026 +0300 @@ -0,0 +1,415 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -23552,7 +23552,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlrole.cpp umbrello-15.08.1/ + * (at your option) any later version. * + * * + * copyright (C) 2003-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header @@ -23914,7 +23914,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlrole.cpp umbrello-15.08.1/ + m_pAssoc->setAssociationType(Uml::AssociationType::Aggregation); + + if (!element.hasAttribute(QLatin1String("isNavigable"))) { -+ // Backward compatibility mode: In Umbrello version 1.3.x the ++ // Backward compatibility mode: In umbrello-kf6 version 1.3.x the + // logic for saving the isNavigable flag was wrong. + // May happen on loading role A. + m_pAssoc->setOldLoadMode(true); @@ -23960,9 +23960,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlrole.cpp umbrello-15.08.1/ + return true; +} + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlrole.h umbrello-15.08.1/umbrello/umlmodel/umlrole.h ---- umbrello-15.08.1.orig/umbrello/umlmodel/umlrole.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/umlrole.h 2015-10-08 11:48:59.508089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/umlrole.h umbrello-kf6-15.08.1/umbrello/umlmodel/umlrole.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/umlrole.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/umlrole.h 2015-10-08 11:48:59.508089026 +0300 @@ -0,0 +1,65 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -23971,7 +23971,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlrole.h umbrello-15.08.1/um + * (at your option) any later version. * + * * + * copyright (C) 2003-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef UMLROLE_H @@ -24029,9 +24029,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlrole.h umbrello-15.08.1/um +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlstereotypelist.h umbrello-15.08.1/umbrello/umlmodel/umlstereotypelist.h ---- umbrello-15.08.1.orig/umbrello/umlmodel/umlstereotypelist.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/umlstereotypelist.h 2015-10-08 11:48:59.508089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/umlstereotypelist.h umbrello-kf6-15.08.1/umbrello/umlmodel/umlstereotypelist.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/umlstereotypelist.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/umlstereotypelist.h 2015-10-08 11:48:59.508089026 +0300 @@ -0,0 +1,22 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -24040,7 +24040,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlstereotypelist.h umbrello- + * (at your option) any later version. * + * * + * copyright (C) 2003-2012 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef UMLSTEREOTYPELIST_H @@ -24055,9 +24055,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umlstereotypelist.h umbrello- +typedef QListIterator UMLStereotypeListIt; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umltemplatelist.h umbrello-15.08.1/umbrello/umlmodel/umltemplatelist.h ---- umbrello-15.08.1.orig/umbrello/umlmodel/umltemplatelist.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/umltemplatelist.h 2015-10-08 11:48:59.508089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/umltemplatelist.h umbrello-kf6-15.08.1/umbrello/umlmodel/umltemplatelist.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/umltemplatelist.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/umltemplatelist.h 2015-10-08 11:48:59.508089026 +0300 @@ -0,0 +1,23 @@ +/*************************************************************************** + * * @@ -24067,7 +24067,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umltemplatelist.h umbrello-15 + * (at your option) any later version. * + * * + * copyright (C) 2004-2007 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef UMLTEMPLATELIST_H @@ -24082,9 +24082,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/umltemplatelist.h umbrello-15 +typedef QListIterator UMLTemplateListIt; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/uniqueconstraint.cpp umbrello-15.08.1/umbrello/umlmodel/uniqueconstraint.cpp ---- umbrello-15.08.1.orig/umbrello/umlmodel/uniqueconstraint.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/uniqueconstraint.cpp 2015-10-08 11:48:59.508089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/uniqueconstraint.cpp umbrello-kf6-15.08.1/umbrello/umlmodel/uniqueconstraint.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/uniqueconstraint.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/uniqueconstraint.cpp 2015-10-08 11:48:59.508089026 +0300 @@ -0,0 +1,325 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -24093,7 +24093,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/uniqueconstraint.cpp umbrello + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +//own header @@ -24411,9 +24411,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/uniqueconstraint.cpp umbrello + m_EntityAttributeList.clear(); +} + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/uniqueconstraint.h umbrello-15.08.1/umbrello/umlmodel/uniqueconstraint.h ---- umbrello-15.08.1.orig/umbrello/umlmodel/uniqueconstraint.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/uniqueconstraint.h 2015-10-08 11:48:59.508089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/uniqueconstraint.h umbrello-kf6-15.08.1/umbrello/umlmodel/uniqueconstraint.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/uniqueconstraint.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/uniqueconstraint.h 2015-10-08 11:48:59.508089026 +0300 @@ -0,0 +1,77 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -24422,7 +24422,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/uniqueconstraint.h umbrello-1 + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef UNIQUECONSTRAINT_H @@ -24440,7 +24440,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/uniqueconstraint.h umbrello-1 + * @short Sets up Unique entity constraint information. + * @author Sharan Rao + * @see UMLObject UMLClassifierListItem UMLEntityConstraint -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class UMLUniqueConstraint : public UMLEntityConstraint +{ @@ -24492,9 +24492,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/uniqueconstraint.h umbrello-1 +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/usecase.cpp umbrello-15.08.1/umbrello/umlmodel/usecase.cpp ---- umbrello-15.08.1.orig/umbrello/umlmodel/usecase.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/usecase.cpp 2015-10-08 11:48:59.508089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/usecase.cpp umbrello-kf6-15.08.1/umbrello/umlmodel/usecase.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/usecase.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/usecase.cpp 2015-10-08 11:48:59.508089026 +0300 @@ -0,0 +1,67 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -24503,7 +24503,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/usecase.cpp umbrello-15.08.1/ + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#include "usecase.h" @@ -24563,9 +24563,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/usecase.cpp umbrello-15.08.1/ +} + + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/usecase.h umbrello-15.08.1/umbrello/umlmodel/usecase.h ---- umbrello-15.08.1.orig/umbrello/umlmodel/usecase.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlmodel/usecase.h 2015-10-08 11:48:59.508089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlmodel/usecase.h umbrello-kf6-15.08.1/umbrello/umlmodel/usecase.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlmodel/usecase.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlmodel/usecase.h 2015-10-08 11:48:59.508089026 +0300 @@ -0,0 +1,40 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -24574,7 +24574,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/usecase.h umbrello-15.08.1/um + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef USECASE_H @@ -24588,7 +24588,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/usecase.h umbrello-15.08.1/um + * + * @short Information for a non-graphical UML UseCase. + * @author Paul Hensgen -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class UMLUseCase : public UMLCanvasObject +{ @@ -24607,9 +24607,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlmodel/usecase.h umbrello-15.08.1/um +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlobject.cpp umbrello-15.08.1/umbrello/umlobject.cpp ---- umbrello-15.08.1.orig/umbrello/umlobject.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/umlobject.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlobject.cpp umbrello-kf6-15.08.1/umbrello/umlobject.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlobject.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/umlobject.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,1142 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -24618,7 +24618,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlobject.cpp umbrello-15.08.1/umbrell - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header @@ -24854,7 +24854,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlobject.cpp umbrello-15.08.1/umbrell - //don't compare IDs, these are program specific and - //don't mean the objects are the same - //***** CHECK: Who put in this comment? What was the reason? -- //***** Currently some operator== in umbrello compare the IDs +- //***** Currently some operator== in umbrello-kf6 compare the IDs - //***** while others don't. - - if (m_name != rhs.m_name) @@ -25340,7 +25340,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlobject.cpp umbrello-15.08.1/umbrell - << ", using secondary fallback " << m_SecondaryFallback; -#endif - m_SecondaryId = m_SecondaryFallback; -- // Assume we're dealing with the older Umbrello format where +- // Assume we're dealing with the older umbrello-kf6 format where - // the type name was saved in the "type" attribute rather - // than the xmi.id of the model object of the attribute type. - m_pSecondary = pDoc->findUMLObject(m_SecondaryId, ot_UMLObject, this); @@ -25522,14 +25522,14 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlobject.cpp umbrello-15.08.1/umbrell - m_name = element.attribute(QLatin1String("name")); - QString id = Model_Utils::getXmiId(element); - if (id.isEmpty() || id == QLatin1String("-1")) { -- // Before version 1.4, Umbrello did not save the xmi.id of UMLRole objects. +- // Before version 1.4, umbrello-kf6 did not save the xmi.id of UMLRole objects. - // Some tools (such as Embarcadero's) do not have an xmi.id on all attributes. - m_nId = UniqueID::gen(); - uWarning() << m_name << ": xmi.id not present, generating a new one"; - } else { - Uml::ID::Type nId = Uml::ID::fromString(id); - if (m_BaseType == ot_Role) { -- // Some older Umbrello versions had a problem with xmi.id's +- // Some older umbrello-kf6 versions had a problem with xmi.id's - // of other objects being reused for the UMLRole, see e.g. - // attachment 21179 at http://bugs.kde.org/147988 . - // If the xmi.id is already being used then we generate a new one. @@ -25753,9 +25753,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlobject.cpp umbrello-15.08.1/umbrell - return out.space(); -} - -diff -Nuar umbrello-15.08.1.orig/umbrello/umlobject.h umbrello-15.08.1/umbrello/umlobject.h ---- umbrello-15.08.1.orig/umbrello/umlobject.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/umlobject.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlobject.h umbrello-kf6-15.08.1/umbrello/umlobject.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlobject.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/umlobject.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,198 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -25764,7 +25764,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlobject.h umbrello-15.08.1/umbrello/ - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef UMLOBJECT_H @@ -25796,7 +25796,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlobject.h umbrello-15.08.1/umbrello/ - * - * @short The base class for UML objects. - * @author Paul Hensgen -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class UMLObject : public QObject -{ @@ -25955,9 +25955,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlobject.h umbrello-15.08.1/umbrello/ -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlobjectlist.cpp umbrello-15.08.1/umbrello/umlobjectlist.cpp ---- umbrello-15.08.1.orig/umbrello/umlobjectlist.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/umlobjectlist.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlobjectlist.cpp umbrello-kf6-15.08.1/umbrello/umlobjectlist.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlobjectlist.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/umlobjectlist.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,53 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -25966,7 +25966,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlobjectlist.cpp umbrello-15.08.1/umb - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#include "umlobjectlist.h" @@ -26012,9 +26012,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlobjectlist.cpp umbrello-15.08.1/umb - copyInto(clone); - return clone; -} -diff -Nuar umbrello-15.08.1.orig/umbrello/umlobjectlist.h umbrello-15.08.1/umbrello/umlobjectlist.h ---- umbrello-15.08.1.orig/umbrello/umlobjectlist.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/umlobjectlist.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlobjectlist.h umbrello-kf6-15.08.1/umbrello/umlobjectlist.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlobjectlist.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/umlobjectlist.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,40 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -26024,7 +26024,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlobjectlist.h umbrello-15.08.1/umbre - * * - * copyright (C) 2001 Gustavo Madrigal gmadrigal@nextphere.com * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef UMLOBJECTLIST_H @@ -26056,9 +26056,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlobjectlist.h umbrello-15.08.1/umbre -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umloperationlist.h umbrello-15.08.1/umbrello/umloperationlist.h ---- umbrello-15.08.1.orig/umbrello/umloperationlist.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/umloperationlist.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umloperationlist.h umbrello-kf6-15.08.1/umbrello/umloperationlist.h +--- umbrello-kf6-15.08.1.orig/umbrello/umloperationlist.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/umloperationlist.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,23 +0,0 @@ -/*************************************************************************** - * * @@ -26068,7 +26068,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umloperationlist.h umbrello-15.08.1/um - * (at your option) any later version. * - * * - * copyright (C) 2003-2007 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef UMLOPERATIONLIST_H @@ -26083,9 +26083,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umloperationlist.h umbrello-15.08.1/um -typedef QListIterator UMLOperationListIt; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlpackagelist.h umbrello-15.08.1/umbrello/umlpackagelist.h ---- umbrello-15.08.1.orig/umbrello/umlpackagelist.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/umlpackagelist.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlpackagelist.h umbrello-kf6-15.08.1/umbrello/umlpackagelist.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlpackagelist.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/umlpackagelist.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,22 +0,0 @@ -/*************************************************************************** - * * @@ -26095,7 +26095,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlpackagelist.h umbrello-15.08.1/umbr - * (at your option) any later version. * - * * - * copyright (C) 2003-2007 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef UMLPACKAGELIST_H @@ -26109,9 +26109,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlpackagelist.h umbrello-15.08.1/umbr -typedef QListIterator UMLPackageListIt; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlrole.cpp umbrello-15.08.1/umbrello/umlrole.cpp ---- umbrello-15.08.1.orig/umbrello/umlrole.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/umlrole.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlrole.cpp umbrello-kf6-15.08.1/umbrello/umlrole.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlrole.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/umlrole.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,415 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -26120,7 +26120,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlrole.cpp umbrello-15.08.1/umbrello/ - * (at your option) any later version. * - * * - * copyright (C) 2003-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header @@ -26482,7 +26482,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlrole.cpp umbrello-15.08.1/umbrello/ - m_pAssoc->setAssociationType(Uml::AssociationType::Aggregation); - - if (!element.hasAttribute(QLatin1String("isNavigable"))) { -- // Backward compatibility mode: In Umbrello version 1.3.x the +- // Backward compatibility mode: In umbrello-kf6 version 1.3.x the - // logic for saving the isNavigable flag was wrong. - // May happen on loading role A. - m_pAssoc->setOldLoadMode(true); @@ -26528,9 +26528,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlrole.cpp umbrello-15.08.1/umbrello/ - return true; -} - -diff -Nuar umbrello-15.08.1.orig/umbrello/umlrole.h umbrello-15.08.1/umbrello/umlrole.h ---- umbrello-15.08.1.orig/umbrello/umlrole.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/umlrole.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlrole.h umbrello-kf6-15.08.1/umbrello/umlrole.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlrole.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/umlrole.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,65 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -26539,7 +26539,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlrole.h umbrello-15.08.1/umbrello/um - * (at your option) any later version. * - * * - * copyright (C) 2003-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef UMLROLE_H @@ -26597,9 +26597,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlrole.h umbrello-15.08.1/umbrello/um -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlstereotypelist.h umbrello-15.08.1/umbrello/umlstereotypelist.h ---- umbrello-15.08.1.orig/umbrello/umlstereotypelist.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/umlstereotypelist.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlstereotypelist.h umbrello-kf6-15.08.1/umbrello/umlstereotypelist.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlstereotypelist.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/umlstereotypelist.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,22 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -26608,7 +26608,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlstereotypelist.h umbrello-15.08.1/u - * (at your option) any later version. * - * * - * copyright (C) 2003-2012 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef UMLSTEREOTYPELIST_H @@ -26623,9 +26623,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlstereotypelist.h umbrello-15.08.1/u -typedef QListIterator UMLStereotypeListIt; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umltemplatelist.h umbrello-15.08.1/umbrello/umltemplatelist.h ---- umbrello-15.08.1.orig/umbrello/umltemplatelist.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/umltemplatelist.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umltemplatelist.h umbrello-kf6-15.08.1/umbrello/umltemplatelist.h +--- umbrello-kf6-15.08.1.orig/umbrello/umltemplatelist.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/umltemplatelist.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,23 +0,0 @@ -/*************************************************************************** - * * @@ -26635,7 +26635,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umltemplatelist.h umbrello-15.08.1/umb - * (at your option) any later version. * - * * - * copyright (C) 2004-2007 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef UMLTEMPLATELIST_H @@ -26650,9 +26650,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umltemplatelist.h umbrello-15.08.1/umb -typedef QListIterator UMLTemplateListIt; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/activitywidget.cpp umbrello-15.08.1/umbrello/umlwidgets/activitywidget.cpp ---- umbrello-15.08.1.orig/umbrello/umlwidgets/activitywidget.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/activitywidget.cpp 2015-10-08 11:48:59.508089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/activitywidget.cpp umbrello-kf6-15.08.1/umbrello/umlwidgets/activitywidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/activitywidget.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/activitywidget.cpp 2015-10-08 11:48:59.508089026 +0300 @@ -0,0 +1,457 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -26661,7 +26661,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/activitywidget.cpp umbrello + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header @@ -27111,9 +27111,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/activitywidget.cpp umbrello +} + + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/activitywidget.h umbrello-15.08.1/umbrello/umlwidgets/activitywidget.h ---- umbrello-15.08.1.orig/umbrello/umlwidgets/activitywidget.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/activitywidget.h 2015-10-08 11:48:59.508089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/activitywidget.h umbrello-kf6-15.08.1/umbrello/umlwidgets/activitywidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/activitywidget.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/activitywidget.h 2015-10-08 11:48:59.508089026 +0300 @@ -0,0 +1,98 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -27122,7 +27122,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/activitywidget.h umbrello-1 + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef ACTIVITYWIDGET_H @@ -27145,7 +27145,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/activitywidget.h umbrello-1 + * + * @short A graphical version of a UML Activity. + * @author Paul Hensgen -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class ActivityWidget : public UMLWidget +{ @@ -27213,9 +27213,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/activitywidget.h umbrello-1 +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/actorwidget.cpp umbrello-15.08.1/umbrello/umlwidgets/actorwidget.cpp ---- umbrello-15.08.1.orig/umbrello/umlwidgets/actorwidget.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/actorwidget.cpp 2015-10-08 11:48:59.508089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/actorwidget.cpp umbrello-kf6-15.08.1/umbrello/umlwidgets/actorwidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/actorwidget.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/actorwidget.cpp 2015-10-08 11:48:59.508089026 +0300 @@ -0,0 +1,104 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -27224,7 +27224,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/actorwidget.cpp umbrello-15 + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header file @@ -27321,9 +27321,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/actorwidget.cpp umbrello-15 +} + + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/actorwidget.h umbrello-15.08.1/umbrello/umlwidgets/actorwidget.h ---- umbrello-15.08.1.orig/umbrello/umlwidgets/actorwidget.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/actorwidget.h 2015-10-08 11:48:59.508089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/actorwidget.h umbrello-kf6-15.08.1/umbrello/umlwidgets/actorwidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/actorwidget.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/actorwidget.h 2015-10-08 11:48:59.508089026 +0300 @@ -0,0 +1,55 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -27332,7 +27332,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/actorwidget.h umbrello-15.0 + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef ACTORWIDGET_H @@ -27363,7 +27363,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/actorwidget.h umbrello-15.0 + * @author Paul Hensgen + * @see UMLWidget + * @see UMLView -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class ActorWidget : public UMLWidget +{ @@ -27380,9 +27380,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/actorwidget.h umbrello-15.0 +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/artifactwidget.cpp umbrello-15.08.1/umbrello/umlwidgets/artifactwidget.cpp ---- umbrello-15.08.1.orig/umbrello/umlwidgets/artifactwidget.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/artifactwidget.cpp 2015-10-08 11:48:59.508089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/artifactwidget.cpp umbrello-kf6-15.08.1/umbrello/umlwidgets/artifactwidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/artifactwidget.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/artifactwidget.cpp 2015-10-08 11:48:59.508089026 +0300 @@ -0,0 +1,293 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -27391,7 +27391,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/artifactwidget.cpp umbrello + * (at your option) any later version. * + * * + * copyright (C) 2003-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header @@ -27677,9 +27677,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/artifactwidget.cpp umbrello + UMLWidget::paint(painter, option); +} + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/artifactwidget.h umbrello-15.08.1/umbrello/umlwidgets/artifactwidget.h ---- umbrello-15.08.1.orig/umbrello/umlwidgets/artifactwidget.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/artifactwidget.h 2015-10-08 11:48:59.508089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/artifactwidget.h umbrello-kf6-15.08.1/umbrello/umlwidgets/artifactwidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/artifactwidget.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/artifactwidget.h 2015-10-08 11:48:59.508089026 +0300 @@ -0,0 +1,55 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -27688,7 +27688,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/artifactwidget.h umbrello-1 + * (at your option) any later version. * + * * + * copyright (C) 2003-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef ARTIFACTWIDGET_H @@ -27708,7 +27708,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/artifactwidget.h umbrello-1 + * @short A graphical version of a Artifact. + * @author Jonathan Riddell + * @see UMLWidget -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class ArtifactWidget : public UMLWidget +{ @@ -27736,9 +27736,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/artifactwidget.h umbrello-1 +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/associationline.cpp umbrello-15.08.1/umbrello/umlwidgets/associationline.cpp ---- umbrello-15.08.1.orig/umbrello/umlwidgets/associationline.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/associationline.cpp 2015-10-08 11:48:59.508089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/associationline.cpp umbrello-kf6-15.08.1/umbrello/umlwidgets/associationline.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/associationline.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/associationline.cpp 2015-10-08 11:48:59.508089026 +0300 @@ -0,0 +1,1404 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -27747,7 +27747,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/associationline.cpp umbrell + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header @@ -28116,7 +28116,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/associationline.cpp umbrell + */ +QBrush AssociationLine::brush() const +{ -+ QBrush brush(Qt::SolidPattern); ++ QBrush brush(Qt::solid-kf6Pattern); + Uml::AssociationType::Enum type = m_associationWidget->associationType(); + if (type == Uml::AssociationType::Aggregation || + type == Uml::AssociationType::Generalization || @@ -28136,7 +28136,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/associationline.cpp umbrell +{ + QPen pen(m_associationWidget->lineColor(), + m_associationWidget->lineWidth(), -+ Qt::SolidLine, ++ Qt::solid-kf6Line, + Qt::RoundCap, + Qt::RoundJoin); + Uml::AssociationType::Enum type = m_associationWidget->associationType(); @@ -29124,7 +29124,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/associationline.cpp umbrell + prepareGeometryChange(); + m_pen = pen; + if (m_symbolType == ClosedArrow) -+ m_pen.setStyle(Qt::SolidLine); ++ m_pen.setStyle(Qt::solid-kf6Line); +} + +/** @@ -29144,9 +29144,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/associationline.cpp umbrell + update(); +} + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/associationline.h umbrello-15.08.1/umbrello/umlwidgets/associationline.h ---- umbrello-15.08.1.orig/umbrello/umlwidgets/associationline.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/associationline.h 2015-10-08 11:48:59.508089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/associationline.h umbrello-kf6-15.08.1/umbrello/umlwidgets/associationline.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/associationline.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/associationline.h 2015-10-08 11:48:59.508089026 +0300 @@ -0,0 +1,207 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -29155,7 +29155,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/associationline.h umbrello- + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef ASSOCIATIONLINE_H @@ -29355,9 +29355,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/associationline.h umbrello- +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/associationwidget.cpp umbrello-15.08.1/umbrello/umlwidgets/associationwidget.cpp ---- umbrello-15.08.1.orig/umbrello/umlwidgets/associationwidget.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/associationwidget.cpp 2015-10-08 11:48:59.508089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/associationwidget.cpp umbrello-kf6-15.08.1/umbrello/umlwidgets/associationwidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/associationwidget.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/associationwidget.cpp 2015-10-08 11:48:59.508089026 +0300 @@ -0,0 +1,4407 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -29366,7 +29366,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/associationwidget.cpp umbre + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header @@ -30534,7 +30534,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/associationwidget.cpp umbre +} + +/** -+ * For internal purposes only. ++ * For internal purpose-kf6s only. + * Other classes/users should use setChangeability() instead. + */ +void AssociationWidget::setChangeWidget(const QString &strChangeWidget, Uml::RoleType::Enum role) @@ -33766,9 +33766,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/associationwidget.cpp umbre + } +} + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/associationwidget.h umbrello-15.08.1/umbrello/umlwidgets/associationwidget.h ---- umbrello-15.08.1.orig/umbrello/umlwidgets/associationwidget.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/associationwidget.h 2015-10-08 11:48:59.508089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/associationwidget.h umbrello-kf6-15.08.1/umbrello/umlwidgets/associationwidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/associationwidget.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/associationwidget.h 2015-10-08 11:48:59.508089026 +0300 @@ -0,0 +1,328 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -33777,7 +33777,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/associationwidget.h umbrell + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef ASSOCIATIONWIDGET_H @@ -33817,7 +33817,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/associationwidget.h umbrell + * @author Gustavo Madrigal + * @author Gopala Krishna + * @short This class represents an association inside a diagram. -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class AssociationWidget : public WidgetBase, public LinkWidget +{ @@ -34098,9 +34098,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/associationwidget.h umbrell +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/boxwidget.cpp umbrello-15.08.1/umbrello/umlwidgets/boxwidget.cpp ---- umbrello-15.08.1.orig/umbrello/umlwidgets/boxwidget.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/boxwidget.cpp 2015-10-08 11:48:59.508089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/boxwidget.cpp umbrello-kf6-15.08.1/umbrello/umlwidgets/boxwidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/boxwidget.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/boxwidget.cpp 2015-10-08 11:48:59.508089026 +0300 @@ -0,0 +1,79 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -34109,7 +34109,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/boxwidget.cpp umbrello-15.0 + * (at your option) any later version. * + * * + * copyright (C) 2003-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header @@ -34181,9 +34181,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/boxwidget.cpp umbrello-15.0 + umlDoc()->setModified(true); + } +} -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/boxwidget.h umbrello-15.08.1/umbrello/umlwidgets/boxwidget.h ---- umbrello-15.08.1.orig/umbrello/umlwidgets/boxwidget.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/boxwidget.h 2015-10-08 11:48:59.508089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/boxwidget.h umbrello-kf6-15.08.1/umbrello/umlwidgets/boxwidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/boxwidget.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/boxwidget.h 2015-10-08 11:48:59.508089026 +0300 @@ -0,0 +1,39 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -34192,7 +34192,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/boxwidget.h umbrello-15.08. + * (at your option) any later version. * + * * + * copyright (C) 2003-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef BOXWIDGET_H @@ -34204,12 +34204,12 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/boxwidget.h umbrello-15.08. +/** + * Displays a rectangular box. + * These widgets are diagram specific. They will still need a unique id -+ * from the @ref UMLDoc class for deletion and other purposes. ++ * from the @ref UMLDoc class for deletion and other purpose-kf6s. + * + * @short Displays a box. + * @author Jonathan Riddell + * @see UMLWidget -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class BoxWidget : public UMLWidget +{ @@ -34224,9 +34224,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/boxwidget.h umbrello-15.08. +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/categorywidget.cpp umbrello-15.08.1/umbrello/umlwidgets/categorywidget.cpp ---- umbrello-15.08.1.orig/umbrello/umlwidgets/categorywidget.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/categorywidget.cpp 2015-10-08 11:48:59.508089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/categorywidget.cpp umbrello-kf6-15.08.1/umbrello/umlwidgets/categorywidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/categorywidget.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/categorywidget.cpp 2015-10-08 11:48:59.508089026 +0300 @@ -0,0 +1,148 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -34235,7 +34235,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/categorywidget.cpp umbrello + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header file @@ -34376,9 +34376,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/categorywidget.cpp umbrello + } +} + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/categorywidget.h umbrello-15.08.1/umbrello/umlwidgets/categorywidget.h ---- umbrello-15.08.1.orig/umbrello/umlwidgets/categorywidget.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/categorywidget.h 2015-10-08 11:48:59.508089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/categorywidget.h umbrello-kf6-15.08.1/umbrello/umlwidgets/categorywidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/categorywidget.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/categorywidget.h 2015-10-08 11:48:59.508089026 +0300 @@ -0,0 +1,56 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -34387,7 +34387,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/categorywidget.h umbrello-1 + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef CATEGORYWIDGET_H @@ -34413,7 +34413,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/categorywidget.h umbrello-1 + * + * @short A graphical version of a UMLCategory. + * @author Sharan Rao -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class CategoryWidget : public UMLWidget +{ @@ -34436,9 +34436,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/categorywidget.h umbrello-1 +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/classifierwidget.cpp umbrello-15.08.1/umbrello/umlwidgets/classifierwidget.cpp ---- umbrello-15.08.1.orig/umbrello/umlwidgets/classifierwidget.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/classifierwidget.cpp 2015-10-08 11:48:59.508089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/classifierwidget.cpp umbrello-kf6-15.08.1/umbrello/umlwidgets/classifierwidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/classifierwidget.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/classifierwidget.cpp 2015-10-08 11:48:59.508089026 +0300 @@ -0,0 +1,1426 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -34447,7 +34447,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/classifierwidget.cpp umbrel + * (at your option) any later version. * + * * + * copyright (C) 2004-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header @@ -35866,9 +35866,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/classifierwidget.cpp umbrel + setVisualProperty(ShowOperations, state); +} + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/classifierwidget.h umbrello-15.08.1/umbrello/umlwidgets/classifierwidget.h ---- umbrello-15.08.1.orig/umbrello/umlwidgets/classifierwidget.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/classifierwidget.h 2015-10-08 11:48:59.508089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/classifierwidget.h umbrello-kf6-15.08.1/umbrello/umlwidgets/classifierwidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/classifierwidget.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/classifierwidget.h 2015-10-08 11:48:59.508089026 +0300 @@ -0,0 +1,146 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -35877,7 +35877,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/classifierwidget.h umbrello + * (at your option) any later version. * + * * + * copyright (C) 2004-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef CLASSIFIERWIDGET_H @@ -35899,7 +35899,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/classifierwidget.h umbrello + * @author Gopala Krishna + * + * @see UMLWidget -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class ClassifierWidget : public UMLWidget +{ @@ -36016,9 +36016,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/classifierwidget.h umbrello +Q_DECLARE_OPERATORS_FOR_FLAGS(ClassifierWidget::VisualProperties) + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/combinedfragmentwidget.cpp umbrello-15.08.1/umbrello/umlwidgets/combinedfragmentwidget.cpp ---- umbrello-15.08.1.orig/umbrello/umlwidgets/combinedfragmentwidget.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/combinedfragmentwidget.cpp 2015-10-08 11:48:59.508089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/combinedfragmentwidget.cpp umbrello-kf6-15.08.1/umbrello/umlwidgets/combinedfragmentwidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/combinedfragmentwidget.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/combinedfragmentwidget.cpp 2015-10-08 11:48:59.508089026 +0300 @@ -0,0 +1,477 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -36027,7 +36027,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/combinedfragmentwidget.cpp + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header @@ -36497,9 +36497,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/combinedfragmentwidget.cpp + } +} + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/combinedfragmentwidget.h umbrello-15.08.1/umbrello/umlwidgets/combinedfragmentwidget.h ---- umbrello-15.08.1.orig/umbrello/umlwidgets/combinedfragmentwidget.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/combinedfragmentwidget.h 2015-10-08 11:48:59.509089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/combinedfragmentwidget.h umbrello-kf6-15.08.1/umbrello/umlwidgets/combinedfragmentwidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/combinedfragmentwidget.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/combinedfragmentwidget.h 2015-10-08 11:48:59.509089026 +0300 @@ -0,0 +1,91 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -36508,7 +36508,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/combinedfragmentwidget.h um + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef COMBINEDFRAGMENTWIDGET_H @@ -36534,7 +36534,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/combinedfragmentwidget.h um + * + * @short A graphical version of a UML combined fragment. + * @author Hassan KOUCH -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class CombinedFragmentWidget : public UMLWidget +{ @@ -36592,9 +36592,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/combinedfragmentwidget.h um +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/componentwidget.cpp umbrello-15.08.1/umbrello/umlwidgets/componentwidget.cpp ---- umbrello-15.08.1.orig/umbrello/umlwidgets/componentwidget.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/componentwidget.cpp 2015-10-08 11:48:59.509089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/componentwidget.cpp umbrello-kf6-15.08.1/umbrello/umlwidgets/componentwidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/componentwidget.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/componentwidget.cpp 2015-10-08 11:48:59.509089026 +0300 @@ -0,0 +1,207 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -36603,7 +36603,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/componentwidget.cpp umbrell + * (at your option) any later version. * + * * + * copyright (C) 2003-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header @@ -36803,9 +36803,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/componentwidget.cpp umbrell + return QSizeF(width, height); +} + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/componentwidget.h umbrello-15.08.1/umbrello/umlwidgets/componentwidget.h ---- umbrello-15.08.1.orig/umbrello/umlwidgets/componentwidget.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/componentwidget.h 2015-10-08 11:48:59.509089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/componentwidget.h umbrello-kf6-15.08.1/umbrello/umlwidgets/componentwidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/componentwidget.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/componentwidget.h 2015-10-08 11:48:59.509089026 +0300 @@ -0,0 +1,58 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -36814,7 +36814,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/componentwidget.h umbrello- + * (at your option) any later version. * + * * + * copyright (C) 2003-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef COMPONENTWIDGET_H @@ -36833,7 +36833,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/componentwidget.h umbrello- + * @short A graphical version of a Component. + * @author Jonathan Riddell + * @see UMLWidget -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class ComponentWidget : public UMLWidget +{ @@ -36865,9 +36865,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/componentwidget.h umbrello- +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/datatypewidget.cpp umbrello-15.08.1/umbrello/umlwidgets/datatypewidget.cpp ---- umbrello-15.08.1.orig/umbrello/umlwidgets/datatypewidget.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/datatypewidget.cpp 2015-10-08 11:48:59.509089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/datatypewidget.cpp umbrello-kf6-15.08.1/umbrello/umlwidgets/datatypewidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/datatypewidget.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/datatypewidget.cpp 2015-10-08 11:48:59.509089026 +0300 @@ -0,0 +1,129 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -36876,7 +36876,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/datatypewidget.cpp umbrello + * (at your option) any later version. * + * * + * copyright (C) 2003-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header @@ -36998,9 +36998,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/datatypewidget.cpp umbrello + + return QSizeF(width, height); +} -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/datatypewidget.h umbrello-15.08.1/umbrello/umlwidgets/datatypewidget.h ---- umbrello-15.08.1.orig/umbrello/umlwidgets/datatypewidget.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/datatypewidget.h 2015-10-08 11:48:59.509089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/datatypewidget.h umbrello-kf6-15.08.1/umbrello/umlwidgets/datatypewidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/datatypewidget.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/datatypewidget.h 2015-10-08 11:48:59.509089026 +0300 @@ -0,0 +1,48 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -37009,7 +37009,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/datatypewidget.h umbrello-1 + * (at your option) any later version. * + * * + * copyright (C) 2003-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef DATATYPEWIDGET_H @@ -37028,7 +37028,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/datatypewidget.h umbrello-1 + * @short A graphical version of an datatype. + * @author Jonathan Riddell + * @see UMLWidget -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class DatatypeWidget : public UMLWidget +{ @@ -37050,9 +37050,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/datatypewidget.h umbrello-1 +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/entitywidget.cpp umbrello-15.08.1/umbrello/umlwidgets/entitywidget.cpp ---- umbrello-15.08.1.orig/umbrello/umlwidgets/entitywidget.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/entitywidget.cpp 2015-10-08 11:48:59.509089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/entitywidget.cpp umbrello-kf6-15.08.1/umbrello/umlwidgets/entitywidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/entitywidget.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/entitywidget.cpp 2015-10-08 11:48:59.509089026 +0300 @@ -0,0 +1,246 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -37061,7 +37061,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/entitywidget.cpp umbrello-1 + * (at your option) any later version. * + * * + * copyright (C) 2003-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header @@ -37300,9 +37300,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/entitywidget.cpp umbrello-1 + + return QSizeF(width, height); +} -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/entitywidget.h umbrello-15.08.1/umbrello/umlwidgets/entitywidget.h ---- umbrello-15.08.1.orig/umbrello/umlwidgets/entitywidget.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/entitywidget.h 2015-10-08 11:48:59.509089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/entitywidget.h umbrello-kf6-15.08.1/umbrello/umlwidgets/entitywidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/entitywidget.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/entitywidget.h 2015-10-08 11:48:59.509089026 +0300 @@ -0,0 +1,49 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -37311,7 +37311,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/entitywidget.h umbrello-15. + * (at your option) any later version. * + * * + * copyright (C) 2003-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef ENTITYWIDGET_H @@ -37330,7 +37330,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/entitywidget.h umbrello-15. + * @short A graphical version of an entity. + * @author Jonathan Riddell + * @see UMLWidget -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class EntityWidget : public UMLWidget +{ @@ -37353,9 +37353,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/entitywidget.h umbrello-15. +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/enumwidget.cpp umbrello-15.08.1/umbrello/umlwidgets/enumwidget.cpp ---- umbrello-15.08.1.orig/umbrello/umlwidgets/enumwidget.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/enumwidget.cpp 2015-10-08 11:48:59.509089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/enumwidget.cpp umbrello-kf6-15.08.1/umbrello/umlwidgets/enumwidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/enumwidget.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/enumwidget.cpp 2015-10-08 11:48:59.509089026 +0300 @@ -0,0 +1,262 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -37364,7 +37364,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/enumwidget.cpp umbrello-15. + * (at your option) any later version. * + * * + * copyright (C) 2003-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header @@ -37619,9 +37619,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/enumwidget.cpp umbrello-15. + + return QSizeF(width, height); +} -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/enumwidget.h umbrello-15.08.1/umbrello/umlwidgets/enumwidget.h ---- umbrello-15.08.1.orig/umbrello/umlwidgets/enumwidget.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/enumwidget.h 2015-10-08 11:48:59.509089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/enumwidget.h umbrello-kf6-15.08.1/umbrello/umlwidgets/enumwidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/enumwidget.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/enumwidget.h 2015-10-08 11:48:59.509089026 +0300 @@ -0,0 +1,52 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -37630,7 +37630,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/enumwidget.h umbrello-15.08 + * (at your option) any later version. * + * * + * copyright (C) 2003-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef ENUMWIDGET_H @@ -37647,7 +37647,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/enumwidget.h umbrello-15.08 + * @short A graphical version of an enum. + * @author Jonathan Riddell + * @see UMLWidget -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class EnumWidget : public UMLWidget +{ @@ -37675,9 +37675,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/enumwidget.h umbrello-15.08 +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/floatingdashlinewidget.cpp umbrello-15.08.1/umbrello/umlwidgets/floatingdashlinewidget.cpp ---- umbrello-15.08.1.orig/umbrello/umlwidgets/floatingdashlinewidget.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/floatingdashlinewidget.cpp 2015-10-08 11:48:59.509089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/floatingdashlinewidget.cpp umbrello-kf6-15.08.1/umbrello/umlwidgets/floatingdashlinewidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/floatingdashlinewidget.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/floatingdashlinewidget.cpp 2015-10-08 11:48:59.509089026 +0300 @@ -0,0 +1,199 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -37686,7 +37686,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/floatingdashlinewidget.cpp + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ +// own header +#include "floatingdashlinewidget.h" @@ -37878,9 +37878,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/floatingdashlinewidget.cpp + return true; +} + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/floatingdashlinewidget.h umbrello-15.08.1/umbrello/umlwidgets/floatingdashlinewidget.h ---- umbrello-15.08.1.orig/umbrello/umlwidgets/floatingdashlinewidget.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/floatingdashlinewidget.h 2015-10-08 11:48:59.509089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/floatingdashlinewidget.h umbrello-kf6-15.08.1/umbrello/umlwidgets/floatingdashlinewidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/floatingdashlinewidget.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/floatingdashlinewidget.h 2015-10-08 11:48:59.509089026 +0300 @@ -0,0 +1,77 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -37889,7 +37889,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/floatingdashlinewidget.h um + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef FLOATINGDASHLINEWIDGET_H @@ -37912,7 +37912,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/floatingdashlinewidget.h um + * + * @short A dash line for UML combined fragments. + * @author Thomas GALLINARI -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class FloatingDashLineWidget : public UMLWidget +{ @@ -37959,9 +37959,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/floatingdashlinewidget.h um +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/floatingtextwidget.cpp umbrello-15.08.1/umbrello/umlwidgets/floatingtextwidget.cpp ---- umbrello-15.08.1.orig/umbrello/umlwidgets/floatingtextwidget.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/floatingtextwidget.cpp 2015-10-08 11:48:59.509089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/floatingtextwidget.cpp umbrello-kf6-15.08.1/umbrello/umlwidgets/floatingtextwidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/floatingtextwidget.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/floatingtextwidget.cpp 2015-10-08 11:48:59.509089026 +0300 @@ -0,0 +1,854 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -37970,7 +37970,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/floatingtextwidget.cpp umbr + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header @@ -38681,7 +38681,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/floatingtextwidget.cpp umbr + // If all texts are empty then this is a useless widget. + // In that case we return false. + // CAVEAT: The caller should not interpret the false return value -+ // as an indication of failure since previous umbrello versions ++ // as an indication of failure since previous umbrello-kf6 versions + // saved lots of these empty FloatingTexts. + bool usefulWidget = !isEmpty(); + return usefulWidget; @@ -38817,9 +38817,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/floatingtextwidget.cpp umbr + setVisible(!text().isEmpty()); +} + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/floatingtextwidget.h umbrello-15.08.1/umbrello/umlwidgets/floatingtextwidget.h ---- umbrello-15.08.1.orig/umbrello/umlwidgets/floatingtextwidget.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/floatingtextwidget.h 2015-10-08 11:48:59.509089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/floatingtextwidget.h umbrello-kf6-15.08.1/umbrello/umlwidgets/floatingtextwidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/floatingtextwidget.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/floatingtextwidget.h 2015-10-08 11:48:59.509089026 +0300 @@ -0,0 +1,131 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -38828,7 +38828,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/floatingtextwidget.h umbrel + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef FLOATINGTEXTWIDGET_H @@ -38843,7 +38843,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/floatingtextwidget.h umbrel +/** + * @short Displays a line of text or an operation. + * -+ * This is a multipurpose class. In its simplest form it will display a ++ * This is a multipurpose-kf6 class. In its simplest form it will display a + * line of text. + * It can also be setup to be the text for an operation with regard to the + * @ref MessageWidget on the sequence diagram. @@ -38854,7 +38854,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/floatingtextwidget.h umbrel + * + * @author Paul Hensgen + * @see UMLWidget -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class FloatingTextWidget : public UMLWidget +{ @@ -38952,9 +38952,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/floatingtextwidget.h umbrel +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/forkjoinwidget.cpp umbrello-15.08.1/umbrello/umlwidgets/forkjoinwidget.cpp ---- umbrello-15.08.1.orig/umbrello/umlwidgets/forkjoinwidget.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/forkjoinwidget.cpp 2015-10-08 11:48:59.509089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/forkjoinwidget.cpp umbrello-kf6-15.08.1/umbrello/umlwidgets/forkjoinwidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/forkjoinwidget.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/forkjoinwidget.cpp 2015-10-08 11:48:59.509089026 +0300 @@ -0,0 +1,205 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -38963,7 +38963,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/forkjoinwidget.cpp umbrello + * (at your option) any later version. * + * * + * copyright (C) 2005-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header @@ -39161,9 +39161,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/forkjoinwidget.cpp umbrello + width = 100; + } +} -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/forkjoinwidget.h umbrello-15.08.1/umbrello/umlwidgets/forkjoinwidget.h ---- umbrello-15.08.1.orig/umbrello/umlwidgets/forkjoinwidget.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/forkjoinwidget.h 2015-10-08 11:48:59.509089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/forkjoinwidget.h umbrello-kf6-15.08.1/umbrello/umlwidgets/forkjoinwidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/forkjoinwidget.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/forkjoinwidget.h 2015-10-08 11:48:59.509089026 +0300 @@ -0,0 +1,57 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -39172,7 +39172,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/forkjoinwidget.h umbrello-1 + * (at your option) any later version. * + * * + * copyright (C) 2005-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef FORKJOINWIDGET_H @@ -39187,7 +39187,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/forkjoinwidget.h umbrello-1 + * @author Oliver Kellogg + * + * @see UMLWidget -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class ForkJoinWidget : public BoxWidget +{ @@ -39222,9 +39222,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/forkjoinwidget.h umbrello-1 +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/layoutgrid.cpp umbrello-15.08.1/umbrello/umlwidgets/layoutgrid.cpp ---- umbrello-15.08.1.orig/umbrello/umlwidgets/layoutgrid.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/layoutgrid.cpp 2015-10-08 11:48:59.509089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/layoutgrid.cpp umbrello-kf6-15.08.1/umbrello/umlwidgets/layoutgrid.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/layoutgrid.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/layoutgrid.cpp 2015-10-08 11:48:59.509089026 +0300 @@ -0,0 +1,113 @@ +/*************************************************************************** + * Copyright (C) 2011 by Andi Fischer * @@ -39237,7 +39237,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/layoutgrid.cpp umbrello-15. + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR purpose-kf6. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * @@ -39339,9 +39339,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/layoutgrid.cpp umbrello-15. + m_scene->update(); + } +} -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/layoutgrid.h umbrello-15.08.1/umbrello/umlwidgets/layoutgrid.h ---- umbrello-15.08.1.orig/umbrello/umlwidgets/layoutgrid.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/layoutgrid.h 2015-10-08 11:48:59.509089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/layoutgrid.h umbrello-kf6-15.08.1/umbrello/umlwidgets/layoutgrid.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/layoutgrid.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/layoutgrid.h 2015-10-08 11:48:59.509089026 +0300 @@ -0,0 +1,76 @@ +/*************************************************************************** + * Copyright (C) 2011 by Andi Fischer * @@ -39354,7 +39354,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/layoutgrid.h umbrello-15.08 + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR purpose-kf6. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * @@ -39419,9 +39419,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/layoutgrid.h umbrello-15.08 +}; + +#endif // LAYOUTGRID_H -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/linkwidget.cpp umbrello-15.08.1/umbrello/umlwidgets/linkwidget.cpp ---- umbrello-15.08.1.orig/umbrello/umlwidgets/linkwidget.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/linkwidget.cpp 2015-10-08 11:48:59.509089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/linkwidget.cpp umbrello-kf6-15.08.1/umbrello/umlwidgets/linkwidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/linkwidget.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/linkwidget.cpp 2015-10-08 11:48:59.509089026 +0300 @@ -0,0 +1,121 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -39430,7 +39430,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/linkwidget.cpp umbrello-15. + * (at your option) any later version. * + * * + * copyright (C) 2004-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header @@ -39544,9 +39544,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/linkwidget.cpp umbrello-15. + + qElement.setAttribute(QLatin1String("seqnum"), m_SequenceNumber); +} -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/linkwidget.h umbrello-15.08.1/umbrello/umlwidgets/linkwidget.h ---- umbrello-15.08.1.orig/umbrello/umlwidgets/linkwidget.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/linkwidget.h 2015-10-08 11:48:59.509089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/linkwidget.h umbrello-kf6-15.08.1/umbrello/umlwidgets/linkwidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/linkwidget.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/linkwidget.h 2015-10-08 11:48:59.509089026 +0300 @@ -0,0 +1,123 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -39555,7 +39555,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/linkwidget.h umbrello-15.08 + * (at your option) any later version. * + * * + * copyright (C) 2004-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef LINKWIDGET_H @@ -39574,13 +39574,13 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/linkwidget.h umbrello-15.08 +/** + * This is an interface realized by AssociationWidget and MessageWidget. + * The design of this interface was driven by the requirements of -+ * class FloatingTextWidget. As the architecture of Umbrello evolves (for ++ * class FloatingTextWidget. As the architecture of umbrello-kf6 evolves (for + * example, if the class FloatingTextWidget is redesigned), it can be + * cleaned up. + * + * @short Interface to FloatingTextWidget for AssociationWidget and MessageWidget. + * @author Oliver Kellogg -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class LinkWidget +{ @@ -39671,9 +39671,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/linkwidget.h umbrello-15.08 +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/messagewidget.cpp umbrello-15.08.1/umbrello/umlwidgets/messagewidget.cpp ---- umbrello-15.08.1.orig/umbrello/umlwidgets/messagewidget.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/messagewidget.cpp 2015-10-08 11:48:59.509089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/messagewidget.cpp umbrello-kf6-15.08.1/umbrello/umlwidgets/messagewidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/messagewidget.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/messagewidget.cpp 2015-10-08 11:48:59.509089026 +0300 @@ -0,0 +1,1385 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -39682,7 +39682,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/messagewidget.cpp umbrello- + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// onw header @@ -39990,10 +39990,10 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/messagewidget.cpp umbrello- +} + +/** -+ * Draw a solid (triangular) arrowhead pointing in the given direction. ++ * Draw a solid-kf6 (triangular) arrowhead pointing in the given direction. + * The direction can be either Qt::LeftArrow or Qt::RightArrow. + */ -+void MessageWidget::paintSolidArrowhead(QPainter *p, int x, int y, Qt::ArrowType direction) ++void MessageWidget::paintsolid-kf6Arrowhead(QPainter *p, int x, int y, Qt::ArrowType direction) +{ + int arrowheadExtentX = 4; + if (direction == Qt::RightArrow) { @@ -40007,7 +40007,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/messagewidget.cpp umbrello- + +/** + * Draw an arrow pointing in the given direction. -+ * The arrow head is not solid, i.e. it is made up of two lines ++ * The arrow head is not solid-kf6, i.e. it is made up of two lines + * like so: ---> + * The direction can be either Qt::LeftArrow or Qt::RightArrow. + */ @@ -40080,7 +40080,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/messagewidget.cpp umbrello- + painter->drawRect(startX, offsetY, wr, h); //box + painter->drawLine(offsetX, offsetY + arrowWidth, startX, offsetY + arrowWidth); //arrow line + if (w > boxWidth + arrowWidth) -+ paintSolidArrowhead(painter, startX - 1, offsetY + arrowWidth, Qt::RightArrow); ++ paintsolid-kf6Arrowhead(painter, startX - 1, offsetY + arrowWidth, Qt::RightArrow); + paintArrow(painter, offsetX, offsetY + h - arrowWidth + 1, w - wr + 1, Qt::LeftArrow, true); // return arrow + if (messageOverlaps) { + offsetX -= 8; //reset for drawSelected() @@ -40094,7 +40094,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/messagewidget.cpp umbrello- + painter->drawRect(offsetX, offsetY, wr, h); //box + painter->drawLine(offsetX + wr + 1, offsetY + arrowWidth, offsetX + w, offsetY + arrowWidth); //arrow line + if (w > boxWidth + arrowWidth) -+ paintSolidArrowhead(painter, offsetX + wr, offsetY + arrowWidth, Qt::LeftArrow); ++ paintsolid-kf6Arrowhead(painter, offsetX + wr, offsetY + arrowWidth, Qt::LeftArrow); + paintArrow(painter, offsetX + wr + 1, offsetY + h - arrowWidth + 1, w - wr - 1, Qt::RightArrow, true); // return arrow + } + @@ -40102,7 +40102,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/messagewidget.cpp umbrello- +} + +/** -+ * Draws a solid arrow line and a stick arrow head. ++ * Draws a solid-kf6 arrow line and a stick arrow head. + */ +void MessageWidget::paintAsynchronous(QPainter *painter, const QStyleOptionGraphicsItem *option) +{ @@ -40150,7 +40150,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/messagewidget.cpp umbrello- +} + +/** -+ * Draws a solid arrow line and a stick arrow head to the ++ * Draws a solid-kf6 arrow line and a stick arrow head to the + * edge of the target object widget instead of to the + * sequence line. + */ @@ -40187,7 +40187,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/messagewidget.cpp umbrello- + + +/** -+ * Draws a solid arrow line and a stick arrow head ++ * Draws a solid-kf6 arrow line and a stick arrow head + * and a circle + */ +void MessageWidget::paintLost(QPainter *painter, const QStyleOptionGraphicsItem *option) @@ -40226,7 +40226,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/messagewidget.cpp umbrello- +} + +/** -+ * Draws a circle and a solid arrow line and a stick arrow head. ++ * Draws a circle and a solid-kf6 arrow line and a stick arrow head. + */ +void MessageWidget::paintFound(QPainter *painter, const QStyleOptionGraphicsItem *option) +{ @@ -40459,7 +40459,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/messagewidget.cpp umbrello- + */ +bool MessageWidget::activate(IDChangeLog * /*Log = 0*/) +{ -+ m_scene->resetPastePoint(); ++ m_scene->resetPastep-kf6oint(); + // UMLWidget::activate(Log); CHECK: I don't think we need this ? + if (m_pOw[Uml::RoleType::A] == NULL) { + UMLWidget *pWA = m_scene->findWidget(m_widgetAId); @@ -41060,9 +41060,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/messagewidget.cpp umbrello- + return true; +} + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/messagewidget.h umbrello-15.08.1/umbrello/umlwidgets/messagewidget.h ---- umbrello-15.08.1.orig/umbrello/umlwidgets/messagewidget.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/messagewidget.h 2015-10-08 11:48:59.509089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/messagewidget.h umbrello-kf6-15.08.1/umbrello/umlwidgets/messagewidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/messagewidget.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/messagewidget.h 2015-10-08 11:48:59.509089026 +0300 @@ -0,0 +1,212 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -41071,7 +41071,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/messagewidget.h umbrello-15 + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef MESSAGEWIDGET_H @@ -41101,7 +41101,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/messagewidget.h umbrello-15 + * @see UMLWidget + * @see ObjectWidget + * @see FloatingTextWidget -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class MessageWidget : public UMLWidget, public LinkWidget +{ @@ -41226,7 +41226,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/messagewidget.h umbrello-15 + + static void paintArrow(QPainter *p, int x, int y, int w, + Qt::ArrowType direction, bool useDottedLine = false); -+ static void paintSolidArrowhead(QPainter *p, int x, int y, Qt::ArrowType direction); ++ static void paintsolid-kf6Arrowhead(QPainter *p, int x, int y, Qt::ArrowType direction); + + void updateResizability(); + @@ -41276,9 +41276,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/messagewidget.h umbrello-15 +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/nodewidget.cpp umbrello-15.08.1/umbrello/umlwidgets/nodewidget.cpp ---- umbrello-15.08.1.orig/umbrello/umlwidgets/nodewidget.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/nodewidget.cpp 2015-10-08 11:48:59.509089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/nodewidget.cpp umbrello-kf6-15.08.1/umbrello/umlwidgets/nodewidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/nodewidget.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/nodewidget.cpp 2015-10-08 11:48:59.509089026 +0300 @@ -0,0 +1,156 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -41287,7 +41287,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/nodewidget.cpp umbrello-15. + * (at your option) any later version. * + * * + * copyright (C) 2003-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header @@ -41436,9 +41436,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/nodewidget.cpp umbrello-15. + qElement.appendChild(conceptElement); +} + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/nodewidget.h umbrello-15.08.1/umbrello/umlwidgets/nodewidget.h ---- umbrello-15.08.1.orig/umbrello/umlwidgets/nodewidget.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/nodewidget.h 2015-10-08 11:48:59.509089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/nodewidget.h umbrello-kf6-15.08.1/umbrello/umlwidgets/nodewidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/nodewidget.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/nodewidget.h 2015-10-08 11:48:59.509089026 +0300 @@ -0,0 +1,44 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -41447,7 +41447,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/nodewidget.h umbrello-15.08 + * (at your option) any later version. * + * * + * copyright (C) 2003-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef NODEWIDGET_H @@ -41464,7 +41464,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/nodewidget.h umbrello-15.08 + * @short A graphical version of a Node. + * @author Jonathan Riddell + * @see UMLWidget -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class NodeWidget : public UMLWidget +{ @@ -41484,9 +41484,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/nodewidget.h umbrello-15.08 +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/notewidget.cpp umbrello-15.08.1/umbrello/umlwidgets/notewidget.cpp ---- umbrello-15.08.1.orig/umbrello/umlwidgets/notewidget.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/notewidget.cpp 2015-10-08 11:48:59.509089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/notewidget.cpp umbrello-kf6-15.08.1/umbrello/umlwidgets/notewidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/notewidget.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/notewidget.cpp 2015-10-08 11:48:59.509089026 +0300 @@ -0,0 +1,517 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -41495,7 +41495,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/notewidget.cpp umbrello-15. + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header @@ -42005,9 +42005,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/notewidget.cpp umbrello-15. + } +} + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/notewidget.h umbrello-15.08.1/umbrello/umlwidgets/notewidget.h ---- umbrello-15.08.1.orig/umbrello/umlwidgets/notewidget.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/notewidget.h 2015-10-08 11:48:59.509089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/notewidget.h umbrello-kf6-15.08.1/umbrello/umlwidgets/notewidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/notewidget.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/notewidget.h 2015-10-08 11:48:59.509089026 +0300 @@ -0,0 +1,83 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -42016,7 +42016,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/notewidget.h umbrello-15.08 + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef NOTEWIDGET_H @@ -42031,12 +42031,12 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/notewidget.h umbrello-15.08 +/** + * Displays a note box to allow multiple lines of text to be displayed. + * These widgets are diagram specific. They will still need a unique id -+ * from the @ref UMLDoc class for deletion and other purposes. ++ * from the @ref UMLDoc class for deletion and other purpose-kf6s. + * + * @short Displays a note box. + * @author Paul Hensgen + * @see UMLWidget -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class NoteWidget : public UMLWidget +{ @@ -42092,9 +42092,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/notewidget.h umbrello-15.08 +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/objectnodewidget.cpp umbrello-15.08.1/umbrello/umlwidgets/objectnodewidget.cpp ---- umbrello-15.08.1.orig/umbrello/umlwidgets/objectnodewidget.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/objectnodewidget.cpp 2015-10-08 11:48:59.509089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/objectnodewidget.cpp umbrello-kf6-15.08.1/umbrello/umlwidgets/objectnodewidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/objectnodewidget.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/objectnodewidget.cpp 2015-10-08 11:48:59.509089026 +0300 @@ -0,0 +1,377 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -42103,7 +42103,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/objectnodewidget.cpp umbrel + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header @@ -42469,13 +42469,13 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/objectnodewidget.cpp umbrel + +void ObjectNodeWidget::slotOk() +{ -+ // KDialog::accept(); ++ // kdialog-kf6::accept(); +} + + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/objectnodewidget.h umbrello-15.08.1/umbrello/umlwidgets/objectnodewidget.h ---- umbrello-15.08.1.orig/umbrello/umlwidgets/objectnodewidget.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/objectnodewidget.h 2015-10-08 11:48:59.509089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/objectnodewidget.h umbrello-kf6-15.08.1/umbrello/umlwidgets/objectnodewidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/objectnodewidget.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/objectnodewidget.h 2015-10-08 11:48:59.509089026 +0300 @@ -0,0 +1,76 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -42484,7 +42484,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/objectnodewidget.h umbrello + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef OBJECTNODEWIDGET_H @@ -42502,7 +42502,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/objectnodewidget.h umbrello + * + * @short A graphical version of a UML Activity. + * @author Florence Mattler -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class ObjectNodeWidget : public UMLWidget +{ @@ -42553,9 +42553,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/objectnodewidget.h umbrello +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/objectwidget.cpp umbrello-15.08.1/umbrello/umlwidgets/objectwidget.cpp ---- umbrello-15.08.1.orig/umbrello/umlwidgets/objectwidget.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/objectwidget.cpp 2015-10-08 11:48:59.509089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/objectwidget.cpp umbrello-kf6-15.08.1/umbrello/umlwidgets/objectwidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/objectwidget.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/objectwidget.cpp 2015-10-08 11:48:59.509089026 +0300 @@ -0,0 +1,710 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -42564,7 +42564,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/objectwidget.cpp umbrello-1 + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header file @@ -43267,9 +43267,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/objectwidget.cpp umbrello-1 + return true; +} + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/objectwidget.h umbrello-15.08.1/umbrello/umlwidgets/objectwidget.h ---- umbrello-15.08.1.orig/umbrello/umlwidgets/objectwidget.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/objectwidget.h 2015-10-08 11:48:59.509089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/objectwidget.h umbrello-kf6-15.08.1/umbrello/umlwidgets/objectwidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/objectwidget.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/objectwidget.h 2015-10-08 11:48:59.509089026 +0300 @@ -0,0 +1,115 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -43278,7 +43278,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/objectwidget.h umbrello-15. + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef OBJECTWIDGET_H @@ -43300,7 +43300,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/objectwidget.h umbrello-15. + * @short Displays an instance of a Concept. + * @author Paul Hensgen + * @see UMLWidget -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class ObjectWidget : public UMLWidget +{ @@ -43386,9 +43386,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/objectwidget.h umbrello-15. +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/packagewidget.cpp umbrello-15.08.1/umbrello/umlwidgets/packagewidget.cpp ---- umbrello-15.08.1.orig/umbrello/umlwidgets/packagewidget.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/packagewidget.cpp 2015-10-08 11:48:59.509089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/packagewidget.cpp umbrello-kf6-15.08.1/umbrello/umlwidgets/packagewidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/packagewidget.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/packagewidget.cpp 2015-10-08 11:48:59.509089026 +0300 @@ -0,0 +1,149 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -43397,7 +43397,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/packagewidget.cpp umbrello- + * (at your option) any later version. * + * * + * copyright (C) 2003-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header @@ -43539,9 +43539,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/packagewidget.cpp umbrello- + UMLWidget::saveToXMI(qDoc, conceptElement); + qElement.appendChild(conceptElement); +} -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/packagewidget.h umbrello-15.08.1/umbrello/umlwidgets/packagewidget.h ---- umbrello-15.08.1.orig/umbrello/umlwidgets/packagewidget.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/packagewidget.h 2015-10-08 11:48:59.509089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/packagewidget.h umbrello-kf6-15.08.1/umbrello/umlwidgets/packagewidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/packagewidget.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/packagewidget.h 2015-10-08 11:48:59.509089026 +0300 @@ -0,0 +1,47 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -43550,7 +43550,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/packagewidget.h umbrello-15 + * (at your option) any later version. * + * * + * copyright (C) 2003-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef PACKAGEWIDGET_H @@ -43570,7 +43570,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/packagewidget.h umbrello-15 + * @short A graphical version of a Package. + * @author Jonathan Riddell + * @see UMLWidget -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class PackageWidget : public UMLWidget +{ @@ -43590,9 +43590,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/packagewidget.h umbrello-15 +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/pinportbase.cpp umbrello-15.08.1/umbrello/umlwidgets/pinportbase.cpp ---- umbrello-15.08.1.orig/umbrello/umlwidgets/pinportbase.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/pinportbase.cpp 2015-10-08 11:48:59.509089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/pinportbase.cpp umbrello-kf6-15.08.1/umbrello/umlwidgets/pinportbase.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/pinportbase.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/pinportbase.cpp 2015-10-08 11:48:59.509089026 +0300 @@ -0,0 +1,378 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -43601,7 +43601,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/pinportbase.cpp umbrello-15 + * (at your option) any later version. * + * * + * copyright (C) 2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header @@ -43972,9 +43972,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/pinportbase.cpp umbrello-15 + return true; +} + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/pinportbase.h umbrello-15.08.1/umbrello/umlwidgets/pinportbase.h ---- umbrello-15.08.1.orig/umbrello/umlwidgets/pinportbase.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/pinportbase.h 2015-10-08 11:48:59.509089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/pinportbase.h umbrello-kf6-15.08.1/umbrello/umlwidgets/pinportbase.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/pinportbase.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/pinportbase.h 2015-10-08 11:48:59.509089026 +0300 @@ -0,0 +1,63 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -43983,7 +43983,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/pinportbase.h umbrello-15.0 + * (at your option) any later version. * + * * + * copyright (C) 2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef PINPORTBASE_H @@ -43997,7 +43997,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/pinportbase.h umbrello-15.0 + * @short Abstract base class for PinWidget and PortWidget + * @author Oliver Kellogg + * @see UMLWidget -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class PinPortBase : public UMLWidget +{ @@ -44039,9 +44039,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/pinportbase.h umbrello-15.0 +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/pinwidget.cpp umbrello-15.08.1/umbrello/umlwidgets/pinwidget.cpp ---- umbrello-15.08.1.orig/umbrello/umlwidgets/pinwidget.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/pinwidget.cpp 2015-10-08 11:48:59.509089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/pinwidget.cpp umbrello-kf6-15.08.1/umbrello/umlwidgets/pinwidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/pinwidget.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/pinwidget.cpp 2015-10-08 11:48:59.509089026 +0300 @@ -0,0 +1,103 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -44050,7 +44050,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/pinwidget.cpp umbrello-15.0 + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header @@ -44146,9 +44146,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/pinwidget.cpp umbrello-15.0 + } +} + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/pinwidget.h umbrello-15.08.1/umbrello/umlwidgets/pinwidget.h ---- umbrello-15.08.1.orig/umbrello/umlwidgets/pinwidget.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/pinwidget.h 2015-10-08 11:48:59.509089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/pinwidget.h umbrello-kf6-15.08.1/umbrello/umlwidgets/pinwidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/pinwidget.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/pinwidget.h 2015-10-08 11:48:59.509089026 +0300 @@ -0,0 +1,46 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -44157,7 +44157,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/pinwidget.h umbrello-15.08. + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef PINWIDGET_H @@ -44175,7 +44175,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/pinwidget.h umbrello-15.08. + * + * @short A graphical version of a UML pin. + * @author Hassan KOUCH -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class PinWidget : public PinPortBase +{ @@ -44196,9 +44196,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/pinwidget.h umbrello-15.08. +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/portwidget.cpp umbrello-15.08.1/umbrello/umlwidgets/portwidget.cpp ---- umbrello-15.08.1.orig/umbrello/umlwidgets/portwidget.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/portwidget.cpp 2015-10-08 11:48:59.509089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/portwidget.cpp umbrello-kf6-15.08.1/umbrello/umlwidgets/portwidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/portwidget.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/portwidget.cpp 2015-10-08 11:48:59.509089026 +0300 @@ -0,0 +1,106 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -44207,7 +44207,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/portwidget.cpp umbrello-15. + * (at your option) any later version. * + * * + * copyright (C) 2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header @@ -44306,9 +44306,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/portwidget.cpp umbrello-15. + } +} + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/portwidget.h umbrello-15.08.1/umbrello/umlwidgets/portwidget.h ---- umbrello-15.08.1.orig/umbrello/umlwidgets/portwidget.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/portwidget.h 2015-10-08 11:48:59.509089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/portwidget.h umbrello-kf6-15.08.1/umbrello/umlwidgets/portwidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/portwidget.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/portwidget.h 2015-10-08 11:48:59.509089026 +0300 @@ -0,0 +1,42 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -44317,7 +44317,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/portwidget.h umbrello-15.08 + * (at your option) any later version. * + * * + * copyright (C) 2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef PORTWIDGET_H @@ -44334,7 +44334,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/portwidget.h umbrello-15.08 + * @short A graphical version of a port on a component. + * @author Oliver Kellogg + * @see PinPortBase, UMLWidget -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class PortWidget : public PinPortBase +{ @@ -44352,9 +44352,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/portwidget.h umbrello-15.08 +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/preconditionwidget.cpp umbrello-15.08.1/umbrello/umlwidgets/preconditionwidget.cpp ---- umbrello-15.08.1.orig/umbrello/umlwidgets/preconditionwidget.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/preconditionwidget.cpp 2015-10-08 11:48:59.509089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/preconditionwidget.cpp umbrello-kf6-15.08.1/umbrello/umlwidgets/preconditionwidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/preconditionwidget.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/preconditionwidget.cpp 2015-10-08 11:48:59.509089026 +0300 @@ -0,0 +1,335 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -44363,7 +44363,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/preconditionwidget.cpp umbr + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header @@ -44512,7 +44512,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/preconditionwidget.cpp umbr + */ +bool PreconditionWidget::activate(IDChangeLog * Log /*= 0*/) +{ -+ m_scene->resetPastePoint(); ++ m_scene->resetPastep-kf6oint(); + UMLWidget::activate(Log); + + loadObjectWidget(); @@ -44691,9 +44691,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/preconditionwidget.cpp umbr + } +} + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/preconditionwidget.h umbrello-15.08.1/umbrello/umlwidgets/preconditionwidget.h ---- umbrello-15.08.1.orig/umbrello/umlwidgets/preconditionwidget.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/preconditionwidget.h 2015-10-08 11:48:59.509089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/preconditionwidget.h umbrello-kf6-15.08.1/umbrello/umlwidgets/preconditionwidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/preconditionwidget.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/preconditionwidget.h 2015-10-08 11:48:59.509089026 +0300 @@ -0,0 +1,70 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -44702,7 +44702,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/preconditionwidget.h umbrel + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef PRECONDITIONWIDGET_H @@ -44724,7 +44724,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/preconditionwidget.h umbrel + * + * @author Florence Mattler + * -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class PreconditionWidget : public UMLWidget +{ @@ -44765,9 +44765,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/preconditionwidget.h umbrel +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/regionwidget.cpp umbrello-15.08.1/umbrello/umlwidgets/regionwidget.cpp ---- umbrello-15.08.1.orig/umbrello/umlwidgets/regionwidget.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/regionwidget.cpp 2015-10-08 11:48:59.509089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/regionwidget.cpp umbrello-kf6-15.08.1/umbrello/umlwidgets/regionwidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/regionwidget.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/regionwidget.cpp 2015-10-08 11:48:59.509089026 +0300 @@ -0,0 +1,108 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -44776,7 +44776,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/regionwidget.cpp umbrello-1 + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header @@ -44877,9 +44877,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/regionwidget.cpp umbrello-1 + return true; +} + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/regionwidget.h umbrello-15.08.1/umbrello/umlwidgets/regionwidget.h ---- umbrello-15.08.1.orig/umbrello/umlwidgets/regionwidget.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/regionwidget.h 2015-10-08 11:48:59.509089026 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/regionwidget.h umbrello-kf6-15.08.1/umbrello/umlwidgets/regionwidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/regionwidget.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/regionwidget.h 2015-10-08 11:48:59.509089026 +0300 @@ -0,0 +1,36 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -44888,7 +44888,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/regionwidget.h umbrello-15. + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * +***************************************************************************/ + +#ifndef REGIONWIDGET_H @@ -44917,9 +44917,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/regionwidget.h umbrello-15. +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/seqlinewidget.cpp umbrello-15.08.1/umbrello/umlwidgets/seqlinewidget.cpp ---- umbrello-15.08.1.orig/umbrello/umlwidgets/seqlinewidget.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/seqlinewidget.cpp 2015-10-08 11:48:59.553089025 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/seqlinewidget.cpp umbrello-kf6-15.08.1/umbrello/umlwidgets/seqlinewidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/seqlinewidget.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/seqlinewidget.cpp 2015-10-08 11:48:59.553089025 +0300 @@ -0,0 +1,197 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -44928,7 +44928,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/seqlinewidget.cpp umbrello- + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header @@ -45118,9 +45118,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/seqlinewidget.cpp umbrello- + moveDestructionBox(); + m_scene->resizeSceneToItems(); +} -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/seqlinewidget.h umbrello-15.08.1/umbrello/umlwidgets/seqlinewidget.h ---- umbrello-15.08.1.orig/umbrello/umlwidgets/seqlinewidget.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/seqlinewidget.h 2015-10-08 11:48:59.553089025 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/seqlinewidget.h umbrello-kf6-15.08.1/umbrello/umlwidgets/seqlinewidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/seqlinewidget.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/seqlinewidget.h 2015-10-08 11:48:59.553089025 +0300 @@ -0,0 +1,86 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -45129,7 +45129,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/seqlinewidget.h umbrello-15 + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef SEQLINEWIDGET_H @@ -45143,7 +45143,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/seqlinewidget.h umbrello-15 +/** + * @short Widget class for graphical representation of sequence lines + * @author Paul Hensgen -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class SeqLineWidget : public QGraphicsLineItem +{ @@ -45208,9 +45208,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/seqlinewidget.h umbrello-15 +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/signalwidget.cpp umbrello-15.08.1/umbrello/umlwidgets/signalwidget.cpp ---- umbrello-15.08.1.orig/umbrello/umlwidgets/signalwidget.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/signalwidget.cpp 2015-10-08 11:48:59.553089025 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/signalwidget.cpp umbrello-kf6-15.08.1/umbrello/umlwidgets/signalwidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/signalwidget.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/signalwidget.cpp 2015-10-08 11:48:59.553089025 +0300 @@ -0,0 +1,386 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -45219,7 +45219,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/signalwidget.cpp umbrello-1 + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header @@ -45485,7 +45485,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/signalwidget.cpp umbrello-1 + UMLWidget *flotext = m_scene -> findWidget(textId); + if (flotext != NULL) { + // This only happens when loading files produced by -+ // umbrello-1.3-beta2. ++ // umbrello-kf6-1.3-beta2. + m_pName = static_cast(flotext); + return true; + } @@ -45598,9 +45598,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/signalwidget.cpp umbrello-1 + m_pName = 0; +} + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/signalwidget.h umbrello-15.08.1/umbrello/umlwidgets/signalwidget.h ---- umbrello-15.08.1.orig/umbrello/umlwidgets/signalwidget.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/signalwidget.h 2015-10-08 11:48:59.553089025 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/signalwidget.h umbrello-kf6-15.08.1/umbrello/umlwidgets/signalwidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/signalwidget.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/signalwidget.h 2015-10-08 11:48:59.553089025 +0300 @@ -0,0 +1,86 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -45609,7 +45609,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/signalwidget.h umbrello-15. + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * +***************************************************************************/ + +#ifndef SIGNALWIDGET_H @@ -45688,9 +45688,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/signalwidget.h umbrello-15. +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/statewidget.cpp umbrello-15.08.1/umbrello/umlwidgets/statewidget.cpp ---- umbrello-15.08.1.orig/umbrello/umlwidgets/statewidget.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/statewidget.cpp 2015-10-08 11:48:59.553089025 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/statewidget.cpp umbrello-kf6-15.08.1/umbrello/umlwidgets/statewidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/statewidget.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/statewidget.cpp 2015-10-08 11:48:59.553089025 +0300 @@ -0,0 +1,534 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -45699,7 +45699,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/statewidget.cpp umbrello-15 + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header @@ -46226,9 +46226,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/statewidget.cpp umbrello-15 + } +} + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/statewidget.h umbrello-15.08.1/umbrello/umlwidgets/statewidget.h ---- umbrello-15.08.1.orig/umbrello/umlwidgets/statewidget.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/statewidget.h 2015-10-08 11:48:59.553089025 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/statewidget.h umbrello-kf6-15.08.1/umbrello/umlwidgets/statewidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/statewidget.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/statewidget.h 2015-10-08 11:48:59.553089025 +0300 @@ -0,0 +1,99 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -46237,7 +46237,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/statewidget.h umbrello-15.0 + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * +***************************************************************************/ + +#ifndef STATEWIDGET_H @@ -46265,7 +46265,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/statewidget.h umbrello-15.0 + * + * @short A graphical version of a UML State. + * @author Paul Hensgen -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class StateWidget : public UMLWidget +{ @@ -46329,13 +46329,13 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/statewidget.h umbrello-15.0 +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/statusbartoolbutton.cpp umbrello-15.08.1/umbrello/umlwidgets/statusbartoolbutton.cpp ---- umbrello-15.08.1.orig/umbrello/umlwidgets/statusbartoolbutton.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/statusbartoolbutton.cpp 2015-10-08 11:48:59.553089025 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/statusbartoolbutton.cpp umbrello-kf6-15.08.1/umbrello/umlwidgets/statusbartoolbutton.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/statusbartoolbutton.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/statusbartoolbutton.cpp 2015-10-08 11:48:59.553089025 +0300 @@ -0,0 +1,122 @@ +// vim: set tabstop=4 shiftwidth=4 noexpandtab: +/* -+Widget taken from Gwenview ++Widget taken from gwenview-kf6 +Copyright 2007 Aurélien Gâteau + +This program is free software; you can redistribute it and/or @@ -46345,7 +46345,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/statusbartoolbutton.cpp umb + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of -+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++MERCHANTABILITY or FITNESS FOR A PARTICULAR purpose-kf6. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License @@ -46455,13 +46455,13 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/statusbartoolbutton.cpp umb + setToolTip(i18nc("@info:tooltip of custom toolbar button", "%1", action->toolTip())); + } +} -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/statusbartoolbutton.h umbrello-15.08.1/umbrello/umlwidgets/statusbartoolbutton.h ---- umbrello-15.08.1.orig/umbrello/umlwidgets/statusbartoolbutton.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/statusbartoolbutton.h 2015-10-08 11:48:59.553089025 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/statusbartoolbutton.h umbrello-kf6-15.08.1/umbrello/umlwidgets/statusbartoolbutton.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/statusbartoolbutton.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/statusbartoolbutton.h 2015-10-08 11:48:59.553089025 +0300 @@ -0,0 +1,58 @@ +// vim: set tabstop=4 shiftwidth=4 noexpandtab: +/* -+Gwenview: an image viewer ++gwenview-kf6: an image viewer +Copyright 2007 Aurélien Gâteau + +This program is free software; you can redistribute it and/or @@ -46471,7 +46471,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/statusbartoolbutton.h umbre + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of -+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++MERCHANTABILITY or FITNESS FOR A PARTICULAR purpose-kf6. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License @@ -46486,7 +46486,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/statusbartoolbutton.h umbre +#include + +/** -+ * A thin tool button which can be grouped with another and look like one solid ++ * A thin tool button which can be grouped with another and look like one solid-kf6 + * bar: + * + * (button1 | button2) @@ -46517,9 +46517,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/statusbartoolbutton.h umbre +}; + +#endif /* STATUSBARTOOLBUTTON_H */ -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/toolbarstateonewidget.cpp umbrello-15.08.1/umbrello/umlwidgets/toolbarstateonewidget.cpp ---- umbrello-15.08.1.orig/umbrello/umlwidgets/toolbarstateonewidget.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/toolbarstateonewidget.cpp 2015-10-08 11:48:59.553089025 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/toolbarstateonewidget.cpp umbrello-kf6-15.08.1/umbrello/umlwidgets/toolbarstateonewidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/toolbarstateonewidget.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/toolbarstateonewidget.cpp 2015-10-08 11:48:59.553089025 +0300 @@ -0,0 +1,249 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -46528,7 +46528,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/toolbarstateonewidget.cpp u + * (at your option) any later version. * + * * + * copyright (C) 2004-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header @@ -46770,9 +46770,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/toolbarstateonewidget.cpp u + ToolBarStatePool::init(); +} + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/toolbarstateonewidget.h umbrello-15.08.1/umbrello/umlwidgets/toolbarstateonewidget.h ---- umbrello-15.08.1.orig/umbrello/umlwidgets/toolbarstateonewidget.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/toolbarstateonewidget.h 2015-10-08 11:48:59.553089025 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/toolbarstateonewidget.h umbrello-kf6-15.08.1/umbrello/umlwidgets/toolbarstateonewidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/toolbarstateonewidget.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/toolbarstateonewidget.h 2015-10-08 11:48:59.553089025 +0300 @@ -0,0 +1,59 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -46781,7 +46781,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/toolbarstateonewidget.h umb + * (at your option) any later version. * + * * + * copyright (C) 2004-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef TOOLBARSTATEONEWIDGET_H @@ -46833,9 +46833,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/toolbarstateonewidget.h umb +}; + +#endif //TOOLBARSTATEONEWIDGET_H -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/umlwidget.cpp umbrello-15.08.1/umbrello/umlwidgets/umlwidget.cpp ---- umbrello-15.08.1.orig/umbrello/umlwidgets/umlwidget.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/umlwidget.cpp 2015-10-08 11:48:59.553089025 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/umlwidget.cpp umbrello-kf6-15.08.1/umbrello/umlwidgets/umlwidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/umlwidget.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/umlwidget.cpp 2015-10-08 11:48:59.553089025 +0300 @@ -0,0 +1,1859 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -46844,7 +46844,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/umlwidget.cpp umbrello-15.0 + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#include "umlwidget.h" @@ -47829,7 +47829,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/umlwidget.cpp umbrello-15.0 + updateGeometry(); + if (m_scene->getPaste()) { + FloatingTextWidget * ft = 0; -+ QPointF point = m_scene->getPastePoint(); ++ QPointF point = m_scene->getPastep-kf6oint(); + int x = point.x() + this->x(); + int y = point.y() + this->y(); + if (m_scene->type() == Uml::DiagramType::Sequence) { @@ -47865,7 +47865,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/umlwidget.cpp umbrello-15.0 + setX(x); + setY(y); + } -+ }//end if pastepoint ++ }//end if pastep-kf6oint + else { + setX(this->x()); + setY(this->y()); @@ -48696,9 +48696,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/umlwidget.cpp umbrello-15.0 + return true; +} + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/umlwidget.h umbrello-15.08.1/umbrello/umlwidgets/umlwidget.h ---- umbrello-15.08.1.orig/umbrello/umlwidgets/umlwidget.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/umlwidget.h 2015-10-08 11:48:59.553089025 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/umlwidget.h umbrello-kf6-15.08.1/umbrello/umlwidgets/umlwidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/umlwidget.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/umlwidget.h 2015-10-08 11:48:59.553089025 +0300 @@ -0,0 +1,347 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -48707,7 +48707,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/umlwidget.h umbrello-15.08. + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef UMLWIDGET_H @@ -48735,7 +48735,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/umlwidget.h umbrello-15.08. + * + * @short The base class for graphical UML objects. + * @author Paul Hensgen -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class UMLWidget : public WidgetBase +{ @@ -49047,9 +49047,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/umlwidget.h umbrello-15.08. + +}; +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/usecasewidget.cpp umbrello-15.08.1/umbrello/umlwidgets/usecasewidget.cpp ---- umbrello-15.08.1.orig/umbrello/umlwidgets/usecasewidget.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/usecasewidget.cpp 2015-10-08 11:48:59.553089025 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/usecasewidget.cpp umbrello-kf6-15.08.1/umbrello/umlwidgets/usecasewidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/usecasewidget.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/usecasewidget.cpp 2015-10-08 11:48:59.553089025 +0300 @@ -0,0 +1,96 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -49058,7 +49058,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/usecasewidget.cpp umbrello- + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header file @@ -49147,9 +49147,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/usecasewidget.cpp umbrello- + + return QSizeF(width, height); +} -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/usecasewidget.h umbrello-15.08.1/umbrello/umlwidgets/usecasewidget.h ---- umbrello-15.08.1.orig/umbrello/umlwidgets/usecasewidget.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/usecasewidget.h 2015-10-08 11:48:59.553089025 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/usecasewidget.h umbrello-kf6-15.08.1/umbrello/umlwidgets/usecasewidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/usecasewidget.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/usecasewidget.h 2015-10-08 11:48:59.553089025 +0300 @@ -0,0 +1,58 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -49158,7 +49158,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/usecasewidget.h umbrello-15 + * (at your option) any later version. * + * * + * copyright (C) 2002-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef USECASEWIDGET_H @@ -49190,7 +49190,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/usecasewidget.h umbrello-15 + * + * @short A graphical version of a UMLUseCase. + * @author Paul Hensgen -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class UseCaseWidget : public UMLWidget +{ @@ -49209,9 +49209,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/usecasewidget.h umbrello-15 +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/widgetbase.cpp umbrello-15.08.1/umbrello/umlwidgets/widgetbase.cpp ---- umbrello-15.08.1.orig/umbrello/umlwidgets/widgetbase.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/widgetbase.cpp 2015-10-08 11:48:59.553089025 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/widgetbase.cpp umbrello-kf6-15.08.1/umbrello/umlwidgets/widgetbase.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/widgetbase.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/widgetbase.cpp 2015-10-08 11:48:59.553089025 +0300 @@ -0,0 +1,1119 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -49220,7 +49220,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/widgetbase.cpp umbrello-15. + * (at your option) any later version. * + * * + * copyright (C) 2004-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#include "widgetbase.h" @@ -49740,7 +49740,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/widgetbase.cpp umbrello-15. +{ + // first load from "linecolour" and then overwrite with the "linecolor" + // attribute if that one is present. The "linecolour" name was a "typo" in -+ // earlier versions of Umbrello ++ // earlier versions of umbrello-kf6 + QString lineColor = qElement.attribute(QLatin1String("linecolour"), QLatin1String("none")); + lineColor = qElement.attribute(QLatin1String("linecolor"), lineColor); + if (lineColor != QLatin1String("none")) { @@ -50332,9 +50332,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/widgetbase.cpp umbrello-15. + return name; +} + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/widgetbase.h umbrello-15.08.1/umbrello/umlwidgets/widgetbase.h ---- umbrello-15.08.1.orig/umbrello/umlwidgets/widgetbase.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/widgetbase.h 2015-10-08 11:48:59.553089025 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/widgetbase.h umbrello-kf6-15.08.1/umbrello/umlwidgets/widgetbase.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/widgetbase.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/widgetbase.h 2015-10-08 11:48:59.553089025 +0300 @@ -0,0 +1,192 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -50343,7 +50343,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/widgetbase.h umbrello-15.08 + * (at your option) any later version. * + * * + * copyright (C) 2004-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef WIDGETBASE_H @@ -50368,7 +50368,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/widgetbase.h umbrello-15.08 +/** + * @short Common base class for UMLWidget and AssociationWidget + * @author Oliver Kellogg -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +class WidgetBase : public QGraphicsObject +{ @@ -50528,9 +50528,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/widgetbase.h umbrello-15.08 +}; + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/widget_factory.cpp umbrello-15.08.1/umbrello/umlwidgets/widget_factory.cpp ---- umbrello-15.08.1.orig/umbrello/umlwidgets/widget_factory.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/widget_factory.cpp 2015-10-08 11:48:59.553089025 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/widget_factory.cpp umbrello-kf6-15.08.1/umbrello/umlwidgets/widget_factory.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/widget_factory.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/widget_factory.cpp 2015-10-08 11:48:59.553089025 +0300 @@ -0,0 +1,298 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -50539,7 +50539,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/widget_factory.cpp umbrello + * (at your option) any later version. * + * * + * copyright (C) 2006-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header @@ -50830,9 +50830,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/widget_factory.cpp umbrello + +} // end namespace Widget_Factory + -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/widget_factory.h umbrello-15.08.1/umbrello/umlwidgets/widget_factory.h ---- umbrello-15.08.1.orig/umbrello/umlwidgets/widget_factory.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/widget_factory.h 2015-10-08 11:48:59.553089025 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/widget_factory.h umbrello-kf6-15.08.1/umbrello/umlwidgets/widget_factory.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/widget_factory.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/widget_factory.h 2015-10-08 11:48:59.553089025 +0300 @@ -0,0 +1,34 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -50841,7 +50841,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/widget_factory.h umbrello-1 + * (at your option) any later version. * + * * + * copyright (C) 2006-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef WIDGET_FACTORY_H @@ -50856,7 +50856,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/widget_factory.h umbrello-1 + +/** + * Widget factory methods. -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +namespace Widget_Factory { + @@ -50868,9 +50868,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/widget_factory.h umbrello-1 +} // end namespace Widget_Factory + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/widgetlist_utils.cpp umbrello-15.08.1/umbrello/umlwidgets/widgetlist_utils.cpp ---- umbrello-15.08.1.orig/umbrello/umlwidgets/widgetlist_utils.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/widgetlist_utils.cpp 2015-10-08 11:48:59.553089025 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/widgetlist_utils.cpp umbrello-kf6-15.08.1/umbrello/umlwidgets/widgetlist_utils.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/widgetlist_utils.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/widgetlist_utils.cpp 2015-10-08 11:48:59.553089025 +0300 @@ -0,0 +1,157 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -50879,7 +50879,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/widgetlist_utils.cpp umbrel + * (at your option) any later version. * + * * + * copyright (C) 2009-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header @@ -51029,9 +51029,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/widgetlist_utils.cpp umbrel +} + +} // namespace WidgetList_Utils -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/widgetlist_utils.h umbrello-15.08.1/umbrello/umlwidgets/widgetlist_utils.h ---- umbrello-15.08.1.orig/umbrello/umlwidgets/widgetlist_utils.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/widgetlist_utils.h 2015-10-08 11:48:59.553089025 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/widgetlist_utils.h umbrello-kf6-15.08.1/umbrello/umlwidgets/widgetlist_utils.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/widgetlist_utils.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/widgetlist_utils.h 2015-10-08 11:48:59.553089025 +0300 @@ -0,0 +1,30 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -51040,7 +51040,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/widgetlist_utils.h umbrello + * (at your option) any later version. * + * * + * copyright (C) 2009-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef WIDGETLIST_UTILS_H @@ -51049,8 +51049,8 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/widgetlist_utils.h umbrello +#include "umlwidgetlist.h" + +/** -+ * General purpose widget list utilities. -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * General purpose-kf6 widget list utilities. ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +namespace WidgetList_Utils +{ @@ -51063,9 +51063,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/widgetlist_utils.h umbrello +} // namespace WidgetList_Utils + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/widget_utils.cpp umbrello-15.08.1/umbrello/umlwidgets/widget_utils.cpp ---- umbrello-15.08.1.orig/umbrello/umlwidgets/widget_utils.cpp 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/widget_utils.cpp 2015-10-08 11:48:59.553089025 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/widget_utils.cpp umbrello-kf6-15.08.1/umbrello/umlwidgets/widget_utils.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/widget_utils.cpp 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/widget_utils.cpp 2015-10-08 11:48:59.553089025 +0300 @@ -0,0 +1,827 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -51074,7 +51074,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/widget_utils.cpp umbrello-1 + * (at your option) any later version. * + * * + * copyright (C) 2004-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +// own header @@ -51221,11 +51221,11 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/widget_utils.cpp umbrello-1 +// * param headPos The position where the head of the arrow should lie. +// * param arrowSize This indicates the size of the arrow head. +// * param arrowType This indicates direction of arrow as in LeftArrow, RightArrow.. -+// * param solid If true, a solid head is drawn. Otherwise 2 lines are drawn. ++// * param solid-kf6 If true, a solid-kf6 head is drawn. Otherwise 2 lines are drawn. +// */ +// void drawArrowHead(QPainter *painter, const QPointF &arrowPos, +// const QSizeF& arrowSize, Qt::ArrowType arrowType, -+// bool solid) ++// bool solid-kf6) +// { +// QPolygonF poly; +// if (arrowType == Qt::LeftArrow) { @@ -51239,7 +51239,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/widget_utils.cpp umbrello-1 +// << QPointF(arrowPos.x() - arrowSize.width(), arrowPos.y() + .5 * arrowSize.height()); +// } + -+// if (solid) { ++// if (solid-kf6) { +// painter->drawPolygon(poly); +// } +// else { @@ -51894,9 +51894,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/widget_utils.cpp umbrello-1 + } + +} // namespace Widget_Utils -diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/widget_utils.h umbrello-15.08.1/umbrello/umlwidgets/widget_utils.h ---- umbrello-15.08.1.orig/umbrello/umlwidgets/widget_utils.h 1970-01-01 02:00:00.000000000 +0200 -+++ umbrello-15.08.1/umbrello/umlwidgets/widget_utils.h 2015-10-08 11:48:59.553089025 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/widget_utils.h umbrello-kf6-15.08.1/umbrello/umlwidgets/widget_utils.h +--- umbrello-kf6-15.08.1.orig/umbrello/umlwidgets/widget_utils.h 1970-01-01 02:00:00.000000000 +0200 ++++ umbrello-kf6-15.08.1/umbrello/umlwidgets/widget_utils.h 2015-10-08 11:48:59.553089025 +0300 @@ -0,0 +1,66 @@ +/*************************************************************************** + * This program is free software; you can redistribute it and/or modify * @@ -51905,7 +51905,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/widget_utils.h umbrello-15. + * (at your option) any later version. * + * * + * copyright (C) 2004-2014 * -+ * Umbrello UML Modeller Authors * ++ * umbrello-kf6 UML Modeller Authors * + ***************************************************************************/ + +#ifndef WIDGET_UTILS_H @@ -51925,8 +51925,8 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/widget_utils.h umbrello-15. +class QGraphicsRectItem; + +/** -+ * General purpose widget utilities. -+ * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org ++ * General purpose-kf6 widget utilities. ++ * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org + */ +namespace Widget_Utils +{ @@ -51940,7 +51940,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/widget_utils.h umbrello-15. + void drawTriangledRect(QPainter *painter, const QRectF& rect, const QSizeF& triSize); +// void drawArrowHead(QPainter *painter, const QPointF& arrowPos, +// const QSizeF& arrowSize, Qt::ArrowType arrowType, -+// bool solid = false); ++// bool solid-kf6 = false); +// void drawRoundedRect(QPainter *painter, const QRectF& rect, qreal xRadius, +// qreal yRadius, Uml::Corners corners); + @@ -51964,9 +51964,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/umlwidgets/widget_utils.h umbrello-15. +} + +#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/uniqueconstraint.cpp umbrello-15.08.1/umbrello/uniqueconstraint.cpp ---- umbrello-15.08.1.orig/umbrello/uniqueconstraint.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/uniqueconstraint.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/uniqueconstraint.cpp umbrello-kf6-15.08.1/umbrello/uniqueconstraint.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/uniqueconstraint.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/uniqueconstraint.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,325 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -51975,7 +51975,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/uniqueconstraint.cpp umbrello-15.08.1/ - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -//own header @@ -52293,9 +52293,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/uniqueconstraint.cpp umbrello-15.08.1/ - m_EntityAttributeList.clear(); -} - -diff -Nuar umbrello-15.08.1.orig/umbrello/uniqueconstraint.h umbrello-15.08.1/umbrello/uniqueconstraint.h ---- umbrello-15.08.1.orig/umbrello/uniqueconstraint.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/uniqueconstraint.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/uniqueconstraint.h umbrello-kf6-15.08.1/umbrello/uniqueconstraint.h +--- umbrello-kf6-15.08.1.orig/umbrello/uniqueconstraint.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/uniqueconstraint.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,77 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -52304,7 +52304,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/uniqueconstraint.h umbrello-15.08.1/um - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef UNIQUECONSTRAINT_H @@ -52322,7 +52322,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/uniqueconstraint.h umbrello-15.08.1/um - * @short Sets up Unique entity constraint information. - * @author Sharan Rao - * @see UMLObject UMLClassifierListItem UMLEntityConstraint -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class UMLUniqueConstraint : public UMLEntityConstraint -{ @@ -52374,9 +52374,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/uniqueconstraint.h umbrello-15.08.1/um -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/usecase.cpp umbrello-15.08.1/umbrello/usecase.cpp ---- umbrello-15.08.1.orig/umbrello/usecase.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/usecase.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/usecase.cpp umbrello-kf6-15.08.1/umbrello/usecase.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/usecase.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/usecase.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,67 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -52385,7 +52385,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/usecase.cpp umbrello-15.08.1/umbrello/ - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#include "usecase.h" @@ -52445,9 +52445,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/usecase.cpp umbrello-15.08.1/umbrello/ -} - - -diff -Nuar umbrello-15.08.1.orig/umbrello/usecase.h umbrello-15.08.1/umbrello/usecase.h ---- umbrello-15.08.1.orig/umbrello/usecase.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/usecase.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/usecase.h umbrello-kf6-15.08.1/umbrello/usecase.h +--- umbrello-kf6-15.08.1.orig/umbrello/usecase.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/usecase.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,40 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -52456,7 +52456,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/usecase.h umbrello-15.08.1/umbrello/us - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef USECASE_H @@ -52470,7 +52470,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/usecase.h umbrello-15.08.1/umbrello/us - * - * @short Information for a non-graphical UML UseCase. - * @author Paul Hensgen -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class UMLUseCase : public UMLCanvasObject -{ @@ -52489,9 +52489,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/usecase.h umbrello-15.08.1/umbrello/us -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/activitywidget.cpp umbrello-15.08.1/umbrello/widgets/activitywidget.cpp ---- umbrello-15.08.1.orig/umbrello/widgets/activitywidget.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/activitywidget.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/activitywidget.cpp umbrello-kf6-15.08.1/umbrello/widgets/activitywidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/activitywidget.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/activitywidget.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,457 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -52500,7 +52500,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/activitywidget.cpp umbrello-15 - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header @@ -52950,9 +52950,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/activitywidget.cpp umbrello-15 -} - - -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/activitywidget.h umbrello-15.08.1/umbrello/widgets/activitywidget.h ---- umbrello-15.08.1.orig/umbrello/widgets/activitywidget.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/activitywidget.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/activitywidget.h umbrello-kf6-15.08.1/umbrello/widgets/activitywidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/activitywidget.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/activitywidget.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,98 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -52961,7 +52961,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/activitywidget.h umbrello-15.0 - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef ACTIVITYWIDGET_H @@ -52984,7 +52984,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/activitywidget.h umbrello-15.0 - * - * @short A graphical version of a UML Activity. - * @author Paul Hensgen -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class ActivityWidget : public UMLWidget -{ @@ -53052,9 +53052,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/activitywidget.h umbrello-15.0 -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/actorwidget.cpp umbrello-15.08.1/umbrello/widgets/actorwidget.cpp ---- umbrello-15.08.1.orig/umbrello/widgets/actorwidget.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/actorwidget.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/actorwidget.cpp umbrello-kf6-15.08.1/umbrello/widgets/actorwidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/actorwidget.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/actorwidget.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,104 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -53063,7 +53063,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/actorwidget.cpp umbrello-15.08 - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header file @@ -53160,9 +53160,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/actorwidget.cpp umbrello-15.08 -} - - -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/actorwidget.h umbrello-15.08.1/umbrello/widgets/actorwidget.h ---- umbrello-15.08.1.orig/umbrello/widgets/actorwidget.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/actorwidget.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/actorwidget.h umbrello-kf6-15.08.1/umbrello/widgets/actorwidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/actorwidget.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/actorwidget.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,55 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -53171,7 +53171,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/actorwidget.h umbrello-15.08.1 - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef ACTORWIDGET_H @@ -53202,7 +53202,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/actorwidget.h umbrello-15.08.1 - * @author Paul Hensgen - * @see UMLWidget - * @see UMLView -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class ActorWidget : public UMLWidget -{ @@ -53219,9 +53219,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/actorwidget.h umbrello-15.08.1 -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/artifactwidget.cpp umbrello-15.08.1/umbrello/widgets/artifactwidget.cpp ---- umbrello-15.08.1.orig/umbrello/widgets/artifactwidget.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/artifactwidget.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/artifactwidget.cpp umbrello-kf6-15.08.1/umbrello/widgets/artifactwidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/artifactwidget.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/artifactwidget.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,293 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -53230,7 +53230,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/artifactwidget.cpp umbrello-15 - * (at your option) any later version. * - * * - * copyright (C) 2003-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header @@ -53516,9 +53516,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/artifactwidget.cpp umbrello-15 - UMLWidget::paint(painter, option); -} - -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/artifactwidget.h umbrello-15.08.1/umbrello/widgets/artifactwidget.h ---- umbrello-15.08.1.orig/umbrello/widgets/artifactwidget.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/artifactwidget.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/artifactwidget.h umbrello-kf6-15.08.1/umbrello/widgets/artifactwidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/artifactwidget.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/artifactwidget.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,55 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -53527,7 +53527,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/artifactwidget.h umbrello-15.0 - * (at your option) any later version. * - * * - * copyright (C) 2003-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef ARTIFACTWIDGET_H @@ -53547,7 +53547,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/artifactwidget.h umbrello-15.0 - * @short A graphical version of a Artifact. - * @author Jonathan Riddell - * @see UMLWidget -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class ArtifactWidget : public UMLWidget -{ @@ -53575,9 +53575,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/artifactwidget.h umbrello-15.0 -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/associationline.cpp umbrello-15.08.1/umbrello/widgets/associationline.cpp ---- umbrello-15.08.1.orig/umbrello/widgets/associationline.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/associationline.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/associationline.cpp umbrello-kf6-15.08.1/umbrello/widgets/associationline.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/associationline.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/associationline.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,1404 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -53586,7 +53586,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/associationline.cpp umbrello-1 - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header @@ -53955,7 +53955,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/associationline.cpp umbrello-1 - */ -QBrush AssociationLine::brush() const -{ -- QBrush brush(Qt::SolidPattern); +- QBrush brush(Qt::solid-kf6Pattern); - Uml::AssociationType::Enum type = m_associationWidget->associationType(); - if (type == Uml::AssociationType::Aggregation || - type == Uml::AssociationType::Generalization || @@ -53975,7 +53975,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/associationline.cpp umbrello-1 -{ - QPen pen(m_associationWidget->lineColor(), - m_associationWidget->lineWidth(), -- Qt::SolidLine, +- Qt::solid-kf6Line, - Qt::RoundCap, - Qt::RoundJoin); - Uml::AssociationType::Enum type = m_associationWidget->associationType(); @@ -54963,7 +54963,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/associationline.cpp umbrello-1 - prepareGeometryChange(); - m_pen = pen; - if (m_symbolType == ClosedArrow) -- m_pen.setStyle(Qt::SolidLine); +- m_pen.setStyle(Qt::solid-kf6Line); -} - -/** @@ -54983,9 +54983,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/associationline.cpp umbrello-1 - update(); -} - -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/associationline.h umbrello-15.08.1/umbrello/widgets/associationline.h ---- umbrello-15.08.1.orig/umbrello/widgets/associationline.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/associationline.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/associationline.h umbrello-kf6-15.08.1/umbrello/widgets/associationline.h +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/associationline.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/associationline.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,207 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -54994,7 +54994,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/associationline.h umbrello-15. - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef ASSOCIATIONLINE_H @@ -55194,9 +55194,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/associationline.h umbrello-15. -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/associationwidget.cpp umbrello-15.08.1/umbrello/widgets/associationwidget.cpp ---- umbrello-15.08.1.orig/umbrello/widgets/associationwidget.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/associationwidget.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/associationwidget.cpp umbrello-kf6-15.08.1/umbrello/widgets/associationwidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/associationwidget.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/associationwidget.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,4407 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -55205,7 +55205,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/associationwidget.cpp umbrello - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header @@ -56373,7 +56373,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/associationwidget.cpp umbrello -} - -/** -- * For internal purposes only. +- * For internal purpose-kf6s only. - * Other classes/users should use setChangeability() instead. - */ -void AssociationWidget::setChangeWidget(const QString &strChangeWidget, Uml::RoleType::Enum role) @@ -59605,9 +59605,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/associationwidget.cpp umbrello - } -} - -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/associationwidget.h umbrello-15.08.1/umbrello/widgets/associationwidget.h ---- umbrello-15.08.1.orig/umbrello/widgets/associationwidget.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/associationwidget.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/associationwidget.h umbrello-kf6-15.08.1/umbrello/widgets/associationwidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/associationwidget.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/associationwidget.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,328 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -59616,7 +59616,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/associationwidget.h umbrello-1 - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef ASSOCIATIONWIDGET_H @@ -59656,7 +59656,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/associationwidget.h umbrello-1 - * @author Gustavo Madrigal - * @author Gopala Krishna - * @short This class represents an association inside a diagram. -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class AssociationWidget : public WidgetBase, public LinkWidget -{ @@ -59937,9 +59937,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/associationwidget.h umbrello-1 -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/boxwidget.cpp umbrello-15.08.1/umbrello/widgets/boxwidget.cpp ---- umbrello-15.08.1.orig/umbrello/widgets/boxwidget.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/boxwidget.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/boxwidget.cpp umbrello-kf6-15.08.1/umbrello/widgets/boxwidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/boxwidget.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/boxwidget.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,79 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -59948,7 +59948,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/boxwidget.cpp umbrello-15.08.1 - * (at your option) any later version. * - * * - * copyright (C) 2003-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header @@ -60020,9 +60020,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/boxwidget.cpp umbrello-15.08.1 - umlDoc()->setModified(true); - } -} -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/boxwidget.h umbrello-15.08.1/umbrello/widgets/boxwidget.h ---- umbrello-15.08.1.orig/umbrello/widgets/boxwidget.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/boxwidget.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/boxwidget.h umbrello-kf6-15.08.1/umbrello/widgets/boxwidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/boxwidget.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/boxwidget.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,39 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -60031,7 +60031,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/boxwidget.h umbrello-15.08.1/u - * (at your option) any later version. * - * * - * copyright (C) 2003-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef BOXWIDGET_H @@ -60043,12 +60043,12 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/boxwidget.h umbrello-15.08.1/u -/** - * Displays a rectangular box. - * These widgets are diagram specific. They will still need a unique id -- * from the @ref UMLDoc class for deletion and other purposes. +- * from the @ref UMLDoc class for deletion and other purpose-kf6s. - * - * @short Displays a box. - * @author Jonathan Riddell - * @see UMLWidget -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class BoxWidget : public UMLWidget -{ @@ -60063,9 +60063,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/boxwidget.h umbrello-15.08.1/u -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/categorywidget.cpp umbrello-15.08.1/umbrello/widgets/categorywidget.cpp ---- umbrello-15.08.1.orig/umbrello/widgets/categorywidget.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/categorywidget.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/categorywidget.cpp umbrello-kf6-15.08.1/umbrello/widgets/categorywidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/categorywidget.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/categorywidget.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,148 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -60074,7 +60074,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/categorywidget.cpp umbrello-15 - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header file @@ -60215,9 +60215,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/categorywidget.cpp umbrello-15 - } -} - -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/categorywidget.h umbrello-15.08.1/umbrello/widgets/categorywidget.h ---- umbrello-15.08.1.orig/umbrello/widgets/categorywidget.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/categorywidget.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/categorywidget.h umbrello-kf6-15.08.1/umbrello/widgets/categorywidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/categorywidget.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/categorywidget.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,56 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -60226,7 +60226,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/categorywidget.h umbrello-15.0 - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef CATEGORYWIDGET_H @@ -60252,7 +60252,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/categorywidget.h umbrello-15.0 - * - * @short A graphical version of a UMLCategory. - * @author Sharan Rao -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class CategoryWidget : public UMLWidget -{ @@ -60275,9 +60275,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/categorywidget.h umbrello-15.0 -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/classifierwidget.cpp umbrello-15.08.1/umbrello/widgets/classifierwidget.cpp ---- umbrello-15.08.1.orig/umbrello/widgets/classifierwidget.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/classifierwidget.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/classifierwidget.cpp umbrello-kf6-15.08.1/umbrello/widgets/classifierwidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/classifierwidget.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/classifierwidget.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,1420 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -60286,7 +60286,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/classifierwidget.cpp umbrello- - * (at your option) any later version. * - * * - * copyright (C) 2004-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header @@ -61699,9 +61699,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/classifierwidget.cpp umbrello- - setVisualProperty(ShowOperations, state); -} - -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/classifierwidget.h umbrello-15.08.1/umbrello/widgets/classifierwidget.h ---- umbrello-15.08.1.orig/umbrello/widgets/classifierwidget.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/classifierwidget.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/classifierwidget.h umbrello-kf6-15.08.1/umbrello/widgets/classifierwidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/classifierwidget.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/classifierwidget.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,146 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -61710,7 +61710,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/classifierwidget.h umbrello-15 - * (at your option) any later version. * - * * - * copyright (C) 2004-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef CLASSIFIERWIDGET_H @@ -61732,7 +61732,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/classifierwidget.h umbrello-15 - * @author Gopala Krishna - * - * @see UMLWidget -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class ClassifierWidget : public UMLWidget -{ @@ -61849,9 +61849,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/classifierwidget.h umbrello-15 -Q_DECLARE_OPERATORS_FOR_FLAGS(ClassifierWidget::VisualProperties) - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/combinedfragmentwidget.cpp umbrello-15.08.1/umbrello/widgets/combinedfragmentwidget.cpp ---- umbrello-15.08.1.orig/umbrello/widgets/combinedfragmentwidget.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/combinedfragmentwidget.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/combinedfragmentwidget.cpp umbrello-kf6-15.08.1/umbrello/widgets/combinedfragmentwidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/combinedfragmentwidget.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/combinedfragmentwidget.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,477 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -61860,7 +61860,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/combinedfragmentwidget.cpp umb - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header @@ -62330,9 +62330,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/combinedfragmentwidget.cpp umb - } -} - -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/combinedfragmentwidget.h umbrello-15.08.1/umbrello/widgets/combinedfragmentwidget.h ---- umbrello-15.08.1.orig/umbrello/widgets/combinedfragmentwidget.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/combinedfragmentwidget.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/combinedfragmentwidget.h umbrello-kf6-15.08.1/umbrello/widgets/combinedfragmentwidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/combinedfragmentwidget.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/combinedfragmentwidget.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,91 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -62341,7 +62341,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/combinedfragmentwidget.h umbre - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef COMBINEDFRAGMENTWIDGET_H @@ -62367,7 +62367,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/combinedfragmentwidget.h umbre - * - * @short A graphical version of a UML combined fragment. - * @author Hassan KOUCH -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class CombinedFragmentWidget : public UMLWidget -{ @@ -62425,9 +62425,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/combinedfragmentwidget.h umbre -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/componentwidget.cpp umbrello-15.08.1/umbrello/widgets/componentwidget.cpp ---- umbrello-15.08.1.orig/umbrello/widgets/componentwidget.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/componentwidget.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/componentwidget.cpp umbrello-kf6-15.08.1/umbrello/widgets/componentwidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/componentwidget.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/componentwidget.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,207 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -62436,7 +62436,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/componentwidget.cpp umbrello-1 - * (at your option) any later version. * - * * - * copyright (C) 2003-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header @@ -62636,9 +62636,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/componentwidget.cpp umbrello-1 - return QSizeF(width, height); -} - -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/componentwidget.h umbrello-15.08.1/umbrello/widgets/componentwidget.h ---- umbrello-15.08.1.orig/umbrello/widgets/componentwidget.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/componentwidget.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/componentwidget.h umbrello-kf6-15.08.1/umbrello/widgets/componentwidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/componentwidget.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/componentwidget.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,58 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -62647,7 +62647,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/componentwidget.h umbrello-15. - * (at your option) any later version. * - * * - * copyright (C) 2003-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef COMPONENTWIDGET_H @@ -62666,7 +62666,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/componentwidget.h umbrello-15. - * @short A graphical version of a Component. - * @author Jonathan Riddell - * @see UMLWidget -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class ComponentWidget : public UMLWidget -{ @@ -62698,9 +62698,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/componentwidget.h umbrello-15. -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/datatypewidget.cpp umbrello-15.08.1/umbrello/widgets/datatypewidget.cpp ---- umbrello-15.08.1.orig/umbrello/widgets/datatypewidget.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/datatypewidget.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/datatypewidget.cpp umbrello-kf6-15.08.1/umbrello/widgets/datatypewidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/datatypewidget.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/datatypewidget.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,129 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -62709,7 +62709,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/datatypewidget.cpp umbrello-15 - * (at your option) any later version. * - * * - * copyright (C) 2003-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header @@ -62831,9 +62831,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/datatypewidget.cpp umbrello-15 - - return QSizeF(width, height); -} -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/datatypewidget.h umbrello-15.08.1/umbrello/widgets/datatypewidget.h ---- umbrello-15.08.1.orig/umbrello/widgets/datatypewidget.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/datatypewidget.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/datatypewidget.h umbrello-kf6-15.08.1/umbrello/widgets/datatypewidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/datatypewidget.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/datatypewidget.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,48 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -62842,7 +62842,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/datatypewidget.h umbrello-15.0 - * (at your option) any later version. * - * * - * copyright (C) 2003-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef DATATYPEWIDGET_H @@ -62861,7 +62861,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/datatypewidget.h umbrello-15.0 - * @short A graphical version of an datatype. - * @author Jonathan Riddell - * @see UMLWidget -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class DatatypeWidget : public UMLWidget -{ @@ -62883,9 +62883,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/datatypewidget.h umbrello-15.0 -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/entitywidget.cpp umbrello-15.08.1/umbrello/widgets/entitywidget.cpp ---- umbrello-15.08.1.orig/umbrello/widgets/entitywidget.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/entitywidget.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/entitywidget.cpp umbrello-kf6-15.08.1/umbrello/widgets/entitywidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/entitywidget.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/entitywidget.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,246 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -62894,7 +62894,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/entitywidget.cpp umbrello-15.0 - * (at your option) any later version. * - * * - * copyright (C) 2003-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header @@ -63133,9 +63133,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/entitywidget.cpp umbrello-15.0 - - return QSizeF(width, height); -} -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/entitywidget.h umbrello-15.08.1/umbrello/widgets/entitywidget.h ---- umbrello-15.08.1.orig/umbrello/widgets/entitywidget.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/entitywidget.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/entitywidget.h umbrello-kf6-15.08.1/umbrello/widgets/entitywidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/entitywidget.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/entitywidget.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,49 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -63144,7 +63144,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/entitywidget.h umbrello-15.08. - * (at your option) any later version. * - * * - * copyright (C) 2003-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef ENTITYWIDGET_H @@ -63163,7 +63163,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/entitywidget.h umbrello-15.08. - * @short A graphical version of an entity. - * @author Jonathan Riddell - * @see UMLWidget -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class EntityWidget : public UMLWidget -{ @@ -63186,9 +63186,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/entitywidget.h umbrello-15.08. -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/enumwidget.cpp umbrello-15.08.1/umbrello/widgets/enumwidget.cpp ---- umbrello-15.08.1.orig/umbrello/widgets/enumwidget.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/enumwidget.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/enumwidget.cpp umbrello-kf6-15.08.1/umbrello/widgets/enumwidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/enumwidget.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/enumwidget.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,262 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -63197,7 +63197,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/enumwidget.cpp umbrello-15.08. - * (at your option) any later version. * - * * - * copyright (C) 2003-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header @@ -63452,9 +63452,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/enumwidget.cpp umbrello-15.08. - - return QSizeF(width, height); -} -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/enumwidget.h umbrello-15.08.1/umbrello/widgets/enumwidget.h ---- umbrello-15.08.1.orig/umbrello/widgets/enumwidget.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/enumwidget.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/enumwidget.h umbrello-kf6-15.08.1/umbrello/widgets/enumwidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/enumwidget.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/enumwidget.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,52 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -63463,7 +63463,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/enumwidget.h umbrello-15.08.1/ - * (at your option) any later version. * - * * - * copyright (C) 2003-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef ENUMWIDGET_H @@ -63480,7 +63480,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/enumwidget.h umbrello-15.08.1/ - * @short A graphical version of an enum. - * @author Jonathan Riddell - * @see UMLWidget -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class EnumWidget : public UMLWidget -{ @@ -63508,9 +63508,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/enumwidget.h umbrello-15.08.1/ -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/floatingdashlinewidget.cpp umbrello-15.08.1/umbrello/widgets/floatingdashlinewidget.cpp ---- umbrello-15.08.1.orig/umbrello/widgets/floatingdashlinewidget.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/floatingdashlinewidget.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/floatingdashlinewidget.cpp umbrello-kf6-15.08.1/umbrello/widgets/floatingdashlinewidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/floatingdashlinewidget.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/floatingdashlinewidget.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,199 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -63519,7 +63519,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/floatingdashlinewidget.cpp umb - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ -// own header -#include "floatingdashlinewidget.h" @@ -63711,9 +63711,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/floatingdashlinewidget.cpp umb - return true; -} - -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/floatingdashlinewidget.h umbrello-15.08.1/umbrello/widgets/floatingdashlinewidget.h ---- umbrello-15.08.1.orig/umbrello/widgets/floatingdashlinewidget.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/floatingdashlinewidget.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/floatingdashlinewidget.h umbrello-kf6-15.08.1/umbrello/widgets/floatingdashlinewidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/floatingdashlinewidget.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/floatingdashlinewidget.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,77 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -63722,7 +63722,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/floatingdashlinewidget.h umbre - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef FLOATINGDASHLINEWIDGET_H @@ -63745,7 +63745,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/floatingdashlinewidget.h umbre - * - * @short A dash line for UML combined fragments. - * @author Thomas GALLINARI -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class FloatingDashLineWidget : public UMLWidget -{ @@ -63792,9 +63792,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/floatingdashlinewidget.h umbre -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/floatingtextwidget.cpp umbrello-15.08.1/umbrello/widgets/floatingtextwidget.cpp ---- umbrello-15.08.1.orig/umbrello/widgets/floatingtextwidget.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/floatingtextwidget.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/floatingtextwidget.cpp umbrello-kf6-15.08.1/umbrello/widgets/floatingtextwidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/floatingtextwidget.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/floatingtextwidget.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,854 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -63803,7 +63803,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/floatingtextwidget.cpp umbrell - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header @@ -64514,7 +64514,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/floatingtextwidget.cpp umbrell - // If all texts are empty then this is a useless widget. - // In that case we return false. - // CAVEAT: The caller should not interpret the false return value -- // as an indication of failure since previous umbrello versions +- // as an indication of failure since previous umbrello-kf6 versions - // saved lots of these empty FloatingTexts. - bool usefulWidget = !isEmpty(); - return usefulWidget; @@ -64650,9 +64650,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/floatingtextwidget.cpp umbrell - setVisible(!text().isEmpty()); -} - -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/floatingtextwidget.h umbrello-15.08.1/umbrello/widgets/floatingtextwidget.h ---- umbrello-15.08.1.orig/umbrello/widgets/floatingtextwidget.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/floatingtextwidget.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/floatingtextwidget.h umbrello-kf6-15.08.1/umbrello/widgets/floatingtextwidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/floatingtextwidget.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/floatingtextwidget.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,131 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -64661,7 +64661,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/floatingtextwidget.h umbrello- - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef FLOATINGTEXTWIDGET_H @@ -64676,7 +64676,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/floatingtextwidget.h umbrello- -/** - * @short Displays a line of text or an operation. - * -- * This is a multipurpose class. In its simplest form it will display a +- * This is a multipurpose-kf6 class. In its simplest form it will display a - * line of text. - * It can also be setup to be the text for an operation with regard to the - * @ref MessageWidget on the sequence diagram. @@ -64687,7 +64687,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/floatingtextwidget.h umbrello- - * - * @author Paul Hensgen - * @see UMLWidget -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class FloatingTextWidget : public UMLWidget -{ @@ -64785,9 +64785,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/floatingtextwidget.h umbrello- -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/forkjoinwidget.cpp umbrello-15.08.1/umbrello/widgets/forkjoinwidget.cpp ---- umbrello-15.08.1.orig/umbrello/widgets/forkjoinwidget.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/forkjoinwidget.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/forkjoinwidget.cpp umbrello-kf6-15.08.1/umbrello/widgets/forkjoinwidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/forkjoinwidget.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/forkjoinwidget.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,205 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -64796,7 +64796,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/forkjoinwidget.cpp umbrello-15 - * (at your option) any later version. * - * * - * copyright (C) 2005-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header @@ -64994,9 +64994,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/forkjoinwidget.cpp umbrello-15 - width = 100; - } -} -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/forkjoinwidget.h umbrello-15.08.1/umbrello/widgets/forkjoinwidget.h ---- umbrello-15.08.1.orig/umbrello/widgets/forkjoinwidget.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/forkjoinwidget.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/forkjoinwidget.h umbrello-kf6-15.08.1/umbrello/widgets/forkjoinwidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/forkjoinwidget.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/forkjoinwidget.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,57 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -65005,7 +65005,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/forkjoinwidget.h umbrello-15.0 - * (at your option) any later version. * - * * - * copyright (C) 2005-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef FORKJOINWIDGET_H @@ -65020,7 +65020,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/forkjoinwidget.h umbrello-15.0 - * @author Oliver Kellogg - * - * @see UMLWidget -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class ForkJoinWidget : public BoxWidget -{ @@ -65055,9 +65055,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/forkjoinwidget.h umbrello-15.0 -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/layoutgrid.cpp umbrello-15.08.1/umbrello/widgets/layoutgrid.cpp ---- umbrello-15.08.1.orig/umbrello/widgets/layoutgrid.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/layoutgrid.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/layoutgrid.cpp umbrello-kf6-15.08.1/umbrello/widgets/layoutgrid.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/layoutgrid.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/layoutgrid.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,113 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2011 by Andi Fischer * @@ -65070,7 +65070,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/layoutgrid.cpp umbrello-15.08. - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR purpose-kf6. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * @@ -65172,9 +65172,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/layoutgrid.cpp umbrello-15.08. - m_scene->update(); - } -} -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/layoutgrid.h umbrello-15.08.1/umbrello/widgets/layoutgrid.h ---- umbrello-15.08.1.orig/umbrello/widgets/layoutgrid.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/layoutgrid.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/layoutgrid.h umbrello-kf6-15.08.1/umbrello/widgets/layoutgrid.h +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/layoutgrid.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/layoutgrid.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,76 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2011 by Andi Fischer * @@ -65187,7 +65187,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/layoutgrid.h umbrello-15.08.1/ - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR purpose-kf6. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * @@ -65252,9 +65252,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/layoutgrid.h umbrello-15.08.1/ -}; - -#endif // LAYOUTGRID_H -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/linkwidget.cpp umbrello-15.08.1/umbrello/widgets/linkwidget.cpp ---- umbrello-15.08.1.orig/umbrello/widgets/linkwidget.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/linkwidget.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/linkwidget.cpp umbrello-kf6-15.08.1/umbrello/widgets/linkwidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/linkwidget.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/linkwidget.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,121 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -65263,7 +65263,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/linkwidget.cpp umbrello-15.08. - * (at your option) any later version. * - * * - * copyright (C) 2004-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header @@ -65377,9 +65377,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/linkwidget.cpp umbrello-15.08. - - qElement.setAttribute(QLatin1String("seqnum"), m_SequenceNumber); -} -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/linkwidget.h umbrello-15.08.1/umbrello/widgets/linkwidget.h ---- umbrello-15.08.1.orig/umbrello/widgets/linkwidget.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/linkwidget.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/linkwidget.h umbrello-kf6-15.08.1/umbrello/widgets/linkwidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/linkwidget.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/linkwidget.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,123 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -65388,7 +65388,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/linkwidget.h umbrello-15.08.1/ - * (at your option) any later version. * - * * - * copyright (C) 2004-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef LINKWIDGET_H @@ -65407,13 +65407,13 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/linkwidget.h umbrello-15.08.1/ -/** - * This is an interface realized by AssociationWidget and MessageWidget. - * The design of this interface was driven by the requirements of -- * class FloatingTextWidget. As the architecture of Umbrello evolves (for +- * class FloatingTextWidget. As the architecture of umbrello-kf6 evolves (for - * example, if the class FloatingTextWidget is redesigned), it can be - * cleaned up. - * - * @short Interface to FloatingTextWidget for AssociationWidget and MessageWidget. - * @author Oliver Kellogg -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class LinkWidget -{ @@ -65504,9 +65504,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/linkwidget.h umbrello-15.08.1/ -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/messagewidget.cpp umbrello-15.08.1/umbrello/widgets/messagewidget.cpp ---- umbrello-15.08.1.orig/umbrello/widgets/messagewidget.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/messagewidget.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/messagewidget.cpp umbrello-kf6-15.08.1/umbrello/widgets/messagewidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/messagewidget.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/messagewidget.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,1385 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -65515,7 +65515,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/messagewidget.cpp umbrello-15. - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// onw header @@ -65823,10 +65823,10 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/messagewidget.cpp umbrello-15. -} - -/** -- * Draw a solid (triangular) arrowhead pointing in the given direction. +- * Draw a solid-kf6 (triangular) arrowhead pointing in the given direction. - * The direction can be either Qt::LeftArrow or Qt::RightArrow. - */ --void MessageWidget::paintSolidArrowhead(QPainter *p, int x, int y, Qt::ArrowType direction) +-void MessageWidget::paintsolid-kf6Arrowhead(QPainter *p, int x, int y, Qt::ArrowType direction) -{ - int arrowheadExtentX = 4; - if (direction == Qt::RightArrow) { @@ -65840,7 +65840,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/messagewidget.cpp umbrello-15. - -/** - * Draw an arrow pointing in the given direction. -- * The arrow head is not solid, i.e. it is made up of two lines +- * The arrow head is not solid-kf6, i.e. it is made up of two lines - * like so: ---> - * The direction can be either Qt::LeftArrow or Qt::RightArrow. - */ @@ -65913,7 +65913,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/messagewidget.cpp umbrello-15. - painter->drawRect(startX, offsetY, wr, h); //box - painter->drawLine(offsetX, offsetY + arrowWidth, startX, offsetY + arrowWidth); //arrow line - if (w > boxWidth + arrowWidth) -- paintSolidArrowhead(painter, startX - 1, offsetY + arrowWidth, Qt::RightArrow); +- paintsolid-kf6Arrowhead(painter, startX - 1, offsetY + arrowWidth, Qt::RightArrow); - paintArrow(painter, offsetX, offsetY + h - arrowWidth + 1, w - wr + 1, Qt::LeftArrow, true); // return arrow - if (messageOverlaps) { - offsetX -= 8; //reset for drawSelected() @@ -65927,7 +65927,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/messagewidget.cpp umbrello-15. - painter->drawRect(offsetX, offsetY, wr, h); //box - painter->drawLine(offsetX + wr + 1, offsetY + arrowWidth, offsetX + w, offsetY + arrowWidth); //arrow line - if (w > boxWidth + arrowWidth) -- paintSolidArrowhead(painter, offsetX + wr, offsetY + arrowWidth, Qt::LeftArrow); +- paintsolid-kf6Arrowhead(painter, offsetX + wr, offsetY + arrowWidth, Qt::LeftArrow); - paintArrow(painter, offsetX + wr + 1, offsetY + h - arrowWidth + 1, w - wr - 1, Qt::RightArrow, true); // return arrow - } - @@ -65935,7 +65935,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/messagewidget.cpp umbrello-15. -} - -/** -- * Draws a solid arrow line and a stick arrow head. +- * Draws a solid-kf6 arrow line and a stick arrow head. - */ -void MessageWidget::paintAsynchronous(QPainter *painter, const QStyleOptionGraphicsItem *option) -{ @@ -65983,7 +65983,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/messagewidget.cpp umbrello-15. -} - -/** -- * Draws a solid arrow line and a stick arrow head to the +- * Draws a solid-kf6 arrow line and a stick arrow head to the - * edge of the target object widget instead of to the - * sequence line. - */ @@ -66020,7 +66020,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/messagewidget.cpp umbrello-15. - - -/** -- * Draws a solid arrow line and a stick arrow head +- * Draws a solid-kf6 arrow line and a stick arrow head - * and a circle - */ -void MessageWidget::paintLost(QPainter *painter, const QStyleOptionGraphicsItem *option) @@ -66059,7 +66059,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/messagewidget.cpp umbrello-15. -} - -/** -- * Draws a circle and a solid arrow line and a stick arrow head. +- * Draws a circle and a solid-kf6 arrow line and a stick arrow head. - */ -void MessageWidget::paintFound(QPainter *painter, const QStyleOptionGraphicsItem *option) -{ @@ -66292,7 +66292,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/messagewidget.cpp umbrello-15. - */ -bool MessageWidget::activate(IDChangeLog * /*Log = 0*/) -{ -- m_scene->resetPastePoint(); +- m_scene->resetPastep-kf6oint(); - // UMLWidget::activate(Log); CHECK: I don't think we need this ? - if (m_pOw[Uml::RoleType::A] == NULL) { - UMLWidget *pWA = m_scene->findWidget(m_widgetAId); @@ -66893,9 +66893,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/messagewidget.cpp umbrello-15. - return true; -} - -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/messagewidget.h umbrello-15.08.1/umbrello/widgets/messagewidget.h ---- umbrello-15.08.1.orig/umbrello/widgets/messagewidget.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/messagewidget.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/messagewidget.h umbrello-kf6-15.08.1/umbrello/widgets/messagewidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/messagewidget.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/messagewidget.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,212 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -66904,7 +66904,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/messagewidget.h umbrello-15.08 - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef MESSAGEWIDGET_H @@ -66934,7 +66934,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/messagewidget.h umbrello-15.08 - * @see UMLWidget - * @see ObjectWidget - * @see FloatingTextWidget -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class MessageWidget : public UMLWidget, public LinkWidget -{ @@ -67059,7 +67059,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/messagewidget.h umbrello-15.08 - - static void paintArrow(QPainter *p, int x, int y, int w, - Qt::ArrowType direction, bool useDottedLine = false); -- static void paintSolidArrowhead(QPainter *p, int x, int y, Qt::ArrowType direction); +- static void paintsolid-kf6Arrowhead(QPainter *p, int x, int y, Qt::ArrowType direction); - - void updateResizability(); - @@ -67109,9 +67109,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/messagewidget.h umbrello-15.08 -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/nodewidget.cpp umbrello-15.08.1/umbrello/widgets/nodewidget.cpp ---- umbrello-15.08.1.orig/umbrello/widgets/nodewidget.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/nodewidget.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/nodewidget.cpp umbrello-kf6-15.08.1/umbrello/widgets/nodewidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/nodewidget.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/nodewidget.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,156 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -67120,7 +67120,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/nodewidget.cpp umbrello-15.08. - * (at your option) any later version. * - * * - * copyright (C) 2003-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header @@ -67269,9 +67269,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/nodewidget.cpp umbrello-15.08. - qElement.appendChild(conceptElement); -} - -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/nodewidget.h umbrello-15.08.1/umbrello/widgets/nodewidget.h ---- umbrello-15.08.1.orig/umbrello/widgets/nodewidget.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/nodewidget.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/nodewidget.h umbrello-kf6-15.08.1/umbrello/widgets/nodewidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/nodewidget.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/nodewidget.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,44 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -67280,7 +67280,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/nodewidget.h umbrello-15.08.1/ - * (at your option) any later version. * - * * - * copyright (C) 2003-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef NODEWIDGET_H @@ -67297,7 +67297,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/nodewidget.h umbrello-15.08.1/ - * @short A graphical version of a Node. - * @author Jonathan Riddell - * @see UMLWidget -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class NodeWidget : public UMLWidget -{ @@ -67317,9 +67317,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/nodewidget.h umbrello-15.08.1/ -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/notewidget.cpp umbrello-15.08.1/umbrello/widgets/notewidget.cpp ---- umbrello-15.08.1.orig/umbrello/widgets/notewidget.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/notewidget.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/notewidget.cpp umbrello-kf6-15.08.1/umbrello/widgets/notewidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/notewidget.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/notewidget.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,517 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -67328,7 +67328,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/notewidget.cpp umbrello-15.08. - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header @@ -67838,9 +67838,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/notewidget.cpp umbrello-15.08. - } -} - -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/notewidget.h umbrello-15.08.1/umbrello/widgets/notewidget.h ---- umbrello-15.08.1.orig/umbrello/widgets/notewidget.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/notewidget.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/notewidget.h umbrello-kf6-15.08.1/umbrello/widgets/notewidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/notewidget.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/notewidget.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,83 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -67849,7 +67849,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/notewidget.h umbrello-15.08.1/ - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef NOTEWIDGET_H @@ -67864,12 +67864,12 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/notewidget.h umbrello-15.08.1/ -/** - * Displays a note box to allow multiple lines of text to be displayed. - * These widgets are diagram specific. They will still need a unique id -- * from the @ref UMLDoc class for deletion and other purposes. +- * from the @ref UMLDoc class for deletion and other purpose-kf6s. - * - * @short Displays a note box. - * @author Paul Hensgen - * @see UMLWidget -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class NoteWidget : public UMLWidget -{ @@ -67925,9 +67925,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/notewidget.h umbrello-15.08.1/ -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/objectnodewidget.cpp umbrello-15.08.1/umbrello/widgets/objectnodewidget.cpp ---- umbrello-15.08.1.orig/umbrello/widgets/objectnodewidget.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/objectnodewidget.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/objectnodewidget.cpp umbrello-kf6-15.08.1/umbrello/widgets/objectnodewidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/objectnodewidget.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/objectnodewidget.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,377 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -67936,7 +67936,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/objectnodewidget.cpp umbrello- - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header @@ -68302,13 +68302,13 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/objectnodewidget.cpp umbrello- - -void ObjectNodeWidget::slotOk() -{ -- // KDialog::accept(); +- // kdialog-kf6::accept(); -} - - -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/objectnodewidget.h umbrello-15.08.1/umbrello/widgets/objectnodewidget.h ---- umbrello-15.08.1.orig/umbrello/widgets/objectnodewidget.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/objectnodewidget.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/objectnodewidget.h umbrello-kf6-15.08.1/umbrello/widgets/objectnodewidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/objectnodewidget.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/objectnodewidget.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,76 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -68317,7 +68317,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/objectnodewidget.h umbrello-15 - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef OBJECTNODEWIDGET_H @@ -68335,7 +68335,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/objectnodewidget.h umbrello-15 - * - * @short A graphical version of a UML Activity. - * @author Florence Mattler -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class ObjectNodeWidget : public UMLWidget -{ @@ -68386,9 +68386,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/objectnodewidget.h umbrello-15 -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/objectwidget.cpp umbrello-15.08.1/umbrello/widgets/objectwidget.cpp ---- umbrello-15.08.1.orig/umbrello/widgets/objectwidget.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/objectwidget.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/objectwidget.cpp umbrello-kf6-15.08.1/umbrello/widgets/objectwidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/objectwidget.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/objectwidget.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,710 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -68397,7 +68397,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/objectwidget.cpp umbrello-15.0 - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header file @@ -69100,9 +69100,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/objectwidget.cpp umbrello-15.0 - return true; -} - -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/objectwidget.h umbrello-15.08.1/umbrello/widgets/objectwidget.h ---- umbrello-15.08.1.orig/umbrello/widgets/objectwidget.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/objectwidget.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/objectwidget.h umbrello-kf6-15.08.1/umbrello/widgets/objectwidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/objectwidget.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/objectwidget.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,115 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -69111,7 +69111,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/objectwidget.h umbrello-15.08. - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef OBJECTWIDGET_H @@ -69133,7 +69133,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/objectwidget.h umbrello-15.08. - * @short Displays an instance of a Concept. - * @author Paul Hensgen - * @see UMLWidget -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class ObjectWidget : public UMLWidget -{ @@ -69219,9 +69219,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/objectwidget.h umbrello-15.08. -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/packagewidget.cpp umbrello-15.08.1/umbrello/widgets/packagewidget.cpp ---- umbrello-15.08.1.orig/umbrello/widgets/packagewidget.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/packagewidget.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/packagewidget.cpp umbrello-kf6-15.08.1/umbrello/widgets/packagewidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/packagewidget.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/packagewidget.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,149 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -69230,7 +69230,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/packagewidget.cpp umbrello-15. - * (at your option) any later version. * - * * - * copyright (C) 2003-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header @@ -69372,9 +69372,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/packagewidget.cpp umbrello-15. - UMLWidget::saveToXMI(qDoc, conceptElement); - qElement.appendChild(conceptElement); -} -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/packagewidget.h umbrello-15.08.1/umbrello/widgets/packagewidget.h ---- umbrello-15.08.1.orig/umbrello/widgets/packagewidget.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/packagewidget.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/packagewidget.h umbrello-kf6-15.08.1/umbrello/widgets/packagewidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/packagewidget.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/packagewidget.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,47 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -69383,7 +69383,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/packagewidget.h umbrello-15.08 - * (at your option) any later version. * - * * - * copyright (C) 2003-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef PACKAGEWIDGET_H @@ -69403,7 +69403,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/packagewidget.h umbrello-15.08 - * @short A graphical version of a Package. - * @author Jonathan Riddell - * @see UMLWidget -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class PackageWidget : public UMLWidget -{ @@ -69423,9 +69423,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/packagewidget.h umbrello-15.08 -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/pinportbase.cpp umbrello-15.08.1/umbrello/widgets/pinportbase.cpp ---- umbrello-15.08.1.orig/umbrello/widgets/pinportbase.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/pinportbase.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/pinportbase.cpp umbrello-kf6-15.08.1/umbrello/widgets/pinportbase.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/pinportbase.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/pinportbase.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,378 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -69434,7 +69434,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/pinportbase.cpp umbrello-15.08 - * (at your option) any later version. * - * * - * copyright (C) 2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header @@ -69805,9 +69805,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/pinportbase.cpp umbrello-15.08 - return true; -} - -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/pinportbase.h umbrello-15.08.1/umbrello/widgets/pinportbase.h ---- umbrello-15.08.1.orig/umbrello/widgets/pinportbase.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/pinportbase.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/pinportbase.h umbrello-kf6-15.08.1/umbrello/widgets/pinportbase.h +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/pinportbase.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/pinportbase.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,63 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -69816,7 +69816,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/pinportbase.h umbrello-15.08.1 - * (at your option) any later version. * - * * - * copyright (C) 2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef PINPORTBASE_H @@ -69830,7 +69830,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/pinportbase.h umbrello-15.08.1 - * @short Abstract base class for PinWidget and PortWidget - * @author Oliver Kellogg - * @see UMLWidget -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class PinPortBase : public UMLWidget -{ @@ -69872,9 +69872,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/pinportbase.h umbrello-15.08.1 -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/pinwidget.cpp umbrello-15.08.1/umbrello/widgets/pinwidget.cpp ---- umbrello-15.08.1.orig/umbrello/widgets/pinwidget.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/pinwidget.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/pinwidget.cpp umbrello-kf6-15.08.1/umbrello/widgets/pinwidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/pinwidget.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/pinwidget.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,103 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -69883,7 +69883,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/pinwidget.cpp umbrello-15.08.1 - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header @@ -69979,9 +69979,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/pinwidget.cpp umbrello-15.08.1 - } -} - -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/pinwidget.h umbrello-15.08.1/umbrello/widgets/pinwidget.h ---- umbrello-15.08.1.orig/umbrello/widgets/pinwidget.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/pinwidget.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/pinwidget.h umbrello-kf6-15.08.1/umbrello/widgets/pinwidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/pinwidget.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/pinwidget.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,46 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -69990,7 +69990,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/pinwidget.h umbrello-15.08.1/u - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef PINWIDGET_H @@ -70008,7 +70008,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/pinwidget.h umbrello-15.08.1/u - * - * @short A graphical version of a UML pin. - * @author Hassan KOUCH -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class PinWidget : public PinPortBase -{ @@ -70029,9 +70029,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/pinwidget.h umbrello-15.08.1/u -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/portwidget.cpp umbrello-15.08.1/umbrello/widgets/portwidget.cpp ---- umbrello-15.08.1.orig/umbrello/widgets/portwidget.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/portwidget.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/portwidget.cpp umbrello-kf6-15.08.1/umbrello/widgets/portwidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/portwidget.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/portwidget.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,106 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -70040,7 +70040,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/portwidget.cpp umbrello-15.08. - * (at your option) any later version. * - * * - * copyright (C) 2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header @@ -70139,9 +70139,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/portwidget.cpp umbrello-15.08. - } -} - -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/portwidget.h umbrello-15.08.1/umbrello/widgets/portwidget.h ---- umbrello-15.08.1.orig/umbrello/widgets/portwidget.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/portwidget.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/portwidget.h umbrello-kf6-15.08.1/umbrello/widgets/portwidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/portwidget.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/portwidget.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,42 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -70150,7 +70150,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/portwidget.h umbrello-15.08.1/ - * (at your option) any later version. * - * * - * copyright (C) 2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef PORTWIDGET_H @@ -70167,7 +70167,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/portwidget.h umbrello-15.08.1/ - * @short A graphical version of a port on a component. - * @author Oliver Kellogg - * @see PinPortBase, UMLWidget -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class PortWidget : public PinPortBase -{ @@ -70185,9 +70185,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/portwidget.h umbrello-15.08.1/ -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/preconditionwidget.cpp umbrello-15.08.1/umbrello/widgets/preconditionwidget.cpp ---- umbrello-15.08.1.orig/umbrello/widgets/preconditionwidget.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/preconditionwidget.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/preconditionwidget.cpp umbrello-kf6-15.08.1/umbrello/widgets/preconditionwidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/preconditionwidget.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/preconditionwidget.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,335 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -70196,7 +70196,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/preconditionwidget.cpp umbrell - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header @@ -70345,7 +70345,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/preconditionwidget.cpp umbrell - */ -bool PreconditionWidget::activate(IDChangeLog * Log /*= 0*/) -{ -- m_scene->resetPastePoint(); +- m_scene->resetPastep-kf6oint(); - UMLWidget::activate(Log); - - loadObjectWidget(); @@ -70524,9 +70524,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/preconditionwidget.cpp umbrell - } -} - -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/preconditionwidget.h umbrello-15.08.1/umbrello/widgets/preconditionwidget.h ---- umbrello-15.08.1.orig/umbrello/widgets/preconditionwidget.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/preconditionwidget.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/preconditionwidget.h umbrello-kf6-15.08.1/umbrello/widgets/preconditionwidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/preconditionwidget.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/preconditionwidget.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,70 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -70535,7 +70535,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/preconditionwidget.h umbrello- - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef PRECONDITIONWIDGET_H @@ -70557,7 +70557,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/preconditionwidget.h umbrello- - * - * @author Florence Mattler - * -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class PreconditionWidget : public UMLWidget -{ @@ -70598,9 +70598,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/preconditionwidget.h umbrello- -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/regionwidget.cpp umbrello-15.08.1/umbrello/widgets/regionwidget.cpp ---- umbrello-15.08.1.orig/umbrello/widgets/regionwidget.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/regionwidget.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/regionwidget.cpp umbrello-kf6-15.08.1/umbrello/widgets/regionwidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/regionwidget.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/regionwidget.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,108 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -70609,7 +70609,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/regionwidget.cpp umbrello-15.0 - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header @@ -70710,9 +70710,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/regionwidget.cpp umbrello-15.0 - return true; -} - -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/regionwidget.h umbrello-15.08.1/umbrello/widgets/regionwidget.h ---- umbrello-15.08.1.orig/umbrello/widgets/regionwidget.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/regionwidget.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/regionwidget.h umbrello-kf6-15.08.1/umbrello/widgets/regionwidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/regionwidget.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/regionwidget.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,36 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -70721,7 +70721,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/regionwidget.h umbrello-15.08. - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * -***************************************************************************/ - -#ifndef REGIONWIDGET_H @@ -70750,9 +70750,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/regionwidget.h umbrello-15.08. -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/seqlinewidget.cpp umbrello-15.08.1/umbrello/widgets/seqlinewidget.cpp ---- umbrello-15.08.1.orig/umbrello/widgets/seqlinewidget.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/seqlinewidget.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/seqlinewidget.cpp umbrello-kf6-15.08.1/umbrello/widgets/seqlinewidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/seqlinewidget.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/seqlinewidget.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,197 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -70761,7 +70761,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/seqlinewidget.cpp umbrello-15. - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header @@ -70951,9 +70951,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/seqlinewidget.cpp umbrello-15. - moveDestructionBox(); - m_scene->resizeSceneToItems(); -} -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/seqlinewidget.h umbrello-15.08.1/umbrello/widgets/seqlinewidget.h ---- umbrello-15.08.1.orig/umbrello/widgets/seqlinewidget.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/seqlinewidget.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/seqlinewidget.h umbrello-kf6-15.08.1/umbrello/widgets/seqlinewidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/seqlinewidget.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/seqlinewidget.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,86 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -70962,7 +70962,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/seqlinewidget.h umbrello-15.08 - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef SEQLINEWIDGET_H @@ -70976,7 +70976,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/seqlinewidget.h umbrello-15.08 -/** - * @short Widget class for graphical representation of sequence lines - * @author Paul Hensgen -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class SeqLineWidget : public QGraphicsLineItem -{ @@ -71041,9 +71041,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/seqlinewidget.h umbrello-15.08 -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/signalwidget.cpp umbrello-15.08.1/umbrello/widgets/signalwidget.cpp ---- umbrello-15.08.1.orig/umbrello/widgets/signalwidget.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/signalwidget.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/signalwidget.cpp umbrello-kf6-15.08.1/umbrello/widgets/signalwidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/signalwidget.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/signalwidget.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,386 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -71052,7 +71052,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/signalwidget.cpp umbrello-15.0 - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header @@ -71318,7 +71318,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/signalwidget.cpp umbrello-15.0 - UMLWidget *flotext = m_scene -> findWidget(textId); - if (flotext != NULL) { - // This only happens when loading files produced by -- // umbrello-1.3-beta2. +- // umbrello-kf6-1.3-beta2. - m_pName = static_cast(flotext); - return true; - } @@ -71431,9 +71431,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/signalwidget.cpp umbrello-15.0 - m_pName = 0; -} - -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/signalwidget.h umbrello-15.08.1/umbrello/widgets/signalwidget.h ---- umbrello-15.08.1.orig/umbrello/widgets/signalwidget.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/signalwidget.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/signalwidget.h umbrello-kf6-15.08.1/umbrello/widgets/signalwidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/signalwidget.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/signalwidget.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,86 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -71442,7 +71442,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/signalwidget.h umbrello-15.08. - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * -***************************************************************************/ - -#ifndef SIGNALWIDGET_H @@ -71521,9 +71521,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/signalwidget.h umbrello-15.08. -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/statewidget.cpp umbrello-15.08.1/umbrello/widgets/statewidget.cpp ---- umbrello-15.08.1.orig/umbrello/widgets/statewidget.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/statewidget.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/statewidget.cpp umbrello-kf6-15.08.1/umbrello/widgets/statewidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/statewidget.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/statewidget.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,534 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -71532,7 +71532,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/statewidget.cpp umbrello-15.08 - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header @@ -72059,9 +72059,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/statewidget.cpp umbrello-15.08 - } -} - -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/statewidget.h umbrello-15.08.1/umbrello/widgets/statewidget.h ---- umbrello-15.08.1.orig/umbrello/widgets/statewidget.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/statewidget.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/statewidget.h umbrello-kf6-15.08.1/umbrello/widgets/statewidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/statewidget.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/statewidget.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,99 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -72070,7 +72070,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/statewidget.h umbrello-15.08.1 - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * -***************************************************************************/ - -#ifndef STATEWIDGET_H @@ -72098,7 +72098,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/statewidget.h umbrello-15.08.1 - * - * @short A graphical version of a UML State. - * @author Paul Hensgen -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class StateWidget : public UMLWidget -{ @@ -72162,13 +72162,13 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/statewidget.h umbrello-15.08.1 -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/statusbartoolbutton.cpp umbrello-15.08.1/umbrello/widgets/statusbartoolbutton.cpp ---- umbrello-15.08.1.orig/umbrello/widgets/statusbartoolbutton.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/statusbartoolbutton.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/statusbartoolbutton.cpp umbrello-kf6-15.08.1/umbrello/widgets/statusbartoolbutton.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/statusbartoolbutton.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/statusbartoolbutton.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,122 +0,0 @@ -// vim: set tabstop=4 shiftwidth=4 noexpandtab: -/* --Widget taken from Gwenview +-Widget taken from gwenview-kf6 -Copyright 2007 Aurélien Gâteau - -This program is free software; you can redistribute it and/or @@ -72178,7 +72178,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/statusbartoolbutton.cpp umbrel - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of --MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-MERCHANTABILITY or FITNESS FOR A PARTICULAR purpose-kf6. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License @@ -72288,13 +72288,13 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/statusbartoolbutton.cpp umbrel - setToolTip(i18nc("@info:tooltip of custom toolbar button", "%1", action->toolTip())); - } -} -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/statusbartoolbutton.h umbrello-15.08.1/umbrello/widgets/statusbartoolbutton.h ---- umbrello-15.08.1.orig/umbrello/widgets/statusbartoolbutton.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/statusbartoolbutton.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/statusbartoolbutton.h umbrello-kf6-15.08.1/umbrello/widgets/statusbartoolbutton.h +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/statusbartoolbutton.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/statusbartoolbutton.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,58 +0,0 @@ -// vim: set tabstop=4 shiftwidth=4 noexpandtab: -/* --Gwenview: an image viewer +-gwenview-kf6: an image viewer -Copyright 2007 Aurélien Gâteau - -This program is free software; you can redistribute it and/or @@ -72304,7 +72304,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/statusbartoolbutton.h umbrello - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of --MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-MERCHANTABILITY or FITNESS FOR A PARTICULAR purpose-kf6. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License @@ -72319,7 +72319,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/statusbartoolbutton.h umbrello -#include - -/** -- * A thin tool button which can be grouped with another and look like one solid +- * A thin tool button which can be grouped with another and look like one solid-kf6 - * bar: - * - * (button1 | button2) @@ -72350,9 +72350,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/statusbartoolbutton.h umbrello -}; - -#endif /* STATUSBARTOOLBUTTON_H */ -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/toolbarstateonewidget.cpp umbrello-15.08.1/umbrello/widgets/toolbarstateonewidget.cpp ---- umbrello-15.08.1.orig/umbrello/widgets/toolbarstateonewidget.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/toolbarstateonewidget.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/toolbarstateonewidget.cpp umbrello-kf6-15.08.1/umbrello/widgets/toolbarstateonewidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/toolbarstateonewidget.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/toolbarstateonewidget.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,249 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -72361,7 +72361,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/toolbarstateonewidget.cpp umbr - * (at your option) any later version. * - * * - * copyright (C) 2004-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header @@ -72603,9 +72603,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/toolbarstateonewidget.cpp umbr - ToolBarStatePool::init(); -} - -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/toolbarstateonewidget.h umbrello-15.08.1/umbrello/widgets/toolbarstateonewidget.h ---- umbrello-15.08.1.orig/umbrello/widgets/toolbarstateonewidget.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/toolbarstateonewidget.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/toolbarstateonewidget.h umbrello-kf6-15.08.1/umbrello/widgets/toolbarstateonewidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/toolbarstateonewidget.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/toolbarstateonewidget.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,59 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -72614,7 +72614,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/toolbarstateonewidget.h umbrel - * (at your option) any later version. * - * * - * copyright (C) 2004-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef TOOLBARSTATEONEWIDGET_H @@ -72666,9 +72666,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/toolbarstateonewidget.h umbrel -}; - -#endif //TOOLBARSTATEONEWIDGET_H -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/umlwidget.cpp umbrello-15.08.1/umbrello/widgets/umlwidget.cpp ---- umbrello-15.08.1.orig/umbrello/widgets/umlwidget.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/umlwidget.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/umlwidget.cpp umbrello-kf6-15.08.1/umbrello/widgets/umlwidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/umlwidget.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/umlwidget.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,1859 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -72677,7 +72677,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/umlwidget.cpp umbrello-15.08.1 - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#include "umlwidget.h" @@ -73662,7 +73662,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/umlwidget.cpp umbrello-15.08.1 - updateGeometry(); - if (m_scene->getPaste()) { - FloatingTextWidget * ft = 0; -- QPointF point = m_scene->getPastePoint(); +- QPointF point = m_scene->getPastep-kf6oint(); - int x = point.x() + this->x(); - int y = point.y() + this->y(); - if (m_scene->type() == Uml::DiagramType::Sequence) { @@ -73698,7 +73698,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/umlwidget.cpp umbrello-15.08.1 - setX(x); - setY(y); - } -- }//end if pastepoint +- }//end if pastep-kf6oint - else { - setX(this->x()); - setY(this->y()); @@ -74529,9 +74529,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/umlwidget.cpp umbrello-15.08.1 - return true; -} - -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/umlwidget.h umbrello-15.08.1/umbrello/widgets/umlwidget.h ---- umbrello-15.08.1.orig/umbrello/widgets/umlwidget.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/umlwidget.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/umlwidget.h umbrello-kf6-15.08.1/umbrello/widgets/umlwidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/umlwidget.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/umlwidget.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,347 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -74540,7 +74540,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/umlwidget.h umbrello-15.08.1/u - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef UMLWIDGET_H @@ -74568,7 +74568,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/umlwidget.h umbrello-15.08.1/u - * - * @short The base class for graphical UML objects. - * @author Paul Hensgen -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class UMLWidget : public WidgetBase -{ @@ -74880,9 +74880,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/umlwidget.h umbrello-15.08.1/u - -}; -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/usecasewidget.cpp umbrello-15.08.1/umbrello/widgets/usecasewidget.cpp ---- umbrello-15.08.1.orig/umbrello/widgets/usecasewidget.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/usecasewidget.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/usecasewidget.cpp umbrello-kf6-15.08.1/umbrello/widgets/usecasewidget.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/usecasewidget.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/usecasewidget.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,96 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -74891,7 +74891,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/usecasewidget.cpp umbrello-15. - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header file @@ -74980,9 +74980,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/usecasewidget.cpp umbrello-15. - - return QSizeF(width, height); -} -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/usecasewidget.h umbrello-15.08.1/umbrello/widgets/usecasewidget.h ---- umbrello-15.08.1.orig/umbrello/widgets/usecasewidget.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/usecasewidget.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/usecasewidget.h umbrello-kf6-15.08.1/umbrello/widgets/usecasewidget.h +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/usecasewidget.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/usecasewidget.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,58 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -74991,7 +74991,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/usecasewidget.h umbrello-15.08 - * (at your option) any later version. * - * * - * copyright (C) 2002-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef USECASEWIDGET_H @@ -75023,7 +75023,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/usecasewidget.h umbrello-15.08 - * - * @short A graphical version of a UMLUseCase. - * @author Paul Hensgen -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class UseCaseWidget : public UMLWidget -{ @@ -75042,9 +75042,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/usecasewidget.h umbrello-15.08 -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/widgetbase.cpp umbrello-15.08.1/umbrello/widgets/widgetbase.cpp ---- umbrello-15.08.1.orig/umbrello/widgets/widgetbase.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/widgetbase.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/widgetbase.cpp umbrello-kf6-15.08.1/umbrello/widgets/widgetbase.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/widgetbase.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/widgetbase.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,1119 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -75053,7 +75053,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/widgetbase.cpp umbrello-15.08. - * (at your option) any later version. * - * * - * copyright (C) 2004-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#include "widgetbase.h" @@ -75573,7 +75573,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/widgetbase.cpp umbrello-15.08. -{ - // first load from "linecolour" and then overwrite with the "linecolor" - // attribute if that one is present. The "linecolour" name was a "typo" in -- // earlier versions of Umbrello +- // earlier versions of umbrello-kf6 - QString lineColor = qElement.attribute(QLatin1String("linecolour"), QLatin1String("none")); - lineColor = qElement.attribute(QLatin1String("linecolor"), lineColor); - if (lineColor != QLatin1String("none")) { @@ -76165,9 +76165,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/widgetbase.cpp umbrello-15.08. - return name; -} - -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/widgetbase.h umbrello-15.08.1/umbrello/widgets/widgetbase.h ---- umbrello-15.08.1.orig/umbrello/widgets/widgetbase.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/widgetbase.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/widgetbase.h umbrello-kf6-15.08.1/umbrello/widgets/widgetbase.h +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/widgetbase.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/widgetbase.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,192 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -76176,7 +76176,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/widgetbase.h umbrello-15.08.1/ - * (at your option) any later version. * - * * - * copyright (C) 2004-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef WIDGETBASE_H @@ -76201,7 +76201,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/widgetbase.h umbrello-15.08.1/ -/** - * @short Common base class for UMLWidget and AssociationWidget - * @author Oliver Kellogg -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -class WidgetBase : public QGraphicsObject -{ @@ -76361,9 +76361,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/widgetbase.h umbrello-15.08.1/ -}; - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/widget_factory.cpp umbrello-15.08.1/umbrello/widgets/widget_factory.cpp ---- umbrello-15.08.1.orig/umbrello/widgets/widget_factory.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/widget_factory.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/widget_factory.cpp umbrello-kf6-15.08.1/umbrello/widgets/widget_factory.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/widget_factory.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/widget_factory.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,296 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -76372,7 +76372,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/widget_factory.cpp umbrello-15 - * (at your option) any later version. * - * * - * copyright (C) 2006-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header @@ -76661,9 +76661,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/widget_factory.cpp umbrello-15 - -} // end namespace Widget_Factory - -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/widget_factory.h umbrello-15.08.1/umbrello/widgets/widget_factory.h ---- umbrello-15.08.1.orig/umbrello/widgets/widget_factory.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/widget_factory.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/widget_factory.h umbrello-kf6-15.08.1/umbrello/widgets/widget_factory.h +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/widget_factory.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/widget_factory.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,34 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -76672,7 +76672,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/widget_factory.h umbrello-15.0 - * (at your option) any later version. * - * * - * copyright (C) 2006-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef WIDGET_FACTORY_H @@ -76687,7 +76687,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/widget_factory.h umbrello-15.0 - -/** - * Widget factory methods. -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -namespace Widget_Factory { - @@ -76699,9 +76699,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/widget_factory.h umbrello-15.0 -} // end namespace Widget_Factory - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/widgetlist_utils.cpp umbrello-15.08.1/umbrello/widgets/widgetlist_utils.cpp ---- umbrello-15.08.1.orig/umbrello/widgets/widgetlist_utils.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/widgetlist_utils.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/widgetlist_utils.cpp umbrello-kf6-15.08.1/umbrello/widgets/widgetlist_utils.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/widgetlist_utils.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/widgetlist_utils.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,157 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -76710,7 +76710,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/widgetlist_utils.cpp umbrello- - * (at your option) any later version. * - * * - * copyright (C) 2009-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header @@ -76860,9 +76860,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/widgetlist_utils.cpp umbrello- -} - -} // namespace WidgetList_Utils -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/widgetlist_utils.h umbrello-15.08.1/umbrello/widgets/widgetlist_utils.h ---- umbrello-15.08.1.orig/umbrello/widgets/widgetlist_utils.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/widgetlist_utils.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/widgetlist_utils.h umbrello-kf6-15.08.1/umbrello/widgets/widgetlist_utils.h +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/widgetlist_utils.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/widgetlist_utils.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,30 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -76871,7 +76871,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/widgetlist_utils.h umbrello-15 - * (at your option) any later version. * - * * - * copyright (C) 2009-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef WIDGETLIST_UTILS_H @@ -76880,8 +76880,8 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/widgetlist_utils.h umbrello-15 -#include "umlwidgetlist.h" - -/** -- * General purpose widget list utilities. -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * General purpose-kf6 widget list utilities. +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -namespace WidgetList_Utils -{ @@ -76894,9 +76894,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/widgetlist_utils.h umbrello-15 -} // namespace WidgetList_Utils - -#endif -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/widget_utils.cpp umbrello-15.08.1/umbrello/widgets/widget_utils.cpp ---- umbrello-15.08.1.orig/umbrello/widgets/widget_utils.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/widget_utils.cpp 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/widget_utils.cpp umbrello-kf6-15.08.1/umbrello/widgets/widget_utils.cpp +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/widget_utils.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/widget_utils.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,827 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -76905,7 +76905,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/widget_utils.cpp umbrello-15.0 - * (at your option) any later version. * - * * - * copyright (C) 2004-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -// own header @@ -77052,11 +77052,11 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/widget_utils.cpp umbrello-15.0 -// * param headPos The position where the head of the arrow should lie. -// * param arrowSize This indicates the size of the arrow head. -// * param arrowType This indicates direction of arrow as in LeftArrow, RightArrow.. --// * param solid If true, a solid head is drawn. Otherwise 2 lines are drawn. +-// * param solid-kf6 If true, a solid-kf6 head is drawn. Otherwise 2 lines are drawn. -// */ -// void drawArrowHead(QPainter *painter, const QPointF &arrowPos, -// const QSizeF& arrowSize, Qt::ArrowType arrowType, --// bool solid) +-// bool solid-kf6) -// { -// QPolygonF poly; -// if (arrowType == Qt::LeftArrow) { @@ -77070,7 +77070,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/widget_utils.cpp umbrello-15.0 -// << QPointF(arrowPos.x() - arrowSize.width(), arrowPos.y() + .5 * arrowSize.height()); -// } - --// if (solid) { +-// if (solid-kf6) { -// painter->drawPolygon(poly); -// } -// else { @@ -77725,9 +77725,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/widget_utils.cpp umbrello-15.0 - } - -} // namespace Widget_Utils -diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/widget_utils.h umbrello-15.08.1/umbrello/widgets/widget_utils.h ---- umbrello-15.08.1.orig/umbrello/widgets/widget_utils.h 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/umbrello/widgets/widget_utils.h 1970-01-01 02:00:00.000000000 +0200 +diff -Nuar umbrello-kf6-15.08.1.orig/umbrello/widgets/widget_utils.h umbrello-kf6-15.08.1/umbrello/widgets/widget_utils.h +--- umbrello-kf6-15.08.1.orig/umbrello/widgets/widget_utils.h 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/umbrello/widgets/widget_utils.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,66 +0,0 @@ -/*************************************************************************** - * This program is free software; you can redistribute it and/or modify * @@ -77736,7 +77736,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/widget_utils.h umbrello-15.08. - * (at your option) any later version. * - * * - * copyright (C) 2004-2014 * -- * Umbrello UML Modeller Authors * +- * umbrello-kf6 UML Modeller Authors * - ***************************************************************************/ - -#ifndef WIDGET_UTILS_H @@ -77756,8 +77756,8 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/widget_utils.h umbrello-15.08. -class QGraphicsRectItem; - -/** -- * General purpose widget utilities. -- * Bugs and comments to umbrello-devel@kde.org or http://bugs.kde.org +- * General purpose-kf6 widget utilities. +- * Bugs and comments to umbrello-kf6-devel@kde.org or http://bugs.kde.org - */ -namespace Widget_Utils -{ @@ -77771,7 +77771,7 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/widget_utils.h umbrello-15.08. - void drawTriangledRect(QPainter *painter, const QRectF& rect, const QSizeF& triSize); -// void drawArrowHead(QPainter *painter, const QPointF& arrowPos, -// const QSizeF& arrowSize, Qt::ArrowType arrowType, --// bool solid = false); +-// bool solid-kf6 = false); -// void drawRoundedRect(QPainter *painter, const QRectF& rect, qreal xRadius, -// qreal yRadius, Uml::Corners corners); - @@ -77795,9 +77795,9 @@ diff -Nuar umbrello-15.08.1.orig/umbrello/widgets/widget_utils.h umbrello-15.08. -} - -#endif -diff -Nuar umbrello-15.08.1.orig/unittests/CMakeLists.txt umbrello-15.08.1/unittests/CMakeLists.txt ---- umbrello-15.08.1.orig/unittests/CMakeLists.txt 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/unittests/CMakeLists.txt 2015-10-08 11:48:59.553089025 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/unittests/CMakeLists.txt umbrello-kf6-15.08.1/unittests/CMakeLists.txt +--- umbrello-kf6-15.08.1.orig/unittests/CMakeLists.txt 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/unittests/CMakeLists.txt 2015-10-08 11:48:59.553089025 +0300 @@ -37,7 +37,8 @@ ${SRC_PATH}/dialogs ${SRC_PATH}/docgenerators @@ -77808,9 +77808,9 @@ diff -Nuar umbrello-15.08.1.orig/unittests/CMakeLists.txt umbrello-15.08.1/unitt ${CMAKE_CURRENT_BINARY_DIR} ) -diff -Nuar umbrello-15.08.1.orig/unittests/testbase.cpp umbrello-15.08.1/unittests/testbase.cpp ---- umbrello-15.08.1.orig/unittests/testbase.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/unittests/testbase.cpp 2015-10-08 11:48:59.553089025 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/unittests/testbase.cpp umbrello-kf6-15.08.1/unittests/testbase.cpp +--- umbrello-kf6-15.08.1.orig/unittests/testbase.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/unittests/testbase.cpp 2015-10-08 11:48:59.553089025 +0300 @@ -39,8 +39,6 @@ #include #endif @@ -77835,9 +77835,9 @@ diff -Nuar umbrello-15.08.1.orig/unittests/testbase.cpp umbrello-15.08.1/unittes } void TestCodeGeneratorBase::initTestCase() -diff -Nuar umbrello-15.08.1.orig/unittests/TEST_cppwriter.cpp umbrello-15.08.1/unittests/TEST_cppwriter.cpp ---- umbrello-15.08.1.orig/unittests/TEST_cppwriter.cpp 2015-09-10 01:54:59.000000000 +0300 -+++ umbrello-15.08.1/unittests/TEST_cppwriter.cpp 2015-10-08 11:48:59.553089025 +0300 +diff -Nuar umbrello-kf6-15.08.1.orig/unittests/TEST_cppwriter.cpp umbrello-kf6-15.08.1/unittests/TEST_cppwriter.cpp +--- umbrello-kf6-15.08.1.orig/unittests/TEST_cppwriter.cpp 2015-09-10 01:54:59.000000000 +0300 ++++ umbrello-kf6-15.08.1/unittests/TEST_cppwriter.cpp 2015-10-08 11:48:59.553089025 +0300 @@ -51,9 +51,11 @@ UMLAttribute* attr; attr = c->createAttribute("name_"); diff --git a/desktop/kde/applications/umbrello/pspec.xml b/desktop/kde/applications/umbrello/pspec.xml index 4bbb90d0c8..d73603bb06 100755 --- a/desktop/kde/applications/umbrello/pspec.xml +++ b/desktop/kde/applications/umbrello/pspec.xml @@ -1,3 +1,4 @@ + @@ -12,35 +13,32 @@ app:gui desktop.kde.sdk UML modelling tool and code generator - Umbrello UML Modeller is a Unified Modelling Language diagram editor for KDE. - mirrors://kde/stable/release-service/23.08.5/src/umbrello-23.08.5.tar.xz + umbrello UML Modeller is a Unified Modelling Language diagram editor for KDE. + mirrors://kde/stable/release-service/24.12.1/src/umbrello-24.12.1.tar.xz - qt5-base-devel - qt5-webkit-devel libxslt-devel - qt5-svg-devel - kio-devel - kparts-devel - kinit-devel - kcompletion-devel - kxmlgui-devel - kauth-devel - kconfig-devel - ktexteditor-devel - kcoreaddons-devel - kdoctools-devel + kio5-devel + kparts5-devel + kcompletion5-devel + kxmlgui5-devel + kauth5-devel + kconfig5-devel + ktexteditor5-devel + kcoreaddons5-devel + kdoctools5-devel docbook-xsl - extra-cmake-modules - kwindowsystem-devel - kdelibs4-support-devel - kdesignerplugin - kemoticons-devel - kitemmodels-devel - kunitconversion-devel + kwindowsystem5-devel + kitemmodels5-devel + kunitconversion5-devel llvm llvm-clang-devel llvm-mlir llvm-polly + extra-cmake-modules + kdelibs4-support5-devel + qt5-base-devel + qt5-webkit-devel + qt5-svg-devel