apoorva/greenhouse
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed virtual hidden method warning (Mac OS X)

Browse Source 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@283 620bd6b2-0a58-f614-fd9a-1bd335dccda9
This commit is contained in:
matlabbe 2014-05-22 15:46:43 +00:00
parent b15c499227
commit 9422df9965
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Camera.cpp
View File

@ -14,7 +14,7 @@ CameraTcpClient::CameraTcpClient(QObject *parent) :
QTcpSocket(parent), QTcpSocket(parent),
blockSize_(0) blockSize_(0)
{ {
connect(this, SIGNAL(readyRead()), this, SLOT(readData())); connect(this, SIGNAL(readyRead()), this, SLOT(readReceivedData()));
connect(this, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(displayError(QAbstractSocket::SocketError))); connect(this, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(displayError(QAbstractSocket::SocketError)));
connect(this, SIGNAL(disconnected()), this, SLOT(connectionLost())); connect(this, SIGNAL(disconnected()), this, SLOT(connectionLost()));
} }
@ -26,7 +26,7 @@ cv::Mat CameraTcpClient::getImage()
return img; return img;
} }
void CameraTcpClient::readData() void CameraTcpClient::readReceivedData()
{ {
QDataStream in(this); QDataStream in(this);
in.setVersion(QDataStream::Qt_4_0); in.setVersion(QDataStream::Qt_4_0);

2
src/Camera.h
View File

@ -20,7 +20,7 @@ public:
bool isConnected() const {return connected_;} bool isConnected() const {return connected_;}
private slots: private slots:
void readData(); void readReceivedData();
void displayError(QAbstractSocket::SocketError socketError); void displayError(QAbstractSocket::SocketError socketError);
void connectionLost(); void connectionLost();