Skip to content
Permalink
Browse files
[sip] align pointer and reference in blacklisted files
this will facilitate sip diff checking
  • Loading branch information
3nids committed May 1, 2017
1 parent e581d46 commit 93971d5ed3089abb7a431acf637033cb46c0aed1
Showing with 1,842 additions and 1,842 deletions.
  1. +31 −31 python/core/conversions.sip
  2. +5 −5 python/core/qgis.sip
  3. +5 −5 python/core/qgscachedfeatureiterator.sip
  4. +2 −2 python/core/qgscacheindex.sip
  5. +2 −2 python/core/qgscacheindexfeatureid.sip
  6. +1 −1 python/core/qgsdartmeasurement.sip
  7. +1 −1 python/core/qgsdataitemprovider.sip
  8. +3 −3 python/core/qgsdataitemproviderregistry.sip
  9. +4 −4 python/core/qgsdbfilterproxymodel.sip
  10. +51 −51 python/core/qgsdiagramrenderer.sip
  11. +14 −14 python/core/qgseditformconfig.sip
  12. +1 −1 python/core/qgseditorwidgetsetup.sip
  13. +4 −4 python/core/qgserror.sip
  14. +60 −60 python/core/qgsexpressioncontext.sip
  15. +7 −7 python/core/qgsexpressionfieldbuffer.sip
  16. +2 −2 python/core/qgsfeaturefilterprovider.sip
  17. +11 −11 python/core/qgsfeatureiterator.sip
  18. +31 −31 python/core/qgsfeaturerequest.sip
  19. +13 −13 python/core/qgsfontutils.sip
  20. +5 −5 python/core/qgsgeometrycache.sip
  21. +4 −4 python/core/qgsgeometrysimplifier.sip
  22. +3 −3 python/core/qgsgml.sip
  23. +6 −6 python/core/qgsgmlschema.sip
  24. +2 −2 python/core/qgshistogram.sip
  25. +1 −1 python/core/qgsinterval.sip
  26. +13 −13 python/core/qgsjsonutils.sip
  27. +4 −4 python/core/qgslabelsearchtree.sip
  28. +8 −8 python/core/qgslayerdefinition.sip
  29. +4 −4 python/core/qgslegendrenderer.sip
  30. +14 −14 python/core/qgslegendsettings.sip
  31. +7 −7 python/core/qgslogger.sip
  32. +5 −5 python/core/qgsmaphittest.sip
  33. +2 −2 python/core/qgsmaplayerdependency.sip
  34. +17 −17 python/core/qgsmaplayerlegend.sip
  35. +2 −2 python/core/qgsmaplayerrenderer.sip
  36. +20 −20 python/core/qgsmaplayerstylemanager.sip
  37. +6 −6 python/core/qgsmaprenderercache.sip
  38. +2 −2 python/core/qgsmaprenderercustompainterjob.sip
  39. +8 −8 python/core/qgsmaprendererjob.sip
  40. +2 −2 python/core/qgsmaprendererparalleljob.sip
  41. +2 −2 python/core/qgsmaprenderersequentialjob.sip
  42. +21 −21 python/core/qgsmapsettings.sip
  43. +15 −15 python/core/qgsmapthemecollection.sip
  44. +5 −5 python/core/qgsmaptopixel.sip
  45. +2 −2 python/core/qgsmaptopixelgeometrysimplifier.sip
  46. +3 −3 python/core/qgsmapunitscale.sip
  47. +1 −1 python/core/qgsmargins.sip
  48. +8 −8 python/core/qgsmessageoutput.sip
  49. +5 −5 python/core/qgsmimedatautils.sip
  50. +6 −6 python/core/qgsmultirenderchecker.sip
  51. +2 −2 python/core/qgsnetworkcontentfetcher.sip
  52. +5 −5 python/core/qgsobjectcustomproperties.sip
  53. +12 −12 python/core/qgsogcutils.sip
  54. +6 −6 python/core/qgsoptionalexpression.sip
  55. +5 −5 python/core/qgsowsconnection.sip
  56. +31 −31 python/core/qgspallabeling.sip
  57. +3 −3 python/core/qgspathresolver.sip
  58. +2 −2 python/core/qgspluginlayer.sip
  59. +9 −9 python/core/qgspluginlayerregistry.sip
  60. +14 −14 python/core/qgspointlocator.sip
  61. +50 −50 python/core/qgsproject.sip
  62. +5 −5 python/core/qgsprojectbadlayerhandler.sip
  63. +3 −3 python/core/qgsprojectfiletransform.sip
  64. +16 −16 python/core/qgsprojectproperty.sip
  65. +2 −2 python/core/qgsprojectversion.sip
  66. +21 −21 python/core/qgsproperty.sip
  67. +30 −30 python/core/qgspropertycollection.sip
  68. +1 −1 python/core/qgsprovidermetadata.sip
  69. +9 −9 python/core/qgsproviderregistry.sip
  70. +4 −4 python/core/qgspythonrunner.sip
  71. +7 −7 python/core/qgsrelationmanager.sip
  72. +9 −9 python/core/qgsrenderchecker.sip
  73. +24 −24 python/core/qgsrendercontext.sip
  74. +2 −2 python/core/qgsrunprocess.sip
  75. +2 −2 python/core/qgsruntimeprofiler.sip
  76. +1 −1 python/core/qgssimplifymethod.sip
  77. +17 −17 python/core/qgssnappingconfig.sip
  78. +14 −14 python/core/qgssnappingutils.sip
  79. +9 −9 python/core/qgsspatialindex.sip
  80. +106 −106 python/core/qgssqlstatement.sip
  81. +10 −10 python/core/qgsstringutils.sip
  82. +10 −10 python/core/qgstaskmanager.sip
  83. +5 −5 python/core/qgstolerance.sip
  84. +5 −5 python/core/qgstracer.sip
  85. +6 −6 python/core/qgstrackedvectorlayertools.sip
  86. +9 −9 python/core/qgstransaction.sip
  87. +2 −2 python/core/qgstransactiongroup.sip
  88. +6 −6 python/core/qgsunittypes.sip
  89. +2 −2 python/core/qgsvector.sip
  90. +20 −20 python/core/qgsvectordataprovider.sip
  91. +21 −21 python/core/qgsvectorfilewriter.sip
  92. +3 −3 python/core/qgsvectorfilewritertask.sip
  93. +9 −9 python/core/qgsvectorlayercache.sip
  94. +17 −17 python/core/qgsvectorlayereditbuffer.sip
  95. +7 −7 python/core/qgsvectorlayereditpassthrough.sip
  96. +14 −14 python/core/qgsvectorlayereditutils.sip
  97. +10 −10 python/core/qgsvectorlayerfeatureiterator.sip
  98. +2 −2 python/core/qgsvectorlayerimport.sip
  99. +12 −12 python/core/qgsvectorlayerjoinbuffer.sip
  100. +9 −9 python/core/qgsvectorlayerjoininfo.sip
  101. +5 −5 python/core/qgsvectorlayertools.sip
  102. +7 −7 python/core/qgsvectorlayerundocommand.sip
  103. +3 −3 python/core/qgsvectorlayerutils.sip
  104. +1 −1 python/core/qgsvectorsimplifymethod.sip
  105. +14 −14 python/core/qgsvirtuallayerdefinition.sip
  106. +1 −1 python/core/qgsvirtuallayerdefinitionutils.sip
  107. +6 −6 python/core/qgsxmlutils.sip
  108. +41 −41 python/gui/qgisinterface.sip
  109. +6 −6 python/gui/qgsactionmenu.sip
  110. +1 −1 python/gui/qgsadvanceddigitizingcanvasitem.sip
  111. +2 −2 python/gui/qgsattributedialog.sip
  112. +9 −9 python/gui/qgsattributeeditorcontext.sip
  113. +15 −15 python/gui/qgsattributeform.sip
  114. +7 −7 python/gui/qgsattributeformeditorwidget.sip
  115. +4 −4 python/gui/qgsattributeforminterface.sip
  116. +1 −1 python/gui/qgsblendmodecombobox.sip
  117. +6 −6 python/gui/qgsbrowsertreeview.sip
  118. +2 −2 python/gui/qgsbusyindicatordialog.sip
  119. +2 −2 python/gui/qgscharacterselectdialog.sip
  120. +4 −4 python/gui/qgscodeeditor.sip
  121. +7 −7 python/gui/qgscomposeritemcombobox.sip
  122. +7 −7 python/gui/qgscomposerruler.sip
  123. +17 −17 python/gui/qgscomposerview.sip
  124. +3 −3 python/gui/qgscompoundcolorwidget.sip
  125. +3 −3 python/gui/qgsconfigureshortcutsdialog.sip
  126. +3 −3 python/gui/qgscurveeditorwidget.sip
  127. +1 −1 python/gui/qgscustomdrophandler.sip
  128. +4 −4 python/gui/qgsdetaileditemdata.sip
  129. +3 −3 python/gui/qgsdetaileditemdelegate.sip
  130. +2 −2 python/gui/qgsdetaileditemwidget.sip
  131. +5 −5 python/gui/qgsexpressionbuilderdialog.sip
  132. +12 −12 python/gui/qgsexpressionbuilderwidget.sip
  133. +1 −1 python/gui/qgsexpressionhighlighter.sip
  134. +6 −6 python/gui/qgsexpressionlineedit.sip
  135. +6 −6 python/gui/qgsexpressionselectiondialog.sip
  136. +10 −10 python/gui/qgsextentgroupbox.sip
  137. +3 −3 python/gui/qgsfeatureselectiondlg.sip
  138. +1 −1 python/gui/qgsfieldvalidator.sip
  139. +3 −3 python/gui/qgsfieldvalueslineedit.sip
  140. +1 −1 python/gui/qgsfiledropedit.sip
  141. +10 −10 python/gui/qgsfilterlineedit.sip
  142. +6 −6 python/gui/qgsfloatingwidget.sip
  143. +2 −2 python/gui/qgsfocuswatcher.sip
  144. +7 −7 python/gui/qgsformannotation.sip
  145. +7 −7 python/gui/qgsgeometryrubberband.sip
  146. +4 −4 python/gui/qgsgradientcolorrampdialog.sip
  147. +11 −11 python/gui/qgsgradientstopeditor.sip
  148. +2 −2 python/gui/qgshelp.sip
  149. +5 −5 python/gui/qgshighlight.sip
  150. +10 −10 python/gui/qgshistogramwidget.sip
  151. +2 −2 python/gui/qgskeyvaluewidget.sip
  152. +4 −4 python/gui/qgslegendfilterbutton.sip
  153. +4 −4 python/gui/qgslimitedrandomcolorrampdialog.sip
  154. +2 −2 python/gui/qgslistwidget.sip
  155. +3 −3 python/gui/qgsludialog.sip
  156. +1 −1 python/gui/qgsmanageconnectionsdialog.sip
  157. +19 −19 python/gui/qgsmapcanvas.sip
  158. +3 −3 python/gui/qgsmapcanvasannotationitem.sip
  159. +6 −6 python/gui/qgsmapcanvasitem.sip
  160. +1 −1 python/gui/qgsmapcanvassnappingutils.sip
  161. +4 −4 python/gui/qgsmapcanvastracer.sip
  162. +17 −17 python/gui/qgsmaplayeractionregistry.sip
  163. +1 −1 python/gui/qgsmaplayerconfigwidget.sip
  164. +4 −4 python/gui/qgsmaplayerconfigwidgetfactory.sip
  165. +1 −1 python/gui/qgsmaplayerstylemanagerwidget.sip
  166. +3 −3 python/gui/qgsmapmouseevent.sip
  167. +8 −8 python/gui/qgsmapoverviewcanvas.sip
  168. +24 −24 python/gui/qgsmaptool.sip
  169. +8 −8 python/gui/qgsmaptooladvanceddigitizing.sip
  170. +10 −10 python/gui/qgsmaptoolcapture.sip
  171. +5 −5 python/gui/qgsmaptooledit.sip
  172. +5 −5 python/gui/qgsmaptoolemitpoint.sip
  173. +14 −14 python/gui/qgsmaptoolidentify.sip
  174. +3 −3 python/gui/qgsmaptoolidentifyfeature.sip
  175. +4 −4 python/gui/qgsmaptoolpan.sip
  176. +4 −4 python/gui/qgsmaptoolzoom.sip
  177. +8 −8 python/gui/qgsmessagebar.sip
  178. +3 −3 python/gui/qgsmessagebaritem.sip
  179. +8 −8 python/gui/qgsmessageviewer.sip
  180. +1 −1 python/gui/qgsnewgeopackagelayerdialog.sip
  181. +1 −1 python/gui/qgsnewhttpconnection.sip
  182. +6 −6 python/gui/qgsnewnamedialog.sip
  183. +3 −3 python/gui/qgsnewvectorlayerdialog.sip
  184. +8 −8 python/gui/qgsoptionsdialogbase.sip
  185. +2 −2 python/gui/qgsorderbydialog.sip
  186. +5 −5 python/gui/qgsowssourceselect.sip
  187. +10 −10 python/gui/qgspanelwidget.sip
  188. +7 −7 python/gui/qgspanelwidgetstack.sip
  189. +3 −3 python/gui/qgspluginmanagerinterface.sip
  190. +4 −4 python/gui/qgspresetcolorrampdialog.sip
  191. +1 −1 python/gui/qgsprevieweffect.sip
  192. +4 −4 python/gui/qgsprojectionselectiondialog.sip
  193. +5 −5 python/gui/qgsprojectionselectiontreewidget.sip
  194. +4 −4 python/gui/qgsprojectionselectionwidget.sip
  195. +3 −3 python/gui/qgspropertyassistantwidget.sip
  196. +9 −9 python/gui/qgspropertyoverridebutton.sip
  197. +3 −3 python/gui/qgsquerybuilder.sip
  198. +11 −11 python/gui/qgsrasterformatsaveoptionswidget.sip
  199. +1 −1 python/gui/qgsrasterlayersaveasdialog.sip
  200. +4 −4 python/gui/qgsrasterpyramidsoptionswidget.sip
  201. +6 −6 python/gui/qgsrelationeditorwidget.sip
  202. +10 −10 python/gui/qgsrubberband.sip
  203. +1 −1 python/gui/qgsscalerangewidget.sip
  204. +1 −1 python/gui/qgsscalevisibilitydialog.sip
  205. +2 −2 python/gui/qgssearchquerybuilder.sip
  206. +21 −21 python/gui/qgsshortcutsmanager.sip
  207. +2 −2 python/gui/qgsslider.sip
  208. +5 −5 python/gui/qgssourceselectdialog.sip
  209. +2 −2 python/gui/qgssublayersdialog.sip
  210. +5 −5 python/gui/qgssubstitutionlistwidget.sip
  211. +2 −2 python/gui/qgstablewidgetbase.sip
  212. +1 −1 python/gui/qgstablewidgetitem.sip
  213. +4 −4 python/gui/qgstabwidget.sip
  214. +1 −1 python/gui/qgstaskmanagerwidget.sip
  215. +6 −6 python/gui/qgstextformatwidget.sip
  216. +3 −3 python/gui/qgstextpreview.sip
  217. +5 −5 python/gui/qgstreewidgetitem.sip
  218. +12 −12 python/gui/qgsunitselectionwidget.sip
  219. +2 −2 python/gui/qgsuserinputdockwidget.sip
  220. +3 −3 python/gui/qgsvariableeditorwidget.sip
  221. +7 −7 python/server/qgsaccesscontrolfilter.sip
  222. +3 −3 python/server/qgscapabilitiescache.sip
  223. +3 −3 python/server/qgsconfigcache.sip
  224. +1 −1 python/server/qgsmapserviceexception.sip
  225. +3 −3 python/server/qgsserver.sip
  226. +4 −4 python/server/qgsserverexception.sip
  227. +2 −2 python/server/qgsserverfilter.sip
  228. +12 −12 python/server/qgsserverinterface.sip
  229. +17 −17 python/server/qgsserverprojectparser.sip
  230. +22 −22 python/server/qgsserverprojectutils.sip
  231. +7 −7 python/server/qgsserverrequest.sip
  232. +1 −1 python/server/qgsservice.sip
  233. +1 −1 python/server/qgsservicemodule.sip
  234. +4 −4 python/server/qgsserviceregistry.sip
  235. +14 −14 python/server/qgswmsconfigparser.sip
  236. +23 −23 python/server/qgswmsprojectparser.sip
