Changeset View
Changeset View
Standalone View
Standalone View
kded/output.cpp
Show All 10 Lines | |||||
11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
12 | GNU General Public License for more details. | 12 | GNU General Public License for more details. | ||
13 | 13 | | |||
14 | You should have received a copy of the GNU General Public License | 14 | You should have received a copy of the GNU General Public License | ||
15 | along with this program. If not, see <http://www.gnu.org/licenses/>. | 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
16 | *********************************************************************/ | 16 | *********************************************************************/ | ||
17 | #include "output.h" | 17 | #include "output.h" | ||
18 | #include "config.h" | 18 | #include "config.h" | ||
19 | #include "../common/globals.h" | ||||
19 | 20 | | |||
20 | #include "kscreen_daemon_debug.h" | 21 | #include "kscreen_daemon_debug.h" | ||
21 | #include "generator.h" | 22 | #include "generator.h" | ||
22 | 23 | | |||
23 | #include <QStringList> | 24 | #include <QStringList> | ||
24 | #include <QFile> | 25 | #include <QFile> | ||
25 | #include <QStringBuilder> | 26 | #include <QStringBuilder> | ||
26 | #include <QJsonDocument> | 27 | #include <QJsonDocument> | ||
27 | #include <QDir> | 28 | #include <QDir> | ||
28 | #include <QLoggingCategory> | 29 | #include <QLoggingCategory> | ||
29 | 30 | | |||
30 | #include <kscreen/output.h> | 31 | #include <kscreen/output.h> | ||
31 | #include <kscreen/edid.h> | 32 | #include <kscreen/edid.h> | ||
32 | 33 | | |||
33 | QString Output::s_dirName = QStringLiteral("outputs/"); | 34 | QString Output::s_dirName = QStringLiteral("outputs/"); | ||
34 | 35 | | |||
35 | QString Output::dirPath() | 36 | QString Output::dirPath() | ||
36 | { | 37 | { | ||
37 | return Config::dirPath() % s_dirName; | 38 | return Globals::dirPath() % s_dirName; | ||
38 | } | 39 | } | ||
39 | 40 | | |||
40 | QString Output::globalFileName(const QString &hash) | 41 | QString Output::globalFileName(const QString &hash) | ||
41 | { | 42 | { | ||
42 | const auto dir = dirPath(); | 43 | const auto dir = dirPath(); | ||
43 | if (!QDir().mkpath(dir)) { | 44 | if (!QDir().mkpath(dir)) { | ||
44 | return QString(); | 45 | return QString(); | ||
45 | } | 46 | } | ||
▲ Show 20 Lines • Show All 196 Lines • Show Last 20 Lines |