Merge lp:~jonas-drange/ubuntu-ui-extras/clean-up-for-review into lp:~phablet-team/ubuntu-ui-extras/printer-components

[Jonas G. Drange]

drops a lot of code that was not used, and some TODOS/FIXMES that aren't necessary

drops a lot of code that was not used, and some TODOS/FIXMES that aren't necessary

[Andrew Hayzen (ahayzen)]

LGTM, tests still pass

100% tests passed, 0 tests failed out of 15

Total Test time (real) = 27.88 sec

Also the examples and ubuntu-printing-app still work :-)

review: Approve

=== modified file 'modules/Ubuntu/Components/Extras/Printers/backend/backend.cpp'
--- modules/Ubuntu/Components/Extras/Printers/backend/backend.cpp	2017-02-21 10:46:29 +0000
+++ modules/Ubuntu/Components/Extras/Printers/backend/backend.cpp	2017-02-23 14:15:28 +0000
@@ -99,83 +99,6 @@
     return QString();
 }
 
-QString PrinterBackend::printerSetLocation(const QString &name,
-                                           const QString &location)
-{
-    Q_UNUSED(name);
-    Q_UNUSED(location);
-    return QString();
-}
-
-QString PrinterBackend::printerSetShared(const QString &name,
-                                         const bool shared)
-{
-    Q_UNUSED(name);
-    Q_UNUSED(shared);
-    return QString();
-}
-
-QString PrinterBackend::printerSetJobSheets(const QString &name,
-                                            const QString &start,
-                                            const QString &end)
-{
-    Q_UNUSED(name);
-    Q_UNUSED(start);
-    Q_UNUSED(end);
-    return QString();
-}
-
-QString PrinterBackend::printerSetErrorPolicy(const QString &name,
-                                              const PrinterEnum::ErrorPolicy &policy)
-{
-    Q_UNUSED(name);
-    Q_UNUSED(policy);
-    return QString();
-}
-
-
-QString PrinterBackend::printerSetOpPolicy(const QString &name,
-                                           const PrinterEnum::OperationPolicy &policy)
-{
-    Q_UNUSED(name);
-    Q_UNUSED(policy);
-    return QString();
-}
-
-QString PrinterBackend::printerSetUsersAllowed(const QString &name,
-                                               const QStringList &users)
-{
-    Q_UNUSED(name);
-    Q_UNUSED(users);
-    return QString();
-}
-
-QString PrinterBackend::printerSetUsersDenied(const QString &name,
-                                              const QStringList &users)
-{
-    Q_UNUSED(name);
-    Q_UNUSED(users);
-    return QString();
-}
-
-QString PrinterBackend::printerAddOptionDefault(const QString &name,
-                                                const QString &option,
-                                                const QStringList &values)
-{
-    Q_UNUSED(name);
-    Q_UNUSED(option);
-    Q_UNUSED(values);
-    return QString();
-}
-
-QString PrinterBackend::printerDeleteOptionDefault(const QString &name,
-                                                   const QString &value)
-{
-    Q_UNUSED(name);
-    Q_UNUSED(value);
-    return QString();
-}
-
 QString PrinterBackend::printerAddOption(const QString &name,
                                          const QString &option,
                                          const QStringList &values)
@@ -202,7 +125,6 @@
     return QMap<QString, QVariant>();
 }
 
-// FIXME: maybe have a PrinterDest iface that has a CupsDest impl?
 cups_dest_t* PrinterBackend::makeDest(const QString &name,
                               const PrinterJob *options)
 {

=== modified file 'modules/Ubuntu/Components/Extras/Printers/backend/backend.h'
--- modules/Ubuntu/Components/Extras/Printers/backend/backend.h	2017-02-21 10:46:29 +0000
+++ modules/Ubuntu/Components/Extras/Printers/backend/backend.h	2017-02-23 14:15:28 +0000
@@ -65,27 +65,6 @@
         const QString &reason = QString::null);
     virtual QString printerSetInfo(const QString &name,
                                    const QString &info);
