Skip to content

Commit 2148fa9

Browse files
3nids3nids
committed
handle protected inheritance, rename ui class to avoid class name collision
1 parent 625cfc7 commit 2148fa9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+213
-210
lines changed

‎i18n/qgis_ar.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58353,27 +58353,27 @@ This may be a problem in your network connection or at the WMS server.</source>
5835358353
<context>
5835458354
<name>QgsLayerTreeEmbeddedConfigWidget</name>
5835558355
<message>
58356-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="14"/>
58356+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="14"/>
5835758357
<source>Form</source>
5835858358
<translation>شكل</translation>
5835958359
</message>
5836058360
<message>
58361-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="20"/>
58361+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="20"/>
5836258362
<source>Available widgets</source>
5836358363
<translation type="unfinished"></translation>
5836458364
</message>
5836558365
<message>
58366-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="27"/>
58366+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="27"/>
5836758367
<source>Used widgets</source>
5836858368
<translation type="unfinished"></translation>
5836958369
</message>
5837058370
<message>
58371-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="52"/>
58371+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="52"/>
5837258372
<source>-&gt;</source>
5837358373
<translation type="unfinished"></translation>
5837458374
</message>
5837558375
<message>
58376-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="63"/>
58376+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="63"/>
5837758377
<source>&lt;-</source>
5837858378
<translation type="unfinished"></translation>
5837958379
</message>

‎i18n/qgis_bg.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58389,27 +58389,27 @@ This may be a problem in your network connection or at the WMS server.</source>
5838958389
<context>
5839058390
<name>QgsLayerTreeEmbeddedConfigWidget</name>
5839158391
<message>
58392-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="14"/>
58392+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="14"/>
5839358393
<source>Form</source>
5839458394
<translation>Форма</translation>
5839558395
</message>
5839658396
<message>
58397-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="20"/>
58397+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="20"/>
5839858398
<source>Available widgets</source>
5839958399
<translation type="unfinished"></translation>
5840058400
</message>
5840158401
<message>
58402-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="27"/>
58402+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="27"/>
5840358403
<source>Used widgets</source>
5840458404
<translation type="unfinished"></translation>
5840558405
</message>
5840658406
<message>
58407-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="52"/>
58407+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="52"/>
5840858408
<source>-&gt;</source>
5840958409
<translation type="unfinished"></translation>
5841058410
</message>
5841158411
<message>
58412-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="63"/>
58412+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="63"/>
5841358413
<source>&lt;-</source>
5841458414
<translation type="unfinished"></translation>
5841558415
</message>

‎i18n/qgis_bs.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59037,27 +59037,27 @@ Ovo može biti problem do vaše mrežne konekcije ili na WMS serveru.</numerusfo
5903759037
<context>
5903859038
<name>QgsLayerTreeEmbeddedConfigWidget</name>
5903959039
<message>
59040-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="14"/>
59040+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="14"/>
5904159041
<source>Form</source>
5904259042
<translation>Forma</translation>
5904359043
</message>
5904459044
<message>
59045-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="20"/>
59045+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="20"/>
5904659046
<source>Available widgets</source>
5904759047
<translation>Dostupni widgeti</translation>
5904859048
</message>
5904959049
<message>
59050-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="27"/>
59050+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="27"/>
5905159051
<source>Used widgets</source>
5905259052
<translation>Korišteni widgeti</translation>
5905359053
</message>
5905459054
<message>
59055-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="52"/>
59055+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="52"/>
5905659056
<source>-&gt;</source>
5905759057
<translation>-&gt;</translation>
5905859058
</message>
5905959059
<message>
59060-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="63"/>
59060+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="63"/>
5906159061
<source>&lt;-</source>
5906259062
<translation>&lt;-</translation>
5906359063
</message>

