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

Merge pull request #124 from Shatur95/use-const-reference

Browse Source 
Use const reference and bump GitHub actions
This commit is contained in:
Itay Grudev 2020-12-21 19:23:04 +02:00 committed by GitHub
commit 451a42d8f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,11 +8,11 @@ jobs:
strategy: strategy:
matrix: matrix:
qt_version: [5.12.6, 5.13.2, 5.14.0, 5.15.0, 6.0.0] qt_version: [5.12.6, 5.13.2, 5.14.0, 5.15.0, 6.0.0]
platform: [ubuntu-latest, windows-latest, macos-latest] platform: [ubuntu-20.04, windows-latest, macos-latest]
include: include:
- qt_version: 6.0.0 - qt_version: 6.0.0
additional_arguments: -D QT_DEFAULT_MAJOR_VERSION=6 additional_arguments: -D QT_DEFAULT_MAJOR_VERSION=6
- platform: ubuntu-latest - platform: ubuntu-20.04
CXXFLAGS: -Wall -Wextra -pedantic -Werror CXXFLAGS: -Wall -Wextra -pedantic -Werror
- platform: macos-latest - platform: macos-latest
CXXFLAGS: -Wall -Wextra -pedantic -Werror CXXFLAGS: -Wall -Wextra -pedantic -Werror
@ -24,10 +24,10 @@ jobs:
CXXFLAGS: ${{ matrix.CXXFLAGS }} CXXFLAGS: ${{ matrix.CXXFLAGS }}
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2.3.4
- name: Install Qt - name: Install Qt
uses: jurplel/install-qt-action@v2.9.0 uses: jurplel/install-qt-action@v2.11.1
with: with:
version: ${{ matrix.qt_version }} version: ${{ matrix.qt_version }}

2
singleapplication.cpp
View File

@ -36,7 +36,7 @@
* @param options Optional flags to toggle specific behaviour * @param options Optional flags to toggle specific behaviour
* @param timeout Maximum time blocking functions are allowed during app load * @param timeout Maximum time blocking functions are allowed during app load
*/ */
SingleApplication::SingleApplication( int &argc, char *argv[], bool allowSecondary, Options options, int timeout, QString userData ) SingleApplication::SingleApplication( int &argc, char *argv[], bool allowSecondary, Options options, int timeout, const QString &userData )
: app_t( argc, argv ), d_ptr( new SingleApplicationPrivate( this ) ) : app_t( argc, argv ), d_ptr( new SingleApplicationPrivate( this ) )
{ {
Q_D( SingleApplication ); Q_D( SingleApplication );

2
singleapplication.h
View File

@ -85,7 +85,7 @@ public:
* Usually 4*timeout would be the worst case (fail) scenario. * Usually 4*timeout would be the worst case (fail) scenario.
* @see See the corresponding QAPPLICATION_CLASS constructor for reference * @see See the corresponding QAPPLICATION_CLASS constructor for reference
*/ */
explicit SingleApplication( int &argc, char *argv[], bool allowSecondary = false, Options options = Mode::User, int timeout = 1000, QString userData = QString() ); explicit SingleApplication( int &argc, char *argv[], bool allowSecondary = false, Options options = Mode::User, int timeout = 1000, const QString &userData = {} );
~SingleApplication() override; ~SingleApplication() override;
/** /**