From 9422df99651b8fd0d92e76f78c713419b9153df5 Mon Sep 17 00:00:00 2001
From: matlabbe <matlabbe@620bd6b2-0a58-f614-fd9a-1bd335dccda9>
Date: Thu, 22 May 2014 15:46:43 +0000
Subject: [PATCH] fixed virtual hidden method warning (Mac OS X)

git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@283 620bd6b2-0a58-f614-fd9a-1bd335dccda9
---
 src/Camera.cpp | 4 ++--
 src/Camera.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Camera.cpp b/src/Camera.cpp
index d7973048..93e9f20a 100644
--- a/src/Camera.cpp
+++ b/src/Camera.cpp
@@ -14,7 +14,7 @@ CameraTcpClient::CameraTcpClient(QObject *parent) :
 	QTcpSocket(parent),
     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(disconnected()), this, SLOT(connectionLost()));
 }
@@ -26,7 +26,7 @@ cv::Mat CameraTcpClient::getImage()
 	return img;
 }
 
-void CameraTcpClient::readData()
+void CameraTcpClient::readReceivedData()
 {
 	QDataStream in(this);
 	in.setVersion(QDataStream::Qt_4_0);
diff --git a/src/Camera.h b/src/Camera.h
index f5de0dc6..b578f20a 100644
--- a/src/Camera.h
+++ b/src/Camera.h
@@ -20,7 +20,7 @@ public:
 	bool isConnected() const {return connected_;}
 
 private slots:
-	void readData();
+	void readReceivedData();
 	void displayError(QAbstractSocket::SocketError socketError);
 	void connectionLost();