‎i18n/qgis_ca.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58450,27 +58450,27 @@ This may be a problem in your network connection or at the WMS server.</source>
5845058450
<context>
5845158451
<name>QgsLayerTreeEmbeddedConfigWidget</name>
5845258452
<message>
58453-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="14"/>
58453+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="14"/>
5845458454
<source>Form</source>
5845558455
<translation>Formulari</translation>
5845658456
</message>
5845758457
<message>
58458-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="20"/>
58458+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="20"/>
5845958459
<source>Available widgets</source>
5846058460
<translation type="unfinished"></translation>
5846158461
</message>
5846258462
<message>
58463-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="27"/>
58463+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="27"/>
5846458464
<source>Used widgets</source>
5846558465
<translation type="unfinished"></translation>
5846658466
</message>
5846758467
<message>
58468-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="52"/>
58468+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="52"/>
5846958469
<source>-&gt;</source>
5847058470
<translation type="unfinished"></translation>
5847158471
</message>
5847258472
<message>
58473-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="63"/>
58473+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="63"/>
5847458474
<source>&lt;-</source>
5847558475
<translation type="unfinished"></translation>
5847658476
</message>

‎i18n/qgis_cs.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58428,27 +58428,27 @@ To může být problém vašeho síťového nastavení nebo WMS serveru.</numeru
5842858428
<context>
5842958429
<name>QgsLayerTreeEmbeddedConfigWidget</name>
5843058430
<message>
58431-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="14"/>
58431+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="14"/>
5843258432
<source>Form</source>
5843358433
<translation>Formulář</translation>
5843458434
</message>
5843558435
<message>
58436-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="20"/>
58436+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="20"/>
5843758437
<source>Available widgets</source>
5843858438
<translation>Dostupné widgety</translation>
5843958439
</message>
5844058440
<message>
58441-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="27"/>
58441+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="27"/>
5844258442
<source>Used widgets</source>
5844358443
<translation>Použité widgety</translation>
5844458444
</message>
5844558445
<message>
58446-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="52"/>
58446+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="52"/>
5844758447
<source>-&gt;</source>
5844858448
<translation>-&gt;</translation>
5844958449
</message>
5845058450
<message>
58451-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="63"/>
58451+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="63"/>
5845258452
<source>&lt;-</source>
5845358453
<translation>&lt;-</translation>
5845458454
</message>

‎i18n/qgis_da.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58777,27 +58777,27 @@ Der er måske et problem med din netværksforbindelse, eller på WMS-serveren.</
5877758777
<context>
5877858778
<name>QgsLayerTreeEmbeddedConfigWidget</name>
5877958779
<message>
58780-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="14"/>
58780+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="14"/>
5878158781
<source>Form</source>
5878258782
<translation>Formular</translation>
5878358783
</message>
5878458784
<message>
58785-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="20"/>
58785+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="20"/>
5878658786
<source>Available widgets</source>
5878758787
<translation>Tilgængelige widgets</translation>
5878858788
</message>
5878958789
<message>
58790-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="27"/>
58790+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="27"/>
5879158791
<source>Used widgets</source>
5879258792
<translation>Benyttede widgets</translation>
5879358793
</message>
5879458794
<message>
58795-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="52"/>
58795+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="52"/>
5879658796
<source>-&gt;</source>
5879758797
<translation>-&gt;</translation>
5879858798
</message>
5879958799
<message>
58800-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="63"/>
58800+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="63"/>
5880158801
<source>&lt;-</source>
5880258802
<translation>&lt;-</translation>
5880358803
</message>

‎i18n/qgis_de.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59091,27 +59091,27 @@ Die könnte auf ein Netzwerkproblem oder ein Problem des WMS-Server hindeuten.</
5909159091
<context>
5909259092
<name>QgsLayerTreeEmbeddedConfigWidget</name>
5909359093
<message>
59094-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="14"/>
59094+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="14"/>
5909559095
<source>Form</source>
5909659096
<translation>Form</translation>
5909759097
</message>
5909859098
<message>
59099-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="20"/>
59099+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="20"/>
5910059100
<source>Available widgets</source>
5910159101
<translation>Verfügbare Element</translation>
5910259102
</message>
5910359103
<message>
59104-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="27"/>
59104+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="27"/>
5910559105
<source>Used widgets</source>
5910659106
<translation>Verwendete Elemente</translation>
5910759107
</message>
5910859108
<message>
59109-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="52"/>
59109+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="52"/>
5911059110
<source>-&gt;</source>
5911159111
<translation>-&gt;</translation>
5911259112
</message>
5911359113
<message>
59114-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="63"/>
59114+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="63"/>
5911559115
<source>&lt;-</source>
5911659116
<translation>&lt;-</translation>
5911759117
</message>

