Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'master' into proc_tests
  • Loading branch information
ghtmtt committed Apr 11, 2017
2 parents 5e11886 + 669fa87 commit 410e8e7
Show file tree
Hide file tree
Showing 1,572 changed files with 43,650 additions and 27,462 deletions.
4 changes: 4 additions & 0 deletions ci/travis/code_layout/CMakeLists.txt
Expand Up @@ -2,9 +2,13 @@

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.6)

SET(CMAKE_CXX_STANDARD 11)

ADD_SUBDIRECTORY(../../../src/astyle qgisstyle)

ENABLE_TESTING()

ADD_TEST(qgis_indentation ${CMAKE_SOURCE_DIR}/../../../scripts/verify-indentation.sh)
ADD_TEST(qgis_spelling ${CMAKE_SOURCE_DIR}/../../../scripts/spell_check/spell_test.sh)
ADD_TEST(qgis_sipify ${CMAKE_SOURCE_DIR}/../../../tests/scripts/test_sipify.sh)
ADD_TEST(qgis_sip_uptodate ${CMAKE_SOURCE_DIR}/../../../tests/scripts/test_sipfiles_uptodate.sh)
22 changes: 19 additions & 3 deletions cmake_templates/Doxyfile.in
Expand Up @@ -1307,13 +1307,13 @@ ENABLE_PREPROCESSING = YES
# compilation will be performed. Macro expansion can be done in a controlled
# way by setting EXPAND_ONLY_PREDEF to YES.

MACRO_EXPANSION = NO
MACRO_EXPANSION = YES

# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
# then the macro expansion is limited to the macros specified with the
# PREDEFINED and EXPAND_AS_DEFINED tags.

EXPAND_ONLY_PREDEF = NO
EXPAND_ONLY_PREDEF = YES

# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
# in the INCLUDE_PATH (see below) will be search if a #include is found.
Expand Down Expand Up @@ -1348,7 +1348,23 @@ PREDEFINED = "QT_VERSION=0x040800"
# The macro definition that is found in the sources will be used.
# Use the PREDEFINED tag if you want to use a different macro definition.

EXPAND_AS_DEFINED =
EXPAND_AS_DEFINED = "SIP_TRANSFER" \
"SIP_PYNAME" \
"SIP_OUT" \
"SIP_INOUT" \
"SIP_TRANSFERTHIS" \
"SIP_TRANSFERBACK" \
"SIP_FACTORY" \
"SIP_KEEPREFERENCE" \
"SIP_PYNAME" \
"SIP_SKIP" \
"SIP_PYDEFAULTVALUE" \
"SIP_PYTYPE" \
"SIP_CONVERT_TO_SUBCLASS_CODE" \
"SIP_FEATURE" \
"SIP_IF_FEATURE" \
"SIP_END" \
"SIP_ABSTRACT"

# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
# doxygen's preprocessor will remove all function-like macros that are alone
Expand Down
Binary file modified debian/icons/qgis-icon128x128.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified debian/icons/qgis-icon16x16.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified debian/icons/qgis-icon192x192.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified debian/icons/qgis-icon22x22.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified debian/icons/qgis-icon24x24.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified debian/icons/qgis-icon256x256.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified debian/icons/qgis-icon32x32.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified debian/icons/qgis-icon36x36.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified debian/icons/qgis-icon42x42.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified debian/icons/qgis-icon48x48.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified debian/icons/qgis-icon512x512.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified debian/icons/qgis-icon64x64.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified debian/icons/qgis-icon72x72.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified debian/icons/qgis-icon80x80.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified debian/icons/qgis-icon8x8.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified debian/icons/qgis-icon96x96.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion debian/rules
Expand Up @@ -278,7 +278,7 @@ override_dh_auto_install:
# Install menu pixmap
install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/pixmaps
install -o root -g root -m 644 $(CURDIR)/images/icons/qgis_icon.svg $(CURDIR)/debian/tmp/usr/share/pixmaps/qgis.svg
install -o root -g root -m 644 $(CURDIR)/images/icons/qgis-icon.png $(CURDIR)/debian/tmp/usr/share/pixmaps/qgis.png
install -o root -g root -m 644 $(CURDIR)/images/icons/qgis-icon-512x512.png $(CURDIR)/debian/tmp/usr/share/pixmaps/qgis.png
install -o root -g root -m 644 $(CURDIR)/images/icons/qgis-mime-icon.png $(CURDIR)/debian/tmp/usr/share/pixmaps/qgis-mime.png

# Install MIME type icon
Expand Down
60 changes: 53 additions & 7 deletions doc/api_break.dox
Expand Up @@ -374,6 +374,16 @@ from a project, the new QgsProject.instance().layoutManager() class should be us
Additionally, the new interface methods work with QgsComposerInterface objects instead
of QgsComposerView objects.

