Merge lp://qastaging/~ahayzen/ubuntu-settings-components/fix-compiler-warnings into lp://qastaging/~phablet-team/ubuntu-settings-components/printer-components
Proposed by
Andrew Hayzen
| Status: | Merged |
|---|---|
| Approved by: | Jonas G. Drange |
| Approved revision: | 228 |
| Merged at revision: | 228 |
| Proposed branch: | lp://qastaging/~ahayzen/ubuntu-settings-components/fix-compiler-warnings |
| Merge into: | lp://qastaging/~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://qastaging/~ahayzen/ubuntu-settings-components/fix-compiler-warnings |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Phablet Team | Pending | ||
|
Review via email:
|
|||
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
