Move deprecated QgsHttpTransaction to server

qgis · Sep 20, 2016 · ac4f662 · ac4f662
1 parent 3c4f46d
commit ac4f662
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 101 deletions.
diff --git a/doc/api_break.dox b/doc/api_break.dox
@@ -190,6 +190,7 @@ Use QgsComposerAttributeTableV2 instead.</li>
 <li>QgsCRSCache was removed. QgsCoordinateReferenceSystem now internally uses a cache for CRS creation,
 so there is no longer a need for the separate cache class. Code which previously called QgsCRSCache::updateCRSCache()
 should now call QgsCoordinateReferenceSystem::invalidateCache() and QgsCoordinateTransformCache::instance()->invalidateCrs( authid ).</li>
+<li>QgsHttpTransaction. This class was outdated and code should be ported to native Qt or Python implementations.</li>
 <li>QgsLabel and QgsLabelAttributes. Replaced by labeling based on PAL library, see QgsLabelingEngineV2.</li>
 <li>QgsLegendModel was removed.
 <li>QgsMapCanvasMap. It is an internal class used by map canvas.</li>

diff --git a/python/core/core.sip b/python/core/core.sip
@@ -65,8 +65,6 @@
 %Include qgsmaptopixelgeometrysimplifier.sip
 %Include qgstransaction.sip
 %Include qgstransactiongroup.sip
-// TODO - update for Qt5
-// %Include qgshttptransaction.sip
 %Include qgsdartmeasurement.sip
 %Include qgsexpressionfieldbuffer.sip
 %Include qgsfontutils.sip

diff --git a/python/core/qgshttptransaction.sip b/python/core/qgshttptransaction.sip
diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
@@ -22,6 +22,7 @@ SET ( qgis_mapserv_SRCS
   qgscapabilitiescache.cpp
   qgsconfigcache.cpp
   qgshttprequesthandler.cpp
+#  qgshttptransaction.cpp
   qgsgetrequesthandler.cpp
   qgspostrequesthandler.cpp
   qgssoaprequesthandler.cpp
@@ -65,6 +66,7 @@ ENDIF("${Qt5Network_VERSION}" VERSION_LESS "5.0.0")
 SET (qgis_mapserv_MOC_HDRS
   qgscapabilitiescache.h
   qgsconfigcache.h
+#  qgshttptransaction.h
   qgsmaprenderer.h
   qgsmslayercache.h
   qgsserverlogger.h

diff --git a/src/core/qgshttptransaction.cpp → src/server/qgshttptransaction.cpp b/src/core/qgshttptransaction.cpp → src/server/qgshttptransaction.cpp
diff --git a/src/core/qgshttptransaction.h → src/server/qgshttptransaction.h b/src/core/qgshttptransaction.h → src/server/qgshttptransaction.h
@@ -30,13 +30,14 @@ class QTimer;
 // needs porting to Qt5 - until then don't include in api docs
 ///@cond PRIVATE
 
-/** \ingroup core
+/** \ingroup server
  * HTTP request/response manager that is redirect-aware.
  * This class extends the Qt QHttp concept by being able to recognise
  *  and respond to redirection responses (e.g. HTTP code 302)
+ * @note not available in Python bindings
 */
 
-class CORE_EXPORT QgsHttpTransaction : public QObject
+class QgsHttpTransaction : public QObject
 {
 
     Q_OBJECT