Hello community, here is the log from the commit of package granatier for openSUSE:Leap:15.2 checked in at 2020-05-13 03:50:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/granatier (Old) and /work/SRC/openSUSE:Leap:15.2/.granatier.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "granatier" Wed May 13 03:50:59 2020 rev:43 rq:797327 version:20.04.0 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/granatier/granatier.changes 2020-03-15 13:36:23.386839093 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.granatier.new.2738/granatier.changes 2020-05-13 03:51:00.672096085 +0200 @@ -1,0 +2,28 @@ +Thu Apr 23 12:21:56 UTC 2020 - Luca Beltrame <[email protected]> + +- Update to 20.04.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/releases/2020-04-apps-update +- No code change since 20.03.90 + +------------------------------------------------------------------- +Sun Apr 5 20:29:41 UTC 2020 - Luca Beltrame <[email protected]> + +- Update to 20.03.90 + * New feature release + * For more details please see: + * https://kde.org/announcements/releases/20.04-rc +- No code change since 20.03.80 + +------------------------------------------------------------------- +Sun Mar 22 09:16:37 UTC 2020 - Luca Beltrame <[email protected]> + +- Update to 20.03.80 + * New feature release + * For more details please see: + * https://kde.org/announcements/releases/20.04-beta +- Changes since 19.12.3: + * QXmlSimpleReader is deprecated port to QXmlStreamReader + +------------------------------------------------------------------- Old: ---- granatier-19.12.3.tar.xz granatier-19.12.3.tar.xz.sig New: ---- granatier-20.04.0.tar.xz granatier-20.04.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ granatier.spec ++++++ --- /var/tmp/diff_new_pack.YqZVbo/_old 2020-05-13 03:51:01.096096973 +0200 +++ /var/tmp/diff_new_pack.YqZVbo/_new 2020-05-13 03:51:01.100096981 +0200 @@ -1,7 +1,7 @@ # # spec file for package granatier # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,33 +21,29 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: granatier -Version: 19.12.3 +Version: 20.04.0 Release: 0 Summary: Bomberman-like game for KDE License: GPL-2.0-or-later Group: Amusements/Games/Action/Arcade URL: https://www.kde.org Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz -%if %{with lang} -Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig -Source2: applications.keyring -%endif BuildRequires: extra-cmake-modules +BuildRequires: update-desktop-files BuildRequires: cmake(KF5Config) BuildRequires: cmake(KF5ConfigWidgets) BuildRequires: cmake(KF5CoreAddons) -BuildRequires: cmake(KF5KDELibs4Support) BuildRequires: cmake(KF5GuiAddons) BuildRequires: cmake(KF5I18n) BuildRequires: cmake(KF5IconThemes) -BuildRequires: cmake(KF5KIO) BuildRequires: cmake(KF5ItemViews) +BuildRequires: cmake(KF5KDEGames) +BuildRequires: cmake(KF5KDELibs4Support) +BuildRequires: cmake(KF5KIO) BuildRequires: cmake(KF5NewStuff) BuildRequires: cmake(KF5NotifyConfig) BuildRequires: cmake(KF5WidgetsAddons) BuildRequires: cmake(KF5XmlGui) -BuildRequires: cmake(KF5KDEGames) -BuildRequires: update-desktop-files BuildRequires: cmake(Qt5QuickWidgets) BuildRequires: cmake(Qt5Svg) BuildRequires: cmake(Qt5Test) @@ -55,17 +51,17 @@ Obsoletes: %{name}5 < %{version} Provides: %{name}5 = %{version} %if %{with lang} -Recommends: %{name}-lang +Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig +Source2: applications.keyring %endif +Recommends: %{name}-lang %description In this game, the player walks through an arena, lays bombs and, in that way, is to kill enemies. Granatier is a clone of the popular Bomberman game. -%if %{with lang} %lang_package -%endif %prep %setup -q -n granatier-%{version} ++++++ granatier-19.12.3.tar.xz -> granatier-20.04.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-19.12.3/CMakeLists.txt new/granatier-20.04.0/CMakeLists.txt --- old/granatier-19.12.3/CMakeLists.txt 2020-03-03 01:18:42.000000000 +0100 +++ new/granatier-20.04.0/CMakeLists.txt 2020-04-17 02:31:14.000000000 +0200 @@ -36,10 +36,7 @@ add_definitions(-DQT_NO_FOREACH) MESSAGE(STATUS "compile without foreach") endif() -if (EXISTS "${CMAKE_SOURCE_DIR}/.git") - add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000) - add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x060000) -endif() + add_subdirectory(themes) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-19.12.3/arenas/clover.desktop new/granatier-20.04.0/arenas/clover.desktop --- old/granatier-19.12.3/arenas/clover.desktop 2020-03-01 08:00:07.000000000 +0100 +++ new/granatier-20.04.0/arenas/clover.desktop 2020-04-06 10:16:56.000000000 +0200 @@ -60,7 +60,7 @@ Description[it]=Il quadrifoglio è una rara variante del comune trifoglio. Stando alla tradizione, porta fortuna a chi lo trova, soprattutto se lo trova per caso. Una leggenda dà un significato ad ogni foglia: la prima è la speranza, la seconda la fede, la terza l'amore e la quarta la fortuna. Description[kk]=Әдетте беде үш-жапырақты болады, төрт жапырағы өте сирек кездеседі. Беденің төрт жапырағын тапқанға ол бақыт әкеледі деген сенім бар. Аңыз бойынша, бірінші жапырағы - үміт, екіншісі - сенім, үшіншісі - махаббат, төртіншісі - сәттілік сыйлайды. Description[km]=ដើមបួនសន្លឹកគឺក្លាយចេញមកពីដើមបីសន្លឹក ។ បើយោងតាមជំនឿ ស្លឹកទាំងនេះនឹងនាំសំណាងមកដល់អ្នកដែលបានឃើញវា ជាពិសេសបើសិនជាឃើញវាដោយចៃដន្យ ។ បើយោងតាមរឿងព្រេង សន្លឹកនីមួយៗតំណាងឲ្យធាតុមួយចំនួនដូចជា ៖ ទីមួយតំណាងឲ្យសេចក្ដីសង្ឃឹម ទីពីសេចក្ដីស្មោះត្រង់ ទីបីសេចក្ដីស្រឡាញ់ និងទីបួនសំណាង ។ -Description[ko]=네잎클로버는 흔히 볼 수 있는 세잎클로버의 보기 어려운 변종입니다. 전통에 의하면 네잎클로버를 찾은 사람들에게 행운을 가져다 주며, 특히 우연히 찾은 사람들에게 가져다 줍니다. 전설에 의하면 첫 번째 잎은 희망, 두 번째 잎은 믿음, 세 번째 잎은 사랑, 네 번째 잎은 행운을 뜻합니다. +Description[ko]=네잎클로버는 흔히 볼 수 있는 세잎클로버의 보기 어려운 변종입니다. 전통에 의하면 네잎클로버를 찾은 사람에게 행운을 가져다 주며, 특히 우연히 찾은 사람에게 가져다 줍니다. 전설에 의하면 첫 번째 잎은 희망, 두 번째 잎은 믿음, 세 번째 잎은 사랑, 네 번째 잎은 행운을 뜻합니다. Description[lv]=Četrlapu āboliņš ir parastā, trīslapu āboliņa, neparasta variācija. Tradicionāli šādas lapiņas nes veiksmi to atradējiem, it īpaši, ja atrastas nejauši. Leģenda vēsta, ka katra lapiņa kaut ko simbolizē: pirmā — cerību, otrā — ticību, trešā — mīlestību, bet ceturtā — veiksmi. Description[nb]=Firkløveren er en uvanlig variant av den vanlige kløveren med tre blader. Etter tradisjonen bringer firkløveren hell til den som finner den, spesielt hvis den finnes tilfeldig. I følge legenden står hvert blad for noe: det første er for håp, det andre for tro, det tredje for kjærlighet og det fjerde for hell. Description[nds]=De Kleverveer is de rore Speeloort vun den normalen Klever. De hett veer ansteed vun dree Enkelblääd. So en Blatt mit veer Enkelblääd schall en Glücksbringer wesen, sünnerlich, wenn Een dat tofällig funnen hett. Een seggt ok, elk vun de veer Enkelblääd hett en egen Bedüden: Hapen, Gloov, Leev un Glück. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-19.12.3/po/de/docs/granatier/index.docbook new/granatier-20.04.0/po/de/docs/granatier/index.docbook --- old/granatier-19.12.3/po/de/docs/granatier/index.docbook 2020-03-03 01:18:41.000000000 +0100 +++ new/granatier-20.04.0/po/de/docs/granatier/index.docbook 2020-04-17 02:31:14.000000000 +0200 @@ -188,8 +188,8 @@ > <phrase >Wand</phrase > </textobject> - </inlinemediaobject> -Die <emphasis + </inlinemediaobject +>Die <emphasis >Wand</emphasis > begrenzt das Spielfeld und kann nicht zerstört werden. </para> <para> @@ -200,8 +200,8 @@ > <phrase >Boden</phrase > </textobject> - </inlinemediaobject> -Auf dem <emphasis + </inlinemediaobject +>Auf dem <emphasis >Boden</emphasis > bewegen sich die Spieler. </para> <para> @@ -212,8 +212,8 @@ > <phrase >Eis</phrase > </textobject> - </inlinemediaobject> -Das <emphasis + </inlinemediaobject +>Das <emphasis >Eis</emphasis > macht den Boden rutschig. Die Geschwindigkeit des Spielers erhöht sich und > das vollständige Stehen bleiben ist nicht möglich. </para> <para> @@ -224,8 +224,8 @@ > <phrase >Hindernis</phrase > </textobject> - </inlinemediaobject> -Die <emphasis + </inlinemediaobject +>Die <emphasis >Hindernisse</emphasis > können mit Bomben zerstört werden und ein paar von Ihnen enthalten <emphasis >Boni</emphasis @@ -240,8 +240,8 @@ > <phrase >Mörser</phrase > </textobject> - </inlinemediaobject> -Auf dem <emphasis + </inlinemediaobject +>Auf dem <emphasis >Mörser</emphasis > gelegte Bomben werden an eine zufällige Stelle auf dem Spielfeld <emphasis >teleportiert</emphasis @@ -254,8 +254,8 @@ > <phrase >Pfeile</phrase > </textobject> - </inlinemediaobject> -Die <emphasis + </inlinemediaobject +>Die <emphasis >Pfeile</emphasis > bewegen die darauf gelegten Bomben in die jeweils zeigende Richtung (bis sie > an einer Wand oder einem Hindernis anstoßen). </para> <para @@ -282,8 +282,8 @@ > <phrase >Geschwindigkeit</phrase > </textobject> - </inlinemediaobject> -Durch den <emphasis + </inlinemediaobject +>Durch den <emphasis >Geschwindigkeits</emphasis >bonus kann sich der Spieler ein bisschen schneller bewegen. </para> <para> @@ -294,8 +294,8 @@ > <phrase >Bombe</phrase > </textobject> - </inlinemediaobject> -Durch den <emphasis + </inlinemediaobject +>Durch den <emphasis >Bomben</emphasis >bonus können mehrere Bomben gleichzeitig gelegt werden. </para> <para> @@ -306,8 +306,8 @@ > <phrase >Schlagkraft</phrase > </textobject> - </inlinemediaobject> -Der <emphasis + </inlinemediaobject +>Der <emphasis >Schlagkraft</emphasis >bonus erhöht die Reichweite der Bombe. </para> <para> @@ -318,8 +318,8 @@ > <phrase >Schild</phrase > </textobject> - </inlinemediaobject> -Das <emphasis + </inlinemediaobject +>Das <emphasis >Schild</emphasis > schützt vor der Wirkung der Bombenexplosion. </para> <para> @@ -330,8 +330,8 @@ > <phrase >Werfen</phrase > </textobject> - </inlinemediaobject> -Mit dem <emphasis + </inlinemediaobject +>Mit dem <emphasis >Treten</emphasis >bonus können die Bomben auch geworfen werden. Dazu muss lediglich die Taste >für das Legen der Bombe gedrückt werden, sobald sich die Spielfigur über >einer Bombe befindet. </para> <para> @@ -342,8 +342,8 @@ > <phrase >Treten</phrase > </textobject> - </inlinemediaobject> -Mit dem <emphasis + </inlinemediaobject +>Mit dem <emphasis >Treten</emphasis >bonus können die Bomben bewegt werden. Hierzu wird lediglich die Bombe >berührt und sie bewegt sich in die entsprechende Richtung. </para> </sect2> @@ -370,8 +370,8 @@ > <phrase >Bremse</phrase > </textobject> - </inlinemediaobject> -Durch die <emphasis + </inlinemediaobject +>Durch die <emphasis >Bremse</emphasis > kann sich der Spieler nur noch langsam fortbewegen. </para> <para> @@ -382,8 +382,8 @@ > <phrase >Hyperaktivität</phrase > </textobject> - </inlinemediaobject> -Der <emphasis + </inlinemediaobject +>Der <emphasis >hyperaktive</emphasis > Spieler bewegt sich sehr schnell und ist dadurch nur schwer steuerbar ... > </para> <para> @@ -394,8 +394,8 @@ > <phrase >Spiegel</phrase > </textobject> - </inlinemediaobject> -Durch den <emphasis + </inlinemediaobject +>Durch den <emphasis >Spiegel</emphasis > bewegt sich der Spieler immer in die andere Richtung (hoch -> runter, links > -> rechts, bzw. umgekehrt). </para> <para> @@ -406,8 +406,8 @@ > <phrase >Schusseligkeit</phrase > </textobject> - </inlinemediaobject> -Der <emphasis + </inlinemediaobject +>Der <emphasis >Schussel</emphasis > legt ständig Bomben. </para> <para> @@ -418,8 +418,8 @@ > <phrase >Handschellen</phrase > </textobject> - </inlinemediaobject> -Durch die <emphasis + </inlinemediaobject +>Durch die <emphasis >Handschellen</emphasis > können keine Bomben gelegt werden. </para> </sect2> @@ -438,8 +438,8 @@ > <phrase >Kiste der Pandora</phrase > </textobject> - </inlinemediaobject> -Die <emphasis + </inlinemediaobject +>Die <emphasis >Kiste der Pandora</emphasis > ist eine Überraschung und beinhaltet entweder einen <emphasis >Bonus</emphasis @@ -454,8 +454,8 @@ > <phrase >Wiederbelebung</phrase > </textobject> - </inlinemediaobject> -Die <emphasis + </inlinemediaobject +>Die <emphasis >Wiederbelebung</emphasis > erweckt einen getöteten Spieler zu neuem Leben. </para> </sect2> @@ -729,8 +729,7 @@ >Übersetzung: Johannes Obermayr <email >[email protected]</email ></para -> -&underFDL; &underGPL; </chapter> +> &underFDL; &underGPL; </chapter> &documentation.index; </book> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-19.12.3/po/en_GB/granatier.po new/granatier-20.04.0/po/en_GB/granatier.po --- old/granatier-19.12.3/po/en_GB/granatier.po 2020-03-03 01:18:39.000000000 +0100 +++ new/granatier-20.04.0/po/en_GB/granatier.po 2020-04-17 02:31:13.000000000 +0200 @@ -10,7 +10,7 @@ "POT-Creation-Date: 2019-06-27 02:55+0200\n" "PO-Revision-Date: 2018-05-12 12:03+0000\n" "Last-Translator: Steve Allewell <[email protected]>\n" -"Language-Team: British English <[email protected]>\n" +"Language-Team: British English <[email protected]>\n" "Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-19.12.3/po/et/granatier.po new/granatier-20.04.0/po/et/granatier.po --- old/granatier-19.12.3/po/et/granatier.po 2020-03-03 01:18:39.000000000 +0100 +++ new/granatier-20.04.0/po/et/granatier.po 2020-04-17 02:31:13.000000000 +0200 @@ -2,21 +2,21 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Marek Laane <[email protected]>, 2009, 2012, 2016. +# Marek Laane <[email protected]>, 2009, 2012, 2016, 2019. msgid "" msgstr "" "Project-Id-Version: granatier\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2019-06-27 02:55+0200\n" -"PO-Revision-Date: 2016-01-13 14:20+0200\n" +"PO-Revision-Date: 2019-11-11 12:13+0200\n" "Last-Translator: Marek Laane <[email protected]>\n" -"Language-Team: Estonian <[email protected]>\n" +"Language-Team: Estonian <[email protected]>\n" "Language: et\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 19.08.1\n" #, kde-format msgctxt "NAME OF TRANSLATORS" @@ -26,7 +26,7 @@ #, kde-format msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr "[email protected]" +msgstr "[email protected]" #: config/arenaselector.cpp:284 config/playerselectoritem.cpp:166 #, kde-format @@ -316,12 +316,12 @@ #: main.cpp:83 #, kde-format msgid "Arturo Silva" -msgstr "" +msgstr "Arturo Silva" #: main.cpp:83 #, kde-format msgid "Most of the beautiful granatier graphics" -msgstr "" +msgstr "Enamik Granatieri imekaunist graafikast" #: main.cpp:84 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-19.12.3/po/ko/granatier.po new/granatier-20.04.0/po/ko/granatier.po --- old/granatier-19.12.3/po/ko/granatier.po 2020-03-03 01:18:40.000000000 +0100 +++ new/granatier-20.04.0/po/ko/granatier.po 2020-04-17 02:31:13.000000000 +0200 @@ -1,13 +1,13 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. -# Shinjo Park <[email protected]>, 2014, 2015, 2019. +# Shinjo Park <[email protected]>, 2014, 2015, 2019, 2020. # msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2019-06-27 02:55+0200\n" -"PO-Revision-Date: 2019-05-30 00:44+0200\n" +"PO-Revision-Date: 2020-04-04 00:03+0200\n" "Last-Translator: Shinjo Park <[email protected]>\n" "Language-Team: Korean <[email protected]>\n" "Language: ko\n" @@ -15,7 +15,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Lokalize 18.12.3\n" +"X-Generator: Lokalize 19.04.3\n" #, kde-format msgctxt "NAME OF TRANSLATORS" @@ -151,7 +151,7 @@ #: config/granatier.kcfg:28 #, kde-format msgid "The points a user needs to win the game." -msgstr "게임에서 이기기 위해 따야 하는 점수입니다." +msgstr "게임에서 이기려면 따야 하는 점수입니다." #. i18n: ectx: label, entry (RoundTime), group (General) #: config/granatier.kcfg:32 @@ -193,7 +193,7 @@ #: config/granatier.kcfg:56 #, kde-format msgid "This is a dummy setting for player setup." -msgstr "플레이어 설정을 위한 가짜 설정입니다." +msgstr "가짜 플레이어 설정입니다." #. i18n: ectx: label, entry (ShowAllTiles), group (General) #. i18n: ectx: label, entry (BlastTime1), group (General) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-19.12.3/po/ml/granatier.po new/granatier-20.04.0/po/ml/granatier.po --- old/granatier-19.12.3/po/ml/granatier.po 1970-01-01 01:00:00.000000000 +0100 +++ new/granatier-20.04.0/po/ml/granatier.po 2020-04-17 02:31:13.000000000 +0200 @@ -0,0 +1,401 @@ +# Malayalam translations for granatier package. +# Copyright (C) 2019 This file is copyright: +# This file is distributed under the same license as the granatier package. +# Automatically generated, 2019. +# +msgid "" +msgstr "" +"Project-Id-Version: granatier\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n"; +"POT-Creation-Date: 2019-06-27 02:55+0200\n" +"PO-Revision-Date: 2019-12-12 22:07+0000\n" +"Last-Translator: Vivek KJ Pazhedath <[email protected]>\n" +"Language-Team: SMC <smc.org.in>\n" +"Language: ml\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Weblate 3.9.1\n" + +#, kde-format +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "" + +#, kde-format +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "[email protected],[email protected],[email protected]" + +#: config/arenaselector.cpp:284 config/playerselectoritem.cpp:166 +#, kde-format +msgctxt "Author attribution, e.g. \"by Jack\"" +msgid "by %1" +msgstr "" + +#. i18n: ectx: property (text), widget (QCheckBox, kcfg_RandomArenaMode) +#: config/arenaselector.ui:36 +#, kde-format +msgid "Random Mode" +msgstr "" + +#. i18n: ectx: property (text), widget (QPushButton, getNewButton) +#: config/arenaselector.ui:43 +#, kde-format +msgid "&Get New Arenas..." +msgstr "" + +#. i18n: ectx: property (title), widget (QGroupBox, groupBox) +#: config/generalsettings.ui:17 +#, kde-format +msgid "Only for Artists! Won't be here at release" +msgstr "" + +#. i18n: ectx: property (text), widget (QCheckBox, kcfg_ShowAllTiles) +#: config/generalsettings.ui:23 +#, kde-format +msgid " Show all tiles" +msgstr "" + +#. i18n: ectx: property (text), widget (QLabel, label_9) +#: config/generalsettings.ui:30 +#, kde-format +msgid "Blast Time 2" +msgstr "" + +#. i18n: ectx: property (text), widget (QLabel, label_8) +#: config/generalsettings.ui:37 +#, kde-format +msgid "Blast Time 3" +msgstr "" + +#. i18n: ectx: property (text), widget (QLabel, label_7) +#: config/generalsettings.ui:78 +#, kde-format +msgid "Blast Time 1" +msgstr "" + +#. i18n: ectx: property (text), widget (QLabel, label_10) +#: config/generalsettings.ui:85 +#, kde-format +msgid "Blast Time 5" +msgstr "" + +#. i18n: ectx: property (text), widget (QLabel, label_11) +#: config/generalsettings.ui:106 +#, kde-format +msgid "Blast Time 4" +msgstr "" + +#. i18n: ectx: property (text), widget (QLabel, label_2) +#: config/generalsettings.ui:131 +#, kde-format +msgid "Points to win the game:" +msgstr "" + +#. i18n: ectx: property (text), widget (QLabel, label_3) +#: config/generalsettings.ui:154 +#, kde-format +msgid "Round Time in Seconds:" +msgstr "" + +#. i18n: ectx: property (text), widget (QLabel, label_4) +#: config/generalsettings.ui:177 +#, kde-format +msgid "Initial Speed:" +msgstr "" + +#. i18n: ectx: property (text), widget (QLabel, label_5) +#: config/generalsettings.ui:200 +#, kde-format +msgid "Initial Bomb Power:" +msgstr "" + +#. i18n: ectx: property (text), widget (QLabel, label_6) +#: config/generalsettings.ui:223 +#, kde-format +msgid "Initial Bomb Armory:" +msgstr "" + +#. i18n: ectx: label, entry (FirstRun), group (General) +#: config/granatier.kcfg:9 +#, kde-format +msgid "Check if it is the first run of the game." +msgstr "" + +#. i18n: ectx: label, entry (Theme), group (General) +#: config/granatier.kcfg:13 +#, kde-format +msgid "The graphical theme to be used." +msgstr "" + +#. i18n: ectx: label, entry (Arena), group (General) +#: config/granatier.kcfg:17 +#, kde-format +msgid "The arena to be used." +msgstr "" + +#. i18n: ectx: label, entry (RandomArenaMode), group (General) +#: config/granatier.kcfg:21 +#, kde-format +msgid "Use random arenas." +msgstr "" + +#. i18n: ectx: label, entry (RandomArenaModeArenaList), group (General) +#: config/granatier.kcfg:25 +#, kde-format +msgid "List of arenas, used in random mode." +msgstr "" + +#. i18n: ectx: label, entry (PointsToWin), group (General) +#: config/granatier.kcfg:28 +#, kde-format +msgid "The points a user needs to win the game." +msgstr "" + +#. i18n: ectx: label, entry (RoundTime), group (General) +#: config/granatier.kcfg:32 +#, kde-format +msgid "Time for a round." +msgstr "" + +#. i18n: ectx: label, entry (InitialSpeed), group (General) +#: config/granatier.kcfg:36 +#, kde-format +msgid "The initial speed." +msgstr "" + +#. i18n: ectx: label, entry (InitialBombPower), group (General) +#: config/granatier.kcfg:40 +#, kde-format +msgid "The initial bomb power." +msgstr "" + +#. i18n: ectx: label, entry (InitialBombArmory), group (General) +#: config/granatier.kcfg:44 +#, kde-format +msgid "The initial bomb armory." +msgstr "" + +#. i18n: ectx: label, entry (Sounds), group (General) +#: config/granatier.kcfg:48 +#, kde-format +msgid "Whether sound effects should be played." +msgstr "" + +#. i18n: ectx: label, entry (UseWilhelmScream), group (General) +#: config/granatier.kcfg:52 +#, kde-format +msgid "Whether to use the Wilhelm Scream for dying players." +msgstr "" + +#. i18n: ectx: label, entry (Dummy), group (General) +#: config/granatier.kcfg:56 +#, kde-format +msgid "This is a dummy setting for player setup." +msgstr "" + +#. i18n: ectx: label, entry (ShowAllTiles), group (General) +#. i18n: ectx: label, entry (BlastTime1), group (General) +#. i18n: ectx: label, entry (BlastTime2), group (General) +#. i18n: ectx: label, entry (BlastTime3), group (General) +#. i18n: ectx: label, entry (BlastTime4), group (General) +#. i18n: ectx: label, entry (BlastTime5), group (General) +#: config/granatier.kcfg:60 config/granatier.kcfg:64 config/granatier.kcfg:68 +#: config/granatier.kcfg:72 config/granatier.kcfg:76 config/granatier.kcfg:80 +#, kde-format +msgid "This is only for the artists to make their life easier." +msgstr "" + +#: config/playerselector.cpp:90 +#, kde-format +msgid "Get New Players..." +msgstr "" + +#: config/playerselectoritem.cpp:75 +#, kde-format +msgctxt "Label for the key sequence to move the player." +msgid "Left:" +msgstr "" + +#: config/playerselectoritem.cpp:84 +#, kde-format +msgctxt "Label for the key sequence to move the player." +msgid "Up:" +msgstr "" + +#: config/playerselectoritem.cpp:93 +#, kde-format +msgctxt "Label for the key sequence to move the player." +msgid "Right:" +msgstr "" + +#: config/playerselectoritem.cpp:102 +#, kde-format +msgctxt "Label for the key sequence to move the player." +msgid "Down:" +msgstr "" + +#: config/playerselectoritem.cpp:111 +#, kde-format +msgctxt "Label for the key sequence to move the player." +msgid "Bomb:" +msgstr "" + +#: gamescene.cpp:89 +#, kde-format +msgid "0:00" +msgstr "" + +#: gamescene.cpp:94 +#, kde-format +msgid "Arena Name" +msgstr "" + +#: gamescene.cpp:822 +#, kde-format +msgid "Sudden Death" +msgstr "" + +#: infooverlay.cpp:62 +#, kde-format +msgid "Press Space to continue" +msgstr "" + +#: infooverlay.cpp:69 +#, kde-format +msgid "Press Space to start a new Game" +msgstr "" + +#: infooverlay.cpp:79 +#, kde-format +msgid "GET READY !!!" +msgstr "" + +#: infooverlay.cpp:84 +#, kde-format +msgid "Press Space to start" +msgstr "" + +#: infooverlay.cpp:89 +#, kde-format +msgid "PAUSED" +msgstr "" + +#: infooverlay.cpp:230 +#, kde-format +msgid "The winner is %1" +msgstr "" + +#: main.cpp:79 +#, kde-format +msgid "Granatier" +msgstr "" + +#: main.cpp:80 +#, kde-format +msgid "Granatier is a Bomberman Clone!" +msgstr "" + +#: main.cpp:81 +#, kde-format +msgid "Copyright (c) 2009-2015 The Granatier Team!" +msgstr "" + +#: main.cpp:82 +#, kde-format +msgid "Mathias Kraus" +msgstr "" + +#: main.cpp:82 +#, kde-format +msgid "Maintainer" +msgstr "" + +#: main.cpp:83 +#, kde-format +msgid "Arturo Silva" +msgstr "" + +#: main.cpp:83 +#, kde-format +msgid "Most of the beautiful granatier graphics" +msgstr "" + +#: main.cpp:84 +#, kde-format +msgid "Thomas Gallinari" +msgstr "" + +#: main.cpp:84 main.cpp:85 main.cpp:86 main.cpp:87 main.cpp:88 +#, kde-format +msgid "Developer of Kapman, which was the base of Granatier" +msgstr "" + +#: main.cpp:85 +#, kde-format +msgid "Pierre-Benoit Besse" +msgstr "" + +#: main.cpp:86 +#, kde-format +msgid "Romain Castan" +msgstr "" + +#: main.cpp:87 +#, kde-format +msgid "Alexandre Galinier" +msgstr "" + +#: main.cpp:88 +#, kde-format +msgid "Nathalie Liesse" +msgstr "" + +#: mainwindow.cpp:69 +#, kde-format +msgid "&Play sounds" +msgstr "" + +#: mainwindow.cpp:146 +#, kde-format +msgid "Are you sure you want to quit the current game?" +msgstr "" + +#: mainwindow.cpp:146 +#, kde-format +msgid "New game" +msgstr "" + +#: mainwindow.cpp:181 +#, kde-format +msgctxt "General settings" +msgid "General" +msgstr "" + +#: mainwindow.cpp:185 +#, kde-format +msgid "Theme" +msgstr "" + +#: mainwindow.cpp:187 +#, kde-format +msgid "Arena" +msgstr "" + +#: mainwindow.cpp:189 +#, kde-format +msgid "Player" +msgstr "" + +#: mainwindow.cpp:239 +#, kde-format +msgid "Are you sure you want to quit Granatier?" +msgstr "" + +#: mainwindow.cpp:239 +#, kde-format +msgctxt "To quit Granatier" +msgid "Quit" +msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-19.12.3/po/nb/granatier.po new/granatier-20.04.0/po/nb/granatier.po --- old/granatier-19.12.3/po/nb/granatier.po 2020-03-03 01:18:40.000000000 +0100 +++ new/granatier-20.04.0/po/nb/granatier.po 2020-04-17 02:31:14.000000000 +0200 @@ -8,7 +8,7 @@ "POT-Creation-Date: 2019-06-27 02:55+0200\n" "PO-Revision-Date: 2012-12-11 20:05+0100\n" "Last-Translator: Bjørn Steensrud <[email protected]>\n" -"Language-Team: Norwegian Bokmål <[email protected]>\n" +"Language-Team: Norwegian Bokmål <[email protected]>\n" "Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-19.12.3/po/nn/granatier.po new/granatier-20.04.0/po/nn/granatier.po --- old/granatier-19.12.3/po/nn/granatier.po 2020-03-03 01:18:40.000000000 +0100 +++ new/granatier-20.04.0/po/nn/granatier.po 2020-04-17 02:31:14.000000000 +0200 @@ -8,7 +8,7 @@ "POT-Creation-Date: 2019-06-27 02:55+0200\n" "PO-Revision-Date: 2018-06-09 23:05+0100\n" "Last-Translator: Karl Ove Hufthammer <[email protected]>\n" -"Language-Team: Norwegian Nynorsk <[email protected]>\n" +"Language-Team: Norwegian Nynorsk <[email protected]>\n" "Language: nn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-19.12.3/po/pt_BR/docs/granatier/index.docbook new/granatier-20.04.0/po/pt_BR/docs/granatier/index.docbook --- old/granatier-19.12.3/po/pt_BR/docs/granatier/index.docbook 2020-03-03 01:18:42.000000000 +0100 +++ new/granatier-20.04.0/po/pt_BR/docs/granatier/index.docbook 2020-04-17 02:31:14.000000000 +0200 @@ -1,12 +1,5 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ - <!ENTITY granatier "<application ->Granatier</application ->"> - <!ENTITY kappname "&granatier;"> - - <!ENTITY package "kdegames" -> <!-- do not change this! --> <!ENTITY % Brazilian-Portuguese "INCLUDE" > <!-- change language only here --> <!ENTITY % addindex "IGNORE" @@ -62,13 +55,13 @@ <legalnotice >&FDLNotice;</legalnotice> <date ->15/06/2012</date> +>09/05/2016</date> <releaseinfo ->1.2.0 (&kde; 4.9)</releaseinfo> +>1.3.1 (Applications 16.04)</releaseinfo> <abstract> <para ->Esta documentação descreve o jogo &granatier; na versão 1.2.0</para> +>Esta documentação descreve o jogo &granatier; versão 1.3.1</para> </abstract> <keywordset> @@ -179,8 +172,8 @@ > <phrase >Parede da Arena</phrase > </textobject> - </inlinemediaobject> -A Parede – define o contorno do mapa da arena e não pode ser destruída. </para> + </inlinemediaobject +>A Parede – define o contorno do mapa da arena e não pode ser destruída. </para> <para> <inlinemediaobject> <imageobject @@ -189,8 +182,8 @@ > <phrase >Chão da Arena</phrase > </textobject> - </inlinemediaobject> -O Chão – pode ser percorrido em segurança. </para> + </inlinemediaobject +>O Chão – pode ser percorrido em segurança. </para> <para> <inlinemediaobject> <imageobject @@ -199,8 +192,8 @@ > <phrase >Gelo na Arena</phrase > </textobject> - </inlinemediaobject> -O Gelo – isto tornará o chão escorregadio. A velocidade aumenta no gelo e não é possível parar por completo o movimento. </para> + </inlinemediaobject +>O Gelo – isto tornará o chão escorregadio. A velocidade aumenta no gelo e não é possível parar por completo o movimento. </para> <para> <inlinemediaobject> <imageobject @@ -209,8 +202,8 @@ > <phrase >Bloco da Arena</phrase > </textobject> - </inlinemediaobject> -O Bloco – Os blocos poderão ser destruídos com bombas. Alguns dos blocos poderão conter bônus (ou armadilhas). </para> + </inlinemediaobject +>O Bloco – Os blocos poderão ser destruídos com bombas. Alguns dos blocos poderão conter bônus (ou armadilhas). </para> <para> <inlinemediaobject> <imageobject @@ -219,8 +212,8 @@ > <phrase >Morteiro de Bombas da Arena</phrase > </textobject> - </inlinemediaobject> -O Morteiro de Bombas – isto irá atirar as bombas nele colocadas para locais aleatórios. </para> + </inlinemediaobject +>O Morteiro de Bombas – isto irá atirar as bombas nele colocadas para locais aleatórios. </para> <para> <inlinemediaobject> <imageobject @@ -229,8 +222,8 @@ > <phrase >Seta Direita da Arena</phrase > </textobject> - </inlinemediaobject> -As Setas – isto irá mover as bombas que estão nelas colocadas para a direção onde apontam. </para> + </inlinemediaobject +>As Setas – isto irá mover as bombas que estão nelas colocadas para a direção onde apontam. </para> <para >Se não existir nenhum dos itens acima, existe um buraco no chão e passar nele >fará com que caia para dentro dele e morra. O mesmo se aplica se não existir >nenhuma parede no extremo da arena e o jogador passar para fora da arena. ></para> </sect2> @@ -247,8 +240,8 @@ > <phrase >Bônus de Velocidade</phrase > </textobject> - </inlinemediaobject> -Velocidade – aumenta ligeiramente a sua velocidade. </para> + </inlinemediaobject +>Velocidade – aumenta ligeiramente a sua velocidade. </para> <para> <inlinemediaobject> <imageobject @@ -257,8 +250,8 @@ > <phrase >Bônus de Bomba</phrase > </textobject> - </inlinemediaobject> -Bomba – adiciona uma bomba extra ao seu arsenal, permitindo-lhe soltar mais de uma bomba de cada vez. </para> + </inlinemediaobject +>Bomba – adiciona uma bomba extra ao seu arsenal, permitindo-lhe soltar mais de uma bomba de cada vez. </para> <para> <inlinemediaobject> <imageobject @@ -267,8 +260,8 @@ > <phrase >Bônus de Potência</phrase > </textobject> - </inlinemediaobject> -Potência – aumenta a potência das suas bombas, estendendo o alcance da explosão das mesmas bombas. </para> + </inlinemediaobject +>Potência – aumenta a potência das suas bombas, estendendo o alcance da explosão das mesmas bombas. </para> <para> <inlinemediaobject> <imageobject @@ -277,8 +270,8 @@ > <phrase >Bônus de Escudo</phrase > </textobject> - </inlinemediaobject> -Escudo – fica invencível para uma explosão de bomba. </para> + </inlinemediaobject +>Escudo – fica invencível para uma explosão de bomba. </para> <para> <inlinemediaobject> <imageobject @@ -287,8 +280,8 @@ > <phrase >Bônus para Atirar</phrase > </textobject> - </inlinemediaobject> -Atirar – adiciona a capacidade de atirar bombas. Basta clicar na tecla para soltar bombas, quando tiver uma bomba abaixo de você. </para> + </inlinemediaobject +>Atirar – adiciona a capacidade de atirar bombas. Basta clicar na tecla para soltar bombas, quando tiver uma bomba abaixo de você. </para> <para> <inlinemediaobject> <imageobject @@ -297,8 +290,8 @@ > <phrase >Bônus de Pontapé</phrase > </textobject> - </inlinemediaobject> -Pontapé – adiciona a possibilidade de mover as bombas. Basta correr contra uma bomba, para que esta se mova. </para> + </inlinemediaobject +>Pontapé – adiciona a possibilidade de mover as bombas. Basta correr contra uma bomba, para que esta se mova. </para> </sect2> <sect2> <title @@ -313,8 +306,8 @@ > <phrase >Lentidão</phrase > </textobject> - </inlinemediaobject> -Lentidão – fará você andar muito lentamente. </para> + </inlinemediaobject +>Lentidão – fará você andar muito lentamente. </para> <para> <inlinemediaobject> <imageobject @@ -323,8 +316,8 @@ > <phrase >Hiperatividade</phrase > </textobject> - </inlinemediaobject> -Hiperatividade – fará você andar MUITO depressa. </para> + </inlinemediaobject +>Hiperatividade – fará você andar MUITO depressa. </para> <para> <inlinemediaobject> <imageobject @@ -333,8 +326,8 @@ > <phrase >Espelho</phrase > </textobject> - </inlinemediaobject> -Espelho – inverte as suas teclas de movimento, de modo que o cursor para Cima vira Baixo e a Esquerda vira Direita. </para> + </inlinemediaobject +>Espelho – inverte as suas teclas de movimento, de modo que o cursor para Cima vira Baixo e a Esquerda vira Direita. </para> <para> <inlinemediaobject> <imageobject @@ -343,8 +336,8 @@ > <phrase >Suicida</phrase > </textobject> - </inlinemediaobject> -Suicida – obriga-o a soltar constantemente as bombas sem qualquer controle. </para> + </inlinemediaobject +>Suicida – obriga-o a soltar constantemente as bombas sem qualquer controle. </para> <para> <inlinemediaobject> <imageobject @@ -353,8 +346,8 @@ > <phrase >Impedimento</phrase > </textobject> - </inlinemediaobject> -Impedimento – impede-o de soltar bombas. </para> + </inlinemediaobject +>Impedimento – impede-o de soltar bombas. </para> </sect2> <sect2> <title @@ -369,8 +362,8 @@ > <phrase >Bônus Neutro de Pandora</phrase > </textobject> - </inlinemediaobject> -Pandora – por trás deste, poderá existir tanto um bônus como uma armadilha. </para> + </inlinemediaobject +>Pandora – por trás deste, poderá existir tanto um bônus como uma armadilha. </para> <para> <inlinemediaobject> <imageobject @@ -379,8 +372,8 @@ > <phrase >Bônus Neutro de Ressurreição</phrase > </textobject> - </inlinemediaobject> -Ressurreição – isto irá ressuscitar todos os jogadores mortos. </para> + </inlinemediaobject +>Ressurreição – isto irá ressuscitar todos os jogadores mortos. </para> </sect2> </sect1> </chapter> @@ -582,7 +575,7 @@ <chapter id="credits" ><title ->Créditos e licença</title +>Créditos e Licença</title > <!-- do not change this! --> <para >&granatier; </para> @@ -611,8 +604,7 @@ > e André Marcelo Alvarenga <email >[email protected]</email ></para -> -&underFDL; &underGPL; </chapter> +> &underFDL; &underGPL; </chapter> &documentation.index; </book> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-19.12.3/po/zh_CN/granatier.po new/granatier-20.04.0/po/zh_CN/granatier.po --- old/granatier-19.12.3/po/zh_CN/granatier.po 2020-03-03 01:18:40.000000000 +0100 +++ new/granatier-20.04.0/po/zh_CN/granatier.po 2020-04-17 02:31:14.000000000 +0200 @@ -8,7 +8,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2019-06-27 02:55+0200\n" -"PO-Revision-Date: 2020-01-20 21:56\n" +"PO-Revision-Date: 2020-03-25 19:57\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-19.12.3/src/config/arenaselector.cpp new/granatier-20.04.0/src/config/arenaselector.cpp --- old/granatier-19.12.3/src/config/arenaselector.cpp 2020-03-01 08:00:07.000000000 +0100 +++ new/granatier-20.04.0/src/config/arenaselector.cpp 2020-04-06 10:16:56.000000000 +0200 @@ -290,13 +290,10 @@ m_arena = new Arena; MapParser mapParser(m_arena); QFile arenaXmlFile(selArena->graphics()); - QXmlInputSource source(&arenaXmlFile); - // Create the XML file reader - QXmlSimpleReader reader; - reader.setContentHandler(&mapParser); - // Parse the XML file - reader.parse(source); - + if (!arenaXmlFile.open(QIODevice::ReadOnly)) { + qWarning() << " impossible to open file " << arenaXmlFile.fileName(); + } + mapParser.parse(&arenaXmlFile); while(!m_arenaItems.isEmpty()) { if(m_graphicsScene->items().contains(m_arenaItems.last())) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-19.12.3/src/game.cpp new/granatier-20.04.0/src/game.cpp --- old/granatier-19.12.3/src/game.cpp 2020-03-01 08:00:07.000000000 +0100 +++ new/granatier-20.04.0/src/game.cpp 2020-04-06 10:16:56.000000000 +0200 @@ -145,12 +145,10 @@ QString arenaFileName = group.readEntry("FileName"); QFile arenaXmlFile(QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("arenas/%1").arg(arenaFileName))); - QXmlInputSource source(&arenaXmlFile); - // Create the XML file reader - QXmlSimpleReader reader; - reader.setContentHandler(&mapParser); - // Parse the XML file - reader.parse(source); + if (!arenaXmlFile.open(QIODevice::ReadOnly)) { + qWarning() << " impossible to open file " << arenaFileName; + } + mapParser.parse(&arenaXmlFile); QString arenaName = group.readEntry("Name"); m_arena->setName(arenaName); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-19.12.3/src/mapparser.cpp new/granatier-20.04.0/src/mapparser.cpp --- old/granatier-19.12.3/src/mapparser.cpp 2020-03-01 08:00:07.000000000 +0100 +++ new/granatier-20.04.0/src/mapparser.cpp 2020-04-06 10:16:56.000000000 +0200 @@ -33,34 +33,63 @@ { } -bool MapParser::characters(const QString & ch) +bool MapParser::parse(QIODevice *input) { - m_buffer = ch; + QXmlStreamReader reader(input); + + while (!reader.atEnd()) { + reader.readNext(); + if (reader.hasError()) + return false; + + switch (reader.tokenType()) { + case QXmlStreamReader::StartElement: + if (!startElement(reader.namespaceUri(), reader.name(), + reader.qualifiedName(), reader.attributes())) { + return false; + } + break; + case QXmlStreamReader::EndElement: + if (!endElement(reader.namespaceUri(), reader.name(), + reader.qualifiedName())) { + return false; + } + break; + case QXmlStreamReader::Characters: + if (!reader.isWhitespace() && !reader.text().toString().trimmed().isEmpty()) { + if (!characters(reader.text())) + return false; + } + break; + default: + break; + } + } + + if (reader.isEndDocument()) + return false; + return true; } -bool MapParser::startElement(const QString&, const QString&, const QString& p_qName, const QXmlAttributes& p_atts) +bool MapParser::characters(const QStringRef &ch) { - if (p_qName == QLatin1String("Arena")) - { + m_buffer = ch.toString(); + return true; +} + +bool MapParser::startElement(const QStringRef &namespaceURI, const QStringRef &localName, const QStringRef &qName, const QXmlStreamAttributes &atts) +{ + Q_UNUSED(namespaceURI) + Q_UNUSED(localName) + if (qName == QLatin1String("Arena")) { int nbRows = 0; int nbColumns = 0; - // Initialize the number of rows and columns - for (int i = 0; i < p_atts.count(); ++i) - { - if (p_atts.qName(i) == QLatin1String("rowCount")) - { - nbRows = p_atts.value(i).toInt(); - } - if (p_atts.qName(i) == QLatin1String("colCount")) - { - nbColumns = p_atts.value(i).toInt(); - } - //TODO:check for the right arenaFileVersion - //if (p_atts.qName(i) == "arenaFileVersion") - //{ - // m_arenaFileVersion = p_atts.value(i).toInt(); - //} + if (atts.hasAttribute(QLatin1String("rowCount"))) { + nbRows = atts.value(QLatin1String("rowCount")).toInt(); + } + if (atts.hasAttribute(QLatin1String("colCount"))) { + nbColumns = atts.value(QLatin1String("colCount")).toInt(); } // Create the Arena matrix m_arena->init(nbRows, nbColumns); @@ -69,10 +98,12 @@ return true; } -bool MapParser::endElement(const QString &, const QString &, const QString & p_qName) +bool MapParser::endElement(const QStringRef &namespaceURI, const QStringRef &localName, const QStringRef &qName) { - if(p_qName == QLatin1String("Row")) - { + Q_UNUSED(namespaceURI) + Q_UNUSED(localName) + + if (qName.toString() == QLatin1String("Row")) { for (int i=0; i<m_buffer.length();++i) { switch(m_buffer.at(i).toLatin1()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-19.12.3/src/mapparser.h new/granatier-20.04.0/src/mapparser.h --- old/granatier-19.12.3/src/mapparser.h 2020-03-01 08:00:07.000000000 +0100 +++ new/granatier-20.04.0/src/mapparser.h 2020-04-06 10:16:56.000000000 +0200 @@ -19,15 +19,13 @@ #ifndef MAPPARSER_H #define MAPPARSER_H - -#include <QXmlDefaultHandler> - +#include <QXmlStreamAttributes> class Arena; /** * @brief This class handles XML reader events in order to initialize the Arena properties. */ -class MapParser : public QXmlDefaultHandler +class MapParser { private: @@ -51,23 +49,17 @@ /** * Deletes the GameParser instance. */ - ~MapParser() override; + ~MapParser(); - /** - * Implement QXmlDefaultHandler::characters - */ - bool characters(const QString & ch ) override; + Q_REQUIRED_RESULT bool characters(const QStringRef &ch); - /** - * Implements QXmlDefaultHandler::startElement() - */ - bool startElement(const QString&, const QString&, const QString& p_qName, const QXmlAttributes& p_atts) override; + Q_REQUIRED_RESULT bool startElement(const QStringRef &namespaceURI, const QStringRef &localName, + const QStringRef &qName, const QXmlStreamAttributes &atts); - /** - * Implements QXmlDefaultHandler::endElement() - */ - bool endElement(const QString &, const QString &, const QString & p_qName ) override; + Q_REQUIRED_RESULT bool endElement(const QStringRef &namespaceURI, + const QStringRef &localName, const QStringRef &qName); + Q_REQUIRED_RESULT bool parse(QIODevice *input); }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-19.12.3/src/org.kde.granatier.appdata.xml new/granatier-20.04.0/src/org.kde.granatier.appdata.xml --- old/granatier-19.12.3/src/org.kde.granatier.appdata.xml 2020-03-01 08:00:07.000000000 +0100 +++ new/granatier-20.04.0/src/org.kde.granatier.appdata.xml 2020-04-06 10:16:56.000000000 +0200 @@ -122,6 +122,7 @@ <caption xml:lang="de">Granatier spielen</caption> <caption xml:lang="en-GB">Playing Granatier</caption> <caption xml:lang="es">Jugando a Granatier</caption> + <caption xml:lang="et">Granatieri mängimine</caption> <caption xml:lang="fr">Partie de Granatier en cours</caption> <caption xml:lang="gl">Xogando a Granatier</caption> <caption xml:lang="id">Memainkan Granatier</caption>
