QCpdWindow: fixed compiler warnings

Author: dxli

app/QCpdWindow.cpp

@@ -1,16 +1,25 @@
 #include "QCpdWindow.h"
 #include <QGridLayout>
 #include <QQuickItem>
+#include "components.h"
 
 extern "C" {
     #include "../backends/cups/src/CPD.h"
     #include "../backends/cups/src/print_frontend.h"
 }
-static int add_printer_callback(PrinterObj *p);
-static int remove_printer_callback(char *printer_name);
-void ui_add_printer_aux(gpointer key, gpointer value, gpointer user_data);
 
+namespace {
+struct Command {
+    std::string command;
+    std::string arg1;
+    std::string arg2;
+};
 QCpdWindow *_window;
+}
+
+static int add_printer_callback(PrinterObj *p);
+static int remove_printer_callback(char *printer_name);
+static void ui_add_printer_aux(gpointer key, gpointer value, gpointer user_data);
 
 QCpdWindow::QCpdWindow(QPrinter *printer, QWidget *parent) :
     QAbstractPrintDialog(printer, parent),
@@ -94,27 +103,33 @@ CPrintDialog::CPrintDialog(QPrinter* printer, QWidget *parent) :
     _window->show();
 }
 
-void QCpdWindow::tabBarIndexChanged(qint32 index) {
+void QCpdWindow::tabBarIndexChanged(qint32 index)
+{
     root->rootObject->setProperty("index", index);
 }
 
-void QCpdWindow::swipeViewIndexChanged(qint32 index) {
+void QCpdWindow::swipeViewIndexChanged(qint32 index)
+{
     tabs->rootObject->setProperty("index", index);
 }
 
-void QCpdWindow::cancelButtonClicked() {
+void QCpdWindow::cancelButtonClicked()
+{
     close();
 }
 
-static int add_printer_callback(PrinterObj *p) {
-    printf("print_frontend.c : Printer %s added!\n", p->name);
+int add_printer_callback(PrinterObj *p)
+{
+    return printf("print_frontend.c : Printer %s added!\n", p->name);
 }
 
-static int remove_printer_callback(char *printer_name) {
-    printf("print_frontend.c : Printer %s removed!\n", printer_name);
+int remove_printer_callback(char *printer_name)
+{
+    return printf("print_frontend.c : Printer %s removed!\n", printer_name);
 }
 
-gpointer QCpdWindow::ui_add_printer(gpointer user_data) {
+gpointer QCpdWindow::ui_add_printer(gpointer user_data)
+{
     /*
      * Need this delay so that the FrontendObj
      * initialization completes
@@ -132,14 +147,20 @@ gpointer QCpdWindow::ui_add_printer(gpointer user_data) {
     }
     clearPrinters();
     g_hash_table_foreach(f->printer, ui_add_printer_aux, NULL);
+
+    return nullptr;
 }
 
-void ui_add_printer_aux(gpointer key, gpointer value, gpointer user_data) {
+void ui_add_printer_aux(gpointer key, gpointer value, gpointer user_data)
+{
+    Q_UNUSED(value);
+    Q_UNUSED(user_data);
     _window->addPrinter((const char*)key);
     qDebug() << "Added" << (const char*)key;
 }
 
-void QCpdWindow::addPrinter(const char *printer) {
+void QCpdWindow::addPrinter(const char *printer)
+{
     QObject* obj = root->rootObject->findChild<QObject*>("generalObject");
     if (obj) {
         QMetaObject::invokeMethod(obj,
@@ -150,7 +171,8 @@ void QCpdWindow::addPrinter(const char *printer) {
         qDebug() << "generalObject Not Found";
 }
 
-gpointer QCpdWindow::parse_commands(gpointer user_data) {
+gpointer QCpdWindow::parse_commands(gpointer user_data)
+{
     Command* cmd = (Command*)user_data;
     if (cmd->command.compare("hide-remote-cups") == 0)
         hide_remote_cups_printers(f);
@@ -161,9 +183,12 @@ gpointer QCpdWindow::parse_commands(gpointer user_data) {
         strcpy(printerName, cmd->arg1.c_str());
         get_all_printer_options(_window->f, printerName);
     }
+
+    return nullptr;
 }
 
-void QCpdWindow::init_backend() {
+void QCpdWindow::init_backend()
+{
     event_callback add_cb = (event_callback)add_printer_callback;
     event_callback rem_cb = (event_callback)remove_printer_callback;
     f = get_new_FrontendObj(NULL, add_cb, rem_cb);
@@ -175,7 +200,8 @@ void QCpdWindow::init_backend() {
     //g_main_loop_run(loop);
 }
 
-void QCpdWindow::clearPrinters() {
+void QCpdWindow::clearPrinters()
+{
 //    QObject* obj = root->rootObject->findChild<QObject*>("generalObject");
 //    if (obj) {
 //        QMetaObject::invokeMethod(obj,
@@ -185,12 +211,26 @@ void QCpdWindow::clearPrinters() {
 //        qDebug() << "generalObject Not Found";
 }
 
-void ui_add_job_hold_until(char *startJobOption) {}
+void ui_add_job_hold_until(char *startJobOption)
+{
+    Q_UNUSED(startJobOption);
+}
 
-void ui_add_maximum_print_copies(char *_copies) {}
+void ui_add_maximum_print_copies(char *_copies)
+{
+    Q_UNUSED(_copies);
+}
 
-void ui_add_pages_per_side(char *pages) {}
+void ui_add_pages_per_side(char *pages)
+{
+    Q_UNUSED(pages);
+}
 
-void ui_clear_supported_media() {}
+void ui_clear_supported_media()
+{
+}
 
-void ui_add_supported_media(char *media) {}
+void ui_add_supported_media(char *media)
+{
+    Q_UNUSED(media);
+}

app/QCpdWindow.h

@@ -2,8 +2,6 @@
 #define QCPDWINDOW_H
 
 #include <QAbstractPrintDialog>
-#include "components.h"
-
 
 class QPrinter;
 class QGridLayout;
@@ -19,33 +17,40 @@ using PrinterObj = _PrinterObj;
 
 using gpointer = void *;
 
-typedef struct {
-    std::string command;
-    std::string arg1;
-    std::string arg2;
-} Command;
+class Tabs;
+class Root;
+class Preview;
+class Controls;
 
 class QCpdWindow : public QAbstractPrintDialog {
     Q_OBJECT
 public:
-    FrontendObj *f;
-    GMainLoop *loop;
-    Tabs *tabs;
-    Root *root;
-    Preview *preview;
-    Controls *controls;
-    QGridLayout *masterLayout;
 
     QCpdWindow(QPrinter* printer, QWidget* parent = Q_NULLPTR);
     void init_backend();
     void addPrinter(const char* printer);
     void clearPrinters();
-    void addPrinterSupportedMedia(char* media) {}
+    void addPrinterSupportedMedia(char* media)
+    {
+        Q_UNUSED(media);
+    }
     void clearPrintersSupportedMedia() {}
-    void addMaximumPrintCopies(int copies) {}
-    void addJobHoldUntil(char* startJobOption) {}
-    void addPagesPerSize(char* pages) {}
-    void updateAllOptions(const QString &printer) {}
+    void addMaximumPrintCopies(int copies)
+    {
+        Q_UNUSED(copies);
+    }
+    void addJobHoldUntil(char* startJobOption)
+    {
+        Q_UNUSED(startJobOption);
+    }
+    void addPagesPerSize(char* pages)
+    {
+        Q_UNUSED(pages);
+    }
+    void updateAllOptions(const QString &printer)
+    {
+        Q_UNUSED(printer);
+    }
     int exec() override { return QDialog::exec();}
     gpointer parse_commands(gpointer user_data);
     gpointer ui_add_printer(gpointer user_data);
@@ -54,12 +59,24 @@ public Q_SLOTS:
     void tabBarIndexChanged(qint32 index);
     void swipeViewIndexChanged(qint32 index);
     void cancelButtonClicked();
+
+private:
+    QGridLayout *masterLayout;
+    Tabs *tabs;
+    Root *root;
+    Preview *preview;
+    Controls *controls;
+    FrontendObj *f;
+    GMainLoop *loop;
 };
 
 class Q_PRINTSUPPORT_EXPORT CPrintDialog : public QAbstractPrintDialog {
 public:
     CPrintDialog(QPrinter *printer, QWidget *parent = Q_NULLPTR);
-    int exec() override {}
+    int exec() override
+    {
+        return 0;
+    }
 };
 
 #endif // QCPDWINDOW_H