← Back to branch summary

~phablet-team/ubuntu-settings-components/printer-components

~phablet-team/ubuntu-settings-components/printer-components

Viewing all changes in revision 230.

Committer: Jonas G. Drange
Date: 2017-02-17 14:11:44 UTC
mfrom: (229.1.24 asyncness)
Revision ID: jonas.drange@canonical.com-20170217141144-indo7rbx2cptcaeu

merges ~jonas-drange/ubuntu-settings-components/asyncness/

files added:
plugins/Ubuntu/Settings/Printers/cups/printerdriverloader.cpp

plugins/Ubuntu/Settings/Printers/cups/printerdriverloader.h

plugins/Ubuntu/Settings/Printers/cups/printerloader.cpp

plugins/Ubuntu/Settings/Printers/cups/printerloader.h

tests/unittests/Printers/tst_jobfilter.cpp

tests/unittests/Printers/tst_jobmodel.cpp

files removed:
plugins/Ubuntu/Settings/Printers/cups/cupsfacade.cpp

plugins/Ubuntu/Settings/Printers/cups/cupsfacade.h

files renamed:
plugins/Ubuntu/Settings/Printers/cups/cupspkhelper.cpp => plugins/Ubuntu/Settings/Printers/cups/ippclient.cpp

plugins/Ubuntu/Settings/Printers/cups/cupspkhelper.h => plugins/Ubuntu/Settings/Printers/cups/ippclient.h

files modified:
examples/Printers.qml

plugins/Ubuntu/Settings/Printers/CMakeLists.txt

plugins/Ubuntu/Settings/Printers/backend/backend.cpp

plugins/Ubuntu/Settings/Printers/backend/backend.h

plugins/Ubuntu/Settings/Printers/backend/backend_cups.cpp

plugins/Ubuntu/Settings/Printers/backend/backend_cups.h

plugins/Ubuntu/Settings/Printers/backend/backend_pdf.cpp

plugins/Ubuntu/Settings/Printers/backend/backend_pdf.h

plugins/Ubuntu/Settings/Printers/enums.h

plugins/Ubuntu/Settings/Printers/models/drivermodel.cpp

plugins/Ubuntu/Settings/Printers/models/drivermodel.h

plugins/Ubuntu/Settings/Printers/models/jobmodel.cpp

plugins/Ubuntu/Settings/Printers/models/jobmodel.h

plugins/Ubuntu/Settings/Printers/models/printermodel.cpp

plugins/Ubuntu/Settings/Printers/models/printermodel.h

plugins/Ubuntu/Settings/Printers/plugin.cpp

plugins/Ubuntu/Settings/Printers/printer/printer.cpp

plugins/Ubuntu/Settings/Printers/printer/printer.h

plugins/Ubuntu/Settings/Printers/printer/printerjob.cpp

plugins/Ubuntu/Settings/Printers/printer/printerjob.h

plugins/Ubuntu/Settings/Printers/printers/printers.cpp

plugins/Ubuntu/Settings/Printers/printers/printers.h

tests/unittests/Printers/CMakeLists.txt

tests/unittests/Printers/mockbackend.h

tests/unittests/Printers/tst_printer.cpp

tests/unittests/Printers/tst_printerfilter.cpp

tests/unittests/Printers/tst_printerjob.cpp

tests/unittests/Printers/tst_printermodel.cpp

tests/unittests/Printers/tst_printers.cpp

Show diffs side-by-side

added added

removed removed

examples/Printers.qml

plugins/Ubuntu/Settings/Printers/CMakeLists.txt

plugins/Ubuntu/Settings/Printers/backend/backend.cpp

plugins/Ubuntu/Settings/Printers/backend/backend.h

plugins/Ubuntu/Settings/Printers/backend/backend_cups.cpp

plugins/Ubuntu/Settings/Printers/backend/backend_cups.h

plugins/Ubuntu/Settings/Printers/backend/backend_pdf.cpp

plugins/Ubuntu/Settings/Printers/backend/backend_pdf.h

plugins/Ubuntu/Settings/Printers/cups/cupsfacade.cpp

plugins/Ubuntu/Settings/Printers/cups/cupsfacade.h

plugins/Ubuntu/Settings/Printers/cups/ippclient.cpp

plugins/Ubuntu/Settings/Printers/cups/ippclient.h

plugins/Ubuntu/Settings/Printers/cups/printerdriverloader.cpp

plugins/Ubuntu/Settings/Printers/cups/printerdriverloader.h

plugins/Ubuntu/Settings/Printers/cups/printerloader.cpp

plugins/Ubuntu/Settings/Printers/cups/printerloader.h

plugins/Ubuntu/Settings/Printers/enums.h

plugins/Ubuntu/Settings/Printers/models/drivermodel.cpp

plugins/Ubuntu/Settings/Printers/models/drivermodel.h

plugins/Ubuntu/Settings/Printers/models/jobmodel.cpp

plugins/Ubuntu/Settings/Printers/models/jobmodel.h

plugins/Ubuntu/Settings/Printers/models/printermodel.cpp

plugins/Ubuntu/Settings/Printers/models/printermodel.h

plugins/Ubuntu/Settings/Printers/plugin.cpp

plugins/Ubuntu/Settings/Printers/printer/printer.cpp

plugins/Ubuntu/Settings/Printers/printer/printer.h

plugins/Ubuntu/Settings/Printers/printer/printerjob.cpp

plugins/Ubuntu/Settings/Printers/printer/printerjob.h

plugins/Ubuntu/Settings/Printers/printers/printers.cpp

plugins/Ubuntu/Settings/Printers/printers/printers.h

tests/unittests/Printers/CMakeLists.txt

tests/unittests/Printers/mockbackend.h

tests/unittests/Printers/tst_jobfilter.cpp

tests/unittests/Printers/tst_jobmodel.cpp

tests/unittests/Printers/tst_printer.cpp

tests/unittests/Printers/tst_printerfilter.cpp

tests/unittests/Printers/tst_printerjob.cpp

tests/unittests/Printers/tst_printermodel.cpp

tests/unittests/Printers/tst_printers.cpp

Older »