‎i18n/qgis_el.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58305,27 +58305,27 @@ This may be a problem in your network connection or at the WMS server.</source>
5830558305
<context>
5830658306
<name>QgsLayerTreeEmbeddedConfigWidget</name>
5830758307
<message>
58308-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="14"/>
58308+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="14"/>
5830958309
<source>Form</source>
5831058310
<translation>Φόρμα</translation>
5831158311
</message>
5831258312
<message>
58313-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="20"/>
58313+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="20"/>
5831458314
<source>Available widgets</source>
5831558315
<translation type="unfinished"></translation>
5831658316
</message>
5831758317
<message>
58318-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="27"/>
58318+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="27"/>
5831958319
<source>Used widgets</source>
5832058320
<translation type="unfinished"></translation>
5832158321
</message>
5832258322
<message>
58323-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="52"/>
58323+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="52"/>
5832458324
<source>-&gt;</source>
5832558325
<translation type="unfinished"></translation>
5832658326
</message>
5832758327
<message>
58328-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="63"/>
58328+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="63"/>
5832958329
<source>&lt;-</source>
5833058330
<translation type="unfinished"></translation>
5833158331
</message>

‎i18n/qgis_en.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59013,27 +59013,27 @@ This may be a problem in your network connection or at the WMS server.</numerusf
5901359013
<context>
5901459014
<name>QgsLayerTreeEmbeddedConfigWidget</name>
5901559015
<message>
59016-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="14"/>
59016+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="14"/>
5901759017
<source>Form</source>
5901859018
<translation>Form</translation>
5901959019
</message>
5902059020
<message>
59021-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="20"/>
59021+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="20"/>
5902259022
<source>Available widgets</source>
5902359023
<translation>Available widgets</translation>
5902459024
</message>
5902559025
<message>
59026-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="27"/>
59026+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="27"/>
5902759027
<source>Used widgets</source>
5902859028
<translation>Used widgets</translation>
5902959029
</message>
5903059030
<message>
59031-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="52"/>
59031+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="52"/>
5903259032
<source>-&gt;</source>
5903359033
<translation>-&gt;</translation>
5903459034
</message>
5903559035
<message>
59036-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="63"/>
59036+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="63"/>
5903759037
<source>&lt;-</source>
5903859038
<translation>&lt;-</translation>
5903959039
</message>

‎i18n/qgis_es.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58668,27 +58668,27 @@ Puede haber un problema en su conexión a la red o en el servidor WMS.</numerusf
5866858668
<context>
5866958669
<name>QgsLayerTreeEmbeddedConfigWidget</name>
5867058670
<message>
58671-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="14"/>
58671+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="14"/>
5867258672
<source>Form</source>
5867358673
<translation>Formulario</translation>
5867458674
</message>
5867558675
<message>
58676-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="20"/>
58676+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="20"/>
5867758677
<source>Available widgets</source>
5867858678
<translation>Controles disponibles</translation>
5867958679
</message>
5868058680
<message>
58681-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="27"/>
58681+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="27"/>
5868258682
<source>Used widgets</source>
5868358683
<translation>Controles usados</translation>
5868458684
</message>
5868558685
<message>
58686-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="52"/>
58686+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="52"/>
5868758687
<source>-&gt;</source>
5868858688
<translation>-&gt;</translation>
5868958689
</message>
5869058690
<message>
58691-
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="63"/>
58691+
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="63"/>
5869258692
<source>&lt;-</source>
5869358693
<translation>&lt;-</translation>
5869458694
</message>

0 commit comments

Comments
 (0)