CharacterWidget {#qgis_api_break_3_0_CharacterWidget}
-------------------

- getColumns() was renamed to columns()
- getSquareSize() was renamed to squareSize()
- updateFont() was renamed to setFont()
- updateSize() was renamed to setFontSize()
- updateStyle() was renamed to setFontStyle()
- updateColumns() was renamed to setColumns()


QgsAbstractGeometry {#qgis_api_break_3_0_QgsAbstractGeometry}
-------------------
Expand Down Expand Up @@ -930,6 +940,11 @@ QgsDiagramSettings {#qgis_api_break_3_0_QgsDiagramSettings}

- The SizeType enum was removed. Use QgsUnitTypes.RenderUnit instead.

QgsDial {#qgis_api_break_3_0_QgsDial}
-------

- The protected valueChanged slot was removed.


QgsDistanceArea {#qgis_api_break_3_0_QgsDistanceArea}
---------------
Expand Down Expand Up @@ -1272,10 +1287,10 @@ QgsLayerTreeMapCanvasBridge {#qgis_api_break_3_0_QgsLayerTreeMapCanvasBri

- setAutoEnableCrsTransform() and autoEnableCrsTransform() were removed. CRS transformation is now always enabled.
- setCanvasLayers() now requires a third map layer list argument for storage of all layers in the layer tree order.
- `setCustomLayerOrder()` has been removed. Use `QgsProject::layerTree().setCustomLayerOrder()` instead
- `customLayerOrder()` has been removed. Use `QgsProject::layerTree().customLayerOrder()` or `QgsProject::layerOrder()` instead
- `hasCustomLayerOrder()` has been removed. Use `QgsProject::layerTree().hasCustomLayerOrder()` instead
- `setHasCustomLayerOrder()` has been removed. Use `QgsProject::layerTree().setHasCustomLayerOrder()` instead
- `setCustomLayerOrder()` has been removed. Use `QgsProject::layerTreeRoot().setCustomLayerOrder()` instead
- `customLayerOrder()` has been removed. Use `QgsProject::layerTreeRoot().customLayerOrder()` instead
- `hasCustomLayerOrder()` has been removed. Use `QgsProject::layerTreeRoot().hasCustomLayerOrder()` instead
- `setHasCustomLayerOrder()` has been removed. Use `QgsProject::layerTreeRoot().setHasCustomLayerOrder()` instead
- `defaultLayerOrder()` has been removed.


Expand Down Expand Up @@ -1375,6 +1390,8 @@ screenUpdateRequested() were removed. These members have had no effect for a num
- asLayerDefinition(), fromLayerDefinition(), fromLayerDefinitionFile() were moved to QgsLayerDefinition class and renamed to exportLayerDefinitionLayers() resp. loadLayerDefinitionLayers()
- loadNamedStyleFromDb() was renamed to loadNamedStyleFromDatabase()
- readLayerXml() and writeLayerXml() expect QgsPathResolver reference as the last argument
- the invalidTransformInput() slot was removed - calling this slot had no effect
- metadata() was renamed to htmlMetadata()

QgsMapOverviewCanvas {#qgis_api_break_3_0_QgsMapOverviewCanvas}
--------------------
Expand Down Expand Up @@ -1536,7 +1553,10 @@ QgsPaintEffectRegistry {#qgis_api_break_3_0_QgsPaintEffectRegistry}
QgsPalettedRasterRenderer {#qgis_api_break_3_0_QgsPalettedRasterRenderer}
-------------------------

- The rgbArray() method was made private
- The rgbArray() method was removed
- colors() has been removed, use classes() instead.
- The constructor has a different signature and requires a list of classes instead of an array


QgsPalLabeling {#qgis_api_break_3_0_QgsPalLabeling}
--------------
Expand Down Expand Up @@ -1660,6 +1680,16 @@ QgsRasterDataProvider {#qgis_api_break_3_0_QgsRasterDataProvider}
- setUseSrcNoDataValue() has been renamed to setUseSourceNoDataValue()
- srcNoDataValue() has been renamed to sourceNoDataValue()
- draw() has been removed from the interface as it was not used anywhere.
- The progress and progressUpdate signals were removed. Methods which previously emitted these
signals now accept a QgsRasterBlockFeedback argument for reporting progress updates.


QgsRasterFileWriter {#qgis_api_break_3_0_QgsRasterFileWriter}
------------------

- writeRaster now uses a QgsRasterBlockFeedback object instead of a QProgressDialog argument. Any use of the old
QProgressDialog argument will need to be updated using manually created connections between QgsRasterBlockFeedback's
signals and the updates to the progress dialog.


QgsRasterInterface {#qgis_api_break_3_0_QgsRasterInterface}
Expand All @@ -1668,6 +1698,7 @@ QgsRasterInterface {#qgis_api_break_3_0_QgsRasterInterface}
- srcDataType() has been renamed to sourceDataType()
- srcInput() has been renamed to sourceInput()
- block() has new "feedback" argument.
- The signature of histogram() and bandStatistics() now takes a QgsRasterBlockFeedback pointer argument.


QgsRasterLayer {#qgis_api_break_3_0_QgsRasterLayer}
Expand All @@ -1681,6 +1712,10 @@ constructor variant which accepts a data provider string and loadDefaultStyleFla
- updateProgress() had no effect and was removed.
- CUMULATIVE_CUT_LOWER and CUMULATIVE_CUT_UPPER have been moved to QgsRasterMinMaxOrigin
- the second parameter of setContrastEnhancement() has changed type. It is now QgsRasterMinMaxOrigin::Limits
- showProgress() and onProgress() were removed
- The progressUpdate() signal was removed. Methods which previously emitted these
signals now accept a QgsRasterBlockFeedback argument for reporting progress updates.


QgsRasterProjector {#qgis_api_break_3_0_QgsRasterProjector}
------------------
Expand All @@ -1692,6 +1727,11 @@ QgsRasterRenderer

- MinMaxOrigin enum, minMaxOriginName(), minMaxOriginLabel(), minMaxOriginFromName() removed. Use minMaxOrigin() instead

QgsRectangle {#qgis_api_break_3_0_QgsRectangle}
------------

- The protected members were removed - QgsRectangle is not intended to be subclassed.

QgsRelation {#qgis_api_break_3_0_QgsRelation}
-----------

Expand Down Expand Up @@ -1800,6 +1840,11 @@ QgsSingleSymbolRendererWidget {#qgis_api_break_3_0_QgsSingleSymbolRendere
- sizeScaleFieldChanged() and scaleMethodChanged() were removed. These settings are no longer exposed in the widget's GUI.
- The Mode enum was removed.

QgsSlider {#qgis_api_break_3_0_QgsSlider}
---------

- The protected valueChanged slot was removed.


QgsSnapper {#qgis_api_break_3_0_QgsSnapper}
----------
Expand Down Expand Up @@ -2125,13 +2170,14 @@ Processing {#qgis_api_break_3_0_Processing}
----------

- Algorithm providers now subclass the c++ QgsProcessingProvider class, and must be adapted to the API for QgsProcessingProvider. Specifically,
getName() should be replaced with id(), getDescription() with name(), and getIcon with icon().
getName() should be replaced with id(), getDescription() with name(), and getIcon with icon(). AlgorithmProvider was removed.
- Algorithm's processAlgorithm method now passes a QgsProcessingFeedback object instead of the loosely defined progress parameter. Algorithms will
need to update their use of the progress argument to utilize the QgsProcessingFeedback API.
- Similarly, Python processing scripts no longer have access to a progress variable for reporting their progress. Instead they have a feedback
object of type QgsProcessingFeedback, and will need to adapt their use of progress reporting to the QgsProcessingFeedback API.
- SilentProgress was removed. Use the base QgsProcessingFeedback class instead.

- algList was removed. Use QgsApplication.processingRegistry() instead.
- Processing.algs was removed. QgsApplication.processingRegistry().algorithms() instead.

Triangulation {#qgis_api_break_3_0_Triangulation}
-------------
Expand Down
19 changes: 19 additions & 0 deletions editors/QtCreator/install-win.bat
@@ -0,0 +1,19 @@
@ECHO OFF
SET CREATOR=%APPDATA%\QtProject\qtcreator
SET WIZARDS=%CREATOR%\templates\wizards
SET CODESTYLES=%CREATOR%\codestyles\cpp
IF NOT EXIST "%WIZARDS%" (
mkdir "%WIZARDS%"
)

IF NOT EXIST "%WIZARDS%\qgis" (
mklink /J "%WIZARDS%\qgis" %CD%\templates\wizards\qgis
)

IF NOT EXIST "%CODESTYLES%" (
mkdir "%CODESTYLES%"
)

IF NOT EXIST "%CODESTYLES%\qgis_code_style.xml" (
mklink "%CODESTYLES%\qgis_code_style.xml" %CD%\qgis_code_style.xml
)
File renamed without changes.
File renamed without changes.
25 changes: 25 additions & 0 deletions editors/QtCreator/templates/wizards/qgis/qgis_icon.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
61 changes: 61 additions & 0 deletions editors/QtCreator/templates/wizards/qgis/qgis_test/file.cpp
@@ -0,0 +1,61 @@
/***************************************************************************
%{SrcFileName} - %{CN}
--------------
begin : %{CurrentDate:dd-MM-yyyy}
@if %{HostOs:isWindows}
copyright : (C) %{CurrentDate:yyyy} by %{Env:USERNAME}
@else
copyright : (C) %{CurrentDate:yyyy} by %{Env:USER}
@endif
email : [ YOUR EMAIL]
***************************************************************************/

/***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/

#include "qgstest.h"
#include <QObject>
#include <qgsapplication.h>

class %{CN}: public QObject
{

Q_OBJECT

private slots:
void initTestCase(); // will be called before the first testfunction is executed.
void cleanupTestCase(); // will be called after the last testfunction was executed.
void init(); // will be called before each testfunction is executed.
void cleanup(); // will be called after every testfunction.

// Add your test methods here
};

void %{CN}::initTestCase()
{

}

void %{CN}::cleanupTestCase()
{

}

void %{CN}::init()
{

}

void %{CN}::cleanup()
{

}

QGSTEST_MAIN( %{CN} )
#include "%{JS: Cpp.classToFileName('%{Class}', '.moc')}"

0 comments on commit 410e8e7

Please sign in to comment.