1 | Index: libs/libmythtv/dvbrecorder.cpp |
---|
2 | =================================================================== |
---|
3 | --- libs/libmythtv/dvbrecorder.cpp (revision 13705) |
---|
4 | +++ libs/libmythtv/dvbrecorder.cpp (working copy) |
---|
5 | @@ -142,32 +142,20 @@ |
---|
6 | if (IsOpen()) |
---|
7 | Close(); |
---|
8 | |
---|
9 | - if (_buffer) |
---|
10 | - { |
---|
11 | - delete[] _buffer; |
---|
12 | - _buffer = NULL; |
---|
13 | - } |
---|
14 | + delete[] _buffer; |
---|
15 | + _buffer = NULL; |
---|
16 | |
---|
17 | - if (_drb) |
---|
18 | - { |
---|
19 | - delete _drb; |
---|
20 | - _drb = NULL; |
---|
21 | - } |
---|
22 | + delete _drb; |
---|
23 | + _drb = NULL; |
---|
24 | |
---|
25 | SetOutputPAT(NULL); |
---|
26 | SetOutputPMT(NULL); |
---|
27 | |
---|
28 | - if (_input_pat) |
---|
29 | - { |
---|
30 | - delete _input_pat; |
---|
31 | - _input_pat = NULL; |
---|
32 | - } |
---|
33 | + delete _input_pat; |
---|
34 | + _input_pat = NULL; |
---|
35 | |
---|
36 | - if (_input_pmt) |
---|
37 | - { |
---|
38 | - delete _input_pmt; |
---|
39 | - _input_pmt = NULL; |
---|
40 | - } |
---|
41 | + delete _input_pmt; |
---|
42 | + _input_pmt = NULL; |
---|
43 | } |
---|
44 | |
---|
45 | void DVBRecorder::SetOption(const QString &name, int value) |
---|
46 | @@ -307,8 +295,7 @@ |
---|
47 | |
---|
48 | MPEGStreamData *old_data = _stream_data; |
---|
49 | _stream_data = data; |
---|
50 | - if (old_data) |
---|
51 | - delete old_data; |
---|
52 | + delete old_data; |
---|
53 | |
---|
54 | if (data) |
---|
55 | { |
---|
56 | @@ -837,8 +824,7 @@ |
---|
57 | |
---|
58 | ProgramAssociationTable *old_pat = _pat; |
---|
59 | _pat = new_pat; |
---|
60 | - if (old_pat) |
---|
61 | - delete old_pat; |
---|
62 | + delete old_pat; |
---|
63 | |
---|
64 | if (_pat) |
---|
65 | VERBOSE(VB_RECORD, LOC + "SetOutputPAT()\n" + _pat->toString()); |
---|
66 | @@ -852,8 +838,7 @@ |
---|
67 | |
---|
68 | ProgramMapTable *old_pmt = _pmt; |
---|
69 | _pmt = new_pmt; |
---|
70 | - if (old_pmt) |
---|
71 | - delete old_pmt; |
---|
72 | + delete old_pmt; |
---|
73 | |
---|
74 | if (_pmt) |
---|
75 | VERBOSE(VB_RECORD, LOC + "SetOutputPMT()\n" + _pmt->toString()); |
---|
76 | Index: libs/libmythtv/nuppeldecoder.cpp |
---|
77 | =================================================================== |
---|
78 | --- libs/libmythtv/nuppeldecoder.cpp (revision 13705) |
---|
79 | +++ libs/libmythtv/nuppeldecoder.cpp (working copy) |
---|
80 | @@ -80,18 +80,12 @@ |
---|
81 | |
---|
82 | NuppelDecoder::~NuppelDecoder() |
---|
83 | { |
---|
84 | - if (rtjd) |
---|
85 | - delete rtjd; |
---|
86 | - if (ffmpeg_extradata) |
---|
87 | - delete [] ffmpeg_extradata; |
---|
88 | - if (buf) |
---|
89 | - delete [] buf; |
---|
90 | - if (buf2) |
---|
91 | - delete [] buf2; |
---|
92 | - if (strm) |
---|
93 | - delete [] strm; |
---|
94 | - if (audioSamples) |
---|
95 | - delete [] audioSamples; |
---|
96 | + delete rtjd; |
---|
97 | + delete [] ffmpeg_extradata; |
---|
98 | + delete [] buf; |
---|
99 | + delete [] buf2; |
---|
100 | + delete [] strm; |
---|
101 | + delete [] audioSamples; |
---|
102 | while(! StoredData.isEmpty()) { |
---|
103 | delete StoredData.first(); |
---|
104 | StoredData.removeFirst(); |
---|
105 | Index: libs/libmythtv/NuppelVideoPlayer.cpp |
---|
106 | =================================================================== |
---|
107 | --- libs/libmythtv/NuppelVideoPlayer.cpp (revision 13705) |
---|
108 | +++ libs/libmythtv/NuppelVideoPlayer.cpp (working copy) |
---|
109 | @@ -294,8 +294,7 @@ |
---|
110 | |
---|
111 | NuppelVideoPlayer::~NuppelVideoPlayer(void) |
---|
112 | { |
---|
113 | - if (audioOutput) |
---|
114 | - delete audioOutput; |
---|
115 | + delete audioOutput; |
---|
116 | |
---|
117 | if (m_playbackinfo) |
---|
118 | { |
---|
119 | @@ -303,46 +302,31 @@ |
---|
120 | delete m_playbackinfo; |
---|
121 | } |
---|
122 | |
---|
123 | - if (weMadeBuffer) |
---|
124 | - delete ringBuffer; |
---|
125 | + delete ringBuffer; |
---|
126 | |
---|
127 | if (osdHasSubtitles || !nonDisplayedAVSubtitles.empty()) |
---|
128 | ClearSubtitles(); |
---|
129 | |
---|
130 | - if (osd) |
---|
131 | - delete osd; |
---|
132 | + delete osd; |
---|
133 | |
---|
134 | for (int i = 0; i < MAXTBUFFER; i++) |
---|
135 | - { |
---|
136 | - if (txtbuffers[i].buffer) |
---|
137 | - delete [] txtbuffers[i].buffer; |
---|
138 | - } |
---|
139 | + delete [] txtbuffers[i].buffer; |
---|
140 | |
---|
141 | SetDecoder(NULL); |
---|
142 | |
---|
143 | - if (interactiveTV) |
---|
144 | - delete interactiveTV; |
---|
145 | + delete interactiveTV; |
---|
146 | |
---|
147 | - if (FiltMan) |
---|
148 | - delete FiltMan; |
---|
149 | + delete FiltMan; |
---|
150 | |
---|
151 | - if (videoFilters) |
---|
152 | - delete videoFilters; |
---|
153 | + delete videoFilters; |
---|
154 | |
---|
155 | - if (videosync) |
---|
156 | - delete videosync; |
---|
157 | + delete videosync; |
---|
158 | |
---|
159 | - if (videoOutput) |
---|
160 | - delete videoOutput; |
---|
161 | + delete videoOutput; |
---|
162 | |
---|
163 | - if (argb_buf) |
---|
164 | - { |
---|
165 | - delete [] argb_buf; |
---|
166 | - argb_buf = NULL; |
---|
167 | - } |
---|
168 | + delete [] argb_buf; |
---|
169 | |
---|
170 | - if (output_jmeter) |
---|
171 | - delete output_jmeter; |
---|
172 | + delete output_jmeter; |
---|
173 | |
---|
174 | ShutdownYUVResize(); |
---|
175 | } |
---|
176 | @@ -678,11 +662,8 @@ |
---|
177 | .arg(audio_bits).arg(audio_channels).arg(audio_samplerate)); |
---|
178 | |
---|
179 | no_audio_in = no_audio_out = true; |
---|
180 | - if (audioOutput) |
---|
181 | - { |
---|
182 | - delete audioOutput; |
---|
183 | - audioOutput = NULL; |
---|
184 | - } |
---|
185 | + delete audioOutput; |
---|
186 | + audioOutput = NULL; |
---|
187 | return errMsg; |
---|
188 | } |
---|
189 | |
---|
190 | @@ -706,11 +687,8 @@ |
---|
191 | { |
---|
192 | VERBOSE(VB_IMPORTANT, LOC + "Disabling Audio" + |
---|
193 | QString(", reason is: %1").arg(errMsg)); |
---|
194 | - if (audioOutput) |
---|
195 | - { |
---|
196 | - delete audioOutput; |
---|
197 | - audioOutput = NULL; |
---|
198 | - } |
---|
199 | + delete audioOutput; |
---|
200 | + audioOutput = NULL; |
---|
201 | no_audio_out = true; |
---|
202 | } |
---|
203 | else if (no_audio_out) |
---|
204 | @@ -1108,8 +1086,7 @@ |
---|
205 | |
---|
206 | videofiltersLock.lock(); |
---|
207 | |
---|
208 | - if (videoFilters) |
---|
209 | - delete videoFilters; |
---|
210 | + delete videoFilters; |
---|
211 | |
---|
212 | postfilt_width = video_width; |
---|
213 | postfilt_height = video_height; |
---|
214 | @@ -1373,11 +1350,8 @@ |
---|
215 | |
---|
216 | void NuppelVideoPlayer::ShutdownYUVResize(void) |
---|
217 | { |
---|
218 | - if (yuv_frame_scaled) |
---|
219 | - { |
---|
220 | - delete [] yuv_frame_scaled; |
---|
221 | - yuv_frame_scaled = NULL; |
---|
222 | - } |
---|
223 | + delete [] yuv_frame_scaled; |
---|
224 | + yuv_frame_scaled = NULL; |
---|
225 | |
---|
226 | if (yuv_scaler) |
---|
227 | { |
---|
228 | @@ -1433,8 +1407,7 @@ |
---|
229 | |
---|
230 | if (argb_size != size) |
---|
231 | { |
---|
232 | - if (argb_buf) |
---|
233 | - delete [] argb_buf; |
---|
234 | + delete [] argb_buf; |
---|
235 | argb_buf = new unsigned char[(size.width() * size.height() * 4) + 128]; |
---|
236 | argb_size = QSize(size.width(), size.height()); |
---|
237 | } |
---|
238 | Index: libs/libmythtv/RTjpegN.cpp |
---|
239 | =================================================================== |
---|
240 | --- libs/libmythtv/RTjpegN.cpp (revision 13705) |
---|
241 | +++ libs/libmythtv/RTjpegN.cpp (working copy) |
---|
242 | @@ -2821,8 +2821,7 @@ |
---|
243 | |
---|
244 | RTjpeg::~RTjpeg(void) |
---|
245 | { |
---|
246 | - if (old_start) |
---|
247 | - delete [] old_start; |
---|
248 | + delete [] old_start; |
---|
249 | } |
---|
250 | |
---|
251 | inline int RTjpeg::compressYUV420(int8_t *sp, uint8_t **planes) |
---|
252 | Index: libs/libmythtv/NuppelVideoRecorder.cpp |
---|
253 | =================================================================== |
---|
254 | --- libs/libmythtv/NuppelVideoRecorder.cpp (revision 13705) |
---|
255 | +++ libs/libmythtv/NuppelVideoRecorder.cpp (working copy) |
---|
256 | @@ -176,19 +176,13 @@ |
---|
257 | |
---|
258 | NuppelVideoRecorder::~NuppelVideoRecorder(void) |
---|
259 | { |
---|
260 | - if (weMadeBuffer && ringBuffer) |
---|
261 | - { |
---|
262 | - delete ringBuffer; |
---|
263 | - ringBuffer = NULL; |
---|
264 | - } |
---|
265 | - if (rtjc) |
---|
266 | - delete rtjc; |
---|
267 | - if (mp3buf) |
---|
268 | - delete [] mp3buf; |
---|
269 | + delete ringBuffer; |
---|
270 | + ringBuffer = NULL; |
---|
271 | + delete rtjc; |
---|
272 | + delete [] mp3buf; |
---|
273 | if (gf) |
---|
274 | lame_close(gf); |
---|
275 | - if (strm) |
---|
276 | - delete [] strm; |
---|
277 | + delete [] strm; |
---|
278 | if (fd >= 0) |
---|
279 | close(fd); |
---|
280 | if (seektable) |
---|
281 | @@ -229,12 +223,9 @@ |
---|
282 | av_free(mpa_vidctx); |
---|
283 | mpa_vidctx = NULL; |
---|
284 | |
---|
285 | - if (videoFilters) |
---|
286 | - delete videoFilters; |
---|
287 | - if (FiltMan) |
---|
288 | - delete FiltMan; |
---|
289 | - if (ccd) |
---|
290 | - delete ccd; |
---|
291 | + delete videoFilters; |
---|
292 | + delete FiltMan; |
---|
293 | + delete ccd; |
---|
294 | } |
---|
295 | |
---|
296 | void NuppelVideoRecorder::SetOption(const QString &opt, int value) |
---|
297 | @@ -815,8 +806,7 @@ |
---|
298 | void NuppelVideoRecorder::InitFilters(void) |
---|
299 | { |
---|
300 | int btmp; |
---|
301 | - if (videoFilters) |
---|
302 | - delete videoFilters; |
---|
303 | + delete videoFilters; |
---|
304 | |
---|
305 | QString tmpVideoFilterList; |
---|
306 | |
---|
307 | Index: libs/libmythtv/hdtvrecorder.cpp |
---|
308 | =================================================================== |
---|
309 | --- libs/libmythtv/hdtvrecorder.cpp (revision 13705) |
---|
310 | +++ libs/libmythtv/hdtvrecorder.cpp (working copy) |
---|
311 | @@ -214,8 +214,7 @@ |
---|
312 | |
---|
313 | ATSCStreamData *old_data = _atsc_stream_data; |
---|
314 | _atsc_stream_data = data; |
---|
315 | - if (old_data) |
---|
316 | - delete old_data; |
---|
317 | + delete old_data; |
---|
318 | |
---|
319 | if (data) |
---|
320 | { |
---|
321 | Index: libs/libmythtv/videoout_quartz.cpp |
---|
322 | =================================================================== |
---|
323 | --- libs/libmythtv/videoout_quartz.cpp (revision 13705) |
---|
324 | +++ libs/libmythtv/videoout_quartz.cpp (working copy) |
---|
325 | @@ -1426,8 +1426,7 @@ |
---|
326 | vbuffers.CreateBuffers(video_dim.width(), video_dim.height()); |
---|
327 | |
---|
328 | // Set up pause frame |
---|
329 | - if (pauseFrame.buf) |
---|
330 | - delete [] pauseFrame.buf; |
---|
331 | + delete [] pauseFrame.buf; |
---|
332 | |
---|
333 | VideoFrame *scratch = vbuffers.GetScratchFrame(); |
---|
334 | |
---|
335 | Index: libs/libmythtv/avformatdecoder.cpp |
---|
336 | =================================================================== |
---|
337 | --- libs/libmythtv/avformatdecoder.cpp (revision 13705) |
---|
338 | +++ libs/libmythtv/avformatdecoder.cpp (working copy) |
---|
339 | @@ -333,11 +333,9 @@ |
---|
340 | delete ttd; |
---|
341 | delete d; |
---|
342 | delete h264_kf_seq; |
---|
343 | - if (audioSamples) |
---|
344 | - delete [] audioSamples; |
---|
345 | + delete [] audioSamples; |
---|
346 | |
---|
347 | - if (avfRingBuffer) |
---|
348 | - delete avfRingBuffer; |
---|
349 | + delete avfRingBuffer; |
---|
350 | } |
---|
351 | |
---|
352 | void AvFormatDecoder::CloseCodecs() |
---|
353 | @@ -699,8 +697,7 @@ |
---|
354 | |
---|
355 | ringBuffer = rbuffer; |
---|
356 | |
---|
357 | - if (avfRingBuffer) |
---|
358 | - delete avfRingBuffer; |
---|
359 | + delete avfRingBuffer; |
---|
360 | avfRingBuffer = new AVFRingBuffer(rbuffer); |
---|
361 | |
---|
362 | AVInputFormat *fmt = NULL; |
---|
363 | @@ -2825,8 +2822,7 @@ |
---|
364 | { |
---|
365 | ateof = true; |
---|
366 | GetNVP()->SetEof(); |
---|
367 | - if (pkt) |
---|
368 | - delete pkt; |
---|
369 | + delete pkt; |
---|
370 | return false; |
---|
371 | } |
---|
372 | |
---|
373 | @@ -3418,8 +3414,7 @@ |
---|
374 | av_free_packet(pkt); |
---|
375 | } |
---|
376 | |
---|
377 | - if (pkt) |
---|
378 | - delete pkt; |
---|
379 | + delete pkt; |
---|
380 | |
---|
381 | return true; |
---|
382 | } |
---|
383 | Index: libs/libmythtv/osdtypes.cpp |
---|
384 | =================================================================== |
---|
385 | --- libs/libmythtv/osdtypes.cpp (revision 13705) |
---|
386 | +++ libs/libmythtv/osdtypes.cpp (working copy) |
---|
387 | @@ -155,8 +155,7 @@ |
---|
388 | for (; i != allTypes->end(); i++) |
---|
389 | { |
---|
390 | OSDType *type = (*i); |
---|
391 | - if (type) |
---|
392 | - delete type; |
---|
393 | + delete type; |
---|
394 | } |
---|
395 | allTypes->clear(); |
---|
396 | } |
---|
397 | @@ -1222,10 +1221,8 @@ |
---|
398 | else |
---|
399 | { |
---|
400 | // non-cached |
---|
401 | - if (m_yuv) |
---|
402 | - delete [] m_yuv; |
---|
403 | - if (m_alpha) |
---|
404 | - delete [] m_alpha; |
---|
405 | + delete [] m_yuv; |
---|
406 | + delete [] m_alpha; |
---|
407 | } |
---|
408 | } |
---|
409 | |
---|
410 | @@ -1266,11 +1263,9 @@ |
---|
411 | } |
---|
412 | else if (!m_cacheitem || !usecache) |
---|
413 | { |
---|
414 | - if (m_yuv) |
---|
415 | - delete [] m_yuv; |
---|
416 | + delete [] m_yuv; |
---|
417 | m_yuv = NULL; |
---|
418 | - if (m_alpha) |
---|
419 | - delete [] m_alpha; |
---|
420 | + delete [] m_alpha; |
---|
421 | m_alpha = NULL; |
---|
422 | } |
---|
423 | |
---|
424 | @@ -1372,11 +1367,9 @@ |
---|
425 | |
---|
426 | if (!m_cacheitem) |
---|
427 | { |
---|
428 | - if (m_yuv) |
---|
429 | - delete [] m_yuv; |
---|
430 | + delete [] m_yuv; |
---|
431 | m_yuv = NULL; |
---|
432 | - if (m_alpha) |
---|
433 | - delete [] m_alpha; |
---|
434 | + delete [] m_alpha; |
---|
435 | m_alpha = NULL; |
---|
436 | m_isvalid = false; |
---|
437 | } |
---|
438 | @@ -2241,8 +2234,7 @@ |
---|
439 | for (; i != m_textlist->end(); i++) |
---|
440 | { |
---|
441 | ccText *cc = (*i); |
---|
442 | - if (cc) |
---|
443 | - delete cc; |
---|
444 | + delete cc; |
---|
445 | } |
---|
446 | delete m_textlist; |
---|
447 | m_textlist = NULL; |
---|
448 | Index: libs/libmythtv/ThreadedFileWriter.cpp |
---|
449 | =================================================================== |
---|
450 | --- libs/libmythtv/ThreadedFileWriter.cpp (revision 13705) |
---|
451 | +++ libs/libmythtv/ThreadedFileWriter.cpp (working copy) |
---|
452 | @@ -176,11 +176,7 @@ |
---|
453 | fd = -1; |
---|
454 | } |
---|
455 | |
---|
456 | - if (buf) |
---|
457 | - { |
---|
458 | - delete [] buf; |
---|
459 | - buf = NULL; |
---|
460 | - } |
---|
461 | + delete [] buf; |
---|
462 | } |
---|
463 | |
---|
464 | /** \fn ThreadedFileWriter::Write(const void*, uint) |
---|
465 | Index: libs/libmythtv/recorderbase.cpp |
---|
466 | =================================================================== |
---|
467 | --- libs/libmythtv/recorderbase.cpp (revision 13705) |
---|
468 | +++ libs/libmythtv/recorderbase.cpp (working copy) |
---|
469 | @@ -31,11 +31,7 @@ |
---|
470 | delete ringBuffer; |
---|
471 | ringBuffer = NULL; |
---|
472 | } |
---|
473 | - if (curRecording) |
---|
474 | - { |
---|
475 | - delete curRecording; |
---|
476 | - curRecording = NULL; |
---|
477 | - } |
---|
478 | + delete curRecording; |
---|
479 | } |
---|
480 | |
---|
481 | void RecorderBase::SetRingBuffer(RingBuffer *rbuf) |
---|
482 | @@ -65,8 +61,7 @@ |
---|
483 | else |
---|
484 | curRecording = NULL; |
---|
485 | |
---|
486 | - if (oldrec) |
---|
487 | - delete oldrec; |
---|
488 | + delete oldrec; |
---|
489 | } |
---|
490 | |
---|
491 | void RecorderBase::SetOption(const QString &name, const QString &value) |
---|
492 | @@ -209,8 +204,7 @@ |
---|
493 | ProgramInfo *oldrec = curRecording; |
---|
494 | curRecording = nextRecording; |
---|
495 | nextRecording = NULL; |
---|
496 | - if (oldrec) |
---|
497 | - delete oldrec; |
---|
498 | + delete oldrec; |
---|
499 | rb_changed = true; |
---|
500 | |
---|
501 | StartNewFile(); |
---|
502 | Index: libs/libmythtv/guidegrid.cpp |
---|
503 | =================================================================== |
---|
504 | --- libs/libmythtv/guidegrid.cpp (revision 13705) |
---|
505 | +++ libs/libmythtv/guidegrid.cpp (working copy) |
---|
506 | @@ -285,29 +285,20 @@ |
---|
507 | gContext->removeListener(this); |
---|
508 | for (int x = 0; x < MAX_DISPLAY_TIMES; x++) |
---|
509 | { |
---|
510 | - if (m_timeInfos[x]) |
---|
511 | - { |
---|
512 | - delete m_timeInfos[x]; |
---|
513 | - m_timeInfos[x] = NULL; |
---|
514 | - } |
---|
515 | + delete m_timeInfos[x]; |
---|
516 | + m_timeInfos[x] = NULL; |
---|
517 | } |
---|
518 | |
---|
519 | for (int y = 0; y < MAX_DISPLAY_CHANS; y++) |
---|
520 | { |
---|
521 | - if (m_programs[y]) |
---|
522 | - { |
---|
523 | - delete m_programs[y]; |
---|
524 | - m_programs[y] = NULL; |
---|
525 | - } |
---|
526 | + delete m_programs[y]; |
---|
527 | + m_programs[y] = NULL; |
---|
528 | } |
---|
529 | |
---|
530 | m_channelInfos.clear(); |
---|
531 | |
---|
532 | - if (theme) |
---|
533 | - { |
---|
534 | - delete theme; |
---|
535 | - theme = NULL; |
---|
536 | - } |
---|
537 | + delete theme; |
---|
538 | + theme = NULL; |
---|
539 | |
---|
540 | if (jumpToChannelTimer) |
---|
541 | { |
---|
542 | @@ -663,8 +654,7 @@ |
---|
543 | { |
---|
544 | for (int x = 0; x < DISPLAY_TIMES; x++) |
---|
545 | { |
---|
546 | - if (m_timeInfos[x]) |
---|
547 | - delete m_timeInfos[x]; |
---|
548 | + delete m_timeInfos[x]; |
---|
549 | m_timeInfos[x] = NULL; |
---|
550 | } |
---|
551 | |
---|
552 | @@ -743,8 +733,7 @@ |
---|
553 | ProgramInfo *program; |
---|
554 | ProgramInfo *proginfo = NULL; |
---|
555 | |
---|
556 | - if (m_programs[row]) |
---|
557 | - delete m_programs[row]; |
---|
558 | + delete m_programs[row]; |
---|
559 | m_programs[row] = NULL; |
---|
560 | |
---|
561 | for (int x = 0; x < DISPLAY_TIMES; x++) |
---|
562 | Index: libs/libmythtv/darwinfirewiredevice.cpp |
---|
563 | =================================================================== |
---|
564 | --- libs/libmythtv/darwinfirewiredevice.cpp (revision 13705) |
---|
565 | +++ libs/libmythtv/darwinfirewiredevice.cpp (working copy) |
---|
566 | @@ -84,11 +84,7 @@ |
---|
567 | delete (*it); |
---|
568 | devices.clear(); |
---|
569 | |
---|
570 | - if (logger) |
---|
571 | - { |
---|
572 | - delete logger; |
---|
573 | - logger = NULL; |
---|
574 | - } |
---|
575 | + delete logger; |
---|
576 | } |
---|
577 | |
---|
578 | pthread_t controller_thread; |
---|
579 | @@ -128,11 +124,7 @@ |
---|
580 | ClosePort(); |
---|
581 | } |
---|
582 | |
---|
583 | - if (m_priv) |
---|
584 | - { |
---|
585 | - delete m_priv; |
---|
586 | - m_priv = NULL; |
---|
587 | - } |
---|
588 | + delete m_priv; |
---|
589 | } |
---|
590 | |
---|
591 | void DarwinFirewireDevice::RunController(void) |
---|
592 | Index: libs/libmythtv/hdhrrecorder.cpp |
---|
593 | =================================================================== |
---|
594 | --- libs/libmythtv/hdhrrecorder.cpp (revision 13705) |
---|
595 | +++ libs/libmythtv/hdhrrecorder.cpp (working copy) |
---|
596 | @@ -52,23 +52,14 @@ |
---|
597 | { |
---|
598 | StopRecording(); |
---|
599 | Close(); |
---|
600 | - if (_stream_data) |
---|
601 | - { |
---|
602 | - delete _stream_data; |
---|
603 | - _stream_data = NULL; |
---|
604 | - } |
---|
605 | + delete _stream_data; |
---|
606 | + _stream_data = NULL; |
---|
607 | |
---|
608 | - if (_input_pat) |
---|
609 | - { |
---|
610 | - delete _input_pat; |
---|
611 | - _input_pat = NULL; |
---|
612 | - } |
---|
613 | + delete _input_pat; |
---|
614 | + _input_pat = NULL; |
---|
615 | |
---|
616 | - if (_input_pmt) |
---|
617 | - { |
---|
618 | - delete _input_pmt; |
---|
619 | - _input_pmt = NULL; |
---|
620 | - } |
---|
621 | + delete _input_pmt; |
---|
622 | + _input_pmt = NULL; |
---|
623 | } |
---|
624 | |
---|
625 | void HDHRRecorder::SetOptionsFromProfile(RecordingProfile *profile, |
---|
626 | @@ -158,8 +149,7 @@ |
---|
627 | |
---|
628 | MPEGStreamData *old_data = _stream_data; |
---|
629 | _stream_data = data; |
---|
630 | - if (old_data) |
---|
631 | - delete old_data; |
---|
632 | + delete old_data; |
---|
633 | |
---|
634 | if (data) |
---|
635 | { |
---|
636 | Index: libs/libmythtv/scanwizardscanner.cpp |
---|
637 | =================================================================== |
---|
638 | --- libs/libmythtv/scanwizardscanner.cpp (revision 13705) |
---|
639 | +++ libs/libmythtv/scanwizardscanner.cpp (working copy) |
---|
640 | @@ -110,17 +110,11 @@ |
---|
641 | void ScanWizardScanner::Teardown() |
---|
642 | { |
---|
643 | // Join the thread and close the channel |
---|
644 | - if (scanner) |
---|
645 | - { |
---|
646 | - delete scanner; // TODO we should use deleteLater... |
---|
647 | - scanner = NULL; |
---|
648 | - } |
---|
649 | + delete scanner; // TODO we should use deleteLater... |
---|
650 | + scanner = NULL; |
---|
651 | |
---|
652 | - if (channel) |
---|
653 | - { |
---|
654 | - delete channel; |
---|
655 | - channel = NULL; |
---|
656 | - } |
---|
657 | + delete channel; |
---|
658 | + channel = NULL; |
---|
659 | |
---|
660 | #ifdef USING_IPTV |
---|
661 | if (freeboxScanner) |
---|
662 | @@ -131,11 +125,8 @@ |
---|
663 | } |
---|
664 | #endif |
---|
665 | |
---|
666 | - if (popupProgress) |
---|
667 | - { |
---|
668 | - delete popupProgress; // TODO we should use deleteLater... |
---|
669 | - popupProgress = NULL; |
---|
670 | - } |
---|
671 | + delete popupProgress; // TODO we should use deleteLater... |
---|
672 | + popupProgress = NULL; |
---|
673 | } |
---|
674 | |
---|
675 | void ScanWizardScanner::customEvent(QCustomEvent *e) |
---|
676 | Index: libs/libmythtv/eithelper.cpp |
---|
677 | =================================================================== |
---|
678 | --- libs/libmythtv/eithelper.cpp (revision 13705) |
---|
679 | +++ libs/libmythtv/eithelper.cpp (working copy) |
---|
680 | @@ -195,8 +195,7 @@ |
---|
681 | atsc_major, atsc_minor, *it, |
---|
682 | ett->ExtendedTextMessage().GetBestMatch(languagePreferences)); |
---|
683 | |
---|
684 | - if ((*it).desc) |
---|
685 | - delete [] (*it).desc; |
---|
686 | + delete [] (*it).desc; |
---|
687 | |
---|
688 | (*eits_it).erase(it); |
---|
689 | |
---|
690 | Index: libs/libmythtv/videoout_directfb.cpp |
---|
691 | =================================================================== |
---|
692 | --- libs/libmythtv/videoout_directfb.cpp (revision 13705) |
---|
693 | +++ libs/libmythtv/videoout_directfb.cpp (working copy) |
---|
694 | @@ -287,11 +287,7 @@ |
---|
695 | XJ_started = false; |
---|
696 | } |
---|
697 | |
---|
698 | - if (data) |
---|
699 | - { |
---|
700 | - delete data; |
---|
701 | - data = NULL; |
---|
702 | - } |
---|
703 | + delete data; |
---|
704 | } |
---|
705 | |
---|
706 | int VideoOutputDirectfb::GetRefreshRate(void) |
---|
707 | @@ -675,11 +671,8 @@ |
---|
708 | CreateDirectfbBuffers(desc); |
---|
709 | MoveResize(); |
---|
710 | |
---|
711 | - if (pauseFrame.buf) |
---|
712 | - { |
---|
713 | - delete [] pauseFrame.buf; |
---|
714 | - pauseFrame.buf = NULL; |
---|
715 | - } |
---|
716 | + delete [] pauseFrame.buf; |
---|
717 | + pauseFrame.buf = NULL; |
---|
718 | |
---|
719 | init(&pauseFrame, vbuffers.GetScratchFrame()->codec, |
---|
720 | new unsigned char[vbuffers.GetScratchFrame()->size + 64], |
---|
721 | Index: libs/libmythtv/firewirerecorder.cpp |
---|
722 | =================================================================== |
---|
723 | --- libs/libmythtv/firewirerecorder.cpp (revision 13705) |
---|
724 | +++ libs/libmythtv/firewirerecorder.cpp (working copy) |
---|
725 | @@ -196,8 +196,7 @@ |
---|
726 | |
---|
727 | MPEGStreamData *old_data = _mpeg_stream_data; |
---|
728 | _mpeg_stream_data = data; |
---|
729 | - if (old_data) |
---|
730 | - delete old_data; |
---|
731 | + delete old_data; |
---|
732 | |
---|
733 | if (data) |
---|
734 | { |
---|
735 | Index: libs/libmythtv/siscan.cpp |
---|
736 | =================================================================== |
---|
737 | --- libs/libmythtv/siscan.cpp (revision 13705) |
---|
738 | +++ libs/libmythtv/siscan.cpp (working copy) |
---|
739 | @@ -136,8 +136,7 @@ |
---|
740 | { |
---|
741 | StopScanner(); |
---|
742 | VERBOSE(VB_SIPARSER, LOC + "SIScanner Stopped"); |
---|
743 | - if (signalMonitor) |
---|
744 | - delete signalMonitor; |
---|
745 | + delete signalMonitor; |
---|
746 | } |
---|
747 | |
---|
748 | void SIScan::SetAnalog(bool is_analog) |
---|
749 | @@ -1521,8 +1520,7 @@ |
---|
750 | .arg(service_name)); |
---|
751 | } |
---|
752 | |
---|
753 | - if (desc) |
---|
754 | - delete desc; |
---|
755 | + delete desc; |
---|
756 | } |
---|
757 | } |
---|
758 | |
---|
759 | Index: libs/libmythtv/dbox2recorder.cpp |
---|
760 | =================================================================== |
---|
761 | --- libs/libmythtv/dbox2recorder.cpp (revision 13705) |
---|
762 | +++ libs/libmythtv/dbox2recorder.cpp (working copy) |
---|
763 | @@ -148,11 +148,8 @@ |
---|
764 | |
---|
765 | Close(); |
---|
766 | |
---|
767 | - if (transportStream.buffer) |
---|
768 | - { |
---|
769 | - delete [] transportStream.buffer; |
---|
770 | - transportStream.buffer = NULL; |
---|
771 | - } |
---|
772 | + delete [] transportStream.buffer; |
---|
773 | + transportStream.buffer = NULL; |
---|
774 | |
---|
775 | if (http) |
---|
776 | { |
---|
777 | Index: libs/libmythtv/cc708window.cpp |
---|
778 | =================================================================== |
---|
779 | --- libs/libmythtv/cc708window.cpp (revision 13705) |
---|
780 | +++ libs/libmythtv/cc708window.cpp (working copy) |
---|
781 | @@ -184,11 +184,7 @@ |
---|
782 | true_row_count = 0; |
---|
783 | true_column_count = 0; |
---|
784 | |
---|
785 | - if (text) |
---|
786 | - { |
---|
787 | - delete [] text; |
---|
788 | - text = NULL; |
---|
789 | - } |
---|
790 | + delete [] text; |
---|
791 | } |
---|
792 | |
---|
793 | void CC708Window::Clear(void) |
---|
794 | Index: libs/libmythtv/xvmctextures.cpp |
---|
795 | =================================================================== |
---|
796 | --- libs/libmythtv/xvmctextures.cpp (revision 13705) |
---|
797 | +++ libs/libmythtv/xvmctextures.cpp (working copy) |
---|
798 | @@ -43,8 +43,7 @@ |
---|
799 | return tmp; |
---|
800 | } |
---|
801 | |
---|
802 | - if (tmp) |
---|
803 | - delete tmp; |
---|
804 | + delete tmp; |
---|
805 | |
---|
806 | return NULL; |
---|
807 | } |
---|
808 | @@ -158,8 +157,7 @@ |
---|
809 | if (sz > gl_osd_tmp_buf_size) |
---|
810 | { |
---|
811 | pixels = new unsigned char[sz + 256]; |
---|
812 | - if (gl_osd_tmp_buf) |
---|
813 | - delete [] gl_osd_tmp_buf; |
---|
814 | + delete [] gl_osd_tmp_buf; |
---|
815 | gl_osd_tmp_buf = pixels; |
---|
816 | gl_osd_tmp_buf_size = sz; |
---|
817 | } |
---|
818 | Index: libs/libmythtv/iptvrecorder.cpp |
---|
819 | =================================================================== |
---|
820 | --- libs/libmythtv/iptvrecorder.cpp (revision 13705) |
---|
821 | +++ libs/libmythtv/iptvrecorder.cpp (working copy) |
---|
822 | @@ -251,8 +251,7 @@ |
---|
823 | |
---|
824 | MPEGStreamData *old_data = _stream_data; |
---|
825 | _stream_data = data; |
---|
826 | - if (old_data) |
---|
827 | - delete old_data; |
---|
828 | + delete old_data; |
---|
829 | |
---|
830 | if (data) |
---|
831 | data->AddMPEGSPListener(this); |
---|
832 | Index: libs/libmythtv/cc608decoder.cpp |
---|
833 | =================================================================== |
---|
834 | --- libs/libmythtv/cc608decoder.cpp (revision 13705) |
---|
835 | +++ libs/libmythtv/cc608decoder.cpp (working copy) |
---|
836 | @@ -81,8 +81,7 @@ |
---|
837 | |
---|
838 | CC608Decoder::~CC608Decoder(void) |
---|
839 | { |
---|
840 | - if (rbuf) |
---|
841 | - delete [] rbuf; |
---|
842 | + delete [] rbuf; |
---|
843 | } |
---|
844 | |
---|
845 | void CC608Decoder::FormatCC(int tc, int code1, int code2) |
---|
846 | Index: libs/libmythtv/RingBuffer.cpp |
---|
847 | =================================================================== |
---|
848 | --- libs/libmythtv/RingBuffer.cpp (revision 13705) |
---|
849 | +++ libs/libmythtv/RingBuffer.cpp (working copy) |
---|
850 | @@ -153,10 +153,7 @@ |
---|
851 | |
---|
852 | filename = lfilename; |
---|
853 | |
---|
854 | - if (remotefile) |
---|
855 | - { |
---|
856 | - delete remotefile; |
---|
857 | - } |
---|
858 | + delete remotefile; |
---|
859 | |
---|
860 | if (fd2 >= 0) |
---|
861 | { |
---|
862 | @@ -312,16 +309,9 @@ |
---|
863 | |
---|
864 | pthread_rwlock_wrlock(&rwlock); |
---|
865 | |
---|
866 | - if (remotefile) |
---|
867 | - { |
---|
868 | - delete remotefile; |
---|
869 | - } |
---|
870 | + delete remotefile; |
---|
871 | |
---|
872 | - if (tfw) |
---|
873 | - { |
---|
874 | - delete tfw; |
---|
875 | - tfw = NULL; |
---|
876 | - } |
---|
877 | + delete tfw; |
---|
878 | |
---|
879 | if (fd2 >= 0) |
---|
880 | { |
---|
881 | @@ -330,10 +320,7 @@ |
---|
882 | } |
---|
883 | |
---|
884 | #ifdef USING_FRONTEND |
---|
885 | - if (dvdPriv) |
---|
886 | - { |
---|
887 | - delete dvdPriv; |
---|
888 | - } |
---|
889 | + delete dvdPriv; |
---|
890 | #endif // USING_FRONTEND |
---|
891 | } |
---|
892 | |
---|
893 | Index: libs/libmythtv/tv_play.cpp |
---|
894 | =================================================================== |
---|
895 | --- libs/libmythtv/tv_play.cpp (revision 13705) |
---|
896 | +++ libs/libmythtv/tv_play.cpp (working copy) |
---|
897 | @@ -160,8 +160,7 @@ |
---|
898 | } |
---|
899 | } |
---|
900 | |
---|
901 | - if (reclist) |
---|
902 | - delete reclist; |
---|
903 | + delete reclist; |
---|
904 | continue; |
---|
905 | } |
---|
906 | else |
---|
907 | @@ -705,10 +704,8 @@ |
---|
908 | runMainLoop = false; |
---|
909 | pthread_join(event, NULL); |
---|
910 | |
---|
911 | - if (prbuffer) |
---|
912 | - delete prbuffer; |
---|
913 | - if (nvp) |
---|
914 | - delete nvp; |
---|
915 | + delete prbuffer; |
---|
916 | + delete nvp; |
---|
917 | if (myWindow) |
---|
918 | { |
---|
919 | delete myWindow; |
---|
920 | @@ -719,17 +716,13 @@ |
---|
921 | if (!gContext->GetNumSetting("GuiSizeForTV", 0)) |
---|
922 | mwnd->move(saved_gui_bounds.topLeft()); |
---|
923 | } |
---|
924 | - if (recorderPlaybackInfo) |
---|
925 | - delete recorderPlaybackInfo; |
---|
926 | + delete recorderPlaybackInfo; |
---|
927 | |
---|
928 | - if (treeMenu) |
---|
929 | - delete treeMenu; |
---|
930 | + delete treeMenu; |
---|
931 | |
---|
932 | - if (playbackinfo) |
---|
933 | - delete playbackinfo; |
---|
934 | + delete playbackinfo; |
---|
935 | |
---|
936 | - if (lastProgram) |
---|
937 | - delete lastProgram; |
---|
938 | + delete lastProgram; |
---|
939 | |
---|
940 | if (class LCD * lcd = LCD::Get()) |
---|
941 | lcd->switchToTime(); |
---|
942 | @@ -1174,8 +1167,7 @@ |
---|
943 | |
---|
944 | StopStuff(true, true, true); |
---|
945 | pbinfoLock.lock(); |
---|
946 | - if (playbackinfo) |
---|
947 | - delete playbackinfo; |
---|
948 | + delete playbackinfo; |
---|
949 | playbackinfo = NULL; |
---|
950 | pbinfoLock.unlock(); |
---|
951 | |
---|
952 | @@ -1617,11 +1609,8 @@ |
---|
953 | delete xnvp; |
---|
954 | } |
---|
955 | |
---|
956 | - if (udpnotify) |
---|
957 | - { |
---|
958 | - delete udpnotify; |
---|
959 | - udpnotify = NULL; |
---|
960 | - } |
---|
961 | + delete udpnotify; |
---|
962 | + udpnotify = NULL; |
---|
963 | |
---|
964 | paused = false; |
---|
965 | doing_ff_rew = 0; |
---|
966 | @@ -1631,24 +1620,17 @@ |
---|
967 | normal_speed = 1.0f; |
---|
968 | |
---|
969 | pbinfoLock.lock(); |
---|
970 | - if (playbackinfo) |
---|
971 | - delete playbackinfo; |
---|
972 | + delete playbackinfo; |
---|
973 | playbackinfo = NULL; |
---|
974 | pbinfoLock.unlock(); |
---|
975 | |
---|
976 | DeleteRecorder(); |
---|
977 | |
---|
978 | - if (prbuffer) |
---|
979 | - { |
---|
980 | - delete prbuffer; |
---|
981 | - prbuffer = activerbuffer = NULL; |
---|
982 | - } |
---|
983 | + delete prbuffer; |
---|
984 | + prbuffer = activerbuffer = NULL; |
---|
985 | |
---|
986 | - if (piprbuffer) |
---|
987 | - { |
---|
988 | - delete piprbuffer; |
---|
989 | - piprbuffer = NULL; |
---|
990 | - } |
---|
991 | + delete piprbuffer; |
---|
992 | + piprbuffer = NULL; |
---|
993 | |
---|
994 | if (tvchain) |
---|
995 | { |
---|
996 | @@ -1677,17 +1659,11 @@ |
---|
997 | delete xnvp; |
---|
998 | } |
---|
999 | |
---|
1000 | - if (piprecorder) |
---|
1001 | - { |
---|
1002 | - delete piprecorder; |
---|
1003 | - piprecorder = NULL; |
---|
1004 | - } |
---|
1005 | + delete piprecorder; |
---|
1006 | + piprecorder = NULL; |
---|
1007 | |
---|
1008 | - if (piprbuffer) |
---|
1009 | - { |
---|
1010 | - delete piprbuffer; |
---|
1011 | - piprbuffer = NULL; |
---|
1012 | - } |
---|
1013 | + delete piprbuffer; |
---|
1014 | + piprbuffer = NULL; |
---|
1015 | |
---|
1016 | if (piptvchain) |
---|
1017 | { |
---|
1018 | @@ -3369,8 +3345,7 @@ |
---|
1019 | if (!testrec || !testrec->IsValidRecorder()) |
---|
1020 | { |
---|
1021 | VERBOSE(VB_IMPORTANT, LOC_ERR + "PiP failed to locate recorder"); |
---|
1022 | - if (testrec) |
---|
1023 | - delete testrec; |
---|
1024 | + delete testrec; |
---|
1025 | return; |
---|
1026 | } |
---|
1027 | |
---|
1028 | @@ -3985,11 +3960,8 @@ |
---|
1029 | delete prbuffer; |
---|
1030 | activerbuffer = prbuffer = NULL; |
---|
1031 | |
---|
1032 | - if (playbackinfo) |
---|
1033 | - { |
---|
1034 | - delete playbackinfo; |
---|
1035 | - playbackinfo = NULL; |
---|
1036 | - } |
---|
1037 | + delete playbackinfo; |
---|
1038 | + playbackinfo = NULL; |
---|
1039 | |
---|
1040 | // now restart stuff |
---|
1041 | lastSignalUIInfo.clear(); |
---|
1042 | @@ -4407,8 +4379,7 @@ |
---|
1043 | { |
---|
1044 | ClearInputQueues(true); |
---|
1045 | ShowNoRecorderDialog(); |
---|
1046 | - if (testrec) |
---|
1047 | - delete testrec; |
---|
1048 | + delete testrec; |
---|
1049 | return; |
---|
1050 | } |
---|
1051 | |
---|
1052 | @@ -5128,8 +5099,7 @@ |
---|
1053 | if (!paused) |
---|
1054 | DoPause(false); |
---|
1055 | } |
---|
1056 | - if (theme) |
---|
1057 | - delete theme; |
---|
1058 | + delete theme; |
---|
1059 | nextProgram = RunPlaybackBoxPtr((void *)this); |
---|
1060 | if (nextProgram) |
---|
1061 | { |
---|
1062 | @@ -5186,8 +5156,7 @@ |
---|
1063 | stayPaused = true; |
---|
1064 | } |
---|
1065 | } |
---|
1066 | - if (theme) |
---|
1067 | - delete theme; |
---|
1068 | + delete theme; |
---|
1069 | nextProgram = RunPlaybackBoxPtr((void *)this); |
---|
1070 | if (IsEmbedding()) |
---|
1071 | StopEmbeddingOutput(); |
---|
1072 | @@ -5265,6 +5234,7 @@ |
---|
1073 | pthread_attr_t attr; |
---|
1074 | pthread_attr_init(&attr); |
---|
1075 | pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); |
---|
1076 | + pthread_attr_destroy(&attr); |
---|
1077 | |
---|
1078 | switch (editType) |
---|
1079 | { |
---|
1080 | Index: libs/libmythtv/videoout_null.cpp |
---|
1081 | =================================================================== |
---|
1082 | --- libs/libmythtv/videoout_null.cpp (revision 13705) |
---|
1083 | +++ libs/libmythtv/videoout_null.cpp (working copy) |
---|
1084 | @@ -23,8 +23,7 @@ |
---|
1085 | VideoOutputNull::~VideoOutputNull() |
---|
1086 | { |
---|
1087 | VERBOSE(VB_PLAYBACK, "~VideoOutputNull()"); |
---|
1088 | - if (pauseFrame.buf) |
---|
1089 | - delete [] pauseFrame.buf; |
---|
1090 | + delete [] pauseFrame.buf; |
---|
1091 | |
---|
1092 | Exit(); |
---|
1093 | } |
---|
1094 | @@ -62,8 +61,7 @@ |
---|
1095 | errored = true; |
---|
1096 | } |
---|
1097 | |
---|
1098 | - if (pauseFrame.buf) |
---|
1099 | - delete [] pauseFrame.buf; |
---|
1100 | + delete [] pauseFrame.buf; |
---|
1101 | |
---|
1102 | pauseFrame.height = vbuffers.GetScratchFrame()->height; |
---|
1103 | pauseFrame.width = vbuffers.GetScratchFrame()->width; |
---|
1104 | Index: libs/libmythtv/videooutbase.cpp |
---|
1105 | =================================================================== |
---|
1106 | --- libs/libmythtv/videooutbase.cpp (revision 13705) |
---|
1107 | +++ libs/libmythtv/videooutbase.cpp (working copy) |
---|
1108 | @@ -226,10 +226,8 @@ |
---|
1109 | |
---|
1110 | ShutdownVideoResize(); |
---|
1111 | |
---|
1112 | - if (m_deintFilter) |
---|
1113 | - delete m_deintFilter; |
---|
1114 | - if (m_deintFiltMan) |
---|
1115 | - delete m_deintFiltMan; |
---|
1116 | + delete m_deintFilter; |
---|
1117 | + delete m_deintFiltMan; |
---|
1118 | } |
---|
1119 | |
---|
1120 | /** |
---|
1121 | @@ -294,16 +292,10 @@ |
---|
1122 | if (m_deinterlacing == interlaced) |
---|
1123 | return m_deinterlacing; |
---|
1124 | |
---|
1125 | - if (m_deintFiltMan) |
---|
1126 | - { |
---|
1127 | - delete m_deintFiltMan; |
---|
1128 | - m_deintFiltMan = NULL; |
---|
1129 | - } |
---|
1130 | - if (m_deintFilter) |
---|
1131 | - { |
---|
1132 | - delete m_deintFilter; |
---|
1133 | - m_deintFilter = NULL; |
---|
1134 | - } |
---|
1135 | + delete m_deintFiltMan; |
---|
1136 | + m_deintFiltMan = NULL; |
---|
1137 | + delete m_deintFilter; |
---|
1138 | + m_deintFilter = NULL; |
---|
1139 | |
---|
1140 | m_deinterlacing = interlaced; |
---|
1141 | |
---|
1142 | @@ -1056,11 +1048,8 @@ |
---|
1143 | */ |
---|
1144 | void VideoOutput::ShutdownPipResize(void) |
---|
1145 | { |
---|
1146 | - if (pip_tmp_buf) |
---|
1147 | - { |
---|
1148 | - delete [] pip_tmp_buf; |
---|
1149 | - pip_tmp_buf = NULL; |
---|
1150 | - } |
---|
1151 | + delete [] pip_tmp_buf; |
---|
1152 | + pip_tmp_buf = NULL; |
---|
1153 | |
---|
1154 | if (pip_scaling_context) |
---|
1155 | { |
---|
1156 | @@ -1307,11 +1296,8 @@ |
---|
1157 | |
---|
1158 | void VideoOutput::ShutdownVideoResize(void) |
---|
1159 | { |
---|
1160 | - if (vsz_tmp_buf) |
---|
1161 | - { |
---|
1162 | - delete [] vsz_tmp_buf; |
---|
1163 | - vsz_tmp_buf = NULL; |
---|
1164 | - } |
---|
1165 | + delete [] vsz_tmp_buf; |
---|
1166 | + vsz_tmp_buf = NULL; |
---|
1167 | |
---|
1168 | if (vsz_scale_context) |
---|
1169 | { |
---|
1170 | Index: libs/libmythtv/dvbchannel.cpp |
---|
1171 | =================================================================== |
---|
1172 | --- libs/libmythtv/dvbchannel.cpp (revision 13705) |
---|
1173 | +++ libs/libmythtv/dvbchannel.cpp (working copy) |
---|
1174 | @@ -85,11 +85,7 @@ |
---|
1175 | DVBChannel::~DVBChannel() |
---|
1176 | { |
---|
1177 | Close(); |
---|
1178 | - if (dvbcam) |
---|
1179 | - { |
---|
1180 | - delete dvbcam; |
---|
1181 | - dvbcam = NULL; |
---|
1182 | - } |
---|
1183 | + delete dvbcam; |
---|
1184 | // diseqc_tree is managed elsewhere |
---|
1185 | } |
---|
1186 | |
---|
1187 | Index: libs/libmythtv/videosource.cpp |
---|
1188 | =================================================================== |
---|
1189 | --- libs/libmythtv/videosource.cpp (revision 13705) |
---|
1190 | +++ libs/libmythtv/videosource.cpp (working copy) |
---|
1191 | @@ -1833,11 +1833,7 @@ |
---|
1192 | |
---|
1193 | CardInput::~CardInput() |
---|
1194 | { |
---|
1195 | - if (externalInputSettings) |
---|
1196 | - { |
---|
1197 | - delete externalInputSettings; |
---|
1198 | - externalInputSettings = NULL; |
---|
1199 | - } |
---|
1200 | + delete externalInputSettings; |
---|
1201 | } |
---|
1202 | |
---|
1203 | void CardInput::SetSourceID(const QString &sourceid) |
---|
1204 | Index: libs/libmythtv/dvbcam.cpp |
---|
1205 | =================================================================== |
---|
1206 | --- libs/libmythtv/dvbcam.cpp (revision 13705) |
---|
1207 | +++ libs/libmythtv/dvbcam.cpp (working copy) |
---|
1208 | @@ -124,11 +124,8 @@ |
---|
1209 | pthread_join(ciHandlerThread, NULL); |
---|
1210 | } |
---|
1211 | |
---|
1212 | - if (ciHandler) |
---|
1213 | - { |
---|
1214 | - delete ciHandler; |
---|
1215 | - ciHandler = NULL; |
---|
1216 | - } |
---|
1217 | + delete ciHandler; |
---|
1218 | + ciHandler = NULL; |
---|
1219 | |
---|
1220 | return true; |
---|
1221 | } |
---|
1222 | Index: libs/libmythtv/videoout_xv.cpp |
---|
1223 | =================================================================== |
---|
1224 | --- libs/libmythtv/videoout_xv.cpp (revision 13705) |
---|
1225 | +++ libs/libmythtv/videoout_xv.cpp (working copy) |
---|
1226 | @@ -167,8 +167,7 @@ |
---|
1227 | if (display_res) |
---|
1228 | display_res->SwitchToGUI(); |
---|
1229 | |
---|
1230 | - if (xvmc_tex) |
---|
1231 | - delete xvmc_tex; |
---|
1232 | + delete xvmc_tex; |
---|
1233 | } |
---|
1234 | |
---|
1235 | // this is documented in videooutbase.cpp |
---|
1236 | @@ -656,11 +655,8 @@ |
---|
1237 | { |
---|
1238 | vbuffers.LockFrame(&av_pause_frame, "CreatePauseFrame"); |
---|
1239 | |
---|
1240 | - if (av_pause_frame.buf) |
---|
1241 | - { |
---|
1242 | - delete [] av_pause_frame.buf; |
---|
1243 | - av_pause_frame.buf = NULL; |
---|
1244 | - } |
---|
1245 | + delete [] av_pause_frame.buf; |
---|
1246 | + av_pause_frame.buf = NULL; |
---|
1247 | |
---|
1248 | init(&av_pause_frame, FMT_YV12, |
---|
1249 | new unsigned char[vbuffers.GetScratchFrame()->size + 128], |
---|
1250 | @@ -1783,16 +1779,10 @@ |
---|
1251 | |
---|
1252 | if (delete_pause_frame) |
---|
1253 | { |
---|
1254 | - if (av_pause_frame.buf) |
---|
1255 | - { |
---|
1256 | - delete [] av_pause_frame.buf; |
---|
1257 | - av_pause_frame.buf = NULL; |
---|
1258 | - } |
---|
1259 | - if (av_pause_frame.qscale_table) |
---|
1260 | - { |
---|
1261 | - delete [] av_pause_frame.qscale_table; |
---|
1262 | - av_pause_frame.qscale_table = NULL; |
---|
1263 | - } |
---|
1264 | + delete [] av_pause_frame.buf; |
---|
1265 | + av_pause_frame.buf = NULL; |
---|
1266 | + delete [] av_pause_frame.qscale_table; |
---|
1267 | + av_pause_frame.qscale_table = NULL; |
---|
1268 | } |
---|
1269 | |
---|
1270 | for (uint i = 0; i < XJ_shm_infos.size(); i++) |
---|
1271 | Index: libs/libmythtv/udpnotify.cpp |
---|
1272 | =================================================================== |
---|
1273 | --- libs/libmythtv/udpnotify.cpp (revision 13705) |
---|
1274 | +++ libs/libmythtv/udpnotify.cpp (working copy) |
---|
1275 | @@ -60,8 +60,7 @@ |
---|
1276 | for (; i != allTypes->end(); i++) |
---|
1277 | { |
---|
1278 | UDPNotifyOSDTypeText *type = (*i); |
---|
1279 | - if (type) |
---|
1280 | - delete type; |
---|
1281 | + delete type; |
---|
1282 | } |
---|
1283 | delete allTypes; |
---|
1284 | } |
---|
1285 | @@ -167,8 +166,7 @@ |
---|
1286 | |
---|
1287 | delete qsd; |
---|
1288 | |
---|
1289 | - if (qsn) |
---|
1290 | - delete qsn; |
---|
1291 | + delete qsn; |
---|
1292 | |
---|
1293 | qApp->unlock(); |
---|
1294 | |
---|
1295 | @@ -176,8 +174,7 @@ |
---|
1296 | for (; i != setList->end(); i++) |
---|
1297 | { |
---|
1298 | UDPNotifyOSDSet *set = (*i); |
---|
1299 | - if (set) |
---|
1300 | - delete set; |
---|
1301 | + delete set; |
---|
1302 | } |
---|
1303 | delete setList; |
---|
1304 | } |
---|
1305 | Index: libs/libmythtv/remoteutil.cpp |
---|
1306 | =================================================================== |
---|
1307 | --- libs/libmythtv/remoteutil.cpp (revision 13705) |
---|
1308 | +++ libs/libmythtv/remoteutil.cpp (working copy) |
---|
1309 | @@ -446,8 +446,7 @@ |
---|
1310 | vector<ProgramInfo *> *info = new vector<ProgramInfo *>; |
---|
1311 | if (!RemoteGetRecordingList(info, strlist)) |
---|
1312 | { |
---|
1313 | - if (info) |
---|
1314 | - delete info; |
---|
1315 | + delete info; |
---|
1316 | return reclist; |
---|
1317 | } |
---|
1318 | |
---|
1319 | @@ -462,8 +461,7 @@ |
---|
1320 | reclist->push_back(new ProgramInfo(*p)); |
---|
1321 | } |
---|
1322 | |
---|
1323 | - if (info) |
---|
1324 | - delete info; |
---|
1325 | + delete info; |
---|
1326 | |
---|
1327 | return reclist; |
---|
1328 | } |
---|
1329 | Index: libs/libmythtv/decoderbase.cpp |
---|
1330 | =================================================================== |
---|
1331 | --- libs/libmythtv/decoderbase.cpp (revision 13705) |
---|
1332 | +++ libs/libmythtv/decoderbase.cpp (working copy) |
---|
1333 | @@ -55,14 +55,12 @@ |
---|
1334 | |
---|
1335 | DecoderBase::~DecoderBase() |
---|
1336 | { |
---|
1337 | - if (m_playbackinfo) |
---|
1338 | - delete m_playbackinfo; |
---|
1339 | + delete m_playbackinfo; |
---|
1340 | } |
---|
1341 | |
---|
1342 | void DecoderBase::SetProgramInfo(ProgramInfo *pginfo) |
---|
1343 | { |
---|
1344 | - if (m_playbackinfo) |
---|
1345 | - delete m_playbackinfo; |
---|
1346 | + delete m_playbackinfo; |
---|
1347 | m_playbackinfo = NULL; |
---|
1348 | |
---|
1349 | if (pginfo) |
---|
1350 | Index: libs/libmythtv/iptvchannel.cpp |
---|
1351 | =================================================================== |
---|
1352 | --- libs/libmythtv/iptvchannel.cpp (revision 13705) |
---|
1353 | +++ libs/libmythtv/iptvchannel.cpp (working copy) |
---|
1354 | @@ -30,11 +30,7 @@ |
---|
1355 | IPTVChannel::~IPTVChannel() |
---|
1356 | { |
---|
1357 | VERBOSE(VB_CHANNEL, LOC + "dtor -- begin"); |
---|
1358 | - if (m_feeder) |
---|
1359 | - { |
---|
1360 | - delete m_feeder; |
---|
1361 | - m_feeder = NULL; |
---|
1362 | - } |
---|
1363 | + delete m_feeder; |
---|
1364 | VERBOSE(VB_CHANNEL, LOC + "dtor -- end"); |
---|
1365 | } |
---|
1366 | |
---|
1367 | Index: libs/libmythtv/tv_rec.cpp |
---|
1368 | =================================================================== |
---|
1369 | --- libs/libmythtv/tv_rec.cpp (revision 13705) |
---|
1370 | +++ libs/libmythtv/tv_rec.cpp (working copy) |
---|
1371 | @@ -288,17 +288,11 @@ |
---|
1372 | |
---|
1373 | TeardownSignalMonitor(); |
---|
1374 | |
---|
1375 | - if (scanner) |
---|
1376 | - { |
---|
1377 | - delete scanner; |
---|
1378 | - scanner = NULL; |
---|
1379 | - } |
---|
1380 | + delete scanner; |
---|
1381 | + scanner = NULL; |
---|
1382 | |
---|
1383 | - if (channel) |
---|
1384 | - { |
---|
1385 | - delete channel; |
---|
1386 | - channel = NULL; |
---|
1387 | - } |
---|
1388 | + delete channel; |
---|
1389 | + channel = NULL; |
---|
1390 | |
---|
1391 | TeardownRecorder(true); |
---|
1392 | |
---|
1393 | @@ -358,8 +352,7 @@ |
---|
1394 | void TVRec::RecordPending(const ProgramInfo *rcinfo, int secsleft) |
---|
1395 | { |
---|
1396 | QMutexLocker lock(&stateChangeLock); |
---|
1397 | - if (pendingRecording) |
---|
1398 | - delete pendingRecording; |
---|
1399 | + delete pendingRecording; |
---|
1400 | |
---|
1401 | pendingRecording = new ProgramInfo(*rcinfo); |
---|
1402 | recordPendingStart = QDateTime::currentDateTime().addSecs(secsleft); |
---|
1403 | @@ -373,8 +366,7 @@ |
---|
1404 | { |
---|
1405 | ProgramInfo *old_rec = pseudoLiveTVRecording; |
---|
1406 | pseudoLiveTVRecording = pi; |
---|
1407 | - if (old_rec) |
---|
1408 | - delete old_rec; |
---|
1409 | + delete old_rec; |
---|
1410 | } |
---|
1411 | |
---|
1412 | /** \fn TVRec::GetRecordEndTime(const ProgramInfo*) const |
---|
1413 | @@ -527,11 +519,8 @@ |
---|
1414 | retval = rsTunerBusy; |
---|
1415 | } |
---|
1416 | |
---|
1417 | - if (pendingRecording) |
---|
1418 | - { |
---|
1419 | - delete pendingRecording; |
---|
1420 | - pendingRecording = NULL; |
---|
1421 | - } |
---|
1422 | + delete pendingRecording; |
---|
1423 | + pendingRecording = NULL; |
---|
1424 | |
---|
1425 | WaitForEventThreadSleep(); |
---|
1426 | |
---|
1427 | @@ -2402,8 +2391,7 @@ |
---|
1428 | SetPseudoLiveTVRecording(NULL); |
---|
1429 | } |
---|
1430 | |
---|
1431 | - if (pi) |
---|
1432 | - delete pi; |
---|
1433 | + delete pi; |
---|
1434 | } |
---|
1435 | |
---|
1436 | static uint get_input_id(uint cardid, const QString &inputname) |
---|
1437 | @@ -4205,8 +4193,7 @@ |
---|
1438 | } |
---|
1439 | else if (!set_rec) |
---|
1440 | { |
---|
1441 | - if (curRecording) |
---|
1442 | - delete curRecording; |
---|
1443 | + delete curRecording; |
---|
1444 | curRecording = pginfo; |
---|
1445 | SetRingBuffer(rb); |
---|
1446 | } |
---|
1447 | Index: libs/libmythtv/programinfo.cpp |
---|
1448 | =================================================================== |
---|
1449 | --- libs/libmythtv/programinfo.cpp (revision 13705) |
---|
1450 | +++ libs/libmythtv/programinfo.cpp (working copy) |
---|
1451 | @@ -953,8 +953,7 @@ |
---|
1452 | delete nextday; |
---|
1453 | return 1; |
---|
1454 | } |
---|
1455 | - if (nextday) |
---|
1456 | - delete nextday; |
---|
1457 | + delete nextday; |
---|
1458 | } |
---|
1459 | |
---|
1460 | QDateTime checktime = dtime.addDays(7); |
---|
1461 | @@ -969,8 +968,7 @@ |
---|
1462 | return 2; |
---|
1463 | } |
---|
1464 | |
---|
1465 | - if (nextweek) |
---|
1466 | - delete nextweek; |
---|
1467 | + delete nextweek; |
---|
1468 | return 0; |
---|
1469 | } |
---|
1470 | |
---|
1471 | Index: libs/libmythtv/osdxvmc.cpp |
---|
1472 | =================================================================== |
---|
1473 | --- libs/libmythtv/osdxvmc.cpp (revision 13705) |
---|
1474 | +++ libs/libmythtv/osdxvmc.cpp (working copy) |
---|
1475 | @@ -152,8 +152,7 @@ |
---|
1476 | |
---|
1477 | X11S(XSync(XJ_disp, false)); |
---|
1478 | |
---|
1479 | - if (osd_palette) |
---|
1480 | - delete [] osd_palette; |
---|
1481 | + delete [] osd_palette; |
---|
1482 | } |
---|
1483 | |
---|
1484 | void XvMCOSD::CompositeOSD(VideoFrame* frame, VideoFrame* osdframe) |
---|
1485 | Index: libs/libmythtv/eitscanner.cpp |
---|
1486 | =================================================================== |
---|
1487 | --- libs/libmythtv/eitscanner.cpp (revision 13705) |
---|
1488 | +++ libs/libmythtv/eitscanner.cpp (working copy) |
---|
1489 | @@ -46,11 +46,8 @@ |
---|
1490 | pthread_join(eventThread, NULL); |
---|
1491 | } |
---|
1492 | |
---|
1493 | - if (eitHelper) |
---|
1494 | - { |
---|
1495 | - delete eitHelper; |
---|
1496 | - eitHelper = NULL; |
---|
1497 | - } |
---|
1498 | + delete eitHelper; |
---|
1499 | + eitHelper = NULL; |
---|
1500 | } |
---|
1501 | |
---|
1502 | /** \fn EITScanner::SpawnEventLoop(void*) |
---|
1503 | Index: libs/libmythtv/videoout_ivtv.cpp |
---|
1504 | =================================================================== |
---|
1505 | --- libs/libmythtv/videoout_ivtv.cpp (revision 13705) |
---|
1506 | +++ libs/libmythtv/videoout_ivtv.cpp (working copy) |
---|
1507 | @@ -89,8 +89,7 @@ |
---|
1508 | close(fbfd); |
---|
1509 | } |
---|
1510 | |
---|
1511 | - if (osdbuffer) |
---|
1512 | - delete [] osdbuffer; |
---|
1513 | + delete [] osdbuffer; |
---|
1514 | } |
---|
1515 | |
---|
1516 | void VideoOutputIvtv::ClearOSD(void) |
---|
1517 | Index: libs/libmythtv/ttfont.cpp |
---|
1518 | =================================================================== |
---|
1519 | --- libs/libmythtv/ttfont.cpp (revision 13705) |
---|
1520 | +++ libs/libmythtv/ttfont.cpp (working copy) |
---|
1521 | @@ -152,8 +152,7 @@ |
---|
1522 | { |
---|
1523 | if (!rmap) |
---|
1524 | return; |
---|
1525 | - if (rmap->bitmap) |
---|
1526 | - delete [] rmap->bitmap; |
---|
1527 | + delete [] rmap->bitmap; |
---|
1528 | delete rmap; |
---|
1529 | } |
---|
1530 | |
---|
1531 | Index: libs/libmythtv/osd.cpp |
---|
1532 | =================================================================== |
---|
1533 | --- libs/libmythtv/osd.cpp (revision 13705) |
---|
1534 | +++ libs/libmythtv/osd.cpp (working copy) |
---|
1535 | @@ -98,22 +98,18 @@ |
---|
1536 | for (; fonts != fontMap.end(); ++fonts) |
---|
1537 | { |
---|
1538 | TTFFont *font = (*fonts); |
---|
1539 | - if (font) |
---|
1540 | - delete font; |
---|
1541 | + delete font; |
---|
1542 | } |
---|
1543 | |
---|
1544 | QMap<QString, OSDSet *>::iterator sets = setMap.begin(); |
---|
1545 | for (; sets != setMap.end(); ++sets) |
---|
1546 | { |
---|
1547 | OSDSet *set = (*sets); |
---|
1548 | - if (set) |
---|
1549 | - delete set; |
---|
1550 | + delete set; |
---|
1551 | } |
---|
1552 | |
---|
1553 | - if (editarrowleft) |
---|
1554 | - delete editarrowleft; |
---|
1555 | - if (editarrowright) |
---|
1556 | - delete editarrowright; |
---|
1557 | + delete editarrowleft; |
---|
1558 | + delete editarrowright; |
---|
1559 | |
---|
1560 | delete setList; |
---|
1561 | delete drawSurface; |
---|
1562 | Index: libs/libmythtv/diseqc.cpp |
---|
1563 | =================================================================== |
---|
1564 | --- libs/libmythtv/diseqc.cpp (revision 13705) |
---|
1565 | +++ libs/libmythtv/diseqc.cpp (working copy) |
---|
1566 | @@ -963,8 +963,7 @@ |
---|
1567 | dvbdev_vec_t::iterator it = m_children.begin(); |
---|
1568 | for (; it != m_children.end(); ++it) |
---|
1569 | { |
---|
1570 | - if (*it) |
---|
1571 | - delete *it; |
---|
1572 | + delete *it; |
---|
1573 | } |
---|
1574 | } |
---|
1575 | |
---|
1576 | @@ -1072,8 +1071,7 @@ |
---|
1577 | if (ordinal >= m_children.size()) |
---|
1578 | return false; |
---|
1579 | |
---|
1580 | - if (m_children[ordinal]) |
---|
1581 | - delete m_children[ordinal]; |
---|
1582 | + delete m_children[ordinal]; |
---|
1583 | |
---|
1584 | m_children[ordinal] = device; |
---|
1585 | if (device) |
---|
1586 | @@ -1103,8 +1101,7 @@ |
---|
1587 | dvbdev_vec_t::iterator it = m_children.begin(); |
---|
1588 | for (; it != m_children.end(); ++it) |
---|
1589 | { |
---|
1590 | - if (*it) |
---|
1591 | - delete *it; |
---|
1592 | + delete *it; |
---|
1593 | } |
---|
1594 | |
---|
1595 | m_children.clear(); |
---|
1596 | @@ -1232,8 +1229,7 @@ |
---|
1597 | { |
---|
1598 | for (uint ch = num_ports; ch < old_num; ch++) |
---|
1599 | { |
---|
1600 | - if (m_children[ch]) |
---|
1601 | - delete m_children[ch]; |
---|
1602 | + delete m_children[ch]; |
---|
1603 | } |
---|
1604 | m_children.resize(num_ports); |
---|
1605 | } |
---|
1606 | @@ -1502,8 +1498,7 @@ |
---|
1607 | |
---|
1608 | DiSEqCDevRotor::~DiSEqCDevRotor() |
---|
1609 | { |
---|
1610 | - if (m_child) |
---|
1611 | - delete m_child; |
---|
1612 | + delete m_child; |
---|
1613 | } |
---|
1614 | |
---|
1615 | bool DiSEqCDevRotor::Execute(const DiSEqCDevSettings &settings, |
---|
1616 | @@ -1573,8 +1568,7 @@ |
---|
1617 | |
---|
1618 | DiSEqCDevDevice *old_child = m_child; |
---|
1619 | m_child = NULL; |
---|
1620 | - if (old_child) |
---|
1621 | - delete old_child; |
---|
1622 | + delete old_child; |
---|
1623 | |
---|
1624 | m_child = device; |
---|
1625 | if (m_child) |
---|
1626 | @@ -1648,11 +1642,8 @@ |
---|
1627 | } |
---|
1628 | |
---|
1629 | // load children from db |
---|
1630 | - if (m_child) |
---|
1631 | - { |
---|
1632 | - delete m_child; |
---|
1633 | - m_child = NULL; |
---|
1634 | - } |
---|
1635 | + delete m_child; |
---|
1636 | + m_child = NULL; |
---|
1637 | |
---|
1638 | query.prepare( |
---|
1639 | "SELECT diseqcid " |
---|
1640 | Index: libs/libmythtv/linuxfirewiredevice.cpp |
---|
1641 | =================================================================== |
---|
1642 | --- libs/libmythtv/linuxfirewiredevice.cpp (revision 13705) |
---|
1643 | +++ libs/libmythtv/linuxfirewiredevice.cpp (working copy) |
---|
1644 | @@ -145,11 +145,7 @@ |
---|
1645 | ClosePort(); |
---|
1646 | } |
---|
1647 | |
---|
1648 | - if (m_priv) |
---|
1649 | - { |
---|
1650 | - delete m_priv; |
---|
1651 | - m_priv = NULL; |
---|
1652 | - } |
---|
1653 | + delete m_priv; |
---|
1654 | } |
---|
1655 | |
---|
1656 | void LinuxFirewireDevice::SignalReset(uint generation) |
---|
1657 | Index: libs/libmythtv/videobuffers.cpp |
---|
1658 | =================================================================== |
---|
1659 | --- libs/libmythtv/videobuffers.cpp (revision 13705) |
---|
1660 | +++ libs/libmythtv/videobuffers.cpp (working copy) |
---|
1661 | @@ -197,11 +197,8 @@ |
---|
1662 | frame_vector_t::iterator it = buffers.begin(); |
---|
1663 | for (;it != buffers.end(); it++) |
---|
1664 | { |
---|
1665 | - if (it->qscale_table) |
---|
1666 | - { |
---|
1667 | - delete [] it->qscale_table; |
---|
1668 | - it->qscale_table = NULL; |
---|
1669 | - } |
---|
1670 | + delete [] it->qscale_table; |
---|
1671 | + it->qscale_table = NULL; |
---|
1672 | } |
---|
1673 | |
---|
1674 | available.clear(); |
---|
1675 | @@ -1235,11 +1232,8 @@ |
---|
1676 | { |
---|
1677 | buffers[i].buf = NULL; |
---|
1678 | |
---|
1679 | - if (buffers[i].qscale_table) |
---|
1680 | - { |
---|
1681 | - delete [] buffers[i].qscale_table; |
---|
1682 | - buffers[i].qscale_table = NULL; |
---|
1683 | - } |
---|
1684 | + delete [] buffers[i].qscale_table; |
---|
1685 | + buffers[i].qscale_table = NULL; |
---|
1686 | } |
---|
1687 | |
---|
1688 | for (uint i = 0; i < allocated_structs.size(); i++) |
---|
1689 | Index: libs/libmythtv/videoout_dx.cpp |
---|
1690 | =================================================================== |
---|
1691 | --- libs/libmythtv/videoout_dx.cpp (revision 13705) |
---|
1692 | +++ libs/libmythtv/videoout_dx.cpp (working copy) |
---|
1693 | @@ -76,8 +76,7 @@ |
---|
1694 | |
---|
1695 | VideoOutputDX::~VideoOutputDX() |
---|
1696 | { |
---|
1697 | - if (pauseFrame.buf) |
---|
1698 | - delete [] pauseFrame.buf; |
---|
1699 | + delete [] pauseFrame.buf; |
---|
1700 | |
---|
1701 | DirectXCloseSurface(); |
---|
1702 | DirectXCloseDisplay(); |
---|
1703 | @@ -116,8 +115,7 @@ |
---|
1704 | |
---|
1705 | MoveResize(); |
---|
1706 | |
---|
1707 | - if (pauseFrame.buf) |
---|
1708 | - delete [] pauseFrame.buf; |
---|
1709 | + delete [] pauseFrame.buf; |
---|
1710 | |
---|
1711 | pauseFrame.height = vbuffers.GetScratchFrame()->height; |
---|
1712 | pauseFrame.width = vbuffers.GetScratchFrame()->width; |
---|
1713 | Index: libs/libmythui/mythmainwindow.cpp |
---|
1714 | =================================================================== |
---|
1715 | --- libs/libmythui/mythmainwindow.cpp (revision 13705) |
---|
1716 | +++ libs/libmythui/mythmainwindow.cpp (working copy) |
---|
1717 | @@ -232,8 +232,7 @@ |
---|
1718 | |
---|
1719 | void MythMainWindow::destroyMainWindow(void) |
---|
1720 | { |
---|
1721 | - if (mainWin) |
---|
1722 | - delete mainWin; |
---|
1723 | + delete mainWin; |
---|
1724 | mainWin = NULL; |
---|
1725 | } |
---|
1726 | |
---|
1727 | Index: libs/libmythui/mythuitext.cpp |
---|
1728 | =================================================================== |
---|
1729 | --- libs/libmythui/mythuitext.cpp (revision 13705) |
---|
1730 | +++ libs/libmythui/mythuitext.cpp (working copy) |
---|
1731 | @@ -47,11 +47,7 @@ |
---|
1732 | |
---|
1733 | MythUIText::~MythUIText() |
---|
1734 | { |
---|
1735 | - if (m_Font) |
---|
1736 | - { |
---|
1737 | - delete m_Font; |
---|
1738 | - m_Font = NULL; |
---|
1739 | - } |
---|
1740 | + delete m_Font; |
---|
1741 | } |
---|
1742 | |
---|
1743 | void MythUIText::SetText(const QString &text) |
---|
1744 | Index: libs/libmythui/xmlparsebase.cpp |
---|
1745 | =================================================================== |
---|
1746 | --- libs/libmythui/xmlparsebase.cpp (revision 13705) |
---|
1747 | +++ libs/libmythui/xmlparsebase.cpp (working copy) |
---|
1748 | @@ -137,8 +137,7 @@ |
---|
1749 | parent->AddFont(name, font); |
---|
1750 | } |
---|
1751 | |
---|
1752 | - if (font) |
---|
1753 | - delete font; |
---|
1754 | + delete font; |
---|
1755 | } |
---|
1756 | else if (type == "imagetype" || |
---|
1757 | type == "textarea" || |
---|
1758 | @@ -257,8 +256,7 @@ |
---|
1759 | uitype->AddFont(name, font); |
---|
1760 | } |
---|
1761 | |
---|
1762 | - if (font) |
---|
1763 | - delete font; |
---|
1764 | + delete font; |
---|
1765 | } |
---|
1766 | else if (info.tagName() == "imagetype" || |
---|
1767 | info.tagName() == "textarea" || |
---|
1768 | Index: libs/libmythui/myththemedmenu.cpp |
---|
1769 | =================================================================== |
---|
1770 | --- libs/libmythui/myththemedmenu.cpp (revision 13705) |
---|
1771 | +++ libs/libmythui/myththemedmenu.cpp (working copy) |
---|
1772 | @@ -1091,8 +1091,7 @@ |
---|
1773 | |
---|
1774 | allButtonIcons[name] = newbutton; |
---|
1775 | |
---|
1776 | - if (tmpimg) |
---|
1777 | - delete tmpimg; |
---|
1778 | + delete tmpimg; |
---|
1779 | } |
---|
1780 | |
---|
1781 | void MythThemedMenuState::setDefaults(void) |
---|
1782 | @@ -2327,8 +2326,7 @@ |
---|
1783 | |
---|
1784 | MythThemedMenu::~MythThemedMenu(void) |
---|
1785 | { |
---|
1786 | - if (d) |
---|
1787 | - delete d; |
---|
1788 | + delete d; |
---|
1789 | } |
---|
1790 | |
---|
1791 | bool MythThemedMenu::foundTheme(void) |
---|
1792 | Index: libs/libmythui/mythlistbutton.cpp |
---|
1793 | =================================================================== |
---|
1794 | --- libs/libmythui/mythlistbutton.cpp (revision 13705) |
---|
1795 | +++ libs/libmythui/mythlistbutton.cpp (working copy) |
---|
1796 | @@ -77,10 +77,8 @@ |
---|
1797 | delete m_topIterator; |
---|
1798 | delete m_selIterator; |
---|
1799 | |
---|
1800 | - if (m_fontActive) |
---|
1801 | - delete m_fontActive; |
---|
1802 | - if (m_fontInactive) |
---|
1803 | - delete m_fontInactive; |
---|
1804 | + delete m_fontActive; |
---|
1805 | + delete m_fontInactive; |
---|
1806 | |
---|
1807 | if (itemRegPix) |
---|
1808 | itemRegPix->DownRef(); |
---|
1809 | @@ -714,10 +712,8 @@ |
---|
1810 | else if (element.tagName() == "scrollarrows") |
---|
1811 | { |
---|
1812 | m_showScrollArrows = parseBool(element.attribute("show", "")); |
---|
1813 | - if (m_upArrow) |
---|
1814 | - delete m_upArrow; |
---|
1815 | - if (m_downArrow) |
---|
1816 | - delete m_downArrow; |
---|
1817 | + delete m_upArrow; |
---|
1818 | + delete m_downArrow; |
---|
1819 | ParseChildren(element, this); |
---|
1820 | m_upArrow = dynamic_cast<MythUIStateType *>(GetChild("upscrollarrow")); |
---|
1821 | m_downArrow = dynamic_cast<MythUIStateType *>(GetChild("downscrollarrow")); |
---|
1822 | Index: libs/libmythui/mythuiclock.cpp |
---|
1823 | =================================================================== |
---|
1824 | --- libs/libmythui/mythuiclock.cpp (revision 13705) |
---|
1825 | +++ libs/libmythui/mythuiclock.cpp (working copy) |
---|
1826 | @@ -26,11 +26,7 @@ |
---|
1827 | |
---|
1828 | MythUIClock::~MythUIClock() |
---|
1829 | { |
---|
1830 | - if (m_Font) |
---|
1831 | - { |
---|
1832 | - delete m_Font; |
---|
1833 | - m_Font = NULL; |
---|
1834 | - } |
---|
1835 | + delete m_Font; |
---|
1836 | } |
---|
1837 | |
---|
1838 | void MythUIClock::Pulse(void) |
---|
1839 | Index: libs/libmyth/oldsettings.cpp |
---|
1840 | =================================================================== |
---|
1841 | --- libs/libmyth/oldsettings.cpp (revision 13705) |
---|
1842 | +++ libs/libmyth/oldsettings.cpp (working copy) |
---|
1843 | @@ -35,8 +35,7 @@ |
---|
1844 | |
---|
1845 | Settings::~Settings() |
---|
1846 | { |
---|
1847 | - if (m_pSettings != NULL) |
---|
1848 | - delete m_pSettings; |
---|
1849 | + delete m_pSettings; |
---|
1850 | } |
---|
1851 | |
---|
1852 | // Setting retrieval functions |
---|
1853 | Index: libs/libmyth/mythdialogs.cpp |
---|
1854 | =================================================================== |
---|
1855 | --- libs/libmyth/mythdialogs.cpp (revision 13705) |
---|
1856 | +++ libs/libmyth/mythdialogs.cpp (working copy) |
---|
1857 | @@ -780,10 +780,8 @@ |
---|
1858 | |
---|
1859 | bool MythThemedDialog::loadThemedWindow(QString window_name, QString theme_filename) |
---|
1860 | { |
---|
1861 | + delete theme; |
---|
1862 | |
---|
1863 | - if (theme) |
---|
1864 | - delete theme; |
---|
1865 | - |
---|
1866 | context = -1; |
---|
1867 | my_containers.clear(); |
---|
1868 | widget_with_current_focus = NULL; |
---|
1869 | @@ -871,8 +869,7 @@ |
---|
1870 | |
---|
1871 | MythThemedDialog::~MythThemedDialog() |
---|
1872 | { |
---|
1873 | - if (theme) |
---|
1874 | - delete theme; |
---|
1875 | + delete theme; |
---|
1876 | } |
---|
1877 | |
---|
1878 | void MythThemedDialog::loadWindow(QDomElement &element) |
---|
1879 | @@ -1877,17 +1874,8 @@ |
---|
1880 | |
---|
1881 | MythSearchDialog::~MythSearchDialog() |
---|
1882 | { |
---|
1883 | - if (listbox) |
---|
1884 | - { |
---|
1885 | - delete listbox; |
---|
1886 | - listbox = NULL; |
---|
1887 | - } |
---|
1888 | - |
---|
1889 | - if (editor) |
---|
1890 | - { |
---|
1891 | - delete editor; |
---|
1892 | - editor = NULL; |
---|
1893 | - } |
---|
1894 | + delete listbox; |
---|
1895 | + delete editor; |
---|
1896 | } |
---|
1897 | |
---|
1898 | /* |
---|
1899 | @@ -2277,14 +2265,10 @@ |
---|
1900 | m_parent->detach(this); |
---|
1901 | delete m_bgPixmap; |
---|
1902 | |
---|
1903 | - if (m_upArrowPix) |
---|
1904 | - delete m_upArrowPix; |
---|
1905 | - if (m_dnArrowPix) |
---|
1906 | - delete m_dnArrowPix; |
---|
1907 | - if (m_ltArrowPix) |
---|
1908 | - delete m_ltArrowPix; |
---|
1909 | - if (m_rtArrowPix) |
---|
1910 | - delete m_rtArrowPix; |
---|
1911 | + delete m_upArrowPix; |
---|
1912 | + delete m_dnArrowPix; |
---|
1913 | + delete m_ltArrowPix; |
---|
1914 | + delete m_rtArrowPix; |
---|
1915 | } |
---|
1916 | |
---|
1917 | void MythScrollDialog::setArea(int w, int h) |
---|
1918 | Index: libs/libmyth/mythwidgets.cpp |
---|
1919 | =================================================================== |
---|
1920 | --- libs/libmyth/mythwidgets.cpp (revision 13705) |
---|
1921 | +++ libs/libmyth/mythwidgets.cpp (working copy) |
---|
1922 | @@ -18,8 +18,7 @@ |
---|
1923 | |
---|
1924 | MythComboBox::~MythComboBox() |
---|
1925 | { |
---|
1926 | - if (popup) |
---|
1927 | - delete popup; |
---|
1928 | + delete popup; |
---|
1929 | } |
---|
1930 | |
---|
1931 | void MythComboBox::Init() |
---|
1932 | @@ -356,8 +355,7 @@ |
---|
1933 | |
---|
1934 | MythLineEdit::~MythLineEdit() |
---|
1935 | { |
---|
1936 | - if (popup) |
---|
1937 | - delete popup; |
---|
1938 | + delete popup; |
---|
1939 | } |
---|
1940 | |
---|
1941 | void MythLineEdit::Init() |
---|
1942 | @@ -976,13 +974,8 @@ |
---|
1943 | |
---|
1944 | MythRemoteLineEdit::~MythRemoteLineEdit() |
---|
1945 | { |
---|
1946 | - if (cycle_timer) |
---|
1947 | - { |
---|
1948 | - delete cycle_timer; |
---|
1949 | - } |
---|
1950 | - |
---|
1951 | - if (popup) |
---|
1952 | - delete popup; |
---|
1953 | + delete cycle_timer; |
---|
1954 | + delete popup; |
---|
1955 | } |
---|
1956 | |
---|
1957 | void MythRemoteLineEdit::insert(QString text) |
---|
1958 | Index: libs/libmyth/httpcomms.cpp |
---|
1959 | =================================================================== |
---|
1960 | --- libs/libmyth/httpcomms.cpp (revision 13705) |
---|
1961 | +++ libs/libmyth/httpcomms.cpp (working copy) |
---|
1962 | @@ -32,8 +32,7 @@ |
---|
1963 | |
---|
1964 | HttpComms::~HttpComms() |
---|
1965 | { |
---|
1966 | - if (m_timer) |
---|
1967 | - delete m_timer; |
---|
1968 | + delete m_timer; |
---|
1969 | |
---|
1970 | delete http; |
---|
1971 | } |
---|
1972 | @@ -296,8 +295,7 @@ |
---|
1973 | |
---|
1974 | VERBOSE(VB_NETWORK, QString("getHttp: grabbing: %1").arg(qurl.toString())); |
---|
1975 | |
---|
1976 | - if (httpGrabber != NULL) |
---|
1977 | - delete httpGrabber; |
---|
1978 | + delete httpGrabber; |
---|
1979 | |
---|
1980 | httpGrabber = new HttpComms; |
---|
1981 | |
---|
1982 | @@ -390,8 +388,7 @@ |
---|
1983 | VERBOSE(VB_NETWORK, QString("getHttp: grabbing: '%1'") |
---|
1984 | .arg(qurl.toString())); |
---|
1985 | |
---|
1986 | - if (httpGrabber != NULL) |
---|
1987 | - delete httpGrabber; |
---|
1988 | + delete httpGrabber; |
---|
1989 | |
---|
1990 | httpGrabber = new HttpComms; |
---|
1991 | |
---|
1992 | @@ -525,8 +522,7 @@ |
---|
1993 | |
---|
1994 | VERBOSE(VB_NETWORK, QString("postHttp: grabbing: %1").arg(url.toString())); |
---|
1995 | |
---|
1996 | - if (httpGrabber != NULL) |
---|
1997 | - delete httpGrabber; |
---|
1998 | + delete httpGrabber; |
---|
1999 | |
---|
2000 | httpGrabber = new HttpComms; |
---|
2001 | |
---|
2002 | Index: libs/libmyth/uilistbtntype.cpp |
---|
2003 | =================================================================== |
---|
2004 | --- libs/libmyth/uilistbtntype.cpp (revision 13705) |
---|
2005 | +++ libs/libmyth/uilistbtntype.cpp (working copy) |
---|
2006 | @@ -54,8 +54,7 @@ |
---|
2007 | |
---|
2008 | void UIListGenericTree::RemoveFromParent(void) |
---|
2009 | { |
---|
2010 | - if (m_physitem) |
---|
2011 | - delete m_physitem; |
---|
2012 | + delete m_physitem; |
---|
2013 | m_physitem = NULL; |
---|
2014 | |
---|
2015 | if (getParent()) |
---|
2016 | Index: libs/libmyth/xmlparse.cpp |
---|
2017 | =================================================================== |
---|
2018 | --- libs/libmyth/xmlparse.cpp (revision 13705) |
---|
2019 | +++ libs/libmyth/xmlparse.cpp (working copy) |
---|
2020 | @@ -21,8 +21,7 @@ |
---|
2021 | for (; i != allTypes->end(); i++) |
---|
2022 | { |
---|
2023 | LayerSet *type = (*i); |
---|
2024 | - if (type) |
---|
2025 | - delete type; |
---|
2026 | + delete type; |
---|
2027 | } |
---|
2028 | delete allTypes; |
---|
2029 | } |
---|
2030 | Index: libs/libmyth/uitypes.cpp |
---|
2031 | =================================================================== |
---|
2032 | --- libs/libmyth/uitypes.cpp (revision 13705) |
---|
2033 | +++ libs/libmyth/uitypes.cpp (working copy) |
---|
2034 | @@ -29,8 +29,7 @@ |
---|
2035 | for (; i != allTypes->end(); i++) |
---|
2036 | { |
---|
2037 | UIType *type = (*i); |
---|
2038 | - if (type) |
---|
2039 | - delete type; |
---|
2040 | + delete type; |
---|
2041 | } |
---|
2042 | delete allTypes; |
---|
2043 | } |
---|
2044 | @@ -1546,11 +1545,8 @@ |
---|
2045 | for (; i != imageList->end(); i++) |
---|
2046 | { |
---|
2047 | QPixmap *pixmap = (*i); |
---|
2048 | - if (pixmap) |
---|
2049 | - { |
---|
2050 | - delete pixmap; |
---|
2051 | - (*i) = NULL; |
---|
2052 | - } |
---|
2053 | + delete pixmap; |
---|
2054 | + (*i) = NULL; |
---|
2055 | } |
---|
2056 | } |
---|
2057 | } |
---|
2058 | @@ -1920,30 +1916,19 @@ |
---|
2059 | |
---|
2060 | UIImageGridType::~UIImageGridType(void) |
---|
2061 | { |
---|
2062 | - if (normalPixmap) |
---|
2063 | - delete normalPixmap; |
---|
2064 | - if (highlightedPixmap) |
---|
2065 | - delete highlightedPixmap; |
---|
2066 | - if (selectedPixmap) |
---|
2067 | - delete selectedPixmap; |
---|
2068 | - if (defaultPixmap) |
---|
2069 | - delete defaultPixmap; |
---|
2070 | + delete normalPixmap; |
---|
2071 | + delete highlightedPixmap; |
---|
2072 | + delete selectedPixmap; |
---|
2073 | + delete defaultPixmap; |
---|
2074 | |
---|
2075 | - if (checkNonPixmap) |
---|
2076 | - delete checkNonPixmap; |
---|
2077 | - if (checkHalfPixmap) |
---|
2078 | - delete checkHalfPixmap; |
---|
2079 | - if (checkFullPixmap) |
---|
2080 | - delete checkFullPixmap; |
---|
2081 | + delete checkNonPixmap; |
---|
2082 | + delete checkHalfPixmap; |
---|
2083 | + delete checkFullPixmap; |
---|
2084 | |
---|
2085 | - if (upArrowRegPixmap) |
---|
2086 | - delete upArrowRegPixmap; |
---|
2087 | - if (upArrowActPixmap) |
---|
2088 | - delete upArrowActPixmap; |
---|
2089 | - if (dnArrowRegPixmap) |
---|
2090 | - delete dnArrowRegPixmap; |
---|
2091 | - if (upArrowActPixmap) |
---|
2092 | - delete dnArrowActPixmap; |
---|
2093 | + delete upArrowRegPixmap; |
---|
2094 | + delete upArrowActPixmap; |
---|
2095 | + delete dnArrowRegPixmap; |
---|
2096 | + delete dnArrowActPixmap; |
---|
2097 | |
---|
2098 | delete allData; |
---|
2099 | } |
---|
2100 | @@ -2554,17 +2539,13 @@ |
---|
2101 | |
---|
2102 | UIRichTextType::~UIRichTextType() |
---|
2103 | { |
---|
2104 | - if (m_image) |
---|
2105 | - delete m_image; |
---|
2106 | + delete m_image; |
---|
2107 | |
---|
2108 | - if (m_background) |
---|
2109 | - delete m_background; |
---|
2110 | + delete m_background; |
---|
2111 | |
---|
2112 | - if (m_backgroundImage) |
---|
2113 | - delete m_backgroundImage; |
---|
2114 | + delete m_backgroundImage; |
---|
2115 | |
---|
2116 | - if (m_compBackground) |
---|
2117 | - delete m_compBackground; |
---|
2118 | + delete m_compBackground; |
---|
2119 | } |
---|
2120 | |
---|
2121 | void UIRichTextType::SetText(const QString &text) |
---|
2122 | @@ -2609,8 +2590,7 @@ |
---|
2123 | { |
---|
2124 | if (file != m_backgroundFile) |
---|
2125 | { |
---|
2126 | - if (m_backgroundImage) |
---|
2127 | - delete m_backgroundImage; |
---|
2128 | + delete m_backgroundImage; |
---|
2129 | |
---|
2130 | m_backgroundImage = gContext->LoadScaleImage(file, true); |
---|
2131 | m_backgroundFile = file; |
---|
2132 | @@ -2803,11 +2783,7 @@ |
---|
2133 | |
---|
2134 | UIRemoteEditType::~UIRemoteEditType() |
---|
2135 | { |
---|
2136 | - if (edit) |
---|
2137 | - { |
---|
2138 | - delete edit; |
---|
2139 | - edit = NULL; |
---|
2140 | - } |
---|
2141 | + delete edit; |
---|
2142 | } |
---|
2143 | |
---|
2144 | void UIRemoteEditType::setText(const QString text) |
---|
2145 | Index: libs/libmyth/mythcontext.cpp |
---|
2146 | =================================================================== |
---|
2147 | --- libs/libmyth/mythcontext.cpp (revision 13705) |
---|
2148 | +++ libs/libmyth/mythcontext.cpp (working copy) |
---|
2149 | @@ -284,7 +284,7 @@ |
---|
2150 | |
---|
2151 | DisplayRes *display_res; |
---|
2152 | |
---|
2153 | - QMutex *m_priv_mutex; |
---|
2154 | + QMutex m_priv_mutex; |
---|
2155 | queue<MythPrivRequest> m_priv_requests; |
---|
2156 | QWaitCondition m_priv_queued; |
---|
2157 | |
---|
2158 | @@ -321,7 +321,6 @@ |
---|
2159 | m_logenable(-1), m_logmaxcount(-1), m_logprintlevel(-1), |
---|
2160 | screensaverEnabled(false), |
---|
2161 | display_res(NULL), |
---|
2162 | - m_priv_mutex(new QMutex(true)), |
---|
2163 | useSettingsCache(false) |
---|
2164 | { |
---|
2165 | GetInstallPrefixPath( m_installprefix, m_installlibdir ); |
---|
2166 | @@ -454,18 +453,13 @@ |
---|
2167 | { |
---|
2168 | imageCache.clear(); |
---|
2169 | |
---|
2170 | - if (m_settings) |
---|
2171 | - delete m_settings; |
---|
2172 | - if (m_qtThemeSettings) |
---|
2173 | - delete m_qtThemeSettings; |
---|
2174 | + delete m_settings; |
---|
2175 | + delete m_qtThemeSettings; |
---|
2176 | if (serverSock) |
---|
2177 | serverSock->DownRef(); |
---|
2178 | if (eventSock) |
---|
2179 | eventSock->DownRef(); |
---|
2180 | - if (m_priv_mutex) |
---|
2181 | - delete m_priv_mutex; |
---|
2182 | - if (screensaver) |
---|
2183 | - delete screensaver; |
---|
2184 | + delete screensaver; |
---|
2185 | } |
---|
2186 | |
---|
2187 | // Apply any user overrides to the screen geometry |
---|
2188 | @@ -543,8 +537,7 @@ |
---|
2189 | { |
---|
2190 | if (reload) |
---|
2191 | { |
---|
2192 | - if (m_settings) |
---|
2193 | - delete m_settings; |
---|
2194 | + delete m_settings; |
---|
2195 | m_settings = new Settings; |
---|
2196 | } |
---|
2197 | |
---|
2198 | @@ -850,8 +843,7 @@ |
---|
2199 | |
---|
2200 | MythContext::~MythContext() |
---|
2201 | { |
---|
2202 | - if (d) |
---|
2203 | - delete d; |
---|
2204 | + delete d; |
---|
2205 | } |
---|
2206 | |
---|
2207 | bool MythContext::ConnectToMasterServer(bool blockingClient) |
---|
2208 | @@ -1250,8 +1242,7 @@ |
---|
2209 | d->GetScreenBounds(); |
---|
2210 | |
---|
2211 | |
---|
2212 | - if (d->m_qtThemeSettings) |
---|
2213 | - delete d->m_qtThemeSettings; |
---|
2214 | + delete d->m_qtThemeSettings; |
---|
2215 | |
---|
2216 | d->m_qtThemeSettings = new Settings; |
---|
2217 | |
---|
2218 | @@ -1282,8 +1273,7 @@ |
---|
2219 | d->m_qtThemeSettings->ReadSettings(themedir); |
---|
2220 | d->m_themeloaded = false; |
---|
2221 | |
---|
2222 | - if (d->m_backgroundimage) |
---|
2223 | - delete d->m_backgroundimage; |
---|
2224 | + delete d->m_backgroundimage; |
---|
2225 | d->m_backgroundimage = NULL; |
---|
2226 | |
---|
2227 | themename = GetSetting("MenuTheme"); |
---|
2228 | @@ -2175,8 +2165,7 @@ |
---|
2229 | |
---|
2230 | d->m_themeloaded = true; |
---|
2231 | |
---|
2232 | - if (bgpixmap) |
---|
2233 | - delete bgpixmap; |
---|
2234 | + delete bgpixmap; |
---|
2235 | } |
---|
2236 | |
---|
2237 | bool MythContext::FindThemeFile(QString &filename) |
---|
2238 | @@ -2874,24 +2863,22 @@ |
---|
2239 | |
---|
2240 | void MythContext::addPrivRequest(MythPrivRequest::Type t, void *data) |
---|
2241 | { |
---|
2242 | - QMutexLocker lockit(d->m_priv_mutex); |
---|
2243 | + QMutexLocker lockit(&d->m_priv_mutex); |
---|
2244 | d->m_priv_requests.push(MythPrivRequest(t, data)); |
---|
2245 | d->m_priv_queued.wakeAll(); |
---|
2246 | } |
---|
2247 | |
---|
2248 | void MythContext::waitPrivRequest() const |
---|
2249 | { |
---|
2250 | - while (true) |
---|
2251 | - { |
---|
2252 | - d->m_priv_queued.wait(); |
---|
2253 | - if (!d->m_priv_requests.empty()) |
---|
2254 | - return; |
---|
2255 | - } |
---|
2256 | + d->m_priv_mutex.lock(); |
---|
2257 | + while (d->m_priv_requests.empty()) |
---|
2258 | + d->m_priv_queued.wait(&d->m_priv_mutex); |
---|
2259 | + d->m_priv_mutex.unlock(); |
---|
2260 | } |
---|
2261 | |
---|
2262 | MythPrivRequest MythContext::popPrivRequest() |
---|
2263 | { |
---|
2264 | - QMutexLocker lockit(d->m_priv_mutex); |
---|
2265 | + QMutexLocker lockit(&d->m_priv_mutex); |
---|
2266 | MythPrivRequest ret_val(MythPrivRequest::PrivEnd, NULL); |
---|
2267 | if (!d->m_priv_requests.empty()) { |
---|
2268 | ret_val = d->m_priv_requests.front(); |
---|
2269 | Index: libs/libmyth/jsmenu.cpp |
---|
2270 | =================================================================== |
---|
2271 | --- libs/libmyth/jsmenu.cpp (revision 13705) |
---|
2272 | +++ libs/libmyth/jsmenu.cpp (working copy) |
---|
2273 | @@ -71,17 +71,9 @@ |
---|
2274 | fd = -1; |
---|
2275 | } |
---|
2276 | |
---|
2277 | - if (axes) |
---|
2278 | - { |
---|
2279 | - delete [] axes; |
---|
2280 | - axes = NULL; |
---|
2281 | - } |
---|
2282 | + delete [] axes; |
---|
2283 | |
---|
2284 | - if (buttons) |
---|
2285 | - { |
---|
2286 | - delete [] buttons; |
---|
2287 | - buttons = NULL; |
---|
2288 | - } |
---|
2289 | + delete [] buttons; |
---|
2290 | } |
---|
2291 | |
---|
2292 | /*---------------------------------------------------------------------------- |
---|
2293 | Index: libs/libmyth/audiooutputbase.cpp |
---|
2294 | =================================================================== |
---|
2295 | --- libs/libmyth/audiooutputbase.cpp (revision 13705) |
---|
2296 | +++ libs/libmyth/audiooutputbase.cpp (working copy) |
---|
2297 | @@ -267,11 +267,8 @@ |
---|
2298 | need_resampler = false; |
---|
2299 | |
---|
2300 | // close sound stretcher |
---|
2301 | - if (pSoundStretch) |
---|
2302 | - { |
---|
2303 | - delete pSoundStretch; |
---|
2304 | - pSoundStretch = NULL; |
---|
2305 | - } |
---|
2306 | + delete pSoundStretch; |
---|
2307 | + pSoundStretch = NULL; |
---|
2308 | |
---|
2309 | CloseDevice(); |
---|
2310 | |
---|
2311 | Index: libs/libmyth/mediamonitor-unix.cpp |
---|
2312 | =================================================================== |
---|
2313 | --- libs/libmyth/mediamonitor-unix.cpp (revision 13705) |
---|
2314 | +++ libs/libmyth/mediamonitor-unix.cpp (working copy) |
---|
2315 | @@ -567,8 +567,7 @@ |
---|
2316 | } |
---|
2317 | } |
---|
2318 | |
---|
2319 | - if (pDevice) |
---|
2320 | - delete pDevice; |
---|
2321 | + delete pDevice; |
---|
2322 | |
---|
2323 | return false; |
---|
2324 | } |
---|
2325 | Index: programs/mythfrontend/playbackbox.cpp |
---|
2326 | =================================================================== |
---|
2327 | --- programs/mythfrontend/playbackbox.cpp (revision 13705) |
---|
2328 | +++ programs/mythfrontend/playbackbox.cpp (working copy) |
---|
2329 | @@ -438,30 +438,18 @@ |
---|
2330 | freeSpaceTimer = NULL; |
---|
2331 | } |
---|
2332 | |
---|
2333 | - if (theme) |
---|
2334 | - { |
---|
2335 | - delete theme; |
---|
2336 | - theme = NULL; |
---|
2337 | - } |
---|
2338 | + delete theme; |
---|
2339 | + theme = NULL; |
---|
2340 | |
---|
2341 | - if (drawTransPixmap) |
---|
2342 | - { |
---|
2343 | - delete drawTransPixmap; |
---|
2344 | - drawTransPixmap = NULL; |
---|
2345 | - } |
---|
2346 | + delete drawTransPixmap; |
---|
2347 | + drawTransPixmap = NULL; |
---|
2348 | |
---|
2349 | - if (curitem) |
---|
2350 | - { |
---|
2351 | - delete curitem; |
---|
2352 | - curitem = NULL; |
---|
2353 | - } |
---|
2354 | + delete curitem; |
---|
2355 | + curitem = NULL; |
---|
2356 | + |
---|
2357 | + delete delitem; |
---|
2358 | + delitem = NULL; |
---|
2359 | |
---|
2360 | - if (delitem) |
---|
2361 | - { |
---|
2362 | - delete delitem; |
---|
2363 | - delitem = NULL; |
---|
2364 | - } |
---|
2365 | - |
---|
2366 | clearProgramCache(); |
---|
2367 | |
---|
2368 | // disconnect preview generators |
---|
2369 | @@ -475,11 +463,8 @@ |
---|
2370 | |
---|
2371 | // free preview pixmap after preview generators are |
---|
2372 | // no longer telling us about any new previews. |
---|
2373 | - if (previewPixmap) |
---|
2374 | - { |
---|
2375 | - delete previewPixmap; |
---|
2376 | - previewPixmap = NULL; |
---|
2377 | - } |
---|
2378 | + delete previewPixmap; |
---|
2379 | + previewPixmap = NULL; |
---|
2380 | } |
---|
2381 | |
---|
2382 | int PlaybackBox::exec(void) |
---|
2383 | @@ -628,8 +613,7 @@ |
---|
2384 | { |
---|
2385 | if (m_player) |
---|
2386 | { |
---|
2387 | - if (curitem) |
---|
2388 | - delete curitem; |
---|
2389 | + delete curitem; |
---|
2390 | curitem = NULL; |
---|
2391 | pbbIsVisibleCond.wakeAll(); |
---|
2392 | } |
---|
2393 | @@ -1159,11 +1143,8 @@ |
---|
2394 | |
---|
2395 | int progCount = plist->count(); |
---|
2396 | |
---|
2397 | - if (curitem) |
---|
2398 | - { |
---|
2399 | - delete curitem; |
---|
2400 | - curitem = NULL; |
---|
2401 | - } |
---|
2402 | + delete curitem; |
---|
2403 | + curitem = NULL; |
---|
2404 | |
---|
2405 | if (container && titleList.count() >= 1) |
---|
2406 | { |
---|
2407 | @@ -2450,8 +2431,7 @@ |
---|
2408 | { |
---|
2409 | previewVideoState = kStopping; |
---|
2410 | |
---|
2411 | - if (delitem) |
---|
2412 | - delete delitem; |
---|
2413 | + delete delitem; |
---|
2414 | |
---|
2415 | delitem = new ProgramInfo(*toDel); |
---|
2416 | showDeletePopup(delitem, DeleteRecording); |
---|
2417 | @@ -2461,8 +2441,7 @@ |
---|
2418 | { |
---|
2419 | killPlayer(); |
---|
2420 | |
---|
2421 | - if (delitem) |
---|
2422 | - delete delitem; |
---|
2423 | + delete delitem; |
---|
2424 | |
---|
2425 | delitem = new ProgramInfo(*toExp); |
---|
2426 | |
---|
2427 | @@ -3182,8 +3161,7 @@ |
---|
2428 | |
---|
2429 | cancelPopup(); |
---|
2430 | |
---|
2431 | - if (curitem) |
---|
2432 | - delete curitem; |
---|
2433 | + delete curitem; |
---|
2434 | |
---|
2435 | curitem = new ProgramInfo(*delitem); |
---|
2436 | |
---|
2437 | @@ -3819,8 +3797,7 @@ |
---|
2438 | |
---|
2439 | if (tmpItem) |
---|
2440 | { |
---|
2441 | - if (curitem) |
---|
2442 | - delete curitem; |
---|
2443 | + delete curitem; |
---|
2444 | |
---|
2445 | curitem = tmpItem; |
---|
2446 | |
---|
2447 | @@ -4093,11 +4070,8 @@ |
---|
2448 | previewLastModified == previewFilets && |
---|
2449 | titleList.count() > 1) |
---|
2450 | { |
---|
2451 | - if (previewPixmap) |
---|
2452 | - { |
---|
2453 | - delete previewPixmap; |
---|
2454 | - previewPixmap = NULL; |
---|
2455 | - } |
---|
2456 | + delete previewPixmap; |
---|
2457 | + previewPixmap = NULL; |
---|
2458 | |
---|
2459 | // ask for repaint |
---|
2460 | update(drawVideoBounds); |
---|
2461 | @@ -4191,11 +4165,8 @@ |
---|
2462 | |
---|
2463 | paintSkipUpdate = false; // repaint background next time around |
---|
2464 | |
---|
2465 | - if (previewPixmap) |
---|
2466 | - { |
---|
2467 | - delete previewPixmap; |
---|
2468 | - previewPixmap = NULL; |
---|
2469 | - } |
---|
2470 | + delete previewPixmap; |
---|
2471 | + previewPixmap = NULL; |
---|
2472 | |
---|
2473 | int screenheight = 0, screenwidth = 0; |
---|
2474 | float wmult = 0, hmult = 0; |
---|
2475 | @@ -4409,11 +4380,8 @@ |
---|
2476 | |
---|
2477 | setActiveWindow(); |
---|
2478 | |
---|
2479 | - if (delitem) |
---|
2480 | - { |
---|
2481 | - delete delitem; |
---|
2482 | - delitem = NULL; |
---|
2483 | - } |
---|
2484 | + delete delitem; |
---|
2485 | + delitem = NULL; |
---|
2486 | } |
---|
2487 | |
---|
2488 | void PlaybackBox::showViewChanger(void) |
---|
2489 | @@ -4757,11 +4725,8 @@ |
---|
2490 | { |
---|
2491 | // If delitem is not NULL, then the Recording Group changer will operate |
---|
2492 | // on just that recording, otherwise it operates on the items in theplaylist |
---|
2493 | - if (delitem) |
---|
2494 | - { |
---|
2495 | - delete delitem; |
---|
2496 | - delitem = NULL; |
---|
2497 | - } |
---|
2498 | + delete delitem; |
---|
2499 | + delitem = NULL; |
---|
2500 | |
---|
2501 | showRecGroupChanger(); |
---|
2502 | } |
---|
2503 | @@ -4859,11 +4824,8 @@ |
---|
2504 | { |
---|
2505 | // If delitem is not NULL, then the Playback Group changer will operate |
---|
2506 | // on just that recording, otherwise it operates on the items in theplaylist |
---|
2507 | - if (delitem) |
---|
2508 | - { |
---|
2509 | - delete delitem; |
---|
2510 | - delitem = NULL; |
---|
2511 | - } |
---|
2512 | + delete delitem; |
---|
2513 | + delitem = NULL; |
---|
2514 | |
---|
2515 | showPlayGroupChanger(); |
---|
2516 | } |
---|
2517 | Index: programs/mythfrontend/channelrecpriority.cpp |
---|
2518 | =================================================================== |
---|
2519 | --- programs/mythfrontend/channelrecpriority.cpp (revision 13705) |
---|
2520 | +++ programs/mythfrontend/channelrecpriority.cpp (working copy) |
---|
2521 | @@ -101,10 +101,8 @@ |
---|
2522 | gContext->removeListener(this); |
---|
2523 | gContext->removeCurrentLocation(); |
---|
2524 | delete theme; |
---|
2525 | - if (bgTransBackup) |
---|
2526 | - delete bgTransBackup; |
---|
2527 | - if (curitem) |
---|
2528 | - delete curitem; |
---|
2529 | + delete bgTransBackup; |
---|
2530 | + delete curitem; |
---|
2531 | } |
---|
2532 | |
---|
2533 | void ChannelRecPriority::keyPressEvent(QKeyEvent *e) |
---|
2534 | @@ -582,8 +580,7 @@ |
---|
2535 | |
---|
2536 | if (cnt == inList) |
---|
2537 | { |
---|
2538 | - if (curitem) |
---|
2539 | - delete curitem; |
---|
2540 | + delete curitem; |
---|
2541 | curitem = new ChannelInfo(*chanInfo); |
---|
2542 | ltype->SetItemCurrent(cnt); |
---|
2543 | } |
---|
2544 | Index: programs/mythfrontend/main.cpp |
---|
2545 | =================================================================== |
---|
2546 | --- programs/mythfrontend/main.cpp (revision 13705) |
---|
2547 | +++ programs/mythfrontend/main.cpp (working copy) |
---|
2548 | @@ -1263,8 +1263,7 @@ |
---|
2549 | pthread_join(priv_thread, &value); |
---|
2550 | } |
---|
2551 | |
---|
2552 | - if (networkControl) |
---|
2553 | - delete networkControl; |
---|
2554 | + delete networkControl; |
---|
2555 | |
---|
2556 | DestroyMythMainWindow(); |
---|
2557 | delete themeBase; |
---|
2558 | Index: programs/mythfrontend/programrecpriority.cpp |
---|
2559 | =================================================================== |
---|
2560 | --- programs/mythfrontend/programrecpriority.cpp (revision 13705) |
---|
2561 | +++ programs/mythfrontend/programrecpriority.cpp (working copy) |
---|
2562 | @@ -156,10 +156,8 @@ |
---|
2563 | gContext->removeListener(this); |
---|
2564 | gContext->removeCurrentLocation(); |
---|
2565 | delete theme; |
---|
2566 | - if (bgTransBackup) |
---|
2567 | - delete bgTransBackup; |
---|
2568 | - if (curitem) |
---|
2569 | - delete curitem; |
---|
2570 | + delete bgTransBackup; |
---|
2571 | + delete curitem; |
---|
2572 | } |
---|
2573 | |
---|
2574 | void ProgramRecPriority::keyPressEvent(QKeyEvent *e) |
---|
2575 | @@ -1316,8 +1314,7 @@ |
---|
2576 | |
---|
2577 | if (cnt == inList) |
---|
2578 | { |
---|
2579 | - if (curitem) |
---|
2580 | - delete curitem; |
---|
2581 | + delete curitem; |
---|
2582 | curitem = new ProgramRecPriorityInfo(*progInfo); |
---|
2583 | ltype->SetItemCurrent(cnt); |
---|
2584 | } |
---|
2585 | Index: programs/mythtranscode/transcode.cpp |
---|
2586 | =================================================================== |
---|
2587 | --- programs/mythtranscode/transcode.cpp (revision 13705) |
---|
2588 | +++ programs/mythtranscode/transcode.cpp (working copy) |
---|
2589 | @@ -240,16 +240,11 @@ |
---|
2590 | } |
---|
2591 | Transcode::~Transcode() |
---|
2592 | { |
---|
2593 | - if (nvr) |
---|
2594 | - delete nvr; |
---|
2595 | - if (nvp) |
---|
2596 | - delete nvp; |
---|
2597 | - if (inRingBuffer) |
---|
2598 | - delete inRingBuffer; |
---|
2599 | - if (outRingBuffer) |
---|
2600 | - delete outRingBuffer; |
---|
2601 | - if (fifow) |
---|
2602 | - delete fifow; |
---|
2603 | + delete nvr; |
---|
2604 | + delete nvp; |
---|
2605 | + delete inRingBuffer; |
---|
2606 | + delete outRingBuffer; |
---|
2607 | + delete fifow; |
---|
2608 | if (kfa_table) |
---|
2609 | { |
---|
2610 | while(! kfa_table->isEmpty()) |
---|
2611 | Index: programs/mythcommflag/TemplateFinder.cpp |
---|
2612 | =================================================================== |
---|
2613 | --- programs/mythcommflag/TemplateFinder.cpp (revision 13705) |
---|
2614 | +++ programs/mythcommflag/TemplateFinder.cpp (working copy) |
---|
2615 | @@ -764,8 +764,7 @@ |
---|
2616 | |
---|
2617 | TemplateFinder::~TemplateFinder(void) |
---|
2618 | { |
---|
2619 | - if (scores) |
---|
2620 | - delete []scores; |
---|
2621 | + delete []scores; |
---|
2622 | avpicture_free(&tmpl); |
---|
2623 | avpicture_free(&cropped); |
---|
2624 | } |
---|
2625 | Index: programs/mythcommflag/HistogramAnalyzer.cpp |
---|
2626 | =================================================================== |
---|
2627 | --- programs/mythcommflag/HistogramAnalyzer.cpp (revision 13705) |
---|
2628 | +++ programs/mythcommflag/HistogramAnalyzer.cpp (working copy) |
---|
2629 | @@ -171,26 +171,16 @@ |
---|
2630 | |
---|
2631 | HistogramAnalyzer::~HistogramAnalyzer(void) |
---|
2632 | { |
---|
2633 | - if (monochromatic) |
---|
2634 | - delete []monochromatic; |
---|
2635 | - if (mean) |
---|
2636 | - delete []mean; |
---|
2637 | - if (median) |
---|
2638 | - delete []median; |
---|
2639 | - if (stddev) |
---|
2640 | - delete []stddev; |
---|
2641 | - if (frow) |
---|
2642 | - delete []frow; |
---|
2643 | - if (fcol) |
---|
2644 | - delete []fcol; |
---|
2645 | - if (fwidth) |
---|
2646 | - delete []fwidth; |
---|
2647 | - if (fheight) |
---|
2648 | - delete []fheight; |
---|
2649 | - if (histogram) |
---|
2650 | - delete []histogram; |
---|
2651 | - if (buf) |
---|
2652 | - delete []buf; |
---|
2653 | + delete []monochromatic; |
---|
2654 | + delete []mean; |
---|
2655 | + delete []median; |
---|
2656 | + delete []stddev; |
---|
2657 | + delete []frow; |
---|
2658 | + delete []fcol; |
---|
2659 | + delete []fwidth; |
---|
2660 | + delete []fheight; |
---|
2661 | + delete []histogram; |
---|
2662 | + delete []buf; |
---|
2663 | } |
---|
2664 | |
---|
2665 | enum FrameAnalyzer::analyzeFrameResult |
---|
2666 | Index: programs/mythcommflag/ClassicLogoDetector.cpp |
---|
2667 | =================================================================== |
---|
2668 | --- programs/mythcommflag/ClassicLogoDetector.cpp (revision 13705) |
---|
2669 | +++ programs/mythcommflag/ClassicLogoDetector.cpp (working copy) |
---|
2670 | @@ -62,20 +62,13 @@ |
---|
2671 | ClassicLogoDetector::~ClassicLogoDetector() |
---|
2672 | { |
---|
2673 | commDetector = 0; |
---|
2674 | - if (edgeMask) |
---|
2675 | - delete [] edgeMask; |
---|
2676 | - if (logoFrame) |
---|
2677 | - delete [] logoFrame; |
---|
2678 | - if (logoMask) |
---|
2679 | - delete [] logoMask; |
---|
2680 | - if (logoCheckMask) |
---|
2681 | - delete [] logoCheckMask; |
---|
2682 | - if (logoMaxValues) |
---|
2683 | - delete [] logoMaxValues; |
---|
2684 | - if (logoMinValues) |
---|
2685 | - delete [] logoMinValues; |
---|
2686 | - if (tmpBuf) |
---|
2687 | - delete [] tmpBuf; |
---|
2688 | + delete [] edgeMask; |
---|
2689 | + delete [] logoFrame; |
---|
2690 | + delete [] logoMask; |
---|
2691 | + delete [] logoCheckMask; |
---|
2692 | + delete [] logoMaxValues; |
---|
2693 | + delete [] logoMinValues; |
---|
2694 | + delete [] tmpBuf; |
---|
2695 | } |
---|
2696 | |
---|
2697 | bool ClassicLogoDetector::searchForLogo(NuppelVideoPlayer* nvp) |
---|
2698 | Index: programs/mythcommflag/SceneChangeDetector.cpp |
---|
2699 | =================================================================== |
---|
2700 | --- programs/mythcommflag/SceneChangeDetector.cpp (revision 13705) |
---|
2701 | +++ programs/mythcommflag/SceneChangeDetector.cpp (working copy) |
---|
2702 | @@ -122,10 +122,8 @@ |
---|
2703 | |
---|
2704 | SceneChangeDetector::~SceneChangeDetector(void) |
---|
2705 | { |
---|
2706 | - if (scdata) |
---|
2707 | - delete []scdata; |
---|
2708 | - if (scdiff) |
---|
2709 | - delete []scdiff; |
---|
2710 | + delete []scdata; |
---|
2711 | + delete []scdiff; |
---|
2712 | } |
---|
2713 | |
---|
2714 | enum FrameAnalyzer::analyzeFrameResult |
---|
2715 | Index: programs/mythcommflag/TemplateMatcher.cpp |
---|
2716 | =================================================================== |
---|
2717 | --- programs/mythcommflag/TemplateMatcher.cpp (revision 13705) |
---|
2718 | +++ programs/mythcommflag/TemplateMatcher.cpp (working copy) |
---|
2719 | @@ -358,10 +358,8 @@ |
---|
2720 | |
---|
2721 | TemplateMatcher::~TemplateMatcher(void) |
---|
2722 | { |
---|
2723 | - if (matches) |
---|
2724 | - delete []matches; |
---|
2725 | - if (match) |
---|
2726 | - delete []match; |
---|
2727 | + delete []matches; |
---|
2728 | + delete []match; |
---|
2729 | avpicture_free(&cropped); |
---|
2730 | } |
---|
2731 | |
---|
2732 | Index: programs/mythcommflag/ClassicCommDetector.cpp |
---|
2733 | =================================================================== |
---|
2734 | --- programs/mythcommflag/ClassicCommDetector.cpp (revision 13705) |
---|
2735 | +++ programs/mythcommflag/ClassicCommDetector.cpp (working copy) |
---|
2736 | @@ -185,11 +185,8 @@ |
---|
2737 | |
---|
2738 | ClassicCommDetector::~ClassicCommDetector() |
---|
2739 | { |
---|
2740 | - if (sceneChangeDetector) |
---|
2741 | - delete sceneChangeDetector; |
---|
2742 | - |
---|
2743 | - if (logoDetector) |
---|
2744 | - delete logoDetector; |
---|
2745 | + delete sceneChangeDetector; |
---|
2746 | + delete logoDetector; |
---|
2747 | } |
---|
2748 | |
---|
2749 | bool ClassicCommDetector::go() |
---|
2750 | Index: programs/mythcommflag/CannyEdgeDetector.cpp |
---|
2751 | =================================================================== |
---|
2752 | --- programs/mythcommflag/CannyEdgeDetector.cpp (revision 13705) |
---|
2753 | +++ programs/mythcommflag/CannyEdgeDetector.cpp (working copy) |
---|
2754 | @@ -60,12 +60,9 @@ |
---|
2755 | avpicture_free(&convolved); |
---|
2756 | avpicture_free(&s2); |
---|
2757 | avpicture_free(&s1); |
---|
2758 | - if (sgmsorted) |
---|
2759 | - delete []sgmsorted; |
---|
2760 | - if (sgm) |
---|
2761 | - delete []sgm; |
---|
2762 | - if (mask) |
---|
2763 | - delete []mask; |
---|
2764 | + delete []sgmsorted; |
---|
2765 | + delete []sgm; |
---|
2766 | + delete []mask; |
---|
2767 | } |
---|
2768 | |
---|
2769 | int |
---|
2770 | Index: programs/mythbackend/mythxml.cpp |
---|
2771 | =================================================================== |
---|
2772 | --- programs/mythbackend/mythxml.cpp (revision 13705) |
---|
2773 | +++ programs/mythbackend/mythxml.cpp (working copy) |
---|
2774 | @@ -1081,8 +1081,7 @@ |
---|
2775 | |
---|
2776 | delete pImage; |
---|
2777 | |
---|
2778 | - if (pInfo) |
---|
2779 | - delete pInfo; |
---|
2780 | + delete pInfo; |
---|
2781 | |
---|
2782 | pRequest->m_eResponseType = ResponseTypeFile; |
---|
2783 | pRequest->m_nResponseStatus = 200; |
---|
2784 | Index: programs/mythbackend/mediaserver.cpp |
---|
2785 | =================================================================== |
---|
2786 | --- programs/mythbackend/mediaserver.cpp (revision 13705) |
---|
2787 | +++ programs/mythbackend/mediaserver.cpp (working copy) |
---|
2788 | @@ -180,8 +180,7 @@ |
---|
2789 | |
---|
2790 | // gContext->removeListener(this); |
---|
2791 | |
---|
2792 | - if (m_pHttpServer) |
---|
2793 | - delete m_pHttpServer; |
---|
2794 | + delete m_pHttpServer; |
---|
2795 | } |
---|
2796 | |
---|
2797 | ////////////////////////////////////////////////////////////////////////////// |
---|
2798 | Index: programs/mythbackend/main.cpp |
---|
2799 | =================================================================== |
---|
2800 | --- programs/mythbackend/main.cpp (revision 13705) |
---|
2801 | +++ programs/mythbackend/main.cpp (working copy) |
---|
2802 | @@ -201,11 +201,9 @@ |
---|
2803 | { |
---|
2804 | delete gContext; |
---|
2805 | |
---|
2806 | - if (sched) |
---|
2807 | - delete sched; |
---|
2808 | + delete sched; |
---|
2809 | |
---|
2810 | - if (g_pUPnp) |
---|
2811 | - delete g_pUPnp; |
---|
2812 | + delete g_pUPnp; |
---|
2813 | |
---|
2814 | if (pidfile != "") |
---|
2815 | unlink(pidfile.ascii()); |
---|
2816 | Index: programs/mythbackend/filetransfer.cpp |
---|
2817 | =================================================================== |
---|
2818 | --- programs/mythbackend/filetransfer.cpp (revision 13705) |
---|
2819 | +++ programs/mythbackend/filetransfer.cpp (working copy) |
---|
2820 | @@ -48,8 +48,7 @@ |
---|
2821 | { |
---|
2822 | Stop(); |
---|
2823 | |
---|
2824 | - if (rbuffer) |
---|
2825 | - delete rbuffer; |
---|
2826 | + delete rbuffer; |
---|
2827 | |
---|
2828 | readthreadLock.unlock(); |
---|
2829 | delete this; |
---|
2830 | Index: programs/mythbackend/mainserver.cpp |
---|
2831 | =================================================================== |
---|
2832 | --- programs/mythbackend/mainserver.cpp (revision 13705) |
---|
2833 | +++ programs/mythbackend/mainserver.cpp (working copy) |
---|
2834 | @@ -218,11 +218,8 @@ |
---|
2835 | MainServer::~MainServer() |
---|
2836 | { |
---|
2837 | delete mythserver; |
---|
2838 | - |
---|
2839 | - if (masterServerReconnect) |
---|
2840 | - delete masterServerReconnect; |
---|
2841 | - if (deferredDeleteTimer) |
---|
2842 | - delete deferredDeleteTimer; |
---|
2843 | + delete masterServerReconnect; |
---|
2844 | + delete deferredDeleteTimer; |
---|
2845 | } |
---|
2846 | |
---|
2847 | void MainServer::autoexpireUpdate(void) |
---|
2848 | Index: programs/mythbackend/autoexpire.cpp |
---|
2849 | =================================================================== |
---|
2850 | --- programs/mythbackend/autoexpire.cpp (revision 13705) |
---|
2851 | +++ programs/mythbackend/autoexpire.cpp (working copy) |
---|
2852 | @@ -781,8 +781,7 @@ |
---|
2853 | |
---|
2854 | expireList.pop_back(); |
---|
2855 | |
---|
2856 | - if (deleteProg) |
---|
2857 | - delete pginfo; |
---|
2858 | + delete pginfo; |
---|
2859 | } |
---|
2860 | } |
---|
2861 | |
---|
2862 | Index: programs/mythtv/main.cpp |
---|
2863 | =================================================================== |
---|
2864 | --- programs/mythtv/main.cpp (revision 13705) |
---|
2865 | +++ programs/mythtv/main.cpp (working copy) |
---|
2866 | @@ -290,8 +290,7 @@ |
---|
2867 | |
---|
2868 | TV::StartTV(pginfo, false); |
---|
2869 | |
---|
2870 | - if (pginfo) |
---|
2871 | - delete pginfo; |
---|
2872 | + delete pginfo; |
---|
2873 | |
---|
2874 | if (priv_thread != 0) |
---|
2875 | { |
---|
2876 | Index: programs/mythlcdserver/lcdprocclient.cpp |
---|
2877 | =================================================================== |
---|
2878 | --- programs/mythlcdserver/lcdprocclient.cpp (revision 13705) |
---|
2879 | +++ programs/mythlcdserver/lcdprocclient.cpp (working copy) |
---|
2880 | @@ -2251,8 +2251,7 @@ |
---|
2881 | lcd_ready = false; |
---|
2882 | } |
---|
2883 | |
---|
2884 | - if (lcdMenuItems) |
---|
2885 | - delete lcdMenuItems; |
---|
2886 | + delete lcdMenuItems; |
---|
2887 | |
---|
2888 | gContext->removeListener(this); |
---|
2889 | } |
---|
2890 | Index: programs/mythwelcome/welcomedialog.cpp |
---|
2891 | =================================================================== |
---|
2892 | --- programs/mythwelcome/welcomedialog.cpp (revision 13705) |
---|
2893 | +++ programs/mythwelcome/welcomedialog.cpp (working copy) |
---|
2894 | @@ -298,14 +298,11 @@ |
---|
2895 | { |
---|
2896 | gContext->removeListener(this); |
---|
2897 | |
---|
2898 | - if (m_updateStatusTimer) |
---|
2899 | - delete m_updateStatusTimer; |
---|
2900 | + delete m_updateStatusTimer; |
---|
2901 | |
---|
2902 | - if (m_updateScreenTimer) |
---|
2903 | - delete m_updateScreenTimer; |
---|
2904 | + delete m_updateScreenTimer; |
---|
2905 | |
---|
2906 | - if (m_timeTimer) |
---|
2907 | - delete m_timeTimer; |
---|
2908 | + delete m_timeTimer; |
---|
2909 | } |
---|
2910 | |
---|
2911 | void WelcomeDialog::updateTime(void) |
---|