-    virtual QString printerSetLocation(const QString &name,
-                                       const QString &location);
-    virtual QString printerSetShared(const QString &name,
-                                     const bool shared);
-    virtual QString printerSetJobSheets(const QString &name,
-                                        const QString &start,
-                                        const QString &end);
-    virtual QString printerSetErrorPolicy(const QString &name,
-                                          const PrinterEnum::ErrorPolicy &policy);
-
-    virtual QString printerSetOpPolicy(const QString &name,
-                                       const PrinterEnum::OperationPolicy &policy);
-    virtual QString printerSetUsersAllowed(const QString &name,
-                                           const QStringList &users);
-    virtual QString printerSetUsersDenied(const QString &name,
-                                          const QStringList &users);
-    virtual QString printerAddOptionDefault(const QString &name,
-                                            const QString &option,
-                                            const QStringList &values);
-    virtual QString printerDeleteOptionDefault(const QString &name,
-                                               const QString &value);
     virtual QString printerAddOption(const QString &name,
                                      const QString &option,
                                      const QStringList &values);
@@ -94,7 +73,6 @@
                                       const QString &option) const;
     virtual QMap<QString, QVariant> printerGetOptions(
         const QString &name, const QStringList &options) const;
-    // FIXME: maybe have a PrinterDest iface that has a CupsDest impl?
     virtual cups_dest_t* makeDest(const QString &name,
                                   const PrinterJob *options);
 

=== modified file 'modules/Ubuntu/Components/Extras/Printers/backend/backend_cups.cpp'
--- modules/Ubuntu/Components/Extras/Printers/backend/backend_cups.cpp	2017-02-21 10:46:29 +0000
+++ modules/Ubuntu/Components/Extras/Printers/backend/backend_cups.cpp	2017-02-23 14:15:28 +0000
@@ -187,82 +187,6 @@
     return QString();
 }
 
-QString PrinterCupsBackend::printerSetLocation(const QString &name,
-                                               const QString &location)
-{
-    Q_UNUSED(name);
-    Q_UNUSED(location);
-    return QString();
-}
-
-QString PrinterCupsBackend::printerSetShared(const QString &name,
-                                             const bool shared)
-{
-    Q_UNUSED(name);
-    Q_UNUSED(shared);
-    return QString();
-}
-
-QString PrinterCupsBackend::printerSetJobSheets(const QString &name,
-                                                const QString &start,
-                                                const QString &end)
-{
-    Q_UNUSED(name);
-    Q_UNUSED(start);
-    Q_UNUSED(end);
-    return QString();
-}
-
-QString PrinterCupsBackend::printerSetErrorPolicy(const QString &name,
-                                                  const PrinterEnum::ErrorPolicy &policy)
-{
-    Q_UNUSED(name);
-    Q_UNUSED(policy);
-    return QString();
-}
-
-QString PrinterCupsBackend::printerSetOpPolicy(const QString &name,
-                                               const PrinterEnum::OperationPolicy &policy)
-{
-    Q_UNUSED(name);
-    Q_UNUSED(policy);
-    return QString();
-}
-
-QString PrinterCupsBackend::printerSetUsersAllowed(const QString &name,
-                                                   const QStringList &users)
-{
-    Q_UNUSED(name);
-    Q_UNUSED(users);
-    return QString();
-}
-
-QString PrinterCupsBackend::printerSetUsersDenied(const QString &name,
-                                                  const QStringList &users)
-{
-    Q_UNUSED(name);
-    Q_UNUSED(users);
-    return QString();
-}
-
-QString PrinterCupsBackend::printerAddOptionDefault(const QString &name,
-                                                    const QString &option,
-                                                    const QStringList &values)
-{
-    Q_UNUSED(name);
-    Q_UNUSED(option);
-    Q_UNUSED(values);
-    return QString();
-}
-
-QString PrinterCupsBackend::printerDeleteOptionDefault(const QString &name,
-                                                       const QString &value)
-{
-    Q_UNUSED(name);
-    Q_UNUSED(value);
-    return QString();
-}
-
 QString PrinterCupsBackend::printerAddOption(const QString &name,
                                              const QString &option,
                                              const QStringList &values)
