Skip to content

Commit 2758f3b

Browse files
committed
Remove some more redundant qt version checks
1 parent b72fb59 commit 2758f3b

File tree

2 files changed

+0
-25
lines changed

2 files changed

+0
-25
lines changed

src/plugins/evis/eventbrowser/evisimagedisplaywidget.cpp

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,7 @@ eVisImageDisplayWidget::eVisImageDisplayWidget( QWidget* parent, Qt::WindowFlags
9797

9898
//setup http connection
9999
mHttpBuffer = new QBuffer();
100-
#if QT_VERSION < 0x050000
101-
mHttpConnection = new QHttp();
102-
#endif
103100
mHttpBuffer->open( QBuffer::ReadWrite );
104-
// TODO
105-
#if QT_VERSION < 0x050000
106-
connect( mHttpConnection, SIGNAL( requestFinished( int, bool ) ), this, SLOT( displayUrlImage( int, bool ) ) );
107-
#endif
108101

109102
//initialize remaining variables
110103
mScaleByHeight = false;
@@ -119,9 +112,6 @@ eVisImageDisplayWidget::~eVisImageDisplayWidget()
119112
delete mImageLabel;
120113
delete mImage;
121114
delete mHttpBuffer;
122-
#if QT_VERSION < 0x050000
123-
delete mHttpConnection;
124-
#endif
125115
delete pbtnZoomIn;
126116
delete pbtnZoomOut;
127117
delete pbtnZoomFull;
@@ -199,11 +189,6 @@ void eVisImageDisplayWidget::displayImage()
199189
void eVisImageDisplayWidget::displayUrlImage( const QString& url )
200190
{
201191
Q_UNUSED( url );
202-
#if QT_VERSION < 0x050000
203-
QUrl myUrl( url );
204-
mHttpConnection->setHost( myUrl.host() );
205-
mCurrentHttpImageRequestId = mHttpConnection->get( myUrl.path().replace( '\\', '/' ), mHttpBuffer );
206-
#endif
207192
}
208193

209194
/**

src/plugins/evis/eventbrowser/evisimagedisplaywidget.h

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,6 @@
3232
#include <QScrollArea>
3333
#include <QPushButton>
3434
#include <QBuffer>
35-
// TODO: Update to QNetworkAccessManager
36-
#if QT_VERSION < 0x050000
37-
#include <QHttp>
38-
#endif
3935

4036
#include <QResizeEvent>
4137

@@ -94,12 +90,6 @@ class eVisImageDisplayWidget : public QWidget
9490
//! \brief Pointer to the http buffer
9591
QBuffer* mHttpBuffer;
9692

97-
// TODO: Update to QNetworkAccessManager
98-
#if QT_VERSION < 0x050000
99-
//! \brief Pointer to the http connection if needed
100-
QHttp* mHttpConnection;
101-
#endif
102-
10393
//! \brief This is a point to the actual image being displayed
10494
QPixmap* mImage;
10595

0 commit comments

Comments
 (0)