diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-12-15 14:41:45 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-12-15 14:41:45 +0100 |
commit | a5ba89ad94be0e3e30f2c3e0b12ac4d23cf6805d (patch) | |
tree | 113bb4979d5fe0fba03a7775dd0761bcba471bf1 /tests/integration/indicator-sound-test-base.cpp | |
parent | 1a36cae0aa0fc9c4b55efa47a419a3fafdae4923 (diff) | |
parent | ef792584d74cf8cc9fb70c9f9a18455c6c1da339 (diff) | |
download | ayatana-indicator-sound-a5ba89ad94be0e3e30f2c3e0b12ac4d23cf6805d.tar.gz ayatana-indicator-sound-a5ba89ad94be0e3e30f2c3e0b12ac4d23cf6805d.tar.bz2 ayatana-indicator-sound-a5ba89ad94be0e3e30f2c3e0b12ac4d23cf6805d.zip |
Merge branch 'tari01-pr/build-libayatana-common-with-enable-lomiri-features'
Attributes GH PR #71: https://github.com/AyatanaIndicators/ayatana-indicator-sound/pull/71
Diffstat (limited to 'tests/integration/indicator-sound-test-base.cpp')
-rw-r--r-- | tests/integration/indicator-sound-test-base.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/tests/integration/indicator-sound-test-base.cpp b/tests/integration/indicator-sound-test-base.cpp index 1a74621..6c64815 100644 --- a/tests/integration/indicator-sound-test-base.cpp +++ b/tests/integration/indicator-sound-test-base.cpp @@ -1,6 +1,6 @@ /* - * Copyright (C) 2015 Canonical Ltd. - * Copyright (C) 2021 Robert Tari + * Copyright 2015 Canonical Ltd. + * Copyright 2021 Robert Tari * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License version 3, as published @@ -534,9 +534,10 @@ void IndicatorSoundTestBase::initializeAccountsInterface() auto userPath = userResp.value().path(); if (userPath != "") { - std::unique_ptr<AccountsSoundInterface> soundInterface(new AccountsSoundInterface("org.freedesktop.Accounts", + // This silences cppcheck, but let's leave it here in case we actually need it + /*std::unique_ptr<AccountsSoundInterface> soundInterface(new AccountsSoundInterface("org.freedesktop.Accounts", userPath, - dbusTestRunner.systemConnection(), 0)); + dbusTestRunner.systemConnection(), 0));*/ accounts_interface_.reset(new DBusPropertiesInterface("org.freedesktop.Accounts", userPath, @@ -1008,8 +1009,6 @@ QVariantList IndicatorSoundTestBase::getActionValue(QString const &action) QStringList IndicatorSoundTestBase::getRootIconValue(bool *isValid) { - QString result = 0; - QVariantList varList = getActionValue("root"); if (isValid != nullptr) { |