@@ -371,11 +295,9 @@
     return ret;
 }
 
-// FIXME: maybe have a PrinterDest iface that has a CupsDest impl?
 cups_dest_t* PrinterCupsBackend::makeDest(const QString &name,
                                           const PrinterJob *options)
 {
-    // Get the cups dest
     cups_dest_t *dest = getDest(name);
 
     if (options->collate()) {

=== modified file 'modules/Ubuntu/Components/Extras/Printers/backend/backend_cups.h'
--- modules/Ubuntu/Components/Extras/Printers/backend/backend_cups.h	2017-02-21 10:46:29 +0000
+++ modules/Ubuntu/Components/Extras/Printers/backend/backend_cups.h	2017-02-23 14:15:28 +0000
@@ -56,27 +56,6 @@
         const QString &reason = QString::null) override;
     virtual QString printerSetInfo(const QString &name,
                                    const QString &info) override;
-    virtual QString printerSetLocation(const QString &name,
-                                       const QString &location) override;
-    virtual QString printerSetShared(const QString &name,
-                                     const bool shared) override;
-    virtual QString printerSetJobSheets(const QString &name,
-                                        const QString &start,
-                                        const QString &end) override;
-    virtual QString printerSetErrorPolicy(const QString &name,
-                                          const PrinterEnum::ErrorPolicy &policy) override;
-
-    virtual QString printerSetOpPolicy(const QString &name,
-                                       const PrinterEnum::OperationPolicy &policy) override;
-    virtual QString printerSetUsersAllowed(const QString &name,
-                                           const QStringList &users) override;
-    virtual QString printerSetUsersDenied(const QString &name,
-                                          const QStringList &users) override;
-    virtual QString printerAddOptionDefault(const QString &name,
-                                            const QString &option,
-                                            const QStringList &values) override;
-    virtual QString printerDeleteOptionDefault(const QString &name,
-                                               const QString &value) override;
     virtual QString printerAddOption(const QString &name,
                                      const QString &option,
                                      const QStringList &values) override;

=== modified file 'modules/Ubuntu/Components/Extras/Printers/cups/printerdriverloader.cpp'
--- modules/Ubuntu/Components/Extras/Printers/cups/printerdriverloader.cpp	2017-02-21 10:46:29 +0000
+++ modules/Ubuntu/Components/Extras/Printers/cups/printerdriverloader.cpp	2017-02-23 14:15:28 +0000
@@ -61,7 +61,6 @@
     QByteArray ppdMakeModel;
     QByteArray ppdName;
 
-    // cups_option_t option;
     QList<PrinterDriver> drivers;
 
     for (attr = ippFirstAttribute(response); attr != NULL && m_running; attr = ippNextAttribute(response)) {

=== modified file 'modules/Ubuntu/Components/Extras/Printers/enums.h'
--- modules/Ubuntu/Components/Extras/Printers/enums.h	2017-02-21 10:46:29 +0000
+++ modules/Ubuntu/Components/Extras/Printers/enums.h	2017-02-23 14:15:28 +0000
@@ -41,41 +41,6 @@
     };
     Q_ENUM(ColorModelType)
 
-    enum class ColorSpace
-    {
-        NSpace = 0,
-        RGBSpace,
-        RGBKSpace,
-        GraySpace,
-        CMYSpace,
-        CMYKSpace,
-        UnknownSpace,
-    };
-    Q_ENUM(ColorSpace)
-
-    enum class ColorOrganization
-    {
-        ChunkyOrganization = 0,
-        BandedOrganization,
-        PlanarOrganization,
-        UnknownOrganization,
-    };
-    Q_ENUM(ColorOrganization)
-
-    enum class CartridgeType
-    {
-        BlackCartridge = 0,
-        CyanCartridge,
-        MagentaCartridge,
-        YellowCartridge,
-        RedCartridge,
-        GreenCartridge,
-        BlueCartridge,
-        UnknownCartridge,
-        WhiteCartridge,
-    };
-    Q_ENUM(CartridgeType)
-
     enum class DuplexMode
     {
         DuplexNone = 0,

=== modified file 'modules/Ubuntu/Components/Extras/Printers/i18n.cpp'
--- modules/Ubuntu/Components/Extras/Printers/i18n.cpp	2017-02-21 10:46:29 +0000
+++ modules/Ubuntu/Components/Extras/Printers/i18n.cpp	2017-02-23 14:15:28 +0000
@@ -28,8 +28,6 @@
 {
     // Don't bind the domain or set textdomain as it changes the Apps domain
     // as well. Instead store the domain and use it in the lookups
-//    bindtextdomain(domain, localeDir);
-//    textdomain(domain);
     Q_UNUSED(localeDir);
 
     thisDomain = domain;

=== modified file 'modules/Ubuntu/Components/Extras/Printers/models/jobmodel.cpp'
--- modules/Ubuntu/Components/Extras/Printers/models/jobmodel.cpp	2017-02-21 10:46:29 +0000
+++ modules/Ubuntu/Components/Extras/Printers/models/jobmodel.cpp	2017-02-23 14:15:28 +0000
@@ -62,7 +62,6 @@
     Q_UNUSED(job_state);
     Q_UNUSED(job_state_reasons);
     Q_UNUSED(job_name);
-    Q_UNUSED(job_impressions_completed);
 
     auto job = getJobById(job_id);
     if (job)

=== modified file 'modules/Ubuntu/Components/Extras/Printers/models/printermodel.cpp'
--- modules/Ubuntu/Components/Extras/Printers/models/printermodel.cpp	2017-02-21 10:46:29 +0000
+++ modules/Ubuntu/Components/Extras/Printers/models/printermodel.cpp	2017-02-23 14:15:28 +0000
@@ -225,9 +225,6 @@
                 ret = models;
             }
             break;
-        // case CopiesRole:
-        //     ret = printer->copies();
-        //     break;
         case DefaultPrinterRole:
             ret = printer->name() == m_backend->defaultPrinterName();
             break;
@@ -237,12 +234,6 @@
         case SupportedDuplexModesRole:
             ret = printer->supportedDuplexStrings();
             break;
-        // case PrintRangeRole:
-        //     ret = printer->printRange();
-        //     break;
-        // case PrintRangeModeRole:
-        //     ret = printer->printRangeMode();
-        //     break;
         case PrintQualityRole:
             ret = printer->supportedPrintQualities().indexOf(printer->defaultPrintQuality());
             break;
@@ -268,19 +259,9 @@
                 ret = sizes;
             }
             break;
-
-        // case AccessControlRole:
-        //     ret = printer->accessControl();
-        //     break;
-        // case ErrorPolicyRole:
-        //     ret = printer->errorPolicy();
-        //     break;
-        // case UsersRole:
-        //     ret = printer->users();
-        //     break;
-        // case StateRole:
-        //     ret = printer->state();
-        //     break;
+        case StateRole:
+            ret = QVariant::fromValue(printer->state());
+            break;
         case PrinterRole:
             ret = QVariant::fromValue(printer);
             break;
@@ -302,10 +283,6 @@
         case AcceptJobsRole:
             ret = printer->acceptJobs();
             break;
-
-        // case LastStateMessageRole:
-        //     ret = printer->lastStateMessage();
-        //     break;
         }
     }
 
