Skip to content

Commit

Permalink
Move deprecated QgsHttpTransaction to server
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Sep 20, 2016
1 parent 3c4f46d commit ac4f662
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 101 deletions.
1 change: 1 addition & 0 deletions doc/api_break.dox
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 0 additions & 2 deletions python/core/core.sip
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
97 changes: 0 additions & 97 deletions python/core/qgshttptransaction.sip

This file was deleted.

2 changes: 2 additions & 0 deletions src/server/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ SET ( qgis_mapserv_SRCS
qgscapabilitiescache.cpp
qgsconfigcache.cpp
qgshttprequesthandler.cpp
# qgshttptransaction.cpp
qgsgetrequesthandler.cpp
qgspostrequesthandler.cpp
qgssoaprequesthandler.cpp
Expand Down Expand Up @@ -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
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ac4f662

Please sign in to comment.