mirrors/SingleApplication
1
0
Fork 0
mirror of https://github.com/itay-grudev/SingleApplication.git synced 2025-01-15 08:52:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #113 from Shatur95/fix-conversion-warning

Browse Source 
Fix conversion from int to quint32
This commit is contained in:
Itay Grudev 2020-10-15 09:22:43 +01:00 committed by GitHub
commit 5d837262f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build-cmake.yml vendored
View File

@ -16,7 +16,7 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Install Qt - name: Install Qt
uses: jurplel/install-qt-action@v2 uses: jurplel/install-qt-action@v2.9.0
with: with:
version: ${{ matrix.qt_version }} version: ${{ matrix.qt_version }}

6
singleapplication_p.cpp
View File

@ -70,7 +70,7 @@ SingleApplicationPrivate::SingleApplicationPrivate( SingleApplication *q_ptr )
server = nullptr; server = nullptr;
socket = nullptr; socket = nullptr;
memory = nullptr; memory = nullptr;
instanceNumber = -1; instanceNumber = 0;
} }
SingleApplicationPrivate::~SingleApplicationPrivate() SingleApplicationPrivate::~SingleApplicationPrivate()
@ -233,7 +233,7 @@ bool SingleApplicationPrivate::connectToPrimary( int timeout, ConnectionType con
socket->connectToServer( blockServerName ); socket->connectToServer( blockServerName );
if( socket->state() == QLocalSocket::ConnectingState ){ if( socket->state() == QLocalSocket::ConnectingState ){
socket->waitForConnected( timeout - time.elapsed() ); socket->waitForConnected( static_cast<int>(timeout - time.elapsed()) );
} }
// If connected break out of the loop // If connected break out of the loop
@ -269,7 +269,7 @@ bool SingleApplicationPrivate::connectToPrimary( int timeout, ConnectionType con
socket->write( header ); socket->write( header );
socket->write( initMsg ); socket->write( initMsg );
bool result = socket->waitForBytesWritten( timeout - time.elapsed() ); bool result = socket->waitForBytesWritten( static_cast<int>(timeout - time.elapsed()) );
socket->flush(); socket->flush();
return result; return result;
} }