@@ -375,31 +352,24 @@
         names[Qt::DisplayRole] = "displayName";
         names[ColorModelRole] = "colorModel";
         names[SupportedColorModelsRole] = "supportedColorModels";
-        names[CopiesRole] = "copies";
         names[DefaultPrinterRole] = "default";
         names[DuplexRole] = "duplexMode";
         names[SupportedDuplexModesRole] = "supportedDuplexModes";
         names[NameRole] = "name";
         names[EnabledRole] = "printerEnabled";
         names[AcceptJobsRole] = "acceptJobs";
-        names[PrintRangeRole] = "printRange";
-        names[PrintRangeModeRole] = "printRangeMode";
         names[PdfModeRole] = "pdfMode";
         names[PrintQualityRole] = "printQuality";
         names[SupportedPrintQualitiesRole] = "supportedPrintQualities";
         names[DescriptionRole] = "description";
         names[PageSizeRole] = "pageSize";
         names[SupportedPageSizesRole] = "supportedPageSizes";
-        names[AccessControlRole] = "accessControl";
-        names[ErrorPolicyRole] = "errorPolicy";
-        names[UsersRole] = "users";
         names[StateRole] = "state";
         names[PrinterRole] = "printer";
         names[IsPdfRole] = "isPdf";
         names[IsLoadedRole] = "isLoaded";
         names[IsRawRole] = "isRaw";
         names[JobRole] = "jobs";
