Skip to content

Commit 91b0e7f

Browse files
3nids3nids
committedJan 14, 2016
sort files in cmakelists
·
ltr-3_40archive/master_2
1 parent d12a0b4 commit 91b0e7f

File tree

2 files changed

+141
-142
lines changed

2 files changed

+141
-142
lines changed
 

‎src/core/CMakeLists.txt

Lines changed: 80 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -2,60 +2,60 @@
22
# sources
33

44
SET(QGIS_CORE_SRCS
5+
gps/context.c
6+
gps/gmath.c
7+
gps/info.c
8+
gps/parse.c
59
gps/qgsgpsconnection.cpp
610
gps/qgsgpsconnectionregistry.cpp
7-
gps/qgsnmeaconnection.cpp
811
gps/qgsgpsdconnection.cpp
912
gps/qgsgpsdetector.cpp
10-
gps/parse.c
13+
gps/qgsnmeaconnection.cpp
1114
gps/sentence.c
12-
gps/info.c
1315
gps/time.c
14-
gps/gmath.c
1516
gps/tok.c
16-
gps/context.c
1717

18-
symbology-ng/qgssymbolv2.cpp
19-
symbology-ng/qgssymbollayerv2.cpp
20-
symbology-ng/qgssymbollayerv2registry.cpp
21-
symbology-ng/qgssymbollayerv2utils.cpp
18+
symbology-ng/qgscategorizedsymbolrendererv2.cpp
19+
symbology-ng/qgscolorbrewerpalette.cpp
20+
symbology-ng/qgscptcityarchive.cpp
21+
symbology-ng/qgsellipsesymbollayerv2.cpp
22+
symbology-ng/qgsfillsymbollayerv2.cpp
23+
symbology-ng/qgsgeometrygeneratorsymbollayerv2.cpp
24+
symbology-ng/qgsgraduatedsymbolrendererv2.cpp
25+
symbology-ng/qgsheatmaprenderer.cpp
26+
symbology-ng/qgsinvertedpolygonrenderer.cpp
2227
symbology-ng/qgslegendsymbolitemv2.cpp
2328
symbology-ng/qgslinesymbollayerv2.cpp
2429
symbology-ng/qgsmarkersymbollayerv2.cpp
25-
symbology-ng/qgsfillsymbollayerv2.cpp
30+
symbology-ng/qgspointdisplacementrenderer.cpp
2631
symbology-ng/qgsrendererv2.cpp
2732
symbology-ng/qgsrendererv2registry.cpp
28-
symbology-ng/qgssinglesymbolrendererv2.cpp
29-
symbology-ng/qgscategorizedsymbolrendererv2.cpp
30-
symbology-ng/qgsgraduatedsymbolrendererv2.cpp
3133
symbology-ng/qgsrulebasedrendererv2.cpp
32-
symbology-ng/qgsheatmaprenderer.cpp
33-
symbology-ng/qgsinvertedpolygonrenderer.cpp
34-
symbology-ng/qgsvectorcolorrampv2.cpp
35-
symbology-ng/qgscptcityarchive.cpp
34+
symbology-ng/qgssinglesymbolrendererv2.cpp
3635
symbology-ng/qgsstylev2.cpp
37-
symbology-ng/qgssymbologyv2conversion.cpp
3836
symbology-ng/qgssvgcache.cpp
39-
symbology-ng/qgsellipsesymbollayerv2.cpp
40-
symbology-ng/qgspointdisplacementrenderer.cpp
37+
symbology-ng/qgssymbollayerv2.cpp
38+
symbology-ng/qgssymbollayerv2registry.cpp
39+
symbology-ng/qgssymbollayerv2utils.cpp
40+
symbology-ng/qgssymbologyv2conversion.cpp
41+
symbology-ng/qgssymbolv2.cpp
42+
symbology-ng/qgsvectorcolorrampv2.cpp
4143
symbology-ng/qgsvectorfieldsymbollayer.cpp
42-
symbology-ng/qgscolorbrewerpalette.cpp
43-
symbology-ng/qgsgeometrygeneratorsymbollayerv2.cpp
4444

4545
diagram/qgsdiagram.cpp
46+
diagram/qgshistogramdiagram.cpp
4647
diagram/qgspiediagram.cpp
4748
diagram/qgstextdiagram.cpp
48-
diagram/qgshistogramdiagram.cpp
4949

50-
effects/qgsimageoperation.cpp
51-
effects/qgspainteffect.cpp
52-
effects/qgseffectstack.cpp
5350
effects/qgsblureffect.cpp
54-
effects/qgsshadoweffect.cpp
51+
effects/qgscoloreffect.cpp
52+
effects/qgseffectstack.cpp
5553
effects/qgsgloweffect.cpp
54+
effects/qgsimageoperation.cpp
55+
effects/qgspainteffect.cpp
5656
effects/qgspainteffectregistry.cpp
57+
effects/qgsshadoweffect.cpp
5758
effects/qgstransformeffect.cpp
58-
effects/qgscoloreffect.cpp
5959

6060
layertree/qgslayertreegroup.cpp
6161
layertree/qgslayertreelayer.cpp
@@ -82,19 +82,19 @@ SET(QGIS_CORE_SRCS
8282
qgsclipper.cpp
8383
qgscolorscheme.cpp
8484
qgscolorschemeregistry.cpp
85+
qgsconditionalstyle.cpp
8586
qgscontexthelp.cpp
8687
qgscontexthelp_texts.cpp
8788
qgscoordinatereferencesystem.cpp
8889
qgscoordinatetransform.cpp
89-
qgsconditionalstyle.cpp
9090
qgscredentials.cpp
91-
qgsdartmeasurement.cpp
9291
qgscrscache.cpp
92+
qgsdartmeasurement.cpp
9393
qgsdatadefined.cpp
94-
qgsdatasourceuri.cpp
9594
qgsdataitem.cpp
9695
qgsdataitemprovider.cpp
9796
qgsdataitemproviderregistry.cpp
97+
qgsdatasourceuri.cpp
9898
qgsdatumtransformstore.cpp
9999
qgsdbfilterproxymodel.cpp
100100
qgsdiagramrendererv2.cpp
@@ -103,8 +103,8 @@ SET(QGIS_CORE_SRCS
103103
qgserror.cpp
104104
qgsexpression.cpp
105105
qgsexpressioncontext.cpp
106-
qgsexpression_texts.cpp
107106
qgsexpressionfieldbuffer.cpp
107+
qgsexpression_texts.cpp
108108
qgsfeature.cpp
109109
qgsfeatureiterator.cpp
110110
qgsfeaturerequest.cpp
@@ -117,15 +117,16 @@ SET(QGIS_CORE_SRCS
117117
qgsgml.cpp
118118
qgsgmlschema.cpp
119119
qgshistogram.cpp
120-
qgslayerdefinition.cpp
121120
qgslabel.cpp
122121
qgslabelattributes.cpp
123122
qgslabelfeature.cpp
124123
qgslabelingenginev2.cpp
125124
qgslabelsearchtree.cpp
125+
qgslayerdefinition.cpp
126126
qgslegacyhelpers.cpp
127127
qgslegendrenderer.cpp
128128
qgslegendsettings.cpp
129+
qgslocalec.cpp
129130
qgslogger.cpp
130131
qgsmaphittest.cpp
131132
qgsmaplayer.cpp
@@ -167,27 +168,28 @@ SET(QGIS_CORE_SRCS
167168
qgsprovidermetadata.cpp
168169
qgsproviderregistry.cpp
169170
qgspythonrunner.cpp
171+
qgsrectangle.cpp
170172
qgsrelation.cpp
171173
qgsrelationmanager.cpp
172174
qgsrenderchecker.cpp
173175
qgsrendercontext.cpp
174-
qgsrectangle.cpp
175176
qgsrulebasedlabeling.cpp
176177
qgsrunprocess.cpp
177178
qgsscalecalculator.cpp
178179
qgsscaleexpression.cpp
179180
qgsscaleutils.cpp
180181
qgssimplifymethod.cpp
182+
qgsslconnect.cpp
181183
qgssnapper.cpp
182184
qgssnappingutils.cpp
183185
qgsspatialindex.cpp
184186
qgssqlexpressioncompiler.cpp
185187
qgsstatisticalsummary.cpp
186188
qgsstringutils.cpp
187-
qgstracer.cpp
188-
qgstransaction.cpp
189189
qgstextlabelfeature.cpp
190190
qgstolerance.cpp
191+
qgstracer.cpp
192+
qgstransaction.cpp
191193
qgsvectordataprovider.cpp
192194
qgsvectorfilewriter.cpp
193195
qgsvectorlayer.cpp
@@ -204,56 +206,54 @@ SET(QGIS_CORE_SRCS
204206
qgsvectorlayerrenderer.cpp
205207
qgsvectorlayerundocommand.cpp
206208
qgsvectorsimplifymethod.cpp
207-
qgsvisibilitypresetcollection.cpp
208209
qgsvirtuallayerdefinition.cpp
209210
qgsvirtuallayerdefinitionutils.cpp
211+
qgsvisibilitypresetcollection.cpp
210212
qgsxmlutils.cpp
211-
qgsslconnect.cpp
212-
qgslocalec.cpp
213213

214214
composer/qgsaddremoveitemcommand.cpp
215215
composer/qgsaddremovemultiframecommand.cpp
216-
composer/qgscomposermultiframecommand.cpp
216+
composer/qgsatlascomposition.cpp
217217
composer/qgscomposerarrow.cpp
218+
composer/qgscomposerattributetable.cpp
219+
composer/qgscomposerattributetablemodel.cpp
220+
composer/qgscomposerattributetablemodelv2.cpp
221+
composer/qgscomposerattributetablev2.cpp
222+
composer/qgscomposereffect.cpp
218223
composer/qgscomposerframe.cpp
219-
composer/qgscomposermousehandles.cpp
220-
composer/qgscomposerobject.cpp
221-
composer/qgscomposerutils.cpp
224+
composer/qgscomposerhtml.cpp
222225
composer/qgscomposeritem.cpp
223226
composer/qgscomposeritemcommand.cpp
224227
composer/qgscomposeritemgroup.cpp
225228
composer/qgscomposerlabel.cpp
229+
composer/qgscomposerlegend.cpp
226230
composer/qgscomposerlegenditem.cpp
227-
composer/qgscomposerpicture.cpp
231+
composer/qgscomposerlegendstyle.cpp
228232
composer/qgscomposermap.cpp
229-
composer/qgscomposermapitem.cpp
230233
composer/qgscomposermapgrid.cpp
234+
composer/qgscomposermapitem.cpp
231235
composer/qgscomposermapoverview.cpp
236+
composer/qgscomposermodel.cpp
237+
composer/qgscomposermousehandles.cpp
238+
composer/qgscomposermultiframe.cpp
239+
composer/qgscomposermultiframecommand.cpp
240+
composer/qgscomposerobject.cpp
241+
composer/qgscomposerpicture.cpp
242+
composer/qgscomposerscalebar.cpp
243+
composer/qgscomposershape.cpp
232244
composer/qgscomposertable.cpp
233-
composer/qgscomposertablev2.cpp
234245
composer/qgscomposertablecolumn.cpp
235-
composer/qgscomposerattributetable.cpp
236-
composer/qgscomposerattributetablev2.cpp
237-
composer/qgscomposerattributetablemodel.cpp
238-
composer/qgscomposerattributetablemodelv2.cpp
246+
composer/qgscomposertablev2.cpp
239247
composer/qgscomposertexttable.cpp
240-
composer/qgscomposerscalebar.cpp
241-
composer/qgscomposershape.cpp
242-
composer/qgscomposereffect.cpp
243-
composer/qgsatlascomposition.cpp
248+
composer/qgscomposerutils.cpp
249+
composer/qgscomposition.cpp
250+
composer/qgsdoubleboxscalebarstyle.cpp
244251
composer/qgslegendmodel.cpp
245-
composer/qgscomposerlegend.cpp
246-
composer/qgscomposerlegendstyle.cpp
252+
composer/qgsnumericscalebarstyle.cpp
247253
composer/qgspaperitem.cpp
248254
composer/qgsscalebarstyle.cpp
249-
composer/qgsdoubleboxscalebarstyle.cpp
250-
composer/qgsnumericscalebarstyle.cpp
251255
composer/qgssingleboxscalebarstyle.cpp
252256
composer/qgsticksscalebarstyle.cpp
253-
composer/qgscomposerhtml.cpp
254-
composer/qgscomposermultiframe.cpp
255-
composer/qgscomposermodel.cpp
256-
composer/qgscomposition.cpp
257257

258258
dxf/qgsdxfexport.cpp
259259
dxf/qgsdxfpaintdevice.cpp
@@ -270,68 +270,68 @@ SET(QGIS_CORE_SRCS
270270
pal/pointset.cpp
271271
pal/priorityqueue.cpp
272272
pal/problem.cpp
273-
pal/util.cpp
274273
pal/rtree.hpp
274+
pal/util.cpp
275275

276276
raster/qgscliptominmaxenhancement.cpp
277-
raster/qgsraster.cpp
278-
raster/qgsrasterblock.cpp
279277
raster/qgscolorrampshader.cpp
280278
raster/qgscontrastenhancement.cpp
281279
raster/qgscontrastenhancementfunction.cpp
282-
raster/qgsrasterdataprovider.cpp
283280
raster/qgslinearminmaxenhancement.cpp
284281
raster/qgslinearminmaxenhancementwithclip.cpp
285282
raster/qgspseudocolorshader.cpp
286-
raster/qgsrasterprojector.cpp
283+
raster/qgsraster.cpp
284+
raster/qgsrasterblock.cpp
287285
raster/qgsrasterchecker.cpp
286+
raster/qgsrasterdataprovider.cpp
288287
raster/qgsrasteridentifyresult.cpp
289288
raster/qgsrasterinterface.cpp
290289
raster/qgsrasteriterator.cpp
291290
raster/qgsrasterlayer.cpp
292291
raster/qgsrasterlayerrenderer.cpp
293292
raster/qgsrasternuller.cpp
294-
raster/qgsrastertransparency.cpp
295293
raster/qgsrasterpipe.cpp
294+
raster/qgsrasterprojector.cpp
296295
raster/qgsrasterrange.cpp
297296
raster/qgsrastershader.cpp
298297
raster/qgsrastershaderfunction.cpp
298+
raster/qgsrastertransparency.cpp
299299

300-
raster/qgsrasterdrawer.cpp
301-
raster/qgsrasterfilewriter.cpp
302-
raster/qgsrasterresamplefilter.cpp
303-
raster/qgsrasterrendererregistry.cpp
304-
raster/qgsrasterrenderer.cpp
305300
raster/qgsbilinearrasterresampler.cpp
301+
raster/qgsbrightnesscontrastfilter.cpp
306302
raster/qgscubicrasterresampler.cpp
307-
raster/qgspalettedrasterrenderer.cpp
303+
raster/qgshuesaturationfilter.cpp
308304
raster/qgsmultibandcolorrenderer.cpp
305+
raster/qgspalettedrasterrenderer.cpp
306+
raster/qgsrasterdrawer.cpp
307+
raster/qgsrasterfilewriter.cpp
308+
raster/qgsrasterrenderer.cpp
309+
raster/qgsrasterrendererregistry.cpp
310+
raster/qgsrasterresamplefilter.cpp
309311
raster/qgssinglebandcolordatarenderer.cpp
310312
raster/qgssinglebandgrayrenderer.cpp
311313
raster/qgssinglebandpseudocolorrenderer.cpp
312-
raster/qgsbrightnesscontrastfilter.cpp
313-
raster/qgshuesaturationfilter.cpp
314314

315315
geometry/qgsabstractgeometryv2.cpp
316316
geometry/qgscircularstringv2.cpp
317317
geometry/qgscompoundcurvev2.cpp
318-
geometry/qgscurvev2.cpp
319318
geometry/qgscurvepolygonv2.cpp
319+
geometry/qgscurvev2.cpp
320320
geometry/qgsgeometry.cpp
321321
geometry/qgsgeometrycollectionv2.cpp
322322
geometry/qgsgeometryeditutils.cpp
323-
geometry/qgsinternalgeometryengine.cpp
324323
geometry/qgsgeometryfactory.cpp
325324
geometry/qgsgeometryutils.cpp
326325
geometry/qgsgeos.cpp
327-
geometry/qgspointv2.cpp
328-
geometry/qgspolygonv2.cpp
326+
geometry/qgsinternalgeometryengine.cpp
329327
geometry/qgslinestringv2.cpp
330328
geometry/qgsmulticurvev2.cpp
331329
geometry/qgsmultilinestringv2.cpp
332330
geometry/qgsmultipointv2.cpp
333331
geometry/qgsmultipolygonv2.cpp
334332
geometry/qgsmultisurfacev2.cpp
333+
geometry/qgspointv2.cpp
334+
geometry/qgspolygonv2.cpp
335335
geometry/qgswkbptr.cpp
336336
geometry/qgswkbtypes.cpp
337337
)

‎src/gui/CMakeLists.txt

Lines changed: 61 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,62 @@
11
SET(QGIS_GUI_SRCS
2-
raster/qgsrasterminmaxwidget.cpp
3-
raster/qgsrasterrendererwidget.cpp
42
raster/qgsmultibandcolorrendererwidget.cpp
53
raster/qgspalettedrendererwidget.cpp
4+
raster/qgsrasterhistogramwidget.cpp
5+
raster/qgsrasterminmaxwidget.cpp
6+
raster/qgsrasterrendererwidget.cpp
67
raster/qgssinglebandgrayrendererwidget.cpp
78
raster/qgssinglebandpseudocolorrendererwidget.cpp
8-
raster/qgsrasterhistogramwidget.cpp
99
raster/qwt5_histogram_item.cpp
1010

11+
symbology-ng/characterwidget.cpp
1112
symbology-ng/qgsbrushstylecombobox.cpp
13+
symbology-ng/qgscategorizedsymbolrendererv2widget.cpp
1214
symbology-ng/qgscolorrampcombobox.cpp
15+
symbology-ng/qgscptcitycolorrampv2dialog.cpp
1316
symbology-ng/qgsdashspacedialog.cpp
1417
symbology-ng/qgsdatadefinedsymboldialog.cpp
15-
symbology-ng/qgspenstylecombobox.cpp
16-
symbology-ng/qgssymbollayerv2widget.cpp
17-
symbology-ng/qgsrendererv2widget.cpp
18-
symbology-ng/qgssinglesymbolrendererv2widget.cpp
19-
symbology-ng/qgscategorizedsymbolrendererv2widget.cpp
20-
symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
18+
symbology-ng/qgsellipsesymbollayerv2widget.cpp
2119
symbology-ng/qgsgraduatedhistogramwidget.cpp
22-
symbology-ng/qgsrulebasedrendererv2widget.cpp
20+
symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
2321
symbology-ng/qgsheatmaprendererwidget.cpp
2422
symbology-ng/qgsinvertedpolygonrendererwidget.cpp
23+
symbology-ng/qgslayerpropertieswidget.cpp
24+
symbology-ng/qgspenstylecombobox.cpp
25+
symbology-ng/qgspointdisplacementrendererwidget.cpp
2526
symbology-ng/qgsrendererv2propertiesdialog.cpp
26-
symbology-ng/qgsstylev2managerdialog.cpp
27+
symbology-ng/qgsrendererv2widget.cpp
28+
symbology-ng/qgsrulebasedrendererv2widget.cpp
29+
symbology-ng/qgssinglesymbolrendererv2widget.cpp
30+
symbology-ng/qgssizescalewidget.cpp
31+
symbology-ng/qgssmartgroupeditordialog.cpp
32+
symbology-ng/qgsstylev2exportimportdialog.cpp
2733
symbology-ng/qgsstylev2groupselectiondialog.cpp
34+
symbology-ng/qgsstylev2managerdialog.cpp
35+
symbology-ng/qgssvgselectorwidget.cpp
36+
symbology-ng/qgssymbollayerv2widget.cpp
2837
symbology-ng/qgssymbollevelsv2dialog.cpp
38+
symbology-ng/qgssymbolslistwidget.cpp
2939
symbology-ng/qgssymbolv2selectordialog.cpp
30-
symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp
31-
symbology-ng/qgsvectorrandomcolorrampv2dialog.cpp
3240
symbology-ng/qgsvectorcolorbrewercolorrampv2dialog.cpp
33-
symbology-ng/qgscptcitycolorrampv2dialog.cpp
34-
symbology-ng/characterwidget.cpp
35-
symbology-ng/qgsstylev2exportimportdialog.cpp
36-
symbology-ng/qgsellipsesymbollayerv2widget.cpp
37-
symbology-ng/qgspointdisplacementrendererwidget.cpp
3841
symbology-ng/qgsvectorfieldsymbollayerwidget.cpp
39-
symbology-ng/qgssymbolslistwidget.cpp
40-
symbology-ng/qgssvgselectorwidget.cpp
41-
symbology-ng/qgslayerpropertieswidget.cpp
42-
symbology-ng/qgssmartgroupeditordialog.cpp
43-
symbology-ng/qgssizescalewidget.cpp
42+
symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp
43+
symbology-ng/qgsvectorrandomcolorrampv2dialog.cpp
4444

4545
effects/qgseffectdrawmodecombobox.cpp
46+
effects/qgseffectstackpropertieswidget.cpp
4647
effects/qgspainteffectpropertieswidget.cpp
4748
effects/qgspainteffectwidget.cpp
48-
effects/qgseffectstackpropertieswidget.cpp
4949

5050
attributetable/qgsattributetabledelegate.cpp
5151
attributetable/qgsattributetablefiltermodel.cpp
52-
attributetable/qgsfieldconditionalformatwidget.cpp
5352
attributetable/qgsattributetablemodel.cpp
5453
attributetable/qgsattributetableview.cpp
5554
attributetable/qgsdualview.cpp
5655
attributetable/qgsfeaturelistmodel.cpp
5756
attributetable/qgsfeaturelistview.cpp
5857
attributetable/qgsfeaturelistviewdelegate.cpp
5958
attributetable/qgsfeatureselectionmodel.cpp
59+
attributetable/qgsfieldconditionalformatwidget.cpp
6060
attributetable/qgsgenericfeatureselectionmanager.cpp
6161
attributetable/qgsvectorlayerselectionmanager.cpp
6262

@@ -139,48 +139,46 @@ SET(QGIS_GUI_SRCS
139139
editorwidgets/qgsvaluerelationsearchwidgetwrapper.cpp
140140
editorwidgets/qgsvaluerelationwidgetfactory.cpp
141141

142-
143142
layertree/qgscustomlayerorderwidget.cpp
144143
layertree/qgslayertreemapcanvasbridge.cpp
145144
layertree/qgslayertreeview.cpp
146145
layertree/qgslayertreeviewdefaultactions.cpp
147146

148147
qgisgui.cpp
149148
qgisinterface.cpp
150-
qgsannotationitem.cpp
151149
qgsactionmenu.cpp
152150
qgsadvanceddigitizingcanvasitem.cpp
153151
qgsadvanceddigitizingdockwidget.cpp
152+
qgsannotationitem.cpp
154153
qgsattributedialog.cpp
155154
qgsattributeeditor.cpp
156155
qgsattributeform.cpp
157156
qgsattributeforminterface.cpp
158157
qgsattributeformlegacyinterface.cpp
159158
qgsattributetypeloaddialog.cpp
160159
qgsblendmodecombobox.cpp
160+
qgsbrowsertreeview.cpp
161161
qgsbusyindicatordialog.cpp
162162
qgscharacterselectdialog.cpp
163-
qgsbrowsertreeview.cpp
164-
qgscolorwidgets.cpp
165163
qgscodeeditor.cpp
164+
qgscodeeditorcss.cpp
165+
qgscodeeditorhtml.cpp
166166
qgscodeeditorpython.cpp
167167
qgscodeeditorsql.cpp
168-
qgscodeeditorhtml.cpp
169-
qgscodeeditorcss.cpp
170168
qgscollapsiblegroupbox.cpp
171169
qgscolorbutton.cpp
172170
qgscolorbuttonv2.cpp
173171
qgscolordialog.cpp
174-
qgscolorswatchgrid.cpp
175172
qgscolorschemelist.cpp
173+
qgscolorswatchgrid.cpp
174+
qgscolorwidgets.cpp
176175
qgscomposerruler.cpp
177176
qgscomposerview.cpp
178-
qgsprevieweffect.cpp
179177
qgscredentialdialog.cpp
180178
qgscursors.cpp
181179
qgsdatadefinedbutton.cpp
182-
qgsdetaileditemdata.cpp
183180
qgsdatumtransformdialog.cpp
181+
qgsdetaileditemdata.cpp
184182
qgsdetaileditemdelegate.cpp
185183
qgsdetaileditemwidget.cpp
186184
qgsdial.cpp
@@ -197,18 +195,20 @@ SET(QGIS_GUI_SRCS
197195
qgsfieldcombobox.cpp
198196
qgsfieldexpressionwidget.cpp
199197
qgsfieldmodel.cpp
200-
qgsfieldvalidator.cpp
201198
qgsfieldproxymodel.cpp
199+
qgsfieldvalidator.cpp
202200
qgsfiledropedit.cpp
203201
qgsfilepickerwidget.cpp
204202
qgsfilterlineedit.cpp
205203
qgsformannotationitem.cpp
206204
qgsgenericprojectionselector.cpp
207205
qgsgeometryrubberband.cpp
206+
qgsgroupwmsdatadialog.cpp
208207
qgshighlight.cpp
209208
qgshistogramwidget.cpp
210-
qgsidentifymenu.cpp
211209
qgshtmlannotationitem.cpp
210+
qgsidentifymenu.cpp
211+
qgslegendfilterbutton.cpp
212212
qgslegendinterface.cpp
213213
qgsludialog.cpp
214214
qgsmanageconnectionsdialog.cpp
@@ -248,6 +248,7 @@ SET(QGIS_GUI_SRCS
248248
qgsowssourceselect.cpp
249249
qgspixmaplabel.cpp
250250
qgspluginmanagerinterface.cpp
251+
qgsprevieweffect.cpp
251252
qgsprojectbadlayerguihandler.cpp
252253
qgsprojectionselectionwidget.cpp
253254
qgsprojectionselector.cpp
@@ -266,20 +267,18 @@ SET(QGIS_GUI_SRCS
266267
qgssublayersdialog.cpp
267268
qgssvgannotationitem.cpp
268269
qgstextannotationitem.cpp
270+
qgsunitselectionwidget.cpp
269271
qgsuserinputdockwidget.cpp
270272
qgsvariableeditorwidget.cpp
271273
qgsvertexmarker.cpp
272-
qgsunitselectionwidget.cpp
273-
qgslegendfilterbutton.cpp
274-
qgsgroupwmsdatadialog.cpp
275274
)
276275

277276
IF (WITH_QTWEBKIT)
278277
SET(QGIS_GUI_SRCS
279278
${QGIS_GUI_SRCS}
280279
editorwidgets/qgswebviewconfigdlg.cpp
281-
editorwidgets/qgswebviewwidgetwrapper.cpp
282280
editorwidgets/qgswebviewwidgetfactory.cpp
281+
editorwidgets/qgswebviewwidgetwrapper.cpp
283282
)
284283
ENDIF (WITH_QTWEBKIT)
285284

@@ -303,8 +302,8 @@ SET(QGIS_GUI_MOC_HDRS
303302
qgsbrowsertreeview.h
304303
qgsbusyindicatordialog.h
305304
qgscharacterselectdialog.h
306-
qgscodeeditorcss.h
307305
qgscodeeditor.h
306+
qgscodeeditorcss.h
308307
qgscodeeditorhtml.h
309308
qgscodeeditorpython.h
310309
qgscodeeditorsql.h
@@ -343,9 +342,11 @@ SET(QGIS_GUI_MOC_HDRS
343342
qgsfilterlineedit.h
344343
qgsformannotationitem.h
345344
qgsgenericprojectionselector.h
345+
qgsgroupwmsdatadialog.h
346346
qgshistogramwidget.h
347347
qgshtmlannotationitem.h
348348
qgsidentifymenu.h
349+
qgslegendfilterbutton.h
349350
qgslegendinterface.h
350351
qgslonglongvalidator.h
351352
qgsludialog.h
@@ -398,19 +399,17 @@ SET(QGIS_GUI_MOC_HDRS
398399
qgssearchquerybuilder.h
399400
qgsslider.h
400401
qgssublayersdialog.h
401-
qgsvariableeditorwidget.h
402402
qgsunitselectionwidget.h
403403
qgsuserinputdockwidget.h
404-
qgslegendfilterbutton.h
405-
qgsgroupwmsdatadialog.h
404+
qgsvariableeditorwidget.h
406405

407-
raster/qgsrasterminmaxwidget.h
408-
raster/qgspalettedrendererwidget.h
409406
raster/qgsmultibandcolorrendererwidget.h
410-
raster/qgssinglebandgrayrendererwidget.h
411-
raster/qgssinglebandpseudocolorrendererwidget.h
407+
raster/qgspalettedrendererwidget.h
412408
raster/qgsrasterhistogramwidget.h
409+
raster/qgsrasterminmaxwidget.h
413410
raster/qgsrasterrendererwidget.h
411+
raster/qgssinglebandgrayrendererwidget.h
412+
raster/qgssinglebandpseudocolorrendererwidget.h
414413

415414
symbology-ng/characterwidget.h
416415
symbology-ng/qgsbrushstylecombobox.h
@@ -420,8 +419,8 @@ SET(QGIS_GUI_MOC_HDRS
420419
symbology-ng/qgsdashspacedialog.h
421420
symbology-ng/qgsdatadefinedsymboldialog.h
422421
symbology-ng/qgsellipsesymbollayerv2widget.h
423-
symbology-ng/qgsgraduatedsymbolrendererv2widget.h
424422
symbology-ng/qgsgraduatedhistogramwidget.h
423+
symbology-ng/qgsgraduatedsymbolrendererv2widget.h
425424
symbology-ng/qgsheatmaprendererwidget.h
426425
symbology-ng/qgsinvertedpolygonrendererwidget.h
427426
symbology-ng/qgslayerpropertieswidget.h
@@ -431,6 +430,7 @@ SET(QGIS_GUI_MOC_HDRS
431430
symbology-ng/qgsrendererv2widget.h
432431
symbology-ng/qgsrulebasedrendererv2widget.h
433432
symbology-ng/qgssinglesymbolrendererv2widget.h
433+
symbology-ng/qgssizescalewidget.h
434434
symbology-ng/qgssmartgroupeditordialog.h
435435
symbology-ng/qgsstylev2exportimportdialog.h
436436
symbology-ng/qgsstylev2groupselectiondialog.h
@@ -444,18 +444,17 @@ SET(QGIS_GUI_MOC_HDRS
444444
symbology-ng/qgsvectorfieldsymbollayerwidget.h
445445
symbology-ng/qgsvectorgradientcolorrampv2dialog.h
446446
symbology-ng/qgsvectorrandomcolorrampv2dialog.h
447-
symbology-ng/qgssizescalewidget.h
448447

449448
attributetable/qgsattributetabledelegate.h
450449
attributetable/qgsattributetablefiltermodel.h
451450
attributetable/qgsattributetablemodel.h
452451
attributetable/qgsattributetableview.h
453452
attributetable/qgsdualview.h
454-
attributetable/qgsfieldconditionalformatwidget.h
455453
attributetable/qgsfeaturelistmodel.h
456454
attributetable/qgsfeaturelistview.h
457455
attributetable/qgsfeaturelistviewdelegate.h
458456
attributetable/qgsfeatureselectionmodel.h
457+
attributetable/qgsfieldconditionalformatwidget.h
459458
attributetable/qgsgenericfeatureselectionmanager.h
460459
attributetable/qgsifeatureselectionmanager.h
461460
attributetable/qgsvectorlayerselectionmanager.h
@@ -481,14 +480,14 @@ SET(QGIS_GUI_MOC_HDRS
481480
auth/qgsauthtrustedcasdialog.h
482481

483482
effects/qgseffectdrawmodecombobox.h
483+
effects/qgseffectstackpropertieswidget.h
484484
effects/qgspainteffectpropertieswidget.h
485485
effects/qgspainteffectwidget.h
486-
effects/qgseffectstackpropertieswidget.h
487486

488487
editorwidgets/core/qgseditorconfigwidget.h
489-
editorwidgets/core/qgseditorwidgetregistry.h
490488
editorwidgets/core/qgseditorconfigwidget.h
491489
editorwidgets/core/qgseditorwidgetregistry.h
490+
editorwidgets/core/qgseditorwidgetregistry.h
492491
editorwidgets/core/qgseditorwidgetwrapper.h
493492
editorwidgets/core/qgssearchwidgetwrapper.h
494493
editorwidgets/core/qgswidgetwrapper.h
@@ -523,11 +522,11 @@ SET(QGIS_GUI_MOC_HDRS
523522
editorwidgets/qgsuniquevaluewidgetwrapper.h
524523
editorwidgets/qgsuuidwidgetwrapper.h
525524
editorwidgets/qgsvaluemapconfigdlg.h
526-
editorwidgets/qgsvaluemapwidgetwrapper.h
527525
editorwidgets/qgsvaluemapsearchwidgetwrapper.h
526+
editorwidgets/qgsvaluemapwidgetwrapper.h
528527
editorwidgets/qgsvaluerelationconfigdlg.h
529-
editorwidgets/qgsvaluerelationwidgetwrapper.h
530528
editorwidgets/qgsvaluerelationsearchwidgetwrapper.h
529+
editorwidgets/qgsvaluerelationwidgetwrapper.h
531530

532531
layertree/qgscustomlayerorderwidget.h
533532
layertree/qgslayertreemapcanvasbridge.h
@@ -569,8 +568,8 @@ SET(QGIS_GUI_HDRS
569568
qgsmapcanvassnapper.h
570569
qgsmapcanvassnappingutils.h
571570
qgsmapcanvastracer.h
572-
qgsmaptip.h
573571
qgsmapmouseevent.h
572+
qgsmaptip.h
574573
qgsnumericsortlistviewitem.h
575574
qgsrubberband.h
576575
qgssvgannotationitem.h
@@ -591,11 +590,11 @@ SET(QGIS_GUI_HDRS
591590
auth/qgsauthconfigselect.h
592591
auth/qgsautheditorwidgets.h
593592
auth/qgsauthguiutils.h
594-
auth/qgsauthmethodedit.h
595593
auth/qgsauthidentitieseditor.h
596594
auth/qgsauthimportcertdialog.h
597595
auth/qgsauthimportidentitydialog.h
598596
auth/qgsauthmasterpassresetdialog.h
597+
auth/qgsauthmethodedit.h
599598
auth/qgsauthserverseditor.h
600599
auth/qgsauthsslconfigwidget.h
601600
auth/qgsauthsslerrorsdialog.h
@@ -639,17 +638,17 @@ IF (WITH_TOUCH)
639638
ENDIF (WITH_TOUCH)
640639

641640
SET(QGIS_GUI_UI_HDRS
641+
${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgscredentialdialog.h
642642
${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgsdetaileditemwidgetbase.h
643+
${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgsexpressionbuilderdialogbase.h
644+
${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgsexpressionbuilder.h
645+
${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgsexpressionselectiondialogbase.h
643646
${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgsgenericprojectionselectorbase.h
644-
${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgsmessageviewer.h
645647
${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgsmessagelogviewer.h
648+
${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgsmessageviewer.h
646649
${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgsowssourceselectbase.h
647-
${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgscredentialdialog.h
648650
${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgsprojectionselectorbase.h
649651
${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgsquerybuilderbase.h
650-
${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgsexpressionbuilder.h
651-
${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgsexpressionbuilderdialogbase.h
652-
${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgsexpressionselectiondialogbase.h
653652
${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgssublayersdialogbase.h
654653
)
655654

0 commit comments

Comments
 (0)
Please sign in to comment.