@@ -41,12 +41,12 @@ template <TYPE>
if ((l = PyList_New(sipCpp->size())) == NULL)
return NULL;

const sipMappedType* qvector_qgspoint = sipFindMappedType("QVector<QgsPoint>");
const sipMappedType *qvector_qgspoint = sipFindMappedType("QVector<QgsPoint>");

// Set the list elements.
for (int i = 0; i < sipCpp->size(); ++i)
{
QVector<TYPE>* t = new QVector<TYPE>(sipCpp->at(i));
QVector<TYPE> *t = new QVector<TYPE>(sipCpp->at(i));
PyObject *tobj;

if ((tobj = sipConvertFromMappedType(t, qvector_qgspoint, sipTransferObj)) == NULL)
@@ -62,7 +62,7 @@ template <TYPE>
%End

%ConvertToTypeCode
const sipMappedType* qvector_qgspoint = sipFindMappedType("QVector<QgsPoint>");
const sipMappedType *qvector_qgspoint = sipFindMappedType("QVector<QgsPoint>");

// Check the type if that is all that is required.
if (sipIsErr == NULL)
@@ -84,7 +84,7 @@ template <TYPE>
{
int state;
//TYPE *t = reinterpret_cast<TYPE *>(sipConvertToType(PyList_GET_ITEM(sipPy, i), sipType_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
QVector<TYPE> * t = reinterpret_cast< QVector<TYPE> * >(sipConvertToMappedType(PyList_GET_ITEM(sipPy, i), qvector_qgspoint, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
QVector<TYPE> *t = reinterpret_cast< QVector<TYPE> * >(sipConvertToMappedType(PyList_GET_ITEM(sipPy, i), qvector_qgspoint, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));

if (*sipIsErr)
{
@@ -118,12 +118,12 @@ template <TYPE>
if ((l = PyList_New(sipCpp->size())) == NULL)
return NULL;

const sipMappedType* qvector_qgspoint = sipFindMappedType("QVector<QVector<QgsPoint> >");
const sipMappedType *qvector_qgspoint = sipFindMappedType("QVector<QVector<QgsPoint> >");

// Set the list elements.
for (int i = 0; i < sipCpp->size(); ++i)
{
QVector<QVector<TYPE> >* t = new QVector<QVector<TYPE> >(sipCpp->at(i));
QVector<QVector<TYPE> > *t = new QVector<QVector<TYPE> >(sipCpp->at(i));
PyObject *tobj;

if ((tobj = sipConvertFromMappedType(t, qvector_qgspoint, sipTransferObj)) == NULL)
@@ -139,7 +139,7 @@ template <TYPE>

%ConvertToTypeCode

const sipMappedType* qvector_qgspoint = sipFindMappedType("QVector<QVector<QgsPoint> >");
const sipMappedType *qvector_qgspoint = sipFindMappedType("QVector<QVector<QgsPoint> >");

// Check the type if that is all that is required.
if (sipIsErr == NULL)
@@ -161,7 +161,7 @@ template <TYPE>
{
int state;
//TYPE *t = reinterpret_cast<TYPE *>(sipConvertToType(PyList_GET_ITEM(sipPy, i), sipType_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
QVector<QVector<TYPE> > * t = reinterpret_cast< QVector< QVector<TYPE> > * >(sipConvertToMappedType(PyList_GET_ITEM(sipPy, i), qvector_qgspoint, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
QVector<QVector<TYPE> > *t = reinterpret_cast< QVector< QVector<TYPE> > * >(sipConvertToMappedType(PyList_GET_ITEM(sipPy, i), qvector_qgspoint, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));

if (*sipIsErr)
{
@@ -194,12 +194,12 @@ template <TYPE>
if ((l = PyList_New(sipCpp->size())) == NULL)
return NULL;

const sipMappedType* qlist_type = sipFindMappedType("QList<TYPE>");
const sipMappedType *qlist_type = sipFindMappedType("QList<TYPE>");

// Set the list elements.
for (int i = 0; i < sipCpp->size(); ++i)
{
QList<TYPE>* t = new QList<TYPE>(sipCpp->at(i));
QList<TYPE> *t = new QList<TYPE>(sipCpp->at(i));
PyObject *tobj;

if ((tobj = sipConvertFromMappedType(t, qlist_type, sipTransferObj)) == NULL)
@@ -215,7 +215,7 @@ template <TYPE>
%End

%ConvertToTypeCode
const sipMappedType* qlist_type = sipFindMappedType("QList<TYPE>");
const sipMappedType *qlist_type = sipFindMappedType("QList<TYPE>");

// Check the type if that is all that is required.
if (sipIsErr == NULL)
@@ -237,7 +237,7 @@ template <TYPE>
{
int state;
//TYPE *t = reinterpret_cast<TYPE *>(sipConvertToType(PyList_GET_ITEM(sipPy, i), sipType_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
QList<TYPE> * t = reinterpret_cast< QList<TYPE> * >(sipConvertToMappedType(PyList_GET_ITEM(sipPy, i), qlist_type, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
QList<TYPE> *t = reinterpret_cast< QList<TYPE> * >(sipConvertToMappedType(PyList_GET_ITEM(sipPy, i), qlist_type, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));

if (*sipIsErr)
{
@@ -269,12 +269,12 @@ template <TYPE>
if ((l = PyList_New(sipCpp->size())) == NULL)
return NULL;

const sipMappedType* qlist_type = sipFindMappedType("QList<QgsPointV2>");
const sipMappedType *qlist_type = sipFindMappedType("QList<QgsPointV2>");

// Set the list elements.
for (int i = 0; i < sipCpp->size(); ++i)
{
QList<QgsPointV2>* t = new QList<QgsPointV2>(sipCpp->at(i));
QList<QgsPointV2> *t = new QList<QgsPointV2>(sipCpp->at(i));
PyObject *tobj;

if ((tobj = sipConvertFromMappedType(t, qlist_type, sipTransferObj)) == NULL)
@@ -290,7 +290,7 @@ template <TYPE>
%End

%ConvertToTypeCode
const sipMappedType* qlist_type = sipFindMappedType("QList<QgsPointV2>");
const sipMappedType *qlist_type = sipFindMappedType("QList<QgsPointV2>");

// Check the type if that is all that is required.
if (sipIsErr == NULL)
@@ -312,7 +312,7 @@ template <TYPE>
{
int state;
//TYPE *t = reinterpret_cast<TYPE *>(sipConvertToType(PyList_GET_ITEM(sipPy, i), sipType_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
QList<QgsPointV2> * t = reinterpret_cast< QList<QgsPointV2> * >(sipConvertToMappedType(PyList_GET_ITEM(sipPy, i), qlist_type, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
QList<QgsPointV2> *t = reinterpret_cast< QList<QgsPointV2> * >(sipConvertToMappedType(PyList_GET_ITEM(sipPy, i), qlist_type, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));

if (*sipIsErr)
{
@@ -342,15 +342,15 @@ template <TYPE>
{
return NULL;
}
const sipMappedType* qlist_type = sipFindMappedType("QList<QList<QgsPointV2> >");
const sipMappedType *qlist_type = sipFindMappedType("QList<QList<QgsPointV2> >");
if(!qlist_type )
{
Py_DECREF(l); return NULL;
}

for (int i = 0; i < sipCpp->size(); ++i)
{
QList< QList<QgsPointV2> >* t = new QList<QList<QgsPointV2> >(sipCpp->at(i));
QList< QList<QgsPointV2> > *t = new QList<QList<QgsPointV2> >(sipCpp->at(i));
PyObject *tobj;
if ((tobj = sipConvertFromMappedType(t, qlist_type, sipTransferObj)) == NULL)
{
@@ -363,12 +363,12 @@ template <TYPE>
return l;
%End
%ConvertToTypeCode
const sipMappedType* qlist_type = sipFindMappedType("QList<QList<QgsPointV2> >");
const sipMappedType *qlist_type = sipFindMappedType("QList<QList<QgsPointV2> >");
if (sipIsErr == NULL)
{
return 0;
}
QList< QList< QList<QgsPointV2> > >* ql = new QList< QList< QList<QgsPointV2> > >();
QList< QList< QList<QgsPointV2> > > *ql = new QList< QList< QList<QgsPointV2> > >();
for( int i = 0;i < PyList_GET_SIZE(sipPy); ++i)
{
int state;
@@ -597,12 +597,12 @@ template<TYPE>
if ((d = PyDict_New()) == NULL)
return NULL;

const sipMappedType* qmap2 = sipFindMappedType("QMap<int, TYPE>");
const sipMappedType *qmap2 = sipFindMappedType("QMap<int, TYPE>");

// Set the list elements.
for (QMap<qint64, QMap<int, TYPE> >::iterator it = sipCpp->begin(); it != sipCpp->end(); ++it)
{
QMap<int, TYPE>* t = new QMap<int, TYPE>(*it);
QMap<int, TYPE> *t = new QMap<int, TYPE>(*it);

PyObject *kobj = PyLong_FromLongLong(it.key());
PyObject *tobj = sipConvertFromMappedType(t, qmap2, sipTransferObj);
@@ -677,7 +677,7 @@ template<TYPE>
int k2 = PyLong_AsLong(kobj2);
int state;

TYPE* t2 = reinterpret_cast<TYPE*>(sipConvertToType(tobj2, sipType_TYPE, sipTransferObj,SIP_NOT_NONE,&state,sipIsErr));
TYPE *t2 = reinterpret_cast<TYPE*>(sipConvertToType(tobj2, sipType_TYPE, sipTransferObj,SIP_NOT_NONE,&state,sipIsErr));

if (*sipIsErr)
{
@@ -1125,7 +1125,7 @@ template<double, TYPE>
for (i = sipCpp->begin(); i != sipCpp->end(); ++i)
{
PyObject *t1obj = PyFloat_FromDouble(i.key());
TYPE* t2 = &i.value();
TYPE *t2 = &i.value();
PyObject *t2obj = sipConvertFromType(t2, sipType_TYPE, sipTransferObj);

if (t1obj == NULL || t2obj == NULL || PyDict_SetItem(d, t1obj, t2obj) < 0)
@@ -1220,7 +1220,7 @@ template<double, TYPE2>
{

const double t1 = i.key();
TYPE2 * t2 = &i.value();
TYPE2 *t2 = &i.value();
PyObject *t1obj = PyFloat_FromDouble(t1);
PyObject *t2obj = sipConvertFromType(t2, sipType_TYPE2, sipTransferObj);
if (PyDict_GetItem(d, t1obj) == NULL) {
@@ -1337,7 +1337,7 @@ template<int, TYPE2*>
{

const int t1 = i.key();
TYPE2 * t2 = i.value();
TYPE2 *t2 = i.value();
PyObject *t1obj = PyLong_FromSize_t(t1);
PyObject *t2obj = sipConvertFromType(t2, sipType_TYPE2, sipTransferObj);
if (PyDict_GetItem(d, t1obj) == NULL)
@@ -1729,10 +1729,10 @@ template <TYPE>

for (QMap<qint64, QgsFeature*>::iterator it = sipCpp->begin(); it != sipCpp->end(); ++it)
{
QgsFeature* oobj = new QgsFeature(*it.value());
QgsFeature *oobj = new QgsFeature(*it.value());

PyObject* keyobj = PyLong_FromLong(it.key());
PyObject* pyOobj = sipConvertFromType(oobj, sipType_QgsFeature, sipTransferObj);
PyObject *keyobj = PyLong_FromLong(it.key());
PyObject *pyOobj = sipConvertFromType(oobj, sipType_QgsFeature, sipTransferObj);
PyDict_SetItem(d, keyobj, pyOobj);

if(pyOobj == NULL || keyobj == NULL || PyDict_SetItem(d, keyobj, pyOobj) < 0)
@@ -1767,7 +1767,7 @@ template <TYPE>
{
int state;
qint64 t1 = PyLong_AsLongLong(t1obj);
QgsFeature* t2 = reinterpret_cast<QgsFeature*>(sipConvertToType(t2obj, sipType_QgsFeature, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
QgsFeature *t2 = reinterpret_cast<QgsFeature*>(sipConvertToType(t2obj, sipType_QgsFeature, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));

if (*sipIsErr)
{
@@ -1906,7 +1906,7 @@ bool null_from_qvariant_converter( const QVariant *varp, PyObject **objp )
if ( varp->isNull() && varp->type() != QVariant::ByteArray )
{
sWatchDog = true;
PyObject* vartype = sipConvertFromEnum( varp->type(), sipType_QVariant_Type );
PyObject *vartype = sipConvertFromEnum( varp->type(), sipType_QVariant_Type );
*objp = PyObject_Call(( PyObject * )sipTypeAsPyTypeObject( sipType_QVariant ), PyTuple_Pack( 1, vartype ), nullptr );
sWatchDog = false;
return true;
@@ -37,7 +37,7 @@ class Qgis
// Release name
static const QString QGIS_RELEASE_NAME;
// The development version
static const char* QGIS_DEV_VERSION;
static const char *QGIS_DEV_VERSION;

// Enumerations
//
@@ -112,7 +112,7 @@ class Qgis
* @note added in version 2.9
* @see permissiveToInt
*/
double qgsPermissiveToDouble( QString string, bool& ok );
double qgsPermissiveToDouble( QString string, bool &ok );

/** Converts a string to an integer in a permissive way, e.g., allowing for incorrect
* numbers of digits between thousand separators
@@ -122,18 +122,18 @@ double qgsPermissiveToDouble( QString string, bool& ok );
* @note added in version 2.9
* @see permissiveToDouble
*/
int qgsPermissiveToInt( QString string, bool& ok );
int qgsPermissiveToInt( QString string, bool &ok );
//! Compares two QVariant values and returns whether the first is less than the second.
//! Useful for sorting lists of variants, correctly handling sorting of the various
//! QVariant data types (such as strings, numeric values, dates and times)
//! @see qgsVariantGreaterThan()
bool qgsVariantLessThan( const QVariant& lhs, const QVariant& rhs );
bool qgsVariantLessThan( const QVariant &lhs, const QVariant &rhs );

//! Compares two QVariant values and returns whether the first is greater than the second.
//! Useful for sorting lists of variants, correctly handling sorting of the various
//! QVariant data types (such as strings, numeric values, dates and times)
//! @see qgsVariantLessThan()
bool qgsVariantGreaterThan( const QVariant& lhs, const QVariant& rhs );
bool qgsVariantGreaterThan( const QVariant &lhs, const QVariant &rhs );

/** Wkt string that represents a geographic coord sys
* @note added to replace GEOWkt
@@ -11,7 +11,7 @@ class QgsCachedFeatureIterator : QgsAbstractFeatureIterator
* @param vlCache The vector layer cache to use
* @param featureRequest The feature request to answer
*/
QgsCachedFeatureIterator( QgsVectorLayerCache* vlCache, const QgsFeatureRequest& featureRequest );
QgsCachedFeatureIterator( QgsVectorLayerCache *vlCache, const QgsFeatureRequest &featureRequest );

/**
* Rewind to the beginning of the iterator
@@ -37,15 +37,15 @@ class QgsCachedFeatureIterator : QgsAbstractFeatureIterator
*
* @see bool getFeature( QgsFeature& f )
*/
virtual bool fetchFeature( QgsFeature& f );
virtual bool fetchFeature( QgsFeature &f );

/**
* We have a local special iterator for FilterFids, no need to run the generic.
*
* @param f Will write to this feature
* @return bool true if the operation was ok
*/
virtual bool nextFeatureFilterFids( QgsFeature& f );
virtual bool nextFeatureFilterFids( QgsFeature &f );

};

@@ -66,7 +66,7 @@ class QgsCachedFeatureWriterIterator : QgsAbstractFeatureIterator
* @param vlCache The vector layer cache to use
* @param featureRequest The feature request to answer
*/
QgsCachedFeatureWriterIterator( QgsVectorLayerCache* vlCache, const QgsFeatureRequest& featureRequest );
QgsCachedFeatureWriterIterator( QgsVectorLayerCache *vlCache, const QgsFeatureRequest &featureRequest );

/**
* Rewind to the beginning of the iterator
@@ -92,5 +92,5 @@ class QgsCachedFeatureWriterIterator : QgsAbstractFeatureIterator
*
* @see bool getFeature( QgsFeature& f )
*/
virtual bool fetchFeature( QgsFeature& f );
virtual bool fetchFeature( QgsFeature &f );
};
@@ -28,7 +28,7 @@ class QgsAbstractCacheIndex
* @param featureRequest The feature request that was answered
* @param fids The feature ids that have been returned
*/
virtual void requestCompleted( const QgsFeatureRequest& featureRequest, const QgsFeatureIds& fids );
virtual void requestCompleted( const QgsFeatureRequest &featureRequest, const QgsFeatureIds &fids );

/**
* Is called, when a feature request is issued on a cached layer.
@@ -44,5 +44,5 @@ class QgsAbstractCacheIndex
* @return True, if this index holds the information to answer the request.
*
*/
virtual bool getCacheIterator( QgsFeatureIterator& featureIterator, const QgsFeatureRequest& featureRequest ) = 0;
virtual bool getCacheIterator( QgsFeatureIterator &featureIterator, const QgsFeatureRequest &featureRequest ) = 0;
};
@@ -8,6 +8,6 @@ class QgsCacheIndexFeatureId : QgsAbstractCacheIndex

virtual void flushFeature( const QgsFeatureId fid );
virtual void flush();
virtual void requestCompleted( const QgsFeatureRequest& featureRequest, const QgsFeatureIds& fids );
virtual bool getCacheIterator( QgsFeatureIterator& featureIterator, const QgsFeatureRequest& featureRequest );
virtual void requestCompleted( const QgsFeatureRequest &featureRequest, const QgsFeatureIds &fids );
virtual bool getCacheIterator( QgsFeatureIterator &featureIterator, const QgsFeatureRequest &featureRequest );
};
@@ -13,7 +13,7 @@ class QgsDartMeasurement

QgsDartMeasurement();

QgsDartMeasurement( const QString& name, Type type, const QString& value );
QgsDartMeasurement( const QString &name, Type type, const QString &value );

const QString toString() const;

@@ -15,6 +15,6 @@ class QgsDataItemProvider

//! Create a new instance of QgsDataItem (or null) for given path and parent item.
//! Caller takes responsibility of deleting created items.
virtual QgsDataItem* createDataItem( const QString& path, QgsDataItem* parentItem ) = 0 /Factory/;
virtual QgsDataItem *createDataItem( const QString &path, QgsDataItem *parentItem ) = 0 /Factory/;

};
@@ -18,13 +18,13 @@ class QgsDataItemProviderRegistry
QList<QgsDataItemProvider*> providers() const;

//! Add a provider implementation. Takes ownership of the object.
void addProvider( QgsDataItemProvider* provider /Transfer/ );
void addProvider( QgsDataItemProvider *provider /Transfer/ );

//! Remove provider implementation from the list (provider object is deleted)
void removeProvider( QgsDataItemProvider* provider );
void removeProvider( QgsDataItemProvider *provider );

private:

QgsDataItemProviderRegistry( const QgsDataItemProviderRegistry& rh );
QgsDataItemProviderRegistry( const QgsDataItemProviderRegistry &rh );

};

0 comments on commit 93971d5

Please sign in to comment.