header install update

python/CMakeLists.txt

@@ -256,8 +256,8 @@ ENDIF(WITH_CUSTOM_WIDGETS)
 # Plugin utilities files to copy to staging or install
 SET(PY_FILES
   __init__.py
-  utils.py  
-  user.py  
+  utils.py
+  user.py
 )
 
 ADD_CUSTOM_TARGET(pyutils ALL)

python/gui/qgsexpressionbuilderwidget.sip

@@ -113,7 +113,7 @@ class QgsExpressionBuilderWidget : QWidget
 
     /** Create a new file in the function editor
      */
-    void newFunctionFile( QString fileName = "scratch");
+    void newFunctionFile( QString fileName = "scratch" );
 
     /** Save the current function editor text to the given file.
      */
@@ -133,6 +133,10 @@ class QgsExpressionBuilderWidget : QWidget
 
   public slots:
     void currentChanged( const QModelIndex &index, const QModelIndex & );
+    void on_btnRun_pressed();
+    void on_btnNewFile_pressed();
+    void on_cmbFileNames_currentIndexChanged( int index );
+    void on_btnSaveFile_pressed();
     void on_expressionTree_doubleClicked( const QModelIndex &index );
     void on_txtExpressionString_textChanged();
     void on_txtSearchEdit_textChanged();

src/core/CMakeLists.txt

