Merge pull request #263 from ehlers/osx-warnings

QT5 Compilation issues on OS X

client/dumpview.cpp

@@ -157,7 +157,8 @@ QRegion DumpView::visualRegionForSelection(
 
 //protected slots:
 void DumpView::dataChanged(const QModelIndex &/*topLeft*/, 
-        const QModelIndex &/*bottomRight*/)
+        const QModelIndex &/*bottomRight*/,
+        const QVector<int> &/*roles*/)
 {
     // FIXME(HI)
     update();

client/dumpview.h

@@ -39,7 +39,8 @@ protected:
     QRegion visualRegionForSelection( const QItemSelection &selection ) const;
 protected slots:
     void dataChanged( const QModelIndex &topLeft, 
-            const QModelIndex &bottomRight );
+            const QModelIndex &bottomRight,
+            const QVector<int> &roles );
     void selectionChanged( const QItemSelection &selected,
     const QItemSelection &deselected );
     void paintEvent(QPaintEvent *event);

rpc/rpcconn.cpp

@@ -41,7 +41,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>
 
 static QThreadStorage<QString*> connId;
 
-RpcConnection::RpcConnection(int socketDescriptor, 
+RpcConnection::RpcConnection(qintptr socketDescriptor, 
                              ::google::protobuf::Service *service)
     : socketDescriptor(socketDescriptor),
       service(service)

rpc/rpcconn.h

@@ -43,7 +43,7 @@ class RpcConnection : public QObject
     Q_OBJECT
 
 public:
-    RpcConnection(int socketDescriptor, ::google::protobuf::Service *service);
+    RpcConnection(qintptr socketDescriptor, ::google::protobuf::Service *service);
     virtual ~RpcConnection();
 
     static void connIdMsgHandler(QtMsgType type,
@@ -67,7 +67,7 @@ private slots:
     void on_clientSock_disconnected();
 
 private:
-    int socketDescriptor;
+    qintptr socketDescriptor;
     QTcpSocket *clientSock;
 
     ::google::protobuf::Service *service;

rpc/rpcserver.cpp

@@ -62,7 +62,7 @@ bool RpcServer::registerService(::google::protobuf::Service *service,
     return true;
 }
 
-void RpcServer::incomingConnection(int socketDescriptor)
+void RpcServer::incomingConnection(qintptr socketDescriptor)
 {
     QThread *thread = new QThreadX; // FIXME:QThreadX pending Qt4.4+
     RpcConnection *conn = new RpcConnection(socketDescriptor, service);

rpc/rpcserver.h

@@ -47,7 +47,7 @@ signals:
     void notifyClients(int notifType, SharedProtobufMessage notifData);
 
 protected:
-    void incomingConnection(int socketDescriptor);
+    void incomingConnection(qintptr socketDescriptor);
 
 private:
     ::google::protobuf::Service *service;

server/pcaptxstats.h

@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>
 
 #include <QThread>
 
-class StatsTuple;
+struct StatsTuple;
 
 class PcapTxStats : public QThread
 {