Ubuntu Settings Components

Merge lp:~ahayzen/ubuntu-settings-components/fix-compiler-warnings into lp:~phablet-team/ubuntu-settings-components/printer-components

  1. fix-compiler-warnings
  2. Merge into printer-components
Proposed by Andrew Hayzen
Status: Merged
Approved by: Jonas G. Drange
Approved revision: 228
Merged at revision: 228
Proposed branch: lp:~ahayzen/ubuntu-settings-components/fix-compiler-warnings
Merge into: lp:~phablet-team/ubuntu-settings-components/printer-components
Diff against target: 697 lines (+164/-52)
9 files modified
plugins/Ubuntu/Settings/Printers/backend/backend.cpp (+54/-1)
plugins/Ubuntu/Settings/Printers/backend/backend_cups.cpp (+36/-18)
plugins/Ubuntu/Settings/Printers/backend/backend_pdf.cpp (+1/-1)
plugins/Ubuntu/Settings/Printers/cups/cupspkhelper.cpp (+2/-0)
plugins/Ubuntu/Settings/Printers/printer/printer.cpp (+26/-12)
plugins/Ubuntu/Settings/Printers/printer/printerjob.cpp (+1/-1)
plugins/Ubuntu/Settings/Printers/printers/printers.cpp (+17/-4)
plugins/Ubuntu/Settings/Printers/utils.h (+9/-6)
tests/unittests/Printers/mockbackend.h (+18/-9)
To merge this branch: bzr merge lp:~ahayzen/ubuntu-settings-components/fix-compiler-warnings
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team Pending
Review via email: mp+316457@code.launchpad.net

Commit message

* Resolve console warnings - add TODOs in methods that should be implemented where I've put a fake return value for now
* Set a default for switches that compiler thinks it can reach the end of the control without
* Add return values for methods that are not implemented yet
* Add Q_UNUSED for parameters that aren't used

Description of the change