@@ -392,8 +392,8 @@ SET(QGIS_CORE_MOC_HDRS
   composer/qgsatlascomposition.h
   composer/qgscomposermodel.h
   composer/qgscomposition.h
-
   composer/qgslegendmodel.h
+
   raster/qgsrasterlayer.h
   raster/qgsrasterdataprovider.h
 
@@ -448,27 +448,24 @@ ENDIF(MSVC)
 SET(QGIS_CORE_HDRS
   ${CMAKE_BINARY_DIR}/qgsconfig.h
   ../plugins/qgisplugin.h
+
   qgis.h
-  qgsapplication.h
   qgsattributeaction.h
   qgscachedfeatureiterator.h
   qgscacheindex.h
   qgscacheindexfeatureid.h
   qgsclipper.h
   qgscolorscheme.h
   qgscolorschemeregistry.h
-  qgscontexthelp.h
   qgscoordinatereferencesystem.h
-  qgscoordinatetransform.h
-  qgscredentials.h
   qgscrscache.h
   qgscsexception.h
   qgsdartmeasurement.h
   qgsdatadefined.h
   qgsdatasourceuri.h
-  qgsdataitem.h
   qgsdatumtransformstore.h
   qgsdbfilterproxymodel.h
+  qgsdiagramrendererv2.h
   qgsdistancearea.h
   qgseditorwidgetconfig.h
   qgserror.h
@@ -482,8 +479,6 @@ SET(QGIS_CORE_HDRS
   qgsfield.h
   qgsfontutils.h
   qgsgeometry.h
-  qgsgml.h
-  qgsgmlschema.h
   qgsgeometrycache.h
   qgslabel.h
   qgslabelattributes.h
@@ -493,34 +488,22 @@ SET(QGIS_CORE_HDRS
   qgslegendsettings.h
   qgslogger.h
   qgsmaphittest.h
-  qgsmaplayer.h
-  qgsmaplayerlegend.h
-  qgsmaplayerregistry.h
+  qgsmaplayerrenderer.h
   qgsmaplayerstylemanager.h
-  qgsmaprenderer.h
-  qgsmaprenderercache.h
-  qgsmaprenderercustompainterjob.h
-  qgsmaprendererjob.h
-  qgsmaprendererparalleljob.h
-  qgsmaprenderersequentialjob.h
   qgsmapsettings.h
   qgsmaptopixel.h
+  qgsmaptopixelgeometrysimplifier.h
   qgsmapunitscale.h
-  qgsmessageoutput.h
   qgsmimedatautils.h
   qgsmultirenderchecker.h
-  qgsnetworkcontentfetcher.h
-  qgsnetworkreplyparser.h
   qgsobjectcustomproperties.h
-  qgsofflineediting.h
   qgsogcutils.h
   qgsowsconnection.h
   qgspaintenginehack.h
+  qgspalgeometry.h
   qgspallabeling.h
-  qgspluginlayer.h
   qgspluginlayerregistry.h
   qgspoint.h
-  qgsproject.h
   qgsprojectfiletransform.h
   qgsprojectproperty.h
   qgsprojectversion.h
@@ -531,96 +514,83 @@ SET(QGIS_CORE_HDRS
   qgspythonrunner.h
   qgsrectangle.h
   qgsrelation.h
-  qgsrelationmanager.h
   qgsrenderchecker.h
   qgsrendercontext.h
-  qgsrunprocess.h
   qgsscalecalculator.h
   qgsscaleutils.h
   qgssimplifymethod.h
+  qgssingleton.h
   qgssnapper.h
   qgsspatialindex.h
-  qgssingleton.h
   qgstolerance.h
-  qgsvectordataprovider.h
-  qgsvectorlayercache.h
   qgsvectorfilewriter.h
-  qgsvectorlayer.h
-  qgsvectorlayercache.h
-  qgsvectorlayereditbuffer.h
   qgsvectorlayereditutils.h
   qgsvectorlayerfeatureiterator.h
   qgsvectorlayerimport.h
+  qgsvectorlayerrenderer.h
   qgsvectorlayerundocommand.h
-  qgsvectorlayerjoinbuffer.h
   qgsvectorsimplifymethod.h
+  qgsxmlutils.h
 
-  qgsdiagramrendererv2.h
   diagram/qgsdiagram.h
   diagram/qgspiediagram.h
   diagram/qgstextdiagram.h
   diagram/qgshistogramdiagram.h
 
-  composer/qgslegendmodel.h
+  composer/qgsaddremovemultiframecommand.h
+  composer/qgscomposerarrow.h
+  composer/qgscomposerframe.h
+  composer/qgscomposeritemcommand.h
   composer/qgscomposerlegenditem.h
+  composer/qgscomposerlegendstyle.h
   composer/qgscomposermultiframecommand.h
-  composer/qgsscalebarstyle.h
-  composer/qgsnumericscalebarstyle.h
-  composer/qgsaddremovemultiframecommand.h
-  composer/qgsdoubleboxscalebarstyle.h
   composer/qgscomposertable.h
-  composer/qgscomposertablev2.h
-  composer/qgscomposertablecolumn.h
+  composer/qgscomposertexttable.h
+  composer/qgsdoubleboxscalebarstyle.h
+  composer/qgsnumericscalebarstyle.h
   composer/qgspaperitem.h
-  composer/qgsticksscalebarstyle.h
-  composer/qgscomposerlegendstyle.h
+  composer/qgsscalebarstyle.h
   composer/qgssingleboxscalebarstyle.h
-  composer/qgscomposerframe.h
-  composer/qgscomposerarrow.h
-  composer/qgscomposertexttable.h
-  composer/qgscomposeritemcommand.h
+  composer/qgsticksscalebarstyle.h
 
-  raster/qgsraster.h
-  raster/qgsrasterblock.h
-  raster/qgsrasterdataprovider.h
-  raster/qgsrasterresamplefilter.h
+  raster/qgsbilinearrasterresampler.h
+  raster/qgsbrightnesscontrastfilter.h
   raster/qgscliptominmaxenhancement.h
   raster/qgscolorrampshader.h
-  raster/qgscolorrampshader.h
   raster/qgscontrastenhancement.h
   raster/qgscontrastenhancementfunction.h
+  raster/qgscubicrasterresampler.h
+  raster/qgshuesaturationfilter.h
   raster/qgslinearminmaxenhancement.h
   raster/qgslinearminmaxenhancementwithclip.h
+  raster/qgsmultibandcolorrenderer.h
+  raster/qgspalettedrasterrenderer.h
   raster/qgspseudocolorshader.h
-  raster/qgsrasterchecker.h
-  raster/qgsrasterpyramid.h
+  raster/qgsraster.h
   raster/qgsrasterbandstats.h
+  raster/qgsrasterblock.h
+  raster/qgsrasterchecker.h
+  raster/qgsrasterdrawer.h
+  raster/qgsrasterfilewriter.h
   raster/qgsrasterhistogram.h
   raster/qgsrasteridentifyresult.h
   raster/qgsrasterinterface.h
-  raster/qgsrasterlayer.h
-  raster/qgsrastertransparency.h
+  raster/qgsrasteriterator.h
+  raster/qgsrasternuller.h
   raster/qgsrasterpipe.h
   raster/qgsrasterprojector.h
+  raster/qgsrasterpyramid.h
   raster/qgsrasterrange.h
+  raster/qgsrasterrenderer.h
+  raster/qgsrasterresamplefilter.h
+  raster/qgsrasterresampler.h
   raster/qgsrastershader.h
   raster/qgsrastershaderfunction.h
+  raster/qgsrastertransparency.h
   raster/qgsrasterviewport.h
-  raster/qgsbilinearrasterresampler.h
-  raster/qgsbrightnesscontrastfilter.h
   raster/qgssinglebandcolordatarenderer.h
-  raster/qgssinglebandpseudocolorrenderer.h
-  raster/qgsrasterresampler.h
   raster/qgssinglebandgrayrenderer.h
-  raster/qgspalettedrasterrenderer.h
-  raster/qgsrasternuller.h
-  raster/qgsrasterfilewriter.h
-  raster/qgsrasterrenderer.h
-  raster/qgscubicrasterresampler.h
-  raster/qgsrasteriterator.h
-  raster/qgsrasterdrawer.h
-  raster/qgshuesaturationfilter.h
-  raster/qgsmultibandcolorrenderer.h
+  raster/qgssinglebandpseudocolorrenderer.h
 
   symbology-ng/qgscategorizedsymbolrendererv2.h
   symbology-ng/qgscolorbrewerpalette.h
@@ -637,36 +607,20 @@ SET(QGIS_CORE_HDRS
   symbology-ng/qgssinglesymbolrendererv2.h
   symbology-ng/qgsheatmaprenderer.h
   symbology-ng/qgsinvertedpolygonrenderer.h
-  symbology-ng/qgsstylev2.h
-  symbology-ng/qgssvgcache.h
   symbology-ng/qgssymbollayerv2.h
   symbology-ng/qgssymbollayerv2registry.h
   symbology-ng/qgssymbollayerv2utils.h
   symbology-ng/qgssymbologyv2conversion.h
   symbology-ng/qgssymbolv2.h
   symbology-ng/qgsvectorcolorrampv2.h
-  symbology-ng/qgscptcityarchive.h
   symbology-ng/qgsvectorfieldsymbollayer.h
 
   layertree/qgslayertree.h
-  layertree/qgslayertreegroup.h
-  layertree/qgslayertreelayer.h
-  layertree/qgslayertreemodel.h
-  layertree/qgslayertreemodellegendnode.h
-  layertree/qgslayertreenode.h
-  layertree/qgslayertreeregistrybridge.h
   layertree/qgslayertreeutils.h
 )
 
-IF (NOT QT5_BUILD)
-  SET(QGIS_CORE_HDRS ${QGIS_CORE_HDRS}
-    qgshttptransaction.h
-  )
-ENDIF (NOT QT5_BUILD)
-
 IF (QT_MOBILITY_LOCATION_FOUND)
   SET(QGIS_CORE_HDRS ${QGIS_CORE_HDRS}
-    gps/qgsqtlocationconnection.h
     gps/qgsgpsconnectionregistry.h
   )
 ENDIF (QT_MOBILITY_LOCATION_FOUND)