diff options
| author | Itay Grudev <itay+github.com@grudev.com> | 2020-12-21 19:23:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-21 19:23:04 +0200 |
| commit | 451a42d8f99a9851b3e15761d239a841ea987137 (patch) | |
| tree | 8241b0c4008dd56df60ecd1813285e0fcd9f7017 | |
| parent | Merge pull request #122 from LorenDB/master (diff) | |
| parent | Set Ubuntu version explicitly (diff) | |
| download | singleapplication-451a42d8f99a9851b3e15761d239a841ea987137.tar.xz | |
Merge pull request #124 from Shatur95/use-const-reference
Use const reference and bump GitHub actions
| -rw-r--r-- | .github/workflows/build-cmake.yml | 8 | ||||
| -rw-r--r-- | singleapplication.cpp | 2 | ||||
| -rw-r--r-- | singleapplication.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/.github/workflows/build-cmake.yml b/.github/workflows/build-cmake.yml index 0fd3f51..6344b50 100644 --- a/.github/workflows/build-cmake.yml +++ b/.github/workflows/build-cmake.yml @@ -8,11 +8,11 @@ jobs: strategy: matrix: 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: - qt_version: 6.0.0 additional_arguments: -D QT_DEFAULT_MAJOR_VERSION=6 - - platform: ubuntu-latest + - platform: ubuntu-20.04 CXXFLAGS: -Wall -Wextra -pedantic -Werror - platform: macos-latest CXXFLAGS: -Wall -Wextra -pedantic -Werror @@ -24,10 +24,10 @@ jobs: CXXFLAGS: ${{ matrix.CXXFLAGS }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v2.3.4 - name: Install Qt - uses: jurplel/install-qt-action@v2.9.0 + uses: jurplel/install-qt-action@v2.11.1 with: version: ${{ matrix.qt_version }} diff --git a/singleapplication.cpp b/singleapplication.cpp index 276ceee..6279713 100644 --- a/singleapplication.cpp +++ b/singleapplication.cpp @@ -36,7 +36,7 @@ * @param options Optional flags to toggle specific behaviour * @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 ) ) { Q_D( SingleApplication ); diff --git a/singleapplication.h b/singleapplication.h index d39a661..8768012 100644 --- a/singleapplication.h +++ b/singleapplication.h @@ -85,7 +85,7 @@ public: * Usually 4*timeout would be the worst case (fail) scenario. * @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; /** |