From d511cc2f7a74576338f9bdad1fc9241e5847a541 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 9 Jun 2020 14:21:11 +0200
Subject: [PATCH] [locale] Norfolk Island gave up +11.5 in 2015

---
 src/modules/locale/images/timezone_11.5.png       | Bin 867 -> 0 bytes
 src/modules/locale/locale.qrc                     |   1 -
 .../locale/timezonewidget/TimeZoneImage.cpp       |   4 ++--
 src/modules/locale/timezonewidget/TimeZoneImage.h |   2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)
 delete mode 100644 src/modules/locale/images/timezone_11.5.png

diff --git a/src/modules/locale/images/timezone_11.5.png b/src/modules/locale/images/timezone_11.5.png
deleted file mode 100644
index 442cabfebf69ac0452942abbd78e57c452b960be..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 867
zcmeAS@N?(olHy`uVBq!ia0y~yVCG?9U<~1428!%^?EMQ!v7|ftIx;Y9?C1WI$O_~$
z76-XIF|0c$^AgBWNcITwWnidMV_;}#VPF8MZ+OALP-?)y@G60U!D<ErgLuK5U4b@0
ziD>~oA+A800munwU<hSs-5xaecKniO$xEIlFL<2PbtaUdhk?O~fx(D@!I;4&PSvYj
z*KeAE?^J#FUhR_2?u`fhTaN^`90_bX6i~d;t$L?d$H}0YT|U*jygE+>*Y5T$-|EqN
zG!V!JqPF8f72Cb?*Spm0_HNkc3q-YheDl}2^qdXtJ{t;D&~rYt=Uiy#>EQqW|4%3u
zF$OwJyCldj8010(U}9lqWi*|(b@O&3uPd%zS6w~N|N8OUMcgScAV{qJwwnV`DPxki
zyNlt?+p<MK4rhT!WHAE++aeHVbiHc`WH82ix;TbZ+<JSVo$(-0$AOHCmAX~kVl6l7
ztt1byy>r{4!35MgOhChYt*cQdnR(h2TP{Yh_$=G3GE?8>K+)GTpRY%;<ZOGt=*JtE
z1OEzqE?<shiCMQ@XScnJ!(Ku2$6?VdCA;?4d9sig4)u??H|}9wmFgn10H{;7#5JNM
zC9x#cD!C{XNHG{07#isUk%3W&p^25Tg_Vh^wt=CQfkCx+>NXS&x%nxXX_XKS29~-;
zh9L$9R;I>Q2FBV3MnDY>kIMCd8YDqB1m~xflqVLYGL)B>>t*I;7bhncr0V4trO$q6
RBL!5%;OXk;vd$@?2>@z!)F1!=

diff --git a/src/modules/locale/locale.qrc b/src/modules/locale/locale.qrc
index b6b0d0cf7..713943ae7 100644
--- a/src/modules/locale/locale.qrc
+++ b/src/modules/locale/locale.qrc
@@ -21,7 +21,6 @@
         <file>images/timezone_10.0.png</file>
         <file>images/timezone_10.5.png</file>
         <file>images/timezone_11.0.png</file>
-        <file>images/timezone_11.5.png</file>
         <file>images/timezone_12.0.png</file>
         <file>images/timezone_12.75.png</file>
         <file>images/timezone_13.0.png</file>
diff --git a/src/modules/locale/timezonewidget/TimeZoneImage.cpp b/src/modules/locale/timezonewidget/TimeZoneImage.cpp
index 52ddc24b1..eec939905 100644
--- a/src/modules/locale/timezonewidget/TimeZoneImage.cpp
+++ b/src/modules/locale/timezonewidget/TimeZoneImage.cpp
@@ -26,7 +26,7 @@
 
 static const char* zoneNames[]
     = { "0.0",  "1.0",  "2.0",  "3.0",  "3.5",  "4.0",  "4.5",  "5.0",  "5.5",   "5.75", "6.0",   "6.5",  "7.0",
-        "8.0",  "9.0",  "9.5",  "10.0", "10.5", "11.0", "11.5", "12.0", "12.75", "13.0", "-1.0",  "-2.0", "-3.0",
+        "8.0",  "9.0",  "9.5",  "10.0", "10.5", "11.0", "12.0", "12.75", "13.0", "-1.0",  "-2.0", "-3.0",
         "-3.5", "-4.0", "-4.5", "-5.0", "-5.5", "-6.0", "-7.0", "-8.0", "-9.0",  "-9.5", "-10.0", "-11.0" };
 static_assert( TimeZoneImageList::zoneCount == ( sizeof( zoneNames ) / sizeof( zoneNames[ 0 ] ) ),
                "Incorrect number of zones" );
@@ -36,7 +36,7 @@ static_assert( TimeZoneImageList::zoneCount == ( sizeof( zoneNames ) / sizeof( z
 /* static constexpr */ const int TimeZoneImageList::zoneCount;
 /* static constexpr */ const QSize TimeZoneImageList::imageSize;
 
-static_assert( TimeZoneImageList::zoneCount == 38 );
+static_assert( TimeZoneImageList::zoneCount == 37 );
 
 TimeZoneImageList::TimeZoneImageList() {}
 
diff --git a/src/modules/locale/timezonewidget/TimeZoneImage.h b/src/modules/locale/timezonewidget/TimeZoneImage.h
index 0a3aea145..ee02bfbfd 100644
--- a/src/modules/locale/timezonewidget/TimeZoneImage.h
+++ b/src/modules/locale/timezonewidget/TimeZoneImage.h
@@ -77,7 +77,7 @@ public:
     QImage find( QPoint p ) const;
 
     /// @brief The **expected** number of zones in the list.
-    static constexpr const int zoneCount = 38;
+    static constexpr const int zoneCount = 37;
     /// @brief The expected size of each zone image.
     static constexpr const QSize imageSize = QSize( 780, 340 );
 };