-        names[LastStateMessageRole] = "lastStateMessage";
     }
 
     return names;

=== modified file 'modules/Ubuntu/Components/Extras/Printers/models/printermodel.h'
--- modules/Ubuntu/Components/Extras/Printers/models/printermodel.h	2017-02-21 10:46:29 +0000
+++ modules/Ubuntu/Components/Extras/Printers/models/printermodel.h	2017-02-23 14:15:28 +0000
@@ -43,27 +43,20 @@
         // Qt::DisplayRole holds device name
         ColorModelRole = Qt::UserRole,
         SupportedColorModelsRole,
-        CopiesRole,
         DefaultPrinterRole,
         DuplexRole,
         SupportedDuplexModesRole,
         NameRole,
         EnabledRole,
         AcceptJobsRole,
-        PrintRangeRole,
-        PrintRangeModeRole,
         PdfModeRole,
         PrintQualityRole,
         SupportedPrintQualitiesRole,
         DescriptionRole,
         PageSizeRole,
         SupportedPageSizesRole,
-        AccessControlRole,
-        ErrorPolicyRole,
-        UsersRole,
         StateRole,
         PrinterRole,
-        LastStateMessageRole,
 
         /* Indicates that this printer is a pseudo printer used to create
         PDF files. */

=== modified file 'modules/Ubuntu/Components/Extras/Printers/printer/printer.cpp'
--- modules/Ubuntu/Components/Extras/Printers/printer/printer.cpp	2017-02-21 10:46:29 +0000
+++ modules/Ubuntu/Components/Extras/Printers/printer/printer.cpp	2017-02-23 14:15:28 +0000
@@ -152,13 +152,11 @@
 
 PrinterEnum::AccessControl Printer::accessControl() const
 {
-    // TODO: implement
     return PrinterEnum::AccessControl::AccessAllow;
 }
 
 PrinterEnum::ErrorPolicy Printer::errorPolicy() const
 {
-    // TODO: implement
     return PrinterEnum::ErrorPolicy::RetryOnError;
 }
 
@@ -167,23 +165,11 @@
     return state() != PrinterEnum::State::ErrorState;
 }
 
-QStringList Printer::users() const
-{
-    // TODO: implement
-    return QStringList();
-}
-
 PrinterEnum::State Printer::state() const
 {
     return m_backend->state();
 }
 
-QString Printer::lastStateMessage() const
-{
-    // TODO: implement
-    return QString();
-}
-
 bool Printer::acceptJobs() const
 {
     return m_acceptJobs;
@@ -211,14 +197,7 @@
     }
 
     QStringList vals({colorModel.name});
-    QString reply = m_backend->printerAddOption(name(), "ColorModel", vals);
-    Q_UNUSED(reply);
-}
-
-void Printer::setAccessControl(const PrinterEnum::AccessControl &accessControl)
-{
-    // TODO: implement
-    Q_UNUSED(accessControl);
+    m_backend->printerAddOption(name(), "ColorModel", vals);
 }
 
 void Printer::setDescription(const QString &description)
@@ -240,7 +219,7 @@
     }
 
     QStringList vals({Utils::duplexModeToPpdChoice(duplexMode)});
-    QString reply = m_backend->printerAddOption(name(), "Duplex", vals);
+    m_backend->printerAddOption(name(), "Duplex", vals);
 }
 
 void Printer::setEnabled(const bool enabled)
@@ -263,12 +242,6 @@
     }
 }
 