* Resolve console warnings - add TODOs in methods that should be implemented where I've put a fake return value for now
* Set a default for switches that compiler thinks it can reach the end of the control without
* Add return values for methods that are not implemented yet
* Add Q_UNUSED for parameters that aren't used

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/Ubuntu/Settings/Printers/backend/backend.cpp'
2--- plugins/Ubuntu/Settings/Printers/backend/backend.cpp 2017-02-02 17:22:55 +0000
3+++ plugins/Ubuntu/Settings/Printers/backend/backend.cpp 2017-02-06 14:00:34 +0000
4@@ -42,6 +42,11 @@
5 const QString &info,
6 const QString &location)
7 {
8+ Q_UNUSED(name);
9+ Q_UNUSED(uri);
10+ Q_UNUSED(ppdFile);
11+ Q_UNUSED(info);
12+ Q_UNUSED(location);
13 return QString();
14 }
15
16@@ -51,17 +56,25 @@
17 const QString &info,
18 const QString &location)
19 {
20+ Q_UNUSED(name);
21+ Q_UNUSED(uri);
22+ Q_UNUSED(ppdFileName);
23+ Q_UNUSED(info);
24+ Q_UNUSED(location);
25 return QString();
26 }
27
28 QString PrinterBackend::printerDelete(const QString &name)
29 {
30+ Q_UNUSED(name);
31 return QString();
32 }
33
34 QString PrinterBackend::printerSetEnabled(const QString &name,
35 const bool enabled)
36 {
37+ Q_UNUSED(name);
38+ Q_UNUSED(enabled);
39 return QString();
40 }
41
42@@ -70,24 +83,33 @@
43 const bool enabled,
44 const QString &reason)
45 {
46+ Q_UNUSED(name);
47+ Q_UNUSED(enabled);
48+ Q_UNUSED(reason);
49 return QString();
50 }
51
52 QString PrinterBackend::printerSetInfo(const QString &name,
53 const QString &info)
54 {
55+ Q_UNUSED(name);
56+ Q_UNUSED(info);
57 return QString();
58 }
59
60 QString PrinterBackend::printerSetLocation(const QString &name,
61 const QString &location)
62 {
63+ Q_UNUSED(name);
64+ Q_UNUSED(location);
65 return QString();
66 }
67
68 QString PrinterBackend::printerSetShared(const QString &name,
69 const bool shared)
70 {
71+ Q_UNUSED(name);
72+ Q_UNUSED(shared);
73 return QString();
74 }
75
76@@ -95,12 +117,17 @@
77 const QString &start,
78 const QString &end)
79 {
80+ Q_UNUSED(name);
81+ Q_UNUSED(start);
82+ Q_UNUSED(end);
83 return QString();
84 }
85
86 QString PrinterBackend::printerSetErrorPolicy(const QString &name,
87 const PrinterEnum::ErrorPolicy &policy)
88 {
89+ Q_UNUSED(name);
90+ Q_UNUSED(policy);
91 return QString();
92 }
93
94@@ -108,18 +135,24 @@
95 QString PrinterBackend::printerSetOpPolicy(const QString &name,
96 const PrinterEnum::OperationPolicy &policy)
97 {
98+ Q_UNUSED(name);
99+ Q_UNUSED(policy);
100 return QString();
101 }
102
103 QString PrinterBackend::printerSetUsersAllowed(const QString &name,
104 const QStringList &users)
105 {
106+ Q_UNUSED(name);
107+ Q_UNUSED(users);
108 return QString();
109 }
110
111 QString PrinterBackend::printerSetUsersDenied(const QString &name,
112 const QStringList &users)
113 {
114+ Q_UNUSED(name);
115+ Q_UNUSED(users);
116 return QString();
117 }
118
119@@ -127,12 +160,17 @@
120 const QString &option,
121 const QStringList &values)
122 {
123+ Q_UNUSED(name);
124+ Q_UNUSED(option);
125+ Q_UNUSED(values);
126 return QString();
127 }
128
129 QString PrinterBackend::printerDeleteOptionDefault(const QString &name,
130 const QString &value)
131 {
132+ Q_UNUSED(name);
133+ Q_UNUSED(value);
134 return QString();
135 }
136
137@@ -140,12 +178,17 @@
138 const QString &option,
139 const QStringList &values)
140 {
141+ Q_UNUSED(name);
142+ Q_UNUSED(option);
143+ Q_UNUSED(values);
144 return QString();
145 }
146
147 QVariant PrinterBackend::printerGetOption(const QString &name,
148 const QString &option) const
149 {
150+ Q_UNUSED(name);
151+ Q_UNUSED(option);
152 return QVariant();
153 }
154
155@@ -153,6 +196,8 @@
156 const QString &name, const QStringList &options
157 )
158 {
159+ Q_UNUSED(name);
160+ Q_UNUSED(options);
161 return QMap<QString, QVariant>();
162 }
163
164@@ -160,12 +205,15 @@
165 cups_dest_t* PrinterBackend::makeDest(const QString &name,
166 const PrinterJob *options)
167 {
168+ Q_UNUSED(name);
169+ Q_UNUSED(options);
170 return Q_NULLPTR;
171 }
172
173 QList<ColorModel> PrinterBackend::printerGetSupportedColorModels(
174 const QString &name) const
175 {
176+ Q_UNUSED(name);
177 return QList<ColorModel>();
178 }
179
180@@ -179,6 +227,7 @@
181 QList<PrintQuality> PrinterBackend::printerGetSupportedQualities(
182 const QString &name) const
183 {
184+ Q_UNUSED(name);
185 return QList<PrintQuality>();
186 }
187
188@@ -199,6 +248,9 @@
189 const QString &title,
190 const cups_dest_t *dest)
191 {
192+ Q_UNUSED(filepath);
193+ Q_UNUSED(title);
194+ Q_UNUSED(dest);
195 return -1;
196 }
197
198@@ -241,7 +293,7 @@
199
200 QPageSize PrinterBackend::defaultPageSize() const
201 {
202-
203+ return QPageSize();
204 }
205
206 bool PrinterBackend::supportsCustomPageSizes() const
207@@ -286,6 +338,7 @@
208
209 Printer* PrinterBackend::getPrinter(const QString &printerName)
210 {
211+ Q_UNUSED(printerName);
212 return Q_NULLPTR;
213 }
214
215
216=== modified file 'plugins/Ubuntu/Settings/Printers/backend/backend_cups.cpp'
217--- plugins/Ubuntu/Settings/Printers/backend/backend_cups.cpp 2017-02-03 16:34:49 +0000
218+++ plugins/Ubuntu/Settings/Printers/backend/backend_cups.cpp 2017-02-06 14:00:34 +0000
219@@ -120,13 +120,18 @@
220
221 QString PrinterCupsBackend::printerDelete(const QString &name)
222 {
223-
224+ // TODO: implement
225+ Q_UNUSED(name);
226+ return QString();
227 }
228
229 QString PrinterCupsBackend::printerSetEnabled(const QString &name,
230 const bool enabled)
231 {
232-
233+ // TODO: implement
234+ Q_UNUSED(name);
235+ Q_UNUSED(enabled);
236+ return QString();
237 }
238
239 QString PrinterCupsBackend::printerSetAcceptJobs(
240@@ -134,7 +139,11 @@
241 const bool enabled,
242 const QString &reason)
243 {
244-
245+ // TODO: implement
246+ Q_UNUSED(name);
247+ Q_UNUSED(enabled);
248+ Q_UNUSED(reason);
249+ return QString();
250 }
251
252 QString PrinterCupsBackend::printerSetInfo(const QString &name,
253@@ -292,25 +301,28 @@
254
255 QString PrinterCupsBackend::location() const
256 {
257-
258+ // TODO: implement
259+ return QString();
260 }
261
262 QString PrinterCupsBackend::makeAndModel() const
263 {
264-
265+ // TODO: implement
266+ return QString();
267 }
268
269 PrinterEnum::State PrinterCupsBackend::state() const
270 {
271 switch (m_info.state()) {
272- case QPrinter::Idle:
273- return PrinterEnum::State::IdleState;
274- case QPrinter::Active:
275- return PrinterEnum::State::ActiveState;
276- case QPrinter::Aborted:
277- return PrinterEnum::State::AbortedState;
278- case QPrinter::Error:
279- return PrinterEnum::State::ErrorState;
280+ case QPrinter::Active:
281+ return PrinterEnum::State::ActiveState;
282+ case QPrinter::Aborted:
283+ return PrinterEnum::State::AbortedState;
284+ case QPrinter::Error:
285+ return PrinterEnum::State::ErrorState;
286+ case QPrinter::Idle:
287+ default:
288+ return PrinterEnum::State::IdleState;
289 }
290 }
291
292@@ -326,22 +338,26 @@
293
294 bool PrinterCupsBackend::supportsCustomPageSizes() const
295 {
296-
297+ // TODO: implement
298+ return false;
299 }
300
301 QPageSize PrinterCupsBackend::minimumPhysicalPageSize() const
302 {
303-
304+ // TODO: implement
305+ return QPageSize();
306 }
307
308 QPageSize PrinterCupsBackend::maximumPhysicalPageSize() const
309 {
310-
311+ // TODO: implement
312+ return QPageSize();
313 }
314
315 QList<int> PrinterCupsBackend::supportedResolutions() const
316 {
317-
318+ // TODO: implement
319+ return QList<int>{};
320 }
321
322 PrinterEnum::DuplexMode PrinterCupsBackend::defaultDuplexMode() const
323@@ -388,7 +404,9 @@
324
325 Printer* PrinterCupsBackend::getPrinter(const QString &printerName)
326 {
327-
328+ // TODO: implement
329+ Q_UNUSED(printerName);
330+ return Q_NULLPTR;
331 }
332
333 QString PrinterCupsBackend::defaultPrinterName()
334
335=== modified file 'plugins/Ubuntu/Settings/Printers/backend/backend_pdf.cpp'
336--- plugins/Ubuntu/Settings/Printers/backend/backend_pdf.cpp 2017-01-24 12:34:23 +0000
337+++ plugins/Ubuntu/Settings/Printers/backend/backend_pdf.cpp 2017-02-06 14:00:34 +0000
338@@ -108,7 +108,7 @@
339
340 QList<int> PrinterPdfBackend::supportedResolutions() const
341 {
342-
343+ return QList<int>{};
344 }
345
346 PrinterEnum::DuplexMode PrinterPdfBackend::defaultDuplexMode() const
347
348=== modified file 'plugins/Ubuntu/Settings/Printers/cups/cupspkhelper.cpp'
349--- plugins/Ubuntu/Settings/Printers/cups/cupspkhelper.cpp 2017-02-02 22:52:19 +0000
350+++ plugins/Ubuntu/Settings/Printers/cups/cupspkhelper.cpp 2017-02-06 14:00:34 +0000
351@@ -680,6 +680,8 @@
352 ppd_file_t* CupsPkHelper::getPpdFile(const QString &name,
353 const QString &instance) const
354 {
355+ Q_UNUSED(instance);
356+
357 ppd_file_t* file = 0;
358 const char *ppdFile = cupsGetPPD(name.toUtf8());
359 if (ppdFile) {
360
361=== modified file 'plugins/Ubuntu/Settings/Printers/printer/printer.cpp'
362--- plugins/Ubuntu/Settings/Printers/printer/printer.cpp 2017-02-03 16:34:49 +0000
363+++ plugins/Ubuntu/Settings/Printers/printer/printer.cpp 2017-02-06 14:00:34 +0000
364@@ -133,22 +133,26 @@
365
366 PrinterEnum::AccessControl Printer::accessControl() const
367 {
368-
369+ // TODO: implement
370+ return PrinterEnum::AccessControl::AccessAllow;
371 }
372
373 PrinterEnum::ErrorPolicy Printer::errorPolicy() const
374 {
375-
376+ // TODO: implement
377+ return PrinterEnum::ErrorPolicy::RetryOnError;
378 }
379
380 bool Printer::enabled() const
381 {
382-
383+ // TODO: implement
384+ return true;
385 }
386
387 QStringList Printer::users() const
388 {
389-
390+ // TODO: implement
391+ return QStringList();
392 }
393
394 PrinterEnum::State Printer::state() const
395@@ -158,7 +162,8 @@
396
397 QString Printer::lastStateMessage() const
398 {
399-
400+ // TODO: implement
401+ return QString();
402 }
403
404 bool Printer::isDefault()
405@@ -189,7 +194,8 @@
406
407 void Printer::setAccessControl(const PrinterEnum::AccessControl &accessControl)
408 {
409-
410+ // TODO: implement
411+ Q_UNUSED(accessControl);
412 }
413
414 void Printer::setDescription(const QString &description)
415@@ -214,17 +220,20 @@
416
417 void Printer::setEnabled(const bool enabled)
418 {
419-
420+ // TODO: implement
421+ Q_UNUSED(enabled);
422 }
423
424 void Printer::setErrorPolicy(const PrinterEnum::ErrorPolicy &errorPolicy)
425 {
426-
427+ // TODO: implement
428+ Q_UNUSED(errorPolicy);
429 }
430
431 void Printer::setName(const QString &name)
432 {
433-
434+ // TODO: implement
435+ Q_UNUSED(name);
436 }
437
438 void Printer::setDefaultPrintQuality(const PrintQuality &quality)
439@@ -267,17 +276,20 @@
440
441 void Printer::addUser(const QString &username)
442 {
443-
444+ // TODO: implement
445+ Q_UNUSED(username);
446 }
447
448 void Printer::removeUser(const QString &username)
449 {
450-
451+ // TODO: implement
452+ Q_UNUSED(username);
453 }
454
455 void Printer::requestInkLevels(const QString &name)
456 {
457-
458+ // TODO: implement
459+ Q_UNUSED(name);
460 }
461
462 bool Printer::deepCompare(Printer *other) const
463@@ -301,6 +313,8 @@
464
465 void Printer::updateFrom(Printer* newPrinter)
466 {
467+ Q_UNUSED(newPrinter);
468+
469 m_backend->refresh();
470
471 loadColorModel();
472
473=== modified file 'plugins/Ubuntu/Settings/Printers/printer/printerjob.cpp'
474--- plugins/Ubuntu/Settings/Printers/printer/printerjob.cpp 2017-02-03 16:34:49 +0000
475+++ plugins/Ubuntu/Settings/Printers/printer/printerjob.cpp 2017-02-06 14:00:34 +0000
476@@ -46,8 +46,8 @@
477 , m_print_range(QStringLiteral(""))
478 , m_print_range_mode(PrinterEnum::PrintRange::AllPages)
479 , m_quality(0)
480+ , m_reverse(false)
481 , m_state(PrinterEnum::JobState::Pending)
482- , m_reverse(false)
483 , m_title(QStringLiteral(""))
484 {
485 if (m_printer) {
486
487=== modified file 'plugins/Ubuntu/Settings/Printers/printers/printers.cpp'
488--- plugins/Ubuntu/Settings/Printers/printers/printers.cpp 2017-02-03 12:04:46 +0000
489+++ plugins/Ubuntu/Settings/Printers/printers/printers.cpp 2017-02-06 14:00:34 +0000
490@@ -69,12 +69,14 @@
491
492 QAbstractItemModel* Printers::recentPrinters()
493 {
494-
495+ // TODO: implement
496+ return Q_NULLPTR;
497 }
498
499 QAbstractItemModel* Printers::printJobs()
500 {
501-
502+ // TODO: implement
503+ return Q_NULLPTR;
504 }
505
506 QAbstractItemModel* Printers::drivers()
507@@ -96,7 +98,8 @@
508
509 QString Printers::defaultPrinterName() const
510 {
511-
512+ // TODO: implement
513+ return QString();
514 }
515
516 QString Printers::lastMessage() const
517@@ -111,16 +114,23 @@
518
519 void Printers::setDefaultPrinterName(const QString &name)
520 {
521-
522+ // TODO: implement
523+ Q_UNUSED(name);
524 }
525
526 QSharedPointer<Printer> Printers::getPrinterByName(const QString &name)
527 {
528+ // TODO: implement
529+ Q_UNUSED(name);
530
531+ return QSharedPointer<Printer>(Q_NULLPTR);
532 }
533 QSharedPointer<Printer> Printers::getJobOwner(const int &jobId)
534 {
535+ // TODO: implement
536+ Q_UNUSED(jobId);
537
538+ return QSharedPointer<Printer>(Q_NULLPTR);
539 }
540
541 void Printers::prepareToAddPrinter()
542@@ -158,5 +168,8 @@
543
544 bool Printers::removePrinter(const QString &name)
545 {
546+ // TODO: implement
547+ Q_UNUSED(name);
548
549+ return true;
550 }
551
552=== modified file 'plugins/Ubuntu/Settings/Printers/utils.h'
553--- plugins/Ubuntu/Settings/Printers/utils.h 2017-01-24 12:34:23 +0000
554+++ plugins/Ubuntu/Settings/Printers/utils.h 2017-02-06 14:00:34 +0000
555@@ -42,37 +42,40 @@
556 static const QString duplexModeToPpdChoice(const PrinterEnum::DuplexMode &mode)
557 {
558 switch (mode) {
559- case PrinterEnum::DuplexMode::DuplexNone:
560- return "None";
561 case PrinterEnum::DuplexMode::DuplexShortSide:
562 return "DuplexTumble";
563 case PrinterEnum::DuplexMode::DuplexLongSide:
564 return "DuplexNoTumble";
565+ case PrinterEnum::DuplexMode::DuplexNone:
566+ default:
567+ return "None";
568 }
569 }
570
571 static const QString duplexModeToUIString(const PrinterEnum::DuplexMode &mode)
572 {
573 switch (mode) {
574- case PrinterEnum::DuplexMode::DuplexNone:
575- return __("One Sided");
576 case PrinterEnum::DuplexMode::DuplexShortSide:
577 return __("Short Edge (Flip)");
578 case PrinterEnum::DuplexMode::DuplexLongSide:
579 return __("Long Edge (Standard)");
580+ case PrinterEnum::DuplexMode::DuplexNone:
581+ default:
582+ return __("One Sided");
583 }
584 }
585
586 static PrinterEnum::DuplexMode qDuplexModeToDuplexMode(const QPrinter::DuplexMode &mode)
587 {
588 switch(mode) {
589- case QPrinter::DuplexNone:
590- return PrinterEnum::DuplexMode::DuplexNone;
591 case QPrinter::DuplexAuto:
592 case QPrinter::DuplexLongSide:
593 return PrinterEnum::DuplexMode::DuplexLongSide;
594 case QPrinter::DuplexShortSide:
595 return PrinterEnum::DuplexMode::DuplexShortSide;
596+ case QPrinter::DuplexNone:
597+ default:
598+ return PrinterEnum::DuplexMode::DuplexNone;
599 }
600 }
601
602
603=== modified file 'tests/unittests/Printers/mockbackend.h'
604--- tests/unittests/Printers/mockbackend.h 2017-02-03 12:25:57 +0000
605+++ tests/unittests/Printers/mockbackend.h 2017-02-06 14:00:34 +0000
606@@ -31,7 +31,7 @@
607
608 virtual bool holdsDefinition() const override
609 {
610-
611+ return true;
612 }
613
614 virtual QString printerAdd(const QString &name,
615@@ -81,6 +81,8 @@
616 const QString &reason = QString::null) override
617 {
618 Q_UNUSED(name);
619+ Q_UNUSED(enabled);
620+ Q_UNUSED(reason);
621 return returnValue;
622 }
623
624@@ -194,7 +196,9 @@
625 virtual cups_dest_t* makeDest(const QString &name,
626 const PrinterJob *options) override
627 {
628-
629+ Q_UNUSED(name);
630+ Q_UNUSED(options);
631+ return Q_NULLPTR;
632 }
633
634
635@@ -212,18 +216,23 @@
636
637 virtual void cancelJob(const QString &name, const int jobId) override
638 {
639-
640+ Q_UNUSED(name);
641+ Q_UNUSED(jobId);
642 }
643
644 virtual int printFileToDest(const QString &filepath,
645 const QString &title,
646 const cups_dest_t *dest) override
647 {
648-
649+ Q_UNUSED(filepath);
650+ Q_UNUSED(title);
651+ Q_UNUSED(dest);
652+ return -1;
653 }
654
655 virtual QList<QSharedPointer<PrinterJob>> printerGetJobs(const QString &name) override
656 {
657+ Q_UNUSED(name);
658 return QList<QSharedPointer<PrinterJob>>();
659 }
660
661@@ -264,23 +273,23 @@
662
663 virtual bool supportsCustomPageSizes() const override
664 {
665-
666+ return false;
667 }
668
669
670 virtual QPageSize minimumPhysicalPageSize() const override
671 {
672-
673+ return QPageSize();
674 }
675
676 virtual QPageSize maximumPhysicalPageSize() const override
677 {
678-
679+ return QPageSize();
680 }
681
682 virtual QList<int> supportedResolutions() const override
683 {
684-
685+ return QList<int>{};
686 }
687
688 virtual PrinterEnum::DuplexMode defaultDuplexMode() const override
689@@ -403,7 +412,7 @@
690 QList<Printer*> m_availablePrinters;
691 PrinterBackend::BackendType m_backendType;
692
693-public Q_SLOT:
694+public Q_SLOTS:
695 virtual void refresh() override
696 {
697 }

Subscribers

People subscribed via source and target branches