1 |
commit: 8e9be30e4a081b67be0797e66a44e9f98531f704 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 16 16:04:34 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 16 16:04:57 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e9be30e |
7 |
|
8 |
media-video/kaffeine: Fix build with Qt 5.11 |
9 |
|
10 |
Package-Manager: Portage-2.3.36, Repoman-2.3.9 |
11 |
|
12 |
.../kaffeine/files/kaffeine-2.0.15-qt-5.11.patch | 989 +++++++++++++++++++++ |
13 |
media-video/kaffeine/kaffeine-2.0.15.ebuild | 2 + |
14 |
2 files changed, 991 insertions(+) |
15 |
|
16 |
diff --git a/media-video/kaffeine/files/kaffeine-2.0.15-qt-5.11.patch b/media-video/kaffeine/files/kaffeine-2.0.15-qt-5.11.patch |
17 |
new file mode 100644 |
18 |
index 00000000000..65981526348 |
19 |
--- /dev/null |
20 |
+++ b/media-video/kaffeine/files/kaffeine-2.0.15-qt-5.11.patch |
21 |
@@ -0,0 +1,989 @@ |
22 |
+From cef89684e41b90c644f369edbca2bf079b8b0454 Mon Sep 17 00:00:00 2001 |
23 |
+From: Mauro Carvalho Chehab <mchehab+samsung@××××××.org> |
24 |
+Date: Wed, 16 May 2018 12:34:10 -0300 |
25 |
+Subject: [PATCH] don't use qPrintable() anymore |
26 |
+ |
27 |
+As commented on: https://bugreports.qt.io/browse/QTBUG-68307, |
28 |
+qt5 is explicitly breaking qPrintable(). |
29 |
+ |
30 |
+So, let's define our own version of it. |
31 |
+ |
32 |
+Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@××××××.org> |
33 |
+ |
34 |
+diff --git a/src/backend-vlc/vlcmediawidget.cpp b/src/backend-vlc/vlcmediawidget.cpp |
35 |
+index 2421dd69e285..c03b7dd732c6 100644 |
36 |
+--- a/src/backend-vlc/vlcmediawidget.cpp |
37 |
++++ b/src/backend-vlc/vlcmediawidget.cpp |
38 |
+@@ -55,7 +55,7 @@ bool VlcMediaWidget::init() |
39 |
+ |
40 |
+ vlcInstance = libvlc_new(argc, argv); |
41 |
+ if (!vlcInstance) { |
42 |
+- qCWarning(logMediaWidget, "libVLC: failed to use extra args: %s", qPrintable(args)); |
43 |
++ qCWarning(logMediaWidget, "libVLC: failed to use extra args: %s", toPrintable(args)); |
44 |
+ argc = 0; |
45 |
+ vlcInstance = libvlc_new(0, NULL); |
46 |
+ if (vlcInstance) |
47 |
+@@ -63,7 +63,7 @@ bool VlcMediaWidget::init() |
48 |
+ } |
49 |
+ |
50 |
+ if (vlcInstance == NULL) { |
51 |
+- qFatal("Cannot create vlc instance %s", qPrintable(libvlc_errmsg())); |
52 |
++ qFatal("Cannot create vlc instance %s", toPrintable(libvlc_errmsg())); |
53 |
+ delete argv; |
54 |
+ return false; |
55 |
+ } |
56 |
+@@ -73,14 +73,14 @@ bool VlcMediaWidget::init() |
57 |
+ for (int i = 0; i < argc; i++) |
58 |
+ log += " " + QLatin1String(argv[i]); |
59 |
+ |
60 |
+- qCDebug(logVlc, "%s", qPrintable(log)); |
61 |
++ qCDebug(logVlc, "%s", toPrintable(log)); |
62 |
+ } |
63 |
+ delete argv; |
64 |
+ |
65 |
+ vlcMediaPlayer = libvlc_media_player_new(vlcInstance); |
66 |
+ |
67 |
+ if (vlcMediaPlayer == NULL) { |
68 |
+- qFatal("Cannot create vlc media player %s", qPrintable(libvlc_errmsg())); |
69 |
++ qFatal("Cannot create vlc media player %s", toPrintable(libvlc_errmsg())); |
70 |
+ return false; |
71 |
+ } |
72 |
+ |
73 |
+@@ -95,7 +95,7 @@ bool VlcMediaWidget::init() |
74 |
+ |
75 |
+ for (uint i = 0; i < (sizeof(eventTypes) / sizeof(eventTypes[0])); ++i) { |
76 |
+ if (libvlc_event_attach(eventManager, eventTypes[i], vlcEventHandler, this) != 0) { |
77 |
+- qCCritical(logMediaWidget, "Cannot attach event handler %s", qPrintable(eventTypes[i])); |
78 |
++ qCCritical(logMediaWidget, "Cannot attach event handler %s", toPrintable(eventTypes[i])); |
79 |
+ return false; |
80 |
+ } |
81 |
+ } |
82 |
+@@ -167,7 +167,7 @@ void VlcMediaWidget::setAudioDevice(QString device) |
83 |
+ for (i = vlcAudioOutput; i != NULL; i = i->p_next) { |
84 |
+ if (device.compare(QString::fromUtf8(i->psz_description))) |
85 |
+ continue; |
86 |
+- qCDebug(logVlc, "Setting audio output to: %s", qPrintable(i->psz_device)); |
87 |
++ qCDebug(logVlc, "Setting audio output to: %s", toPrintable(i->psz_device)); |
88 |
+ |
89 |
+ libvlc_audio_output_device_set(vlcMediaPlayer, NULL, i->psz_device); |
90 |
+ } |
91 |
+@@ -319,7 +319,7 @@ void VlcMediaWidget::play(const MediaSource &source) |
92 |
+ |
93 |
+ if (vlcMedia == NULL) { |
94 |
+ libvlc_media_player_stop(vlcMediaPlayer); |
95 |
+- qCWarning(logMediaWidget, "Cannot create media %s", qPrintable(source.getUrl().toDisplayString())); |
96 |
++ qCWarning(logMediaWidget, "Cannot create media %s", toPrintable(source.getUrl().toDisplayString())); |
97 |
+ return; |
98 |
+ } |
99 |
+ |
100 |
+@@ -328,7 +328,7 @@ void VlcMediaWidget::play(const MediaSource &source) |
101 |
+ |
102 |
+ for (uint i = 0; i < (sizeof(eventTypes) / sizeof(eventTypes[0])); ++i) { |
103 |
+ if (libvlc_event_attach(eventManager, eventTypes[i], vlcEventHandler, this) != 0) { |
104 |
+- qCWarning(logMediaWidget, "Cannot attach event handler %s", qPrintable(eventTypes[i])); |
105 |
++ qCWarning(logMediaWidget, "Cannot attach event handler %s", toPrintable(eventTypes[i])); |
106 |
+ } |
107 |
+ } |
108 |
+ |
109 |
+@@ -340,7 +340,7 @@ void VlcMediaWidget::play(const MediaSource &source) |
110 |
+ // setExternalSubtitle(source.subtitleUrl); |
111 |
+ |
112 |
+ if (libvlc_media_player_play(vlcMediaPlayer) != 0) { |
113 |
+- qCWarning(logMediaWidget, "Cannot play media %s", qPrintable(source.getUrl().toDisplayString())); |
114 |
++ qCWarning(logMediaWidget, "Cannot play media %s", toPrintable(source.getUrl().toDisplayString())); |
115 |
+ } |
116 |
+ |
117 |
+ setCursor(Qt::BlankCursor); |
118 |
+@@ -408,7 +408,7 @@ void VlcMediaWidget::setCurrentSubtitle(int currentSubtitle) |
119 |
+ } |
120 |
+ |
121 |
+ if (track->i_id == requestedSubtitle) |
122 |
+- qCDebug(logVlc, "Subtitle set to id %d: %s", track->i_id, qPrintable(subtitle)); |
123 |
++ qCDebug(logVlc, "Subtitle set to id %d: %s", track->i_id, toPrintable(subtitle)); |
124 |
+ track = track->p_next; |
125 |
+ } |
126 |
+ libvlc_track_description_list_release(track); |
127 |
+@@ -424,11 +424,11 @@ void VlcMediaWidget::setExternalSubtitle(const QUrl &url) |
128 |
+ libvlc_media_slave_type_subtitle, |
129 |
+ url.toEncoded().constData(), |
130 |
+ true) == 0) |
131 |
+- qCWarning(logMediaWidget, "Cannot set subtitle file %s", qPrintable(fname)); |
132 |
++ qCWarning(logMediaWidget, "Cannot set subtitle file %s", toPrintable(fname)); |
133 |
+ #else |
134 |
+ if (libvlc_video_set_subtitle_file(vlcMediaPlayer, |
135 |
+- qPrintable(fname)) == 0) |
136 |
+- qCWarning(logMediaWidget, "Cannot set subtitle file %s", qPrintable(fname)); |
137 |
++ toPrintable(fname)) == 0) |
138 |
++ qCWarning(logMediaWidget, "Cannot set subtitle file %s", toPrintable(fname)); |
139 |
+ #endif |
140 |
+ } |
141 |
+ |
142 |
+@@ -625,7 +625,7 @@ void VlcMediaWidget::updateSubtitles() |
143 |
+ // currentSubtitle |
144 |
+ subtitleId[track->i_id] = ++i; |
145 |
+ subtitles.append(subtitle); |
146 |
+- qCDebug(logVlc, "Got subtitle id#%d: %s", track->i_id, qPrintable(subtitle)); |
147 |
++ qCDebug(logVlc, "Got subtitle id#%d: %s", track->i_id, toPrintable(subtitle)); |
148 |
+ track = track->p_next; |
149 |
+ } |
150 |
+ libvlc_track_description_list_release(track); |
151 |
+diff --git a/src/dvb/dvbcam_linux.cpp b/src/dvb/dvbcam_linux.cpp |
152 |
+index 7e1c483ac674..5ef445a34c6a 100644 |
153 |
+--- a/src/dvb/dvbcam_linux.cpp |
154 |
++++ b/src/dvb/dvbcam_linux.cpp |
155 |
+@@ -66,7 +66,7 @@ void DvbLinuxCam::startCa(const QString &path) |
156 |
+ caFd = open(QFile::encodeName(path).constData(), O_RDWR | O_NONBLOCK); |
157 |
+ |
158 |
+ if (caFd < 0) { |
159 |
+- qCWarning(logCam, "Cannot open CA device node %s", qPrintable(path)); |
160 |
++ qCWarning(logCam, "Cannot open CA device node %s", toPrintable(path)); |
161 |
+ return; |
162 |
+ } |
163 |
+ |
164 |
+diff --git a/src/dvb/dvbchannel.cpp b/src/dvb/dvbchannel.cpp |
165 |
+index 8395f6fa52fa..1c3aa973e327 100644 |
166 |
+--- a/src/dvb/dvbchannel.cpp |
167 |
++++ b/src/dvb/dvbchannel.cpp |
168 |
+@@ -146,7 +146,7 @@ DvbChannelModel *DvbChannelModel::createSqlModel(QObject *parent) |
169 |
+ } |
170 |
+ |
171 |
+ if (!file.open(QIODevice::ReadOnly)) { |
172 |
+- qCWarning(logDvb, "Cannot open %s", qPrintable(file.fileName())); |
173 |
++ qCWarning(logDvb, "Cannot open %s", toPrintable(file.fileName())); |
174 |
+ return channelModel; |
175 |
+ } |
176 |
+ |
177 |
+@@ -212,7 +212,7 @@ DvbChannelModel *DvbChannelModel::createSqlModel(QObject *parent) |
178 |
+ channel.isScrambled = (flags & 0x1) != 0; |
179 |
+ |
180 |
+ if (stream.status() != QDataStream::Ok) { |
181 |
+- qCWarning(logDvb, "Invalid channels in file %s", qPrintable(file.fileName())); |
182 |
++ qCWarning(logDvb, "Invalid channels in file %s", toPrintable(file.fileName())); |
183 |
+ break; |
184 |
+ } |
185 |
+ |
186 |
+@@ -223,7 +223,7 @@ DvbChannelModel *DvbChannelModel::createSqlModel(QObject *parent) |
187 |
+ channelModel->channelFlush(); |
188 |
+ |
189 |
+ if (!file.remove()) { |
190 |
+- qCWarning(logDvb, "Cannot remove '%s' from DB", qPrintable(file.fileName())); |
191 |
++ qCWarning(logDvb, "Cannot remove '%s' from DB", toPrintable(file.fileName())); |
192 |
+ } |
193 |
+ |
194 |
+ return channelModel; |
195 |
+diff --git a/src/dvb/dvbconfigdialog.cpp b/src/dvb/dvbconfigdialog.cpp |
196 |
+index fc444595cd34..d0a7bf0c82fe 100644 |
197 |
+--- a/src/dvb/dvbconfigdialog.cpp |
198 |
++++ b/src/dvb/dvbconfigdialog.cpp |
199 |
+@@ -546,7 +546,7 @@ void DvbConfigDialog::accept() |
200 |
+ foreach (RegexInputLine *regexInputLine, regexInputList) |
201 |
+ { |
202 |
+ manager->addRecordingRegex(regexInputLine->lineEdit->text()); |
203 |
+- qCDebug(logDvb, "saved regex: %s", qPrintable(regexInputLine->lineEdit->text())); |
204 |
++ qCDebug(logDvb, "saved regex: %s", toPrintable(regexInputLine->lineEdit->text())); |
205 |
+ manager->addRecordingRegexPriority(regexInputLine->spinBox->value()); |
206 |
+ qCDebug(logDvb, "saved priority: %i", regexInputLine->spinBox->value()); |
207 |
+ } |
208 |
+@@ -1539,7 +1539,7 @@ void DvbSLnbConfigObject::configure() |
209 |
+ |
210 |
+ for (i = 0; i < size; i++) { |
211 |
+ struct lnbSat lnb = device->getLnbSatModels().at(i); |
212 |
+- QRadioButton *radioButton = new QRadioButton(i18nd("libdvbv5", qPrintable(lnb.name)), mainWidget); |
213 |
++ QRadioButton *radioButton = new QRadioButton(i18nd("libdvbv5", toPrintable(lnb.name)), mainWidget); |
214 |
+ mainLayout->addWidget(radioButton); |
215 |
+ lnbSelectionGroup->addButton(radioButton, i + 1); |
216 |
+ gridLayout->addWidget(radioButton, i % ((size + 1) / 2), i / ((size + 1) / 2)); |
217 |
+diff --git a/src/dvb/dvbdevice.cpp b/src/dvb/dvbdevice.cpp |
218 |
+index d4c7150e39e6..27a304931477 100644 |
219 |
+--- a/src/dvb/dvbdevice.cpp |
220 |
++++ b/src/dvb/dvbdevice.cpp |
221 |
+@@ -226,7 +226,7 @@ DvbDataDumper::DvbDataDumper() |
222 |
+ QLatin1String(".bin")); |
223 |
+ |
224 |
+ if (!open(QIODevice::WriteOnly | QIODevice::Truncate)) { |
225 |
+- qCWarning(logDev, "Can't open %s", qPrintable(fileName())); |
226 |
++ qCWarning(logDev, "Can't open %s", toPrintable(fileName())); |
227 |
+ } |
228 |
+ } |
229 |
+ |
230 |
+@@ -343,7 +343,7 @@ void DvbDevice::tune(const DvbTransponder &transponder) |
231 |
+ } |
232 |
+ |
233 |
+ if (!ok) |
234 |
+- qCWarning(logDev, "Can't extract orbital position from %s", qPrintable(config->scanSource)); |
235 |
++ qCWarning(logDev, "Can't extract orbital position from %s", toPrintable(config->scanSource)); |
236 |
+ |
237 |
+ double radius = 6378; |
238 |
+ double semiMajorAxis = 42164; |
239 |
+diff --git a/src/dvb/dvbdevice_linux.cpp b/src/dvb/dvbdevice_linux.cpp |
240 |
+index 1f6c4ad4e1b2..82b29305700a 100644 |
241 |
+--- a/src/dvb/dvbdevice_linux.cpp |
242 |
++++ b/src/dvb/dvbdevice_linux.cpp |
243 |
+@@ -95,7 +95,7 @@ void DvbLinuxDevice::startDevice(const QString &deviceId_) |
244 |
+ struct dvb_v5_fe_parms *parms = dvb_fe_open2(adapter, index, verbose, 0, dvbv5_log); |
245 |
+ |
246 |
+ if (!parms) { |
247 |
+- qCWarning(logDev, "Cannot open frontend %s", qPrintable(frontendPath)); |
248 |
++ qCWarning(logDev, "Cannot open frontend %s", toPrintable(frontendPath)); |
249 |
+ return; |
250 |
+ } |
251 |
+ |
252 |
+@@ -184,7 +184,7 @@ void DvbLinuxDevice::startDevice(const QString &deviceId_) |
253 |
+ |
254 |
+ ready = true; |
255 |
+ |
256 |
+- qCInfo(logDev, "Found dvb device %s: %s", qPrintable(deviceId), qPrintable(frontendName)); |
257 |
++ qCInfo(logDev, "Found dvb device %s: %s", toPrintable(deviceId), toPrintable(frontendName)); |
258 |
+ } |
259 |
+ |
260 |
+ void DvbLinuxDevice::startCa() |
261 |
+@@ -264,14 +264,14 @@ bool DvbLinuxDevice::acquire() |
262 |
+ dvbv5_parms = dvb_fe_open2(adapter, index, verbose, 0, dvbv5_log); |
263 |
+ |
264 |
+ if (!dvbv5_parms) { |
265 |
+- qCWarning(logDev, "Cannot open frontend %s", qPrintable(frontendPath)); |
266 |
++ qCWarning(logDev, "Cannot open frontend %s", toPrintable(frontendPath)); |
267 |
+ return false; |
268 |
+ } |
269 |
+ |
270 |
+ dvrFd = open(QFile::encodeName(dvrPath).constData(), O_RDONLY | O_NONBLOCK | O_CLOEXEC); |
271 |
+ |
272 |
+ if (dvrFd < 0) { |
273 |
+- qCWarning(logDev, "Cannot open dvr %s", qPrintable(dvrPath)); |
274 |
++ qCWarning(logDev, "Cannot open dvr %s", toPrintable(dvrPath)); |
275 |
+ dvb_fe_close(dvbv5_parms); |
276 |
+ dvbv5_parms = NULL; |
277 |
+ return false; |
278 |
+@@ -298,7 +298,7 @@ bool DvbLinuxDevice::sendMessage(const char *message, int length) |
279 |
+ Q_ASSERT(dvbv5_parms && (length >= 0) && (length <= 6)); |
280 |
+ |
281 |
+ if (dvb_fe_diseqc_cmd(dvbv5_parms, length, (const unsigned char *)message) != 0) { |
282 |
+- qCWarning(logDev, "ioctl FE_DISEQC_SEND_MASTER_CMD failed for frontend %s", qPrintable(frontendPath)); |
283 |
++ qCWarning(logDev, "ioctl FE_DISEQC_SEND_MASTER_CMD failed for frontend %s", toPrintable(frontendPath)); |
284 |
+ return false; |
285 |
+ } |
286 |
+ |
287 |
+@@ -310,7 +310,7 @@ bool DvbLinuxDevice::sendBurst(SecBurst burst) |
288 |
+ Q_ASSERT(dvbv5_parms); |
289 |
+ |
290 |
+ if (dvb_fe_diseqc_burst(dvbv5_parms, burst == BurstMiniB) != 0) { |
291 |
+- qCWarning(logDev, "ioctl FE_DISEQC_SEND_BURST failed for frontend %s", qPrintable(frontendPath)); |
292 |
++ qCWarning(logDev, "ioctl FE_DISEQC_SEND_BURST failed for frontend %s", toPrintable(frontendPath)); |
293 |
+ return false; |
294 |
+ } |
295 |
+ |
296 |
+@@ -885,11 +885,11 @@ bool DvbLinuxDevice::satSetup(QString lnbModel, int satNumber, int bpf) |
297 |
+ int lnb = dvb_sat_search_lnb(lnbModel.toUtf8()); |
298 |
+ dvbv5_parms->lnb = dvb_sat_get_lnb(lnb); |
299 |
+ if (!dvbv5_parms->lnb) { |
300 |
+- qCCritical(logDev, "Cannot set LNBf type to %s", qPrintable(lnbModel)); |
301 |
++ qCCritical(logDev, "Cannot set LNBf type to %s", toPrintable(lnbModel)); |
302 |
+ return false; |
303 |
+ } |
304 |
+ |
305 |
+- qCDebug(logDev, "Using LNBf type %s", qPrintable(lnbModel)); |
306 |
++ qCDebug(logDev, "Using LNBf type %s", toPrintable(lnbModel)); |
307 |
+ |
308 |
+ dvbv5_parms->sat_number = satNumber; |
309 |
+ dvbv5_parms->freq_bpf = bpf; |
310 |
+@@ -903,7 +903,7 @@ bool DvbLinuxDevice::tune(const DvbTransponder &transponder) |
311 |
+ stopDvr(); |
312 |
+ fe_delivery_system_t delsys; |
313 |
+ |
314 |
+- qCDebug(logDev, "tune to: %s", qPrintable(transponder.toString())); |
315 |
++ qCDebug(logDev, "tune to: %s", toPrintable(transponder.toString())); |
316 |
+ |
317 |
+ // FIXME: add support for LNA on/off |
318 |
+ |
319 |
+@@ -1067,7 +1067,7 @@ bool DvbLinuxDevice::tune(const DvbTransponder &transponder) |
320 |
+ } |
321 |
+ |
322 |
+ if (dvb_fe_set_parms(dvbv5_parms) != 0) { |
323 |
+- qCWarning(logDev, "ioctl FE_SET_PROPERTY failed for frontend %s", qPrintable(frontendPath)); |
324 |
++ qCWarning(logDev, "ioctl FE_SET_PROPERTY failed for frontend %s", toPrintable(frontendPath)); |
325 |
+ return false; |
326 |
+ } |
327 |
+ |
328 |
+@@ -1245,7 +1245,7 @@ bool DvbLinuxDevice::getProps(DvbTransponder &transponder) |
329 |
+ qCWarning(logDev, "Invalid transmission type"); |
330 |
+ return false; |
331 |
+ default: |
332 |
+- qCWarning(logDev, "Unknown transmission type %s", qPrintable(transponder.getTransmissionType())); |
333 |
++ qCWarning(logDev, "Unknown transmission type %s", toPrintable(transponder.getTransmissionType())); |
334 |
+ return false; |
335 |
+ } |
336 |
+ return true; |
337 |
+@@ -1270,12 +1270,12 @@ bool DvbLinuxDevice::isTuned() |
338 |
+ uint32_t status = 0; |
339 |
+ |
340 |
+ if (dvb_fe_get_stats(dvbv5_parms) != 0) { |
341 |
+- qCWarning(logDev, "ioctl FE_READ_STATUS failed for frontend %s", qPrintable(frontendPath)); |
342 |
++ qCWarning(logDev, "ioctl FE_READ_STATUS failed for frontend %s", toPrintable(frontendPath)); |
343 |
+ return false; |
344 |
+ } |
345 |
+ |
346 |
+ if (dvb_fe_retrieve_stats(dvbv5_parms, DTV_STATUS, &status) != 0) { |
347 |
+- qCWarning(logDev, "ioctl FE_READ_STATUS failed for frontend %s", qPrintable(frontendPath)); |
348 |
++ qCWarning(logDev, "ioctl FE_READ_STATUS failed for frontend %s", toPrintable(frontendPath)); |
349 |
+ return false; |
350 |
+ } |
351 |
+ |
352 |
+@@ -1291,7 +1291,7 @@ float DvbLinuxDevice::getSignal(Scale &scale) |
353 |
+ scale = DvbBackendDevice::NotSupported; |
354 |
+ |
355 |
+ if (dvb_fe_get_stats(dvbv5_parms) != 0) { |
356 |
+- qCWarning(logDev, "ioctl FE_READ_STATUS failed for frontend %s", qPrintable(frontendPath)); |
357 |
++ qCWarning(logDev, "ioctl FE_READ_STATUS failed for frontend %s", toPrintable(frontendPath)); |
358 |
+ return false; |
359 |
+ } |
360 |
+ |
361 |
+@@ -1334,7 +1334,7 @@ float DvbLinuxDevice::getSnr(Scale &scale) |
362 |
+ |
363 |
+ scale = DvbBackendDevice::NotSupported; |
364 |
+ if (dvb_fe_get_stats(dvbv5_parms) != 0) { |
365 |
+- qCWarning(logDev, "ioctl FE_READ_STATUS failed for frontend %s", qPrintable(frontendPath)); |
366 |
++ qCWarning(logDev, "ioctl FE_READ_STATUS failed for frontend %s", toPrintable(frontendPath)); |
367 |
+ return false; |
368 |
+ } |
369 |
+ |
370 |
+@@ -1380,7 +1380,7 @@ bool DvbLinuxDevice::addPidFilter(int pid) |
371 |
+ int dmxFd = open(QFile::encodeName(demuxPath).constData(), O_RDONLY | O_NONBLOCK | O_CLOEXEC); |
372 |
+ |
373 |
+ if (dmxFd < 0) { |
374 |
+- qCWarning(logDev, "Cannot open demux %s", qPrintable(demuxPath)); |
375 |
++ qCWarning(logDev, "Cannot open demux %s", toPrintable(demuxPath)); |
376 |
+ return false; |
377 |
+ } |
378 |
+ |
379 |
+@@ -1393,7 +1393,7 @@ bool DvbLinuxDevice::addPidFilter(int pid) |
380 |
+ pes_filter.flags = DMX_IMMEDIATE_START; |
381 |
+ |
382 |
+ if (ioctl(dmxFd, DMX_SET_PES_FILTER, &pes_filter) != 0) { |
383 |
+- qCWarning(logDev, "Cannot set up PID filter for demux %s", qPrintable(demuxPath)); |
384 |
++ qCWarning(logDev, "Cannot set up PID filter for demux %s", toPrintable(demuxPath)); |
385 |
+ close(dmxFd); |
386 |
+ return false; |
387 |
+ } |
388 |
+@@ -1505,7 +1505,7 @@ void DvbLinuxDevice::startDvr() |
389 |
+ continue; |
390 |
+ } |
391 |
+ |
392 |
+- qCWarning(logDev, "Cannot read from dvr %s: error: %d", qPrintable(dvrPath), errno); |
393 |
++ qCWarning(logDev, "Cannot read from dvr %s: error: %d", toPrintable(dvrPath), errno); |
394 |
+ return; |
395 |
+ } |
396 |
+ } |
397 |
+@@ -1573,7 +1573,7 @@ void DvbLinuxDevice::run() |
398 |
+ continue; |
399 |
+ } |
400 |
+ |
401 |
+- qCWarning(logDev, "Cannot read from dvr %s: error %d", qPrintable(dvrPath), errno); |
402 |
++ qCWarning(logDev, "Cannot read from dvr %s: error %d", toPrintable(dvrPath), errno); |
403 |
+ dataSize = int(read(dvrFd, dvrBuffer.data, bufferSize)); |
404 |
+ |
405 |
+ if (dataSize < 0) { |
406 |
+@@ -1585,7 +1585,7 @@ void DvbLinuxDevice::run() |
407 |
+ continue; |
408 |
+ } |
409 |
+ |
410 |
+- qCWarning(logDev, "Cannot read from dvr %s: error %d", qPrintable(dvrPath), errno); |
411 |
++ qCWarning(logDev, "Cannot read from dvr %s: error %d", toPrintable(dvrPath), errno); |
412 |
+ return; |
413 |
+ } |
414 |
+ } |
415 |
+@@ -1643,16 +1643,16 @@ void DvbLinuxDeviceManager::componentAdded(const QString &udi) |
416 |
+ QString devicePath = QString(QLatin1String("/dev/dvb/adapter%1/%2%3")).arg(adapter).arg(type).arg(index); |
417 |
+ |
418 |
+ if ((adapter < 0) || (adapter > 0x7fff) || (index < 0) || (index > 0x7fff)) { |
419 |
+- qCWarning(logDev, "Cannot determine adapter or index for device %s", qPrintable(udi)); |
420 |
++ qCWarning(logDev, "Cannot determine adapter or index for device %s", toPrintable(udi)); |
421 |
+ return; |
422 |
+ } |
423 |
+ |
424 |
+ if (devicePath.isEmpty()) { |
425 |
+- qCWarning(logDev, "Cannot determine path for device %s", qPrintable(udi)); |
426 |
++ qCWarning(logDev, "Cannot determine path for device %s", toPrintable(udi)); |
427 |
+ return; |
428 |
+ } |
429 |
+ |
430 |
+- qCDebug(logDev, "New device detected: %s", qPrintable(udi)); |
431 |
++ qCDebug(logDev, "New device detected: %s", toPrintable(udi)); |
432 |
+ |
433 |
+ int deviceIndex = ((adapter << 16) | index); |
434 |
+ DvbLinuxDevice *device = devices.value(deviceIndex); |
435 |
+@@ -1800,7 +1800,7 @@ void DvbLinuxDeviceManager::componentRemoved(const QString &udi) |
436 |
+ bool removeDevice = false; |
437 |
+ |
438 |
+ if (device->isReady()) |
439 |
+- qCInfo(logDev, "Digital TV device removed %s: %s", qPrintable(device->getDeviceId()), qPrintable(device->getFrontendName())); |
440 |
++ qCInfo(logDev, "Digital TV device removed %s: %s", toPrintable(device->getDeviceId()), toPrintable(device->getFrontendName())); |
441 |
+ |
442 |
+ if (udi == device->caUdi) { |
443 |
+ device->caPath.clear(); |
444 |
+diff --git a/src/dvb/dvbepg.cpp b/src/dvb/dvbepg.cpp |
445 |
+index 46746c85acee..ff3890d09547 100644 |
446 |
+--- a/src/dvb/dvbepg.cpp |
447 |
++++ b/src/dvb/dvbepg.cpp |
448 |
+@@ -76,7 +76,7 @@ DvbEpgModel::DvbEpgModel(DvbManager *manager_, QObject *parent) : QObject(parent |
449 |
+ QFile file(QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QLatin1String("/epgdata.dvb")); |
450 |
+ |
451 |
+ if (!file.open(QIODevice::ReadOnly)) { |
452 |
+- qCWarning(logEpg, "Cannot open %s", qPrintable(file.fileName())); |
453 |
++ qCWarning(logEpg, "Cannot open %s", toPrintable(file.fileName())); |
454 |
+ return; |
455 |
+ } |
456 |
+ |
457 |
+@@ -94,7 +94,7 @@ DvbEpgModel::DvbEpgModel(DvbManager *manager_, QObject *parent) : QObject(parent |
458 |
+ } else if (version == 0x140c37b5) { |
459 |
+ hasMultilang = false; |
460 |
+ } else if (version != 0x20171112) { |
461 |
+- qCWarning(logEpg, "Wrong DB version for: %s", qPrintable(file.fileName())); |
462 |
++ qCWarning(logEpg, "Wrong DB version for: %s", toPrintable(file.fileName())); |
463 |
+ return; |
464 |
+ } |
465 |
+ |
466 |
+@@ -161,7 +161,7 @@ DvbEpgModel::DvbEpgModel(DvbManager *manager_, QObject *parent) : QObject(parent |
467 |
+ } |
468 |
+ |
469 |
+ if (stream.status() != QDataStream::Ok) { |
470 |
+- qCWarning(logEpg, "Corrupt data %s", qPrintable(file.fileName())); |
471 |
++ qCWarning(logEpg, "Corrupt data %s", toPrintable(file.fileName())); |
472 |
+ break; |
473 |
+ } |
474 |
+ |
475 |
+@@ -182,7 +182,7 @@ DvbEpgModel::~DvbEpgModel() |
476 |
+ QFile file(QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QLatin1String("/epgdata.dvb")); |
477 |
+ |
478 |
+ if (!file.open(QIODevice::WriteOnly | QIODevice::Truncate)) { |
479 |
+- qCWarning(logEpg, "Cannot open %s", qPrintable(file.fileName())); |
480 |
++ qCWarning(logEpg, "Cannot open %s", toPrintable(file.fileName())); |
481 |
+ return; |
482 |
+ } |
483 |
+ |
484 |
+@@ -277,8 +277,8 @@ void DvbEpgModel::Debug(QString text, const DvbSharedEpgEntry &entry) |
485 |
+ QTime end = entry->begin.addSecs(QTime(0, 0, 0).secsTo(entry->duration)).toLocalTime().time(); |
486 |
+ |
487 |
+ qCDebug(logEpg, "event %s: type %d, from %s to %s: %s: %s: %s : %s", |
488 |
+- qPrintable(text), entry->type, qPrintable(QLocale().toString(begin, QLocale::ShortFormat)), qPrintable(QLocale().toString(end)), |
489 |
+- qPrintable(entry->title()), qPrintable(entry->subheading()), qPrintable(entry->details()), qPrintable(entry->content)); |
490 |
++ toPrintable(text), entry->type, toPrintable(QLocale().toString(begin, QLocale::ShortFormat)), toPrintable(QLocale().toString(end)), |
491 |
++ toPrintable(entry->title()), toPrintable(entry->subheading()), toPrintable(entry->details()), toPrintable(entry->content)); |
492 |
+ } |
493 |
+ |
494 |
+ DvbSharedEpgEntry DvbEpgModel::addEntry(const DvbEpgEntry &entry) |
495 |
+diff --git a/src/dvb/dvbliveview.cpp b/src/dvb/dvbliveview.cpp |
496 |
+index b47ba9968413..05ff52ede4a3 100644 |
497 |
+--- a/src/dvb/dvbliveview.cpp |
498 |
++++ b/src/dvb/dvbliveview.cpp |
499 |
+@@ -448,14 +448,14 @@ void DvbLiveView::playbackStatusChanged(MediaWidget::PlaybackStatus playbackStat |
500 |
+ |
501 |
+ if (internal->timeShiftFile.exists() || |
502 |
+ !internal->timeShiftFile.open(QIODevice::WriteOnly)) { |
503 |
+- qCWarning(logDvb, "Cannot open file %s", qPrintable(internal->timeShiftFile.fileName())); |
504 |
++ qCWarning(logDvb, "Cannot open file %s", toPrintable(internal->timeShiftFile.fileName())); |
505 |
+ internal->timeShiftFile.setFileName(QDir::homePath() + QLatin1String("/TimeShift-") + |
506 |
+ QDateTime::currentDateTime().toString(QLatin1String("yyyyMMddThhmmss")) + |
507 |
+ QLatin1String(".m2t")); |
508 |
+ |
509 |
+ if (internal->timeShiftFile.exists() || |
510 |
+ !internal->timeShiftFile.open(QIODevice::WriteOnly)) { |
511 |
+- qCWarning(logDvb, "Cannot open file %s", qPrintable(internal->timeShiftFile.fileName())); |
512 |
++ qCWarning(logDvb, "Cannot open file %s", toPrintable(internal->timeShiftFile.fileName())); |
513 |
+ mediaWidget->stop(); |
514 |
+ break; |
515 |
+ } |
516 |
+diff --git a/src/dvb/dvbmanager.cpp b/src/dvb/dvbmanager.cpp |
517 |
+index 467eeb5f27b7..3134ddec61f4 100644 |
518 |
+--- a/src/dvb/dvbmanager.cpp |
519 |
++++ b/src/dvb/dvbmanager.cpp |
520 |
+@@ -326,7 +326,7 @@ bool DvbManager::updateScanData(const QByteArray &data) |
521 |
+ QFile file(QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QLatin1String("/scanfile.dvb")); |
522 |
+ |
523 |
+ if (!file.open(QIODevice::WriteOnly | QIODevice::Truncate)) { |
524 |
+- qCWarning(logDvb, "Cannot open %s", qPrintable(file.fileName())); |
525 |
++ qCWarning(logDvb, "Cannot open %s", toPrintable(file.fileName())); |
526 |
+ return false; |
527 |
+ } |
528 |
+ |
529 |
+@@ -579,11 +579,11 @@ void DvbManager::loadDeviceManager() |
530 |
+ QObject *deviceManager = QPluginLoader(path).instance(); |
531 |
+ |
532 |
+ if (deviceManager == NULL) { |
533 |
+- qCWarning(logDvb, "Cannot load dvb device manager %s", qPrintable(path)); |
534 |
++ qCWarning(logDvb, "Cannot load dvb device manager %s", toPrintable(path)); |
535 |
+ break; |
536 |
+ } |
537 |
+ |
538 |
+- qCInfo(logDvb, "Using dvb device manager %s", qPrintable(path)); |
539 |
++ qCInfo(logDvb, "Using dvb device manager %s", toPrintable(path)); |
540 |
+ deviceManager->setParent(this); |
541 |
+ connect(deviceManager, SIGNAL(requestBuiltinDeviceManager(QObject*&)), |
542 |
+ this, SLOT(requestBuiltinDeviceManager(QObject*&))); |
543 |
+@@ -610,7 +610,7 @@ void DvbManager::readDeviceConfigs() |
544 |
+ const char *errMsg; |
545 |
+ |
546 |
+ if (!file.open(QIODevice::ReadOnly)) { |
547 |
+- qCWarning(logDvb, "Cannot open %s", qPrintable(file.fileName())); |
548 |
++ qCWarning(logDvb, "Cannot open %s", toPrintable(file.fileName())); |
549 |
+ return; |
550 |
+ } |
551 |
+ |
552 |
+@@ -680,7 +680,7 @@ void DvbManager::readDeviceConfigs() |
553 |
+ } |
554 |
+ |
555 |
+ if (!reader.isValid()) |
556 |
+- qCWarning(logDvb, "Found some problems at %s: %s", qPrintable(file.fileName()), errMsg); |
557 |
++ qCWarning(logDvb, "Found some problems at %s: %s", toPrintable(file.fileName()), errMsg); |
558 |
+ } |
559 |
+ |
560 |
+ void DvbManager::writeDeviceConfigs() |
561 |
+@@ -688,7 +688,7 @@ void DvbManager::writeDeviceConfigs() |
562 |
+ QFile file(QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QLatin1String("/config.dvb")); |
563 |
+ |
564 |
+ if (!file.open(QIODevice::WriteOnly | QIODevice::Truncate)) { |
565 |
+- qCWarning(logDvb, "Cannot open %s", qPrintable(file.fileName())); |
566 |
++ qCWarning(logDvb, "Cannot open %s", toPrintable(file.fileName())); |
567 |
+ return; |
568 |
+ } |
569 |
+ |
570 |
+@@ -769,12 +769,12 @@ void DvbManager::readScanData() |
571 |
+ globalDate = DvbScanData(globalFile.read(1024)).readDate(); |
572 |
+ |
573 |
+ if (globalDate.isNull()) { |
574 |
+- qCWarning(logDvb, "Cannot parse %s", qPrintable(globalFile.fileName())); |
575 |
++ qCWarning(logDvb, "Cannot parse %s", toPrintable(globalFile.fileName())); |
576 |
+ } |
577 |
+ |
578 |
+ globalFile.close(); |
579 |
+ } else { |
580 |
+- qCWarning(logDvb, "Cannot open global scanfile %s", qPrintable(globalFile.fileName())); |
581 |
++ qCWarning(logDvb, "Cannot open global scanfile %s", toPrintable(globalFile.fileName())); |
582 |
+ } |
583 |
+ |
584 |
+ QFile localFile(QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QLatin1String("/scanfile.dvb")); |
585 |
+@@ -786,7 +786,7 @@ void DvbManager::readScanData() |
586 |
+ localDate = DvbScanData(localData).readDate(); |
587 |
+ |
588 |
+ if (localDate.isNull()) { |
589 |
+- qCWarning(logDvb, "Cannot parse %s", qPrintable(localFile.fileName())); |
590 |
++ qCWarning(logDvb, "Cannot parse %s", toPrintable(localFile.fileName())); |
591 |
+ } |
592 |
+ |
593 |
+ localFile.close(); |
594 |
+@@ -796,18 +796,18 @@ void DvbManager::readScanData() |
595 |
+ localData.clear(); |
596 |
+ |
597 |
+ if (localFile.exists() && !localFile.remove()) { |
598 |
+- qCWarning(logDvb, "Cannot remove %s", qPrintable(localFile.fileName())); |
599 |
++ qCWarning(logDvb, "Cannot remove %s", toPrintable(localFile.fileName())); |
600 |
+ } |
601 |
+ |
602 |
+ if (!globalFile.copy(localFile.fileName())) { |
603 |
+- qCWarning(logDvb, "Cannot copy %s to %s", qPrintable(globalFile.fileName()), qPrintable(localFile.fileName())); |
604 |
++ qCWarning(logDvb, "Cannot copy %s to %s", toPrintable(globalFile.fileName()), toPrintable(localFile.fileName())); |
605 |
+ } |
606 |
+ |
607 |
+ if (localFile.open(QIODevice::ReadOnly)) { |
608 |
+ localData = localFile.readAll(); |
609 |
+ localFile.close(); |
610 |
+ } else { |
611 |
+- qCWarning(logDvb, "Cannot open %s", qPrintable(localFile.fileName())); |
612 |
++ qCWarning(logDvb, "Cannot open %s", toPrintable(localFile.fileName())); |
613 |
+ scanDataDate = QDate(1900, 1, 1); |
614 |
+ return; |
615 |
+ } |
616 |
+@@ -817,7 +817,7 @@ void DvbManager::readScanData() |
617 |
+ scanDataDate = data.readDate(); |
618 |
+ |
619 |
+ if (!scanDataDate.isValid()) { |
620 |
+- qCWarning(logDvb, "Cannot parse %s", qPrintable(localFile.fileName())); |
621 |
++ qCWarning(logDvb, "Cannot parse %s", toPrintable(localFile.fileName())); |
622 |
+ scanDataDate = QDate(1900, 1, 1); |
623 |
+ return; |
624 |
+ } |
625 |
+@@ -857,7 +857,7 @@ void DvbManager::readScanData() |
626 |
+ else if (!typeStr.compare("isdb-t", Qt::CaseInsensitive)) |
627 |
+ type = IsdbT; |
628 |
+ else { |
629 |
+- qCWarning(logDvb, "Transmission type '%s' unknown", qPrintable(typeStr)); |
630 |
++ qCWarning(logDvb, "Transmission type '%s' unknown", toPrintable(typeStr)); |
631 |
+ continue; |
632 |
+ } |
633 |
+ |
634 |
+@@ -882,7 +882,7 @@ void DvbManager::readScanData() |
635 |
+ DvbTransponder::fromString(QString::fromLatin1(line)); |
636 |
+ |
637 |
+ if (!transponder.isValid()) { |
638 |
+- qCWarning(logDvb, "Error parsing line : '%s'", qPrintable(line)); |
639 |
++ qCWarning(logDvb, "Error parsing line : '%s'", toPrintable(line)); |
640 |
+ } else { |
641 |
+ transponders.append(transponder); |
642 |
+ |
643 |
+diff --git a/src/dvb/dvbrecording.cpp b/src/dvb/dvbrecording.cpp |
644 |
+index 101845572469..92685cb0d608 100644 |
645 |
+--- a/src/dvb/dvbrecording.cpp |
646 |
++++ b/src/dvb/dvbrecording.cpp |
647 |
+@@ -77,7 +77,7 @@ DvbRecordingModel::DvbRecordingModel(DvbManager *manager_, QObject *parent) : QO |
648 |
+ } |
649 |
+ |
650 |
+ if (!file.open(QIODevice::ReadOnly)) { |
651 |
+- qCWarning(logDvb, "Cannot open file %s", qPrintable(file.fileName())); |
652 |
++ qCWarning(logDvb, "Cannot open file %s", toPrintable(file.fileName())); |
653 |
+ return; |
654 |
+ } |
655 |
+ |
656 |
+@@ -115,7 +115,7 @@ DvbRecordingModel::DvbRecordingModel(DvbManager *manager_, QObject *parent) : QO |
657 |
+ stream >> recording.details; |
658 |
+ |
659 |
+ if (stream.status() != QDataStream::Ok) { |
660 |
+- qCWarning(logDvb, "Invalid recordings in file %s", qPrintable(file.fileName())); |
661 |
++ qCWarning(logDvb, "Invalid recordings in file %s", toPrintable(file.fileName())); |
662 |
+ break; |
663 |
+ } |
664 |
+ |
665 |
+@@ -123,7 +123,7 @@ DvbRecordingModel::DvbRecordingModel(DvbManager *manager_, QObject *parent) : QO |
666 |
+ } |
667 |
+ |
668 |
+ if (!file.remove()) { |
669 |
+- qCWarning(logDvb, "Cannot remove file %s", qPrintable(file.fileName())); |
670 |
++ qCWarning(logDvb, "Cannot remove file %s", toPrintable(file.fileName())); |
671 |
+ } |
672 |
+ } |
673 |
+ |
674 |
+@@ -262,19 +262,19 @@ void DvbRecordingModel::disableLessImportant(DvbSharedRecording &recording1, Dvb |
675 |
+ if (recording1->priority < recording2->priority) { |
676 |
+ DvbRecording rec1 = *(recording1.constData()); |
677 |
+ rec1.disabled = true; |
678 |
+- qCWarning(logDvb, "Disabled %s because %s has more priority", qPrintable(recording1->name), qPrintable(recording2->name)); |
679 |
++ qCWarning(logDvb, "Disabled %s because %s has more priority", toPrintable(recording1->name), toPrintable(recording2->name)); |
680 |
+ } |
681 |
+ if (recording2->priority < recording1->priority) { |
682 |
+ DvbRecording rec2 = *(recording1.constData()); |
683 |
+ rec2.disabled = true; |
684 |
+- qCWarning(logDvb, "Disabled %s because %s has more priority", qPrintable(recording2->name), qPrintable(recording1->name)); |
685 |
++ qCWarning(logDvb, "Disabled %s because %s has more priority", toPrintable(recording2->name), toPrintable(recording1->name)); |
686 |
+ } |
687 |
+ } |
688 |
+ |
689 |
+ void DvbRecordingModel::addToUnwantedRecordings(DvbSharedRecording recording) |
690 |
+ { |
691 |
+ unwantedRecordings.append(recording); |
692 |
+- qCDebug(logDvb, "executed %s", qPrintable(recording->name)); |
693 |
++ qCDebug(logDvb, "executed %s", toPrintable(recording->name)); |
694 |
+ } |
695 |
+ |
696 |
+ void DvbRecordingModel::executeActionAfterRecording(DvbRecording recording) |
697 |
+@@ -321,7 +321,7 @@ void DvbRecordingModel::removeDuplicates() |
698 |
+ && loopEntry1.name == loopEntry2.name) { |
699 |
+ recordings.remove(recordings.key(rec1)); |
700 |
+ recordingMap.remove(rec1); |
701 |
+- qCDebug(logDvb, "Removed. %s", qPrintable(loopEntry1.name)); |
702 |
++ qCDebug(logDvb, "Removed. %s", toPrintable(loopEntry1.name)); |
703 |
+ } |
704 |
+ } |
705 |
+ j = j + 1; |
706 |
+@@ -375,7 +375,7 @@ bool DvbRecordingModel::existsSimilarRecording(DvbEpgEntry recording) |
707 |
+ && QString::compare(entry.channel->name, loopEntry.channel->name) == 0 |
708 |
+ && QString::compare((entry.duration).toString(), |
709 |
+ loopEntry.duration.addSecs(- manager->getBeginMargin() - manager->getEndMargin()).toString()) == 0) { |
710 |
+- qCDebug(logDvb, "Found from unwanteds %s", qPrintable(loopEntry.name)); |
711 |
++ qCDebug(logDvb, "Found from unwanteds %s", toPrintable(loopEntry.name)); |
712 |
+ found = true; |
713 |
+ break; |
714 |
+ } |
715 |
+@@ -409,7 +409,7 @@ void DvbRecordingModel::disableConflicts() |
716 |
+ { |
717 |
+ if (isInConflictWithAll(rec2, conflictList)) { |
718 |
+ conflictList.append(rec2); |
719 |
+- qCDebug(logDvb, "conflict: '%s' '%s' and '%s' '%s'", qPrintable(rec1->name), qPrintable(rec1->begin.toString()), qPrintable(rec2->name), qPrintable(rec2->begin.toString())); |
720 |
++ qCDebug(logDvb, "conflict: '%s' '%s' and '%s' '%s'", toPrintable(rec1->name), toPrintable(rec1->begin.toString()), toPrintable(rec2->name), toPrintable(rec2->begin.toString())); |
721 |
+ |
722 |
+ } |
723 |
+ |
724 |
+@@ -473,13 +473,13 @@ DvbSharedRecording DvbRecordingModel::getLeastImportant(QList<DvbSharedRecording |
725 |
+ DvbSharedRecording leastImportant = recList.value(0); |
726 |
+ foreach(DvbSharedRecording listRec, recList) |
727 |
+ { |
728 |
+- qCDebug(logDvb, "name and priority %s %s", qPrintable(listRec->name), qPrintable(listRec->priority)); |
729 |
++ qCDebug(logDvb, "name and priority %s %s", toPrintable(listRec->name), toPrintable(listRec->priority)); |
730 |
+ if (listRec->priority < leastImportant->priority) { |
731 |
+ leastImportant = listRec; |
732 |
+ } |
733 |
+ } |
734 |
+ |
735 |
+- qCDebug(logDvb, "least important: %s", qPrintable(leastImportant->name)); |
736 |
++ qCDebug(logDvb, "least important: %s", toPrintable(leastImportant->name)); |
737 |
+ return leastImportant; |
738 |
+ } |
739 |
+ |
740 |
+@@ -496,7 +496,7 @@ void DvbRecordingModel::disableLeastImportants(QList<DvbSharedRecording> recList |
741 |
+ if (listRecShared->priority == leastImportance) { |
742 |
+ listRec.disabled = true; |
743 |
+ updateRecording(listRecShared, listRec); |
744 |
+- qCDebug(logDvb, "disabled: %s %s", qPrintable(listRec.name), qPrintable(listRec.begin.toString())); |
745 |
++ qCDebug(logDvb, "disabled: %s %s", toPrintable(listRec.name), toPrintable(listRec.begin.toString())); |
746 |
+ } |
747 |
+ } |
748 |
+ } |
749 |
+@@ -528,7 +528,7 @@ void DvbRecordingModel::findNewRecordings() |
750 |
+ int priority = manager->getRecordingRegexPriorityList().value(i); |
751 |
+ epgModel->scheduleProgram(epgMap.value(key), manager->getBeginMargin(), |
752 |
+ manager->getEndMargin(), false, priority); |
753 |
+- qCDebug(logDvb, "scheduled %s", qPrintable(title)); |
754 |
++ qCDebug(logDvb, "scheduled %s", toPrintable(title)); |
755 |
+ } |
756 |
+ } |
757 |
+ } |
758 |
+@@ -628,7 +628,7 @@ int DvbRecordingModel::getSecondsUntilNextRecording() const |
759 |
+ } |
760 |
+ if (end > QDateTime::currentDateTime().toUTC() && rec.begin <= QDateTime::currentDateTime().toUTC()) { |
761 |
+ timeUntil = 0; |
762 |
+- qCDebug(logDvb, "Rec ongoing %s", qPrintable(rec.name)); |
763 |
++ qCDebug(logDvb, "Rec ongoing %s", toPrintable(rec.name)); |
764 |
+ break; |
765 |
+ } |
766 |
+ if (rec.begin > QDateTime::currentDateTime().toUTC()) { |
767 |
+@@ -688,7 +688,7 @@ void DvbRecordingModel::scanChannels() |
768 |
+ } |
769 |
+ if (channel.isValid()) { |
770 |
+ // TODO update tab |
771 |
+- qCDebug(logDvb, "Executed %s", qPrintable(channel->name)); |
772 |
++ qCDebug(logDvb, "Executed %s", toPrintable(channel->name)); |
773 |
+ manager->getLiveView()->playChannel(channel); |
774 |
+ delay(5); |
775 |
+ } |
776 |
+@@ -814,7 +814,7 @@ bool DvbRecordingFile::start(DvbRecording &recording) |
777 |
+ if (file.open(QIODevice::WriteOnly)) { |
778 |
+ break; |
779 |
+ } else { |
780 |
+- qCWarning(logDvb, "Cannot open file %s. Error: %d", qPrintable(file.fileName()), errno); |
781 |
++ qCWarning(logDvb, "Cannot open file %s. Error: %d", toPrintable(file.fileName()), errno); |
782 |
+ } |
783 |
+ |
784 |
+ if ((attempt == 0) && !QDir(folder).exists()) { |
785 |
+@@ -822,7 +822,7 @@ bool DvbRecordingFile::start(DvbRecording &recording) |
786 |
+ attempt = -1; |
787 |
+ continue; |
788 |
+ } else { |
789 |
+- qCWarning(logDvb, "Cannot create folder %s", qPrintable(folder)); |
790 |
++ qCWarning(logDvb, "Cannot create folder %s", toPrintable(folder)); |
791 |
+ } |
792 |
+ } |
793 |
+ |
794 |
+@@ -855,7 +855,7 @@ bool DvbRecordingFile::start(DvbRecording &recording) |
795 |
+ } |
796 |
+ |
797 |
+ if (!file.isOpen()) { |
798 |
+- qCWarning(logDvb, "Cannot open file %s", qPrintable(file.fileName())); |
799 |
++ qCWarning(logDvb, "Cannot open file %s", toPrintable(file.fileName())); |
800 |
+ return false; |
801 |
+ } |
802 |
+ } |
803 |
+diff --git a/src/dvb/dvbscan.cpp b/src/dvb/dvbscan.cpp |
804 |
+index 8c8c9ec5aba0..6558272d1fa5 100644 |
805 |
+--- a/src/dvb/dvbscan.cpp |
806 |
++++ b/src/dvb/dvbscan.cpp |
807 |
+@@ -773,7 +773,7 @@ void DvbScan::updateState() |
808 |
+ arg(channel.transportStreamId). |
809 |
+ arg(channel.serviceId); |
810 |
+ } |
811 |
+- qCDebug(logDvb, "Found channel %s", qPrintable(channel.name)); |
812 |
++ qCDebug(logDvb, "Found channel %s", toPrintable(channel.name)); |
813 |
+ } |
814 |
+ |
815 |
+ if (!channels.isEmpty()) { |
816 |
+@@ -918,7 +918,7 @@ void DvbScan::processSdt(const DvbSdtSection §ion) |
817 |
+ sdtEntry.name = serviceDescriptor.serviceName(); |
818 |
+ sdtEntry.provider = serviceDescriptor.providerName(); |
819 |
+ |
820 |
+- qCDebug(logDvb, "New SDT entry: service ID 0x%04x, name '%s', provider '%s'", entry.serviceId(), qPrintable(sdtEntry.name), qPrintable(sdtEntry.provider)); |
821 |
++ qCDebug(logDvb, "New SDT entry: service ID 0x%04x, name '%s', provider '%s'", entry.serviceId(), toPrintable(sdtEntry.name), toPrintable(sdtEntry.provider)); |
822 |
+ sdtEntries.append(sdtEntry); |
823 |
+ } |
824 |
+ } |
825 |
+@@ -966,7 +966,7 @@ void DvbScan::processVct(const AtscVctSection §ion) |
826 |
+ sdtEntry.name = majorminor + QString(shortName, nameLength); |
827 |
+ } |
828 |
+ |
829 |
+- qCDebug(logDvb, "New SDT entry: name %s", qPrintable(sdtEntry.name)); |
830 |
++ qCDebug(logDvb, "New SDT entry: name %s", toPrintable(sdtEntry.name)); |
831 |
+ sdtEntries.append(sdtEntry); |
832 |
+ |
833 |
+ if (i < entryCount - 1) |
834 |
+diff --git a/src/iso-codes.cpp b/src/iso-codes.cpp |
835 |
+index fe1d7bbed20a..1d352edde54e 100644 |
836 |
+--- a/src/iso-codes.cpp |
837 |
++++ b/src/iso-codes.cpp |
838 |
+@@ -37,7 +37,7 @@ namespace IsoCodes |
839 |
+ if (fileName.isEmpty()) { |
840 |
+ qCInfo(logConfig, |
841 |
+ "Could not locate %s (is iso-codes installed?)", |
842 |
+- qPrintable(file)); |
843 |
++ toPrintable(file)); |
844 |
+ return; |
845 |
+ } |
846 |
+ |
847 |
+@@ -45,8 +45,8 @@ namespace IsoCodes |
848 |
+ if (!f.open(QIODevice::ReadOnly)) { |
849 |
+ qCWarning(logConfig, |
850 |
+ "Could not open %s (%s)", |
851 |
+- qPrintable(fileName), |
852 |
+- qPrintable(f.errorString())); |
853 |
++ toPrintable(fileName), |
854 |
++ toPrintable(f.errorString())); |
855 |
+ return; |
856 |
+ } |
857 |
+ |
858 |
+@@ -88,7 +88,7 @@ namespace IsoCodes |
859 |
+ if (hash.isEmpty()) |
860 |
+ qCWarning(logConfig, |
861 |
+ "Error parsing %s: no entries found.", |
862 |
+- qPrintable(fileName)); |
863 |
++ toPrintable(fileName)); |
864 |
+ } |
865 |
+ |
866 |
+ /* |
867 |
+diff --git a/src/log.h b/src/log.h |
868 |
+index cf23a7797905..61f7dc224d8c 100644 |
869 |
+--- a/src/log.h |
870 |
++++ b/src/log.h |
871 |
+@@ -40,3 +40,5 @@ Q_DECLARE_LOGGING_CATEGORY(logMediaWidget) |
872 |
+ Q_DECLARE_LOGGING_CATEGORY(logPlaylist) |
873 |
+ Q_DECLARE_LOGGING_CATEGORY(logSql) |
874 |
+ Q_DECLARE_LOGGING_CATEGORY(logVlc) |
875 |
++ |
876 |
++#define toPrintable(string) QString(string).toLocal8Bit().constData() |
877 |
+diff --git a/src/playlist/playlistmodel.cpp b/src/playlist/playlistmodel.cpp |
878 |
+index 4327fe38235b..1b8e2815377e 100644 |
879 |
+--- a/src/playlist/playlistmodel.cpp |
880 |
++++ b/src/playlist/playlistmodel.cpp |
881 |
+@@ -45,7 +45,7 @@ bool Playlist::load(const QUrl &url_, Format format) |
882 |
+ QFile file(localFile); |
883 |
+ |
884 |
+ if (!file.open(QIODevice::ReadOnly)) { |
885 |
+- qCWarning(logPlaylist, "Cannot open file %s", qPrintable(file.fileName())); |
886 |
++ qCWarning(logPlaylist, "Cannot open file %s", toPrintable(file.fileName())); |
887 |
+ return false; |
888 |
+ } |
889 |
+ |
890 |
+@@ -78,7 +78,7 @@ bool Playlist::save(Format format) const |
891 |
+ QFile file(localFile); |
892 |
+ |
893 |
+ if (!file.open(QIODevice::WriteOnly | QIODevice::Truncate)) { |
894 |
+- qCWarning(logPlaylist, "Cannot open file %s", qPrintable(file.fileName())); |
895 |
++ qCWarning(logPlaylist, "Cannot open file %s", toPrintable(file.fileName())); |
896 |
+ return false; |
897 |
+ } |
898 |
+ |
899 |
+diff --git a/src/playlist/playlisttab.cpp b/src/playlist/playlisttab.cpp |
900 |
+index 01f1290f2167..34cc8d5cbf69 100644 |
901 |
+--- a/src/playlist/playlisttab.cpp |
902 |
++++ b/src/playlist/playlisttab.cpp |
903 |
+@@ -48,7 +48,7 @@ PlaylistBrowserModel::PlaylistBrowserModel(PlaylistModel *playlistModel_, |
904 |
+ file.setFileName(QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QLatin1String("/playlists")); |
905 |
+ |
906 |
+ if (!file.open(QIODevice::ReadOnly)) { |
907 |
+- qCWarning(logPlaylist, "Cannot open file %s", qPrintable(file.fileName())); |
908 |
++ qCWarning(logPlaylist, "Cannot open file %s", toPrintable(file.fileName())); |
909 |
+ return; |
910 |
+ } |
911 |
+ } |
912 |
+@@ -69,7 +69,7 @@ PlaylistBrowserModel::PlaylistBrowserModel(PlaylistModel *playlistModel_, |
913 |
+ // compatibility code |
914 |
+ hasSubtitles = false; |
915 |
+ } else if (version != 0x361c4a3c) { |
916 |
+- qCWarning(logPlaylist, "Cannot read file %s", qPrintable(file.fileName())); |
917 |
++ qCWarning(logPlaylist, "Cannot read file %s", toPrintable(file.fileName())); |
918 |
+ return; |
919 |
+ } |
920 |
+ |
921 |
+@@ -112,7 +112,7 @@ PlaylistBrowserModel::PlaylistBrowserModel(PlaylistModel *playlistModel_, |
922 |
+ } |
923 |
+ |
924 |
+ if (stream.status() != QDataStream::Ok) { |
925 |
+- qCWarning(logPlaylist, "Cannot read file %s", qPrintable(file.fileName())); |
926 |
++ qCWarning(logPlaylist, "Cannot read file %s", toPrintable(file.fileName())); |
927 |
+ delete playlist; |
928 |
+ break; |
929 |
+ } |
930 |
+@@ -126,7 +126,7 @@ PlaylistBrowserModel::~PlaylistBrowserModel() |
931 |
+ QFile file(QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QLatin1String("/playlistsK4")); |
932 |
+ |
933 |
+ if (!file.open(QIODevice::WriteOnly | QIODevice::Truncate)) { |
934 |
+- qCWarning(logPlaylist, "Cannot open file %s", qPrintable(file.fileName())); |
935 |
++ qCWarning(logPlaylist, "Cannot open file %s", toPrintable(file.fileName())); |
936 |
+ return; |
937 |
+ } |
938 |
+ |
939 |
+diff --git a/src/sqlhelper.cpp b/src/sqlhelper.cpp |
940 |
+index 089b6970aec2..c48762371ab6 100644 |
941 |
+--- a/src/sqlhelper.cpp |
942 |
++++ b/src/sqlhelper.cpp |
943 |
+@@ -80,7 +80,7 @@ QSqlQuery SqlHelper::prepare(const QString &statement) |
944 |
+ query.setForwardOnly(true); |
945 |
+ |
946 |
+ if (!query.prepare(statement)) { |
947 |
+- qCWarning(logSql, "Error while preparing statement '%s'", qPrintable(query.lastError().text())); |
948 |
++ qCWarning(logSql, "Error while preparing statement '%s'", toPrintable(query.lastError().text())); |
949 |
+ } |
950 |
+ |
951 |
+ return query; |
952 |
+@@ -92,7 +92,7 @@ QSqlQuery SqlHelper::exec(const QString &statement) |
953 |
+ query.setForwardOnly(true); |
954 |
+ |
955 |
+ if (!query.exec(statement)) { |
956 |
+- qCWarning(logSql, "Error while executing statement '%s'", qPrintable(query.lastError().text())); |
957 |
++ qCWarning(logSql, "Error while executing statement '%s'", toPrintable(query.lastError().text())); |
958 |
+ } |
959 |
+ |
960 |
+ return query; |
961 |
+@@ -101,7 +101,7 @@ QSqlQuery SqlHelper::exec(const QString &statement) |
962 |
+ void SqlHelper::exec(QSqlQuery &query) |
963 |
+ { |
964 |
+ if (!query.exec()) { |
965 |
+- qCWarning(logSql, "Error while executing statement '%s'", qPrintable(query.lastError().text())); |
966 |
++ qCWarning(logSql, "Error while executing statement '%s'", toPrintable(query.lastError().text())); |
967 |
+ } |
968 |
+ } |
969 |
+ |
970 |
+diff --git a/src/sqlinterface.cpp b/src/sqlinterface.cpp |
971 |
+index 8cc3bbd239c5..40886f67fddd 100644 |
972 |
+--- a/src/sqlinterface.cpp |
973 |
++++ b/src/sqlinterface.cpp |
974 |
+@@ -135,7 +135,7 @@ void SqlInterface::sqlInsert(SqlKey key) |
975 |
+ break; |
976 |
+ } |
977 |
+ |
978 |
+- qCWarning(logSql, "Invalid pending statement '%s'", qPrintable(pendingStatement)); |
979 |
++ qCWarning(logSql, "Invalid pending statement '%s'", toPrintable(pendingStatement)); |
980 |
+ } |
981 |
+ |
982 |
+ void SqlInterface::sqlUpdate(SqlKey key) |
983 |
+@@ -155,7 +155,7 @@ void SqlInterface::sqlUpdate(SqlKey key) |
984 |
+ break; |
985 |
+ } |
986 |
+ |
987 |
+- qCWarning(logSql, "Invalid pending statement '%s'", qPrintable(pendingStatement)); |
988 |
++ qCWarning(logSql, "Invalid pending statement '%s'", toPrintable(pendingStatement)); |
989 |
+ } |
990 |
+ |
991 |
+ void SqlInterface::sqlRemove(SqlKey key) |
992 |
+@@ -176,7 +176,7 @@ void SqlInterface::sqlRemove(SqlKey key) |
993 |
+ break; |
994 |
+ } |
995 |
+ |
996 |
+- qCWarning(logSql, "Invalid pending statement %s", qPrintable(pendingStatement)); |
997 |
++ qCWarning(logSql, "Invalid pending statement %s", toPrintable(pendingStatement)); |
998 |
+ } |
999 |
+ |
1000 |
+ void SqlInterface::requestSubmission() |
1001 |
+@@ -226,7 +226,7 @@ void SqlInterface::sqlSubmit() |
1002 |
+ continue; |
1003 |
+ } |
1004 |
+ |
1005 |
+- qCWarning(logSql, "Invalid pending statement %s", qPrintable(pendingStatement)); |
1006 |
++ qCWarning(logSql, "Invalid pending statement %s", toPrintable(pendingStatement)); |
1007 |
+ } |
1008 |
+ |
1009 |
+ pendingStatements.clear(); |
1010 |
+ |
1011 |
|
1012 |
diff --git a/media-video/kaffeine/kaffeine-2.0.15.ebuild b/media-video/kaffeine/kaffeine-2.0.15.ebuild |
1013 |
index 7ae8acd549b..ab018a232e4 100644 |
1014 |
--- a/media-video/kaffeine/kaffeine-2.0.15.ebuild |
1015 |
+++ b/media-video/kaffeine/kaffeine-2.0.15.ebuild |
1016 |
@@ -48,6 +48,8 @@ RDEPEND="${CDEPEND} |
1017 |
|
1018 |
DOCS=( Changelog NOTES README.md ) |
1019 |
|
1020 |
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" ) |
1021 |
+ |
1022 |
src_configure() { |
1023 |
# tools working on $HOME directory for a local git checkout |
1024 |
local mycmakeargs=( |