-void Printer::setErrorPolicy(const PrinterEnum::ErrorPolicy &errorPolicy)
-{
-    // TODO: implement
-    Q_UNUSED(errorPolicy);
-}
-
 void Printer::setDefaultPrintQuality(const PrintQuality &quality)
 {
     if (defaultPrintQuality() == quality) {
@@ -281,7 +254,7 @@
     }
 
     QStringList vals({quality.name});
-    QString reply = m_backend->printerAddOption(name(), quality.originalOption, vals);
+    m_backend->printerAddOption(name(), quality.originalOption, vals);
 }
 
 void Printer::setDefaultPageSize(const QPageSize &pageSize)
@@ -301,23 +274,10 @@
     }
 
     QStringList vals({pageSize.key()});
-    QString reply = m_backend->printerAddOption(name(), "PageSize", vals);
-
+    m_backend->printerAddOption(name(), "PageSize", vals);
     m_backend->refresh();
 }
 
-void Printer::addUser(const QString &username)
-{
-    // TODO: implement
-    Q_UNUSED(username);
-}
-
-void Printer::removeUser(const QString &username)
-{
-    // TODO: implement
-    Q_UNUSED(username);
-}
-
 QAbstractItemModel* Printer::jobs()
 {
     auto ret = &m_jobs;
@@ -339,9 +299,6 @@
     changed |= enabled() != other->enabled();
     changed |= state() != other->state();
 
-    // TODO: accessControl
-    // TODO: errorPolicy
-
     // Return true if they are the same, so no change
     return changed == false;
 }

=== modified file 'modules/Ubuntu/Components/Extras/Printers/printer/printer.h'
--- modules/Ubuntu/Components/Extras/Printers/printer/printer.h	2017-02-21 10:46:29 +0000
+++ modules/Ubuntu/Components/Extras/Printers/printer/printer.h	2017-02-23 14:15:28 +0000
@@ -56,22 +56,18 @@
     QList<QPageSize> supportedPageSizes() const;
     PrinterEnum::AccessControl accessControl() const;
     PrinterEnum::ErrorPolicy errorPolicy() const;
-    QStringList users() const;
     PrinterEnum::State state() const;
-    QString lastStateMessage() const;
     bool acceptJobs() const;
     bool holdsDefinition() const;
     QAbstractItemModel* jobs();
 
     PrinterEnum::PrinterType type() const;
 
-    void setAccessControl(const PrinterEnum::AccessControl &accessControl);
     void setDefaultColorModel(const ColorModel &colorModel);
     void setDescription(const QString &description);
     void setDefaultDuplexMode(const PrinterEnum::DuplexMode &duplexMode);
     void setEnabled(const bool enabled);
     void setAcceptJobs(const bool accepting);
-    void setErrorPolicy(const PrinterEnum::ErrorPolicy &errorPolicy);
     void setDefaultPrintQuality(const PrintQuality &quality);
     void setDefaultPageSize(const QPageSize &pageSize);
     void setJobModel(JobModel* jobModel);
@@ -81,14 +77,8 @@
 
 
 public Q_SLOTS:
-    // Add user that is either denied or allowed printer. See AccessControl.
-    void addUser(const QString &username);
-
     int printFile(const QString &filepath, const PrinterJob *options);
 
-    // Removes user. See addUser.
-    void removeUser(const QString &username);
-
 private:
     void loadAcceptJobs();
     void loadColorModel();
@@ -103,7 +93,4 @@
     bool m_acceptJobs;
 };
 
-// FIXME: not necessary outside tests
-Q_DECLARE_METATYPE(QList<PrinterEnum::DuplexMode>)
-
 #endif // USC_PRINTERS_PRINTER_H

=== modified file 'modules/Ubuntu/Components/Extras/Printers/printer/printerjob.cpp'
--- modules/Ubuntu/Components/Extras/Printers/printer/printerjob.cpp	2017-02-21 10:46:29 +0000
+++ modules/Ubuntu/Components/Extras/Printers/printer/printerjob.cpp	2017-02-23 14:15:28 +0000
@@ -220,7 +220,7 @@
 
 QString PrinterJob::printerName() const
 {
-    return m_printerName; // Maybe check if it's a class.
+    return m_printerName;
 }
 
 void PrinterJob::printFile(const QUrl &url)

