matthew/ostinato
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #263 from ehlers/osx-warnings

Browse Source 
QT5 Compilation issues on OS X
This commit is contained in:
Srivats P 2018-05-22 21:20:04 +05:30 committed by GitHub
commit 9a148bec0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/dumpview.cpp
View File

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

3
client/dumpview.h
View File

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

2
rpc/rpcconn.cpp
View File

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

4
rpc/rpcconn.h
View File

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

2
rpc/rpcserver.cpp
View File

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

2
rpc/rpcserver.h
View File

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

2
server/pcaptxstats.h
View File

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