=== modified file 'modules/Ubuntu/Components/Extras/Printers/printer/printerjob.h'
--- modules/Ubuntu/Components/Extras/Printers/printer/printerjob.h	2017-02-21 10:46:29 +0000
+++ modules/Ubuntu/Components/Extras/Printers/printer/printerjob.h	2017-02-23 14:15:28 +0000
@@ -151,7 +151,7 @@
     QDateTime m_completed_time;
     int m_copies;
     QDateTime m_creation_time;
-    PrinterBackend *m_backend; // TODO: Maybe use the printer's backend?
+    PrinterBackend *m_backend;
     QString m_printerName;
     int m_duplex_mode;
     int m_impressions_completed;

=== modified file 'modules/Ubuntu/Components/Extras/Printers/printers/printers.cpp'
--- modules/Ubuntu/Components/Extras/Printers/printers/printers.cpp	2017-02-22 14:36:29 +0000
+++ modules/Ubuntu/Components/Extras/Printers/printers/printers.cpp	2017-02-23 14:15:28 +0000
@@ -103,12 +103,6 @@
     return ret;
 }
 
-QAbstractItemModel* Printers::recentPrinters()
-{
-    // TODO: implement
-    return Q_NULLPTR;
-}
-
 QAbstractItemModel* Printers::printJobs()
 {
     auto ret = &m_jobs;
@@ -163,21 +157,6 @@
     }
 }
 
-QSharedPointer<Printer> Printers::getPrinterByName(const QString &name)
-{
-    // TODO: implement
-    Q_UNUSED(name);
-
-    return QSharedPointer<Printer>(Q_NULLPTR);
-}
-QSharedPointer<Printer> Printers::getJobOwner(const int &jobId)
-{
-    // TODO: implement
-    Q_UNUSED(jobId);
-
-    return QSharedPointer<Printer>(Q_NULLPTR);
-}
-
 void Printers::prepareToAddPrinter()
 {
     m_drivers.load();

=== modified file 'modules/Ubuntu/Components/Extras/Printers/printers/printers.h'
--- modules/Ubuntu/Components/Extras/Printers/printers/printers.h	2017-02-21 10:46:29 +0000
+++ modules/Ubuntu/Components/Extras/Printers/printers/printers.h	2017-02-23 14:15:28 +0000
@@ -36,10 +36,9 @@
     Q_OBJECT
     Q_PROPERTY(QAbstractItemModel* allPrinters READ allPrinters CONSTANT)
     Q_PROPERTY(QAbstractItemModel* allPrintersWithPdf READ allPrintersWithPdf CONSTANT)
-    Q_PROPERTY(QAbstractItemModel* recentPrinters READ recentPrinters CONSTANT)
     Q_PROPERTY(QAbstractItemModel* printJobs READ printJobs CONSTANT)
     Q_PROPERTY(QAbstractItemModel* drivers READ drivers CONSTANT)
-    Q_PROPERTY (QString driverFilter READ driverFilter WRITE setDriverFilter NOTIFY driverFilterChanged)
+    Q_PROPERTY(QString driverFilter READ driverFilter WRITE setDriverFilter NOTIFY driverFilterChanged)
     Q_PROPERTY(QString defaultPrinterName READ defaultPrinterName WRITE setDefaultPrinterName NOTIFY defaultPrinterNameChanged)
     Q_PROPERTY(QString lastMessage READ lastMessage CONSTANT)
 
@@ -52,7 +51,6 @@
 
     QAbstractItemModel* allPrinters();
     QAbstractItemModel* allPrintersWithPdf();
-    QAbstractItemModel* recentPrinters();
     QAbstractItemModel* printJobs();
     QAbstractItemModel* drivers();
     QString driverFilter() const;
@@ -63,9 +61,6 @@
     void setDriverFilter(const QString &filter);
 
 public Q_SLOTS:
-    QSharedPointer<Printer> getPrinterByName(const QString &name);
-    QSharedPointer<Printer> getJobOwner(const int &jobId);
-
     PrinterJob* createJob(const QString &printerName);
     void cancelJob(const QString &printerName, const int jobId);
 

=== modified file 'modules/Ubuntu/Components/Extras/Printers/structs.h'
--- modules/Ubuntu/Components/Extras/Printers/structs.h	2017-02-21 10:46:29 +0000
+++ modules/Ubuntu/Components/Extras/Printers/structs.h	2017-02-23 14:15:28 +0000
@@ -24,12 +24,6 @@
 #include <QDebug>
 #include <QMetaType>
 
-struct InkLevels
-{
-public:
-    QMap<PrinterEnum::CartridgeType, uint> levels;
-};
-
 struct ColorModel
 {
 public:

=== modified file 'tests/unittests/Printers/mockbackend.h'
--- tests/unittests/Printers/mockbackend.h	2017-02-23 13:37:29 +0000
+++ tests/unittests/Printers/mockbackend.h	2017-02-23 14:15:28 +0000
@@ -112,77 +112,6 @@
         return returnValue;
     }
 
-    virtual QString printerSetLocation(const QString &name,
-                                       const QString &location) override
-    {
-        locations.insert(name, location);
-        return returnValue;
-    }
-
-    virtual QString printerSetShared(const QString &name,
-                                     const bool shared) override
-    {
-        shareds.insert(name, shared);
-        return returnValue;
-    }
-
-    virtual QString printerSetJobSheets(const QString &name,
-                                        const QString &start,
-                                        const QString &end) override
-    {
-        Q_UNUSED(name);
-        Q_UNUSED(start);
-        Q_UNUSED(end);
-        return returnValue;
-    }
-
-    virtual QString printerSetErrorPolicy(const QString &name,
-                                          const PrinterEnum::ErrorPolicy &policy) override
-    {
-        errorPolicies.insert(name, policy);
-        return returnValue;
-    }
-
-
-    virtual QString printerSetOpPolicy(const QString &name,
-                                       const PrinterEnum::OperationPolicy &policy) override
-    {
-        operationPolicies.insert(name, policy);
-        return returnValue;
-    }
-
-    virtual QString printerSetUsersAllowed(const QString &name,
-                                           const QStringList &users) override
-    {
-        printerOptions[name].insert("users-allowed", QVariant::fromValue(users));
-        return returnValue;
-    }
-
-    virtual QString printerSetUsersDenied(const QString &name,
-                                          const QStringList &users) override
-    {
-        printerOptions[name].insert("users-denied", QVariant::fromValue(users));
-        return returnValue;
-    }
-
-    virtual QString printerAddOptionDefault(const QString &name,
-                                            const QString &option,
-                                            const QStringList &values) override
-    {
-        Q_UNUSED(name);
-        Q_UNUSED(option);
-        Q_UNUSED(values);
-        return returnValue;
-    }
-
-    virtual QString printerDeleteOptionDefault(const QString &name,
-                                               const QString &value) override
-    {
-        Q_UNUSED(name);
-        Q_UNUSED(value);
-        return returnValue;
-    }
-
     virtual QString printerAddOption(const QString &name,
                                      const QString &option,
                                      const QStringList &values) override
@@ -191,12 +120,9 @@
         return returnValue;
     }
 
-
-    // TODO: const for both these getters (if possible)!
     virtual QVariant printerGetOption(const QString &name,
                                       const QString &option) const override
     {
-        // FIXME: if we're to return a variant, check that it can be converted
         return printerOptions[name].value(option);
     }
 
@@ -210,7 +136,6 @@
         return opts;
     }
 
-    // FIXME: maybe have a PrinterDest iface that has a CupsDest impl?
     virtual cups_dest_t* makeDest(const QString &name,
                                   const PrinterJob *options) override
     {
@@ -452,11 +377,6 @@
 
 Q_SIGNALS:
     void printToFile(const QString &filepath, const QString &title);
-
-public Q_SLOTS:
-    virtual void refresh() override
-    {
-    }
 };
 
 #endif // USC_PRINTERS_MOCK_BACKEND_H