Skip to content

Commit fe43c65

Browse files
Qt coding style. Need to change the _Window class name.
1 parent f72be1a commit fe43c65

File tree

6 files changed

+101
-73
lines changed

6 files changed

+101
-73
lines changed

app/components.cpp

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
11
#include "components.h"
22
#include <poppler/qt5/poppler-qt5.h>
33

4-
Tabs::Tabs(QWidget* parent) :
4+
Tabs::Tabs(QWidget *parent) :
55
QWidget(parent),
6-
tabs(new QQuickWidget(QUrl("qrc:/app/Tabs.qml"), this)) {
6+
tabs(new QQuickWidget(QUrl("qrc:/app/Tabs.qml"), this))
7+
{
78

89
tabs->setResizeMode(QQuickWidget::SizeRootObjectToView);
910
tabs->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
1011
rootObject = tabs->rootObject();
1112
}
1213

13-
Root::Root(QWidget* parent) :
14+
Root::Root(QWidget *parent) :
1415
QWidget(parent),
15-
root(new QQuickWidget(QUrl("qrc:/app/Root.qml"), this)) {
16+
root(new QQuickWidget(QUrl("qrc:/app/Root.qml"), this))
17+
{
1618

1719
root->setResizeMode(QQuickWidget::SizeRootObjectToView);
1820
root->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
1921
rootObject = root->rootObject();
2022
}
21-
Preview::Preview(QPrinter* _printer, QWidget* parent) :
23+
Preview::Preview(QPrinter *_printer, QWidget *parent) :
2224
QWidget(parent),
2325
printer(_printer),
2426
preview(new QPrintPreviewWidget(printer, this))
@@ -31,12 +33,13 @@ Preview::Preview(QPrinter* _printer, QWidget* parent) :
3133
printer->setFullPage(false);
3234

3335
QObject::connect(preview,
34-
SIGNAL(paintRequested(QPrinter*)),
36+
SIGNAL(paintRequested(QPrinter *)),
3537
this,
3638
SLOT(print()));
3739
}
3840

39-
void Preview::print() {
41+
void Preview::print()
42+
{
4043
QPainter painter(printer);
4144
painter.setRenderHints(QPainter::Antialiasing |
4245
QPainter::TextAntialiasing |
@@ -45,7 +48,7 @@ void Preview::print() {
4548
QFile f;
4649
f.setFileName(":/app/test.pdf");
4750
f.open(QIODevice::ReadOnly);
48-
QByteArray pdf=f.readAll();
51+
QByteArray pdf = f.readAll();
4952

5053
Poppler::Document *document = Poppler::Document::loadFromData(pdf);
5154
if (!document)
@@ -59,7 +62,8 @@ void Preview::print() {
5962
if (page == nullptr)
6063
qCritical("File '%s' is empty?", qUtf8Printable(":/app/test.pdf"));
6164

62-
QImage image = page->renderToImage(72.0, 72.0, 0, 0, page->pageSize().width(), page->pageSize().height());
65+
QImage image = page->renderToImage(72.0, 72.0, 0, 0, page->pageSize().width(),
66+
page->pageSize().height());
6367
if (image.isNull())
6468
qCritical("Error!");
6569

@@ -70,26 +74,30 @@ void Preview::print() {
7074
painter.end();
7175
}
7276

73-
void Preview::setZoom(qreal zoomFactor) {
74-
if(previewPainted)
77+
void Preview::setZoom(qreal zoomFactor)
78+
{
79+
if (previewPainted)
7580
preview->setZoomFactor(zoomFactor * (widgetHeight / paperHeight));
7681
preview->updatePreview();
7782
currentZoomFactor = zoomFactor;
7883
}
7984

80-
void Preview::showNextPage() {
85+
void Preview::showNextPage()
86+
{
8187
pageNumber = pageNumber < (pageCount - 1) ? pageNumber + 1 : pageNumber;
8288
preview->updatePreview();
8389
}
8490

85-
void Preview::showPrevPage() {
91+
void Preview::showPrevPage()
92+
{
8693
pageNumber = pageNumber > 0 ? pageNumber - 1 : pageNumber;
8794
preview->updatePreview();
8895
}
8996

90-
Controls::Controls(QWidget* parent) :
97+
Controls::Controls(QWidget *parent) :
9198
QWidget(parent),
92-
controls(new QQuickWidget(QUrl("qrc:/app/Controls.qml"), this)) {
99+
controls(new QQuickWidget(QUrl("qrc:/app/Controls.qml"), this))
100+
{
93101

94102
controls->setResizeMode(QQuickWidget::SizeRootObjectToView);
95103
controls->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);

app/components.h

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,35 @@
77
#include <QPainter>
88
#include <QPrinter>
99

10-
class Tabs : public QWidget {
10+
class Tabs : public QWidget
11+
{
1112
Q_OBJECT
1213
public:
13-
QQuickItem* rootObject;
14-
Tabs(QWidget* parent = Q_NULLPTR);
14+
QQuickItem *rootObject;
15+
Tabs(QWidget *parent = Q_NULLPTR);
1516
~Tabs() = default;
1617

1718
private:
18-
QQuickWidget* tabs;
19+
QQuickWidget *tabs;
1920
};
2021

21-
class Root : public QWidget {
22+
class Root : public QWidget
23+
{
2224
Q_OBJECT
2325
public:
24-
QQuickItem* rootObject;
25-
Root(QWidget* parent = Q_NULLPTR);
26+
QQuickItem *rootObject;
27+
Root(QWidget *parent = Q_NULLPTR);
2628
~Root() = default;
2729

2830
private:
29-
QQuickWidget* root;
31+
QQuickWidget *root;
3032
};
3133

32-
class Preview : public QWidget {
34+
class Preview : public QWidget
35+
{
3336
Q_OBJECT
3437
public:
35-
Preview(QPrinter* _printer, QWidget* parent = Q_NULLPTR);
38+
Preview(QPrinter *_printer, QWidget *parent = Q_NULLPTR);
3639
~Preview() = default;
3740
qreal widgetHeight = 0;
3841
qreal currentZoomFactor = 1;
@@ -44,23 +47,24 @@ public Q_SLOTS:
4447
void showPrevPage();
4548

4649
private:
47-
QPrinter* printer;
48-
QPrintPreviewWidget* preview;
50+
QPrinter *printer;
51+
QPrintPreviewWidget *preview;
4952
int pageNumber = 0;
5053
int pageCount = 0;
5154
qreal paperHeight = 0;
5255
bool previewPainted = 0;
5356
};
5457

55-
class Controls : public QWidget {
58+
class Controls : public QWidget
59+
{
5660
Q_OBJECT
5761
public:
58-
QQuickItem* rootObject;
59-
Controls(QWidget* parent = Q_NULLPTR);
62+
QQuickItem *rootObject;
63+
Controls(QWidget *parent = Q_NULLPTR);
6064
~Controls() = default;
6165

6266
private:
63-
QQuickWidget* controls;
67+
QQuickWidget *controls;
6468
};
6569

6670

app/preview.cpp

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77

88
/* The preview works by using poppler to convert a page of pdf to QImage */
99

10-
QImage QPdfPreview::requestImage(const QString &id, QSize *size, const QSize &requested_size) {
10+
QImage QPdfPreview::requestImage(const QString &id, QSize *size, const QSize &requested_size)
11+
{
1112
QString filename;
1213
QStringList imagesource = id.split("/");
1314
QStringList::iterator it;
@@ -28,13 +29,13 @@ QImage QPdfPreview::requestImage(const QString &id, QSize *size, const QSize &re
2829
QImage image;
2930

3031
Poppler::Document *document = Poppler::Document::load(filename);
31-
if (!document || document->isLocked()){
32+
if (!document || document->isLocked()) {
3233
qCritical("File '%s' does not exist or is locked!", qUtf8Printable(filename));
3334
return image;
3435
}
3536

3637
Poppler::Page *page = document->page(pageNumber);
37-
if (page == nullptr){
38+
if (page == nullptr) {
3839
qCritical("File '%s' is empty?", qUtf8Printable(filename));
3940
return image;
4041
}
@@ -57,17 +58,19 @@ QImage QPdfPreview::requestImage(const QString &id, QSize *size, const QSize &re
5758
return image;
5859
}
5960

60-
int QPreviewData::get_number_of_pages(QString filename){
61+
int QPreviewData::get_number_of_pages(QString filename)
62+
{
6163
Poppler::Document *document = Poppler::Document::load(filename);
62-
if (!document || document->isLocked()){
64+
if (!document || document->isLocked()) {
6365
qCritical("File '%s' does not exist or is locked!", qUtf8Printable(filename));
6466
return 0;
6567
}
6668

6769
return document->numPages();
6870
}
6971

70-
QSizeF QPreviewData::getPageSize(QString page) {
72+
QSizeF QPreviewData::getPageSize(QString page)
73+
{
7174
/*
7275
* Need to come up with a different logic
7376
* This will return page size of A1 for A10 or

app/window.cpp

Lines changed: 35 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ _Window::_Window(QPrinter *printer, QWidget *parent) :
4646
preview,
4747
SLOT(showPrevPage()));
4848

49-
QObject* generalObject = root->rootObject->findChild<QObject*>("generalObject");
49+
QObject *generalObject = root->rootObject->findChild<QObject *>("generalObject");
5050

5151
QObject::connect(generalObject,
5252
SIGNAL(newPrinterSelected(QString)),
@@ -89,40 +89,46 @@ _Window::_Window(QPrinter *printer, QWidget *parent) :
8989
init_backend();
9090
}
9191

92-
CPrintDialog::CPrintDialog(QPrinter* printer, QWidget *parent) :
92+
CPrintDialog::CPrintDialog(QPrinter *printer, QWidget *parent) :
9393
QAbstractPrintDialog(printer, parent)
9494
{
9595
_window = new _Window(printer, parent);
9696
_window->show();
9797
}
9898

99-
void _Window::tabBarIndexChanged(qint32 index) {
99+
void _Window::tabBarIndexChanged(qint32 index)
100+
{
100101
root->rootObject->setProperty("index", index);
101102
}
102103

103-
void _Window::swipeViewIndexChanged(qint32 index) {
104+
void _Window::swipeViewIndexChanged(qint32 index)
105+
{
104106
tabs->rootObject->setProperty("index", index);
105107
}
106108

107-
void _Window::cancelButtonClicked() {
109+
void _Window::cancelButtonClicked()
110+
{
108111
exit(0);
109112
}
110113

111-
static int add_printer_callback(PrinterObj *p) {
114+
static int add_printer_callback(PrinterObj *p)
115+
{
112116
//qDebug() << "Printer" << p->name << "added!";
113117
_window->addPrinter(p->name);
114118
}
115119

116-
static int remove_printer_callback(char *printer_name) {
120+
static int remove_printer_callback(char *printer_name)
121+
{
117122
qDebug() << "Printer" << printer_name << "removed!";
118123
}
119124

120-
gpointer _Window::ui_add_printer(gpointer user_data) {
125+
gpointer _Window::ui_add_printer(gpointer user_data)
126+
{
121127
/*
122128
* Need this delay so that the FrontendObj
123129
* initialization completes
124130
*/
125-
bool* enabled = (bool*)user_data;
131+
bool *enabled = (bool *)user_data;
126132
for (int i = 0; i < 100000000; i++);
127133
Command cmd;
128134
if (*enabled)
@@ -134,23 +140,25 @@ gpointer _Window::ui_add_printer(gpointer user_data) {
134140
g_hash_table_foreach(f->printer, ui_add_printer_aux, NULL);
135141
}
136142

137-
void ui_add_printer_aux(gpointer key, gpointer value, gpointer user_data) {
138-
_window->addPrinter((const char*)key);
143+
void ui_add_printer_aux(gpointer key, gpointer value, gpointer user_data)
144+
{
145+
_window->addPrinter((const char *)key);
139146
}
140147

141-
void _Window::addPrinter(const char *printer) {
142-
QObject* obj = root->rootObject->findChild<QObject*>("generalObject");
148+
void _Window::addPrinter(const char *printer)
149+
{
150+
QObject *obj = root->rootObject->findChild<QObject *>("generalObject");
143151
if (obj) {
144152
QMetaObject::invokeMethod(obj,
145153
"updateDestinationModel",
146154
Q_ARG(QVariant, printer));
147-
}
148-
else
155+
} else
149156
qDebug() << "generalObject Not Found";
150157
}
151158

152-
gpointer _Window::parse_commands(gpointer user_data) {
153-
Command* cmd = (Command*)user_data;
159+
gpointer _Window::parse_commands(gpointer user_data)
160+
{
161+
Command *cmd = (Command *)user_data;
154162
if (cmd->command.compare("hide-remote-cups") == 0)
155163
hide_remote_cups_printers(f);
156164
else if (cmd->command.compare("unhide-remote-cups") == 0)
@@ -172,7 +180,8 @@ gpointer _Window::parse_commands(gpointer user_data) {
172180
}
173181
}
174182

175-
void _Window::init_backend() {
183+
void _Window::init_backend()
184+
{
176185
event_callback add_cb = (event_callback)add_printer_callback;
177186
event_callback rem_cb = (event_callback)remove_printer_callback;
178187
f = get_new_FrontendObj(NULL, add_cb, rem_cb);
@@ -182,25 +191,27 @@ void _Window::init_backend() {
182191
//ui_add_printer(&enabled);
183192
}
184193

185-
void _Window::clearPrinters() {
186-
QObject* obj = root->rootObject->findChild<QObject*>("generalObject");
194+
void _Window::clearPrinters()
195+
{
196+
QObject *obj = root->rootObject->findChild<QObject *>("generalObject");
187197
if (obj) {
188198
QMetaObject::invokeMethod(obj,
189199
"clearDestinationModel");
190-
}
191-
else
200+
} else
192201
qDebug() << "generalObject Not Found";
193202
}
194203

195-
void _Window::newPrinterSelected(const QString &printer) {
204+
void _Window::newPrinterSelected(const QString &printer)
205+
{
196206
Command cmd;
197207
cmd.command = "get-all-options";
198208
cmd.arg1 = printer.toStdString();
199209
if (cmd.arg1.compare("") != 0)
200210
parse_commands(&cmd);
201211
}
202212

203-
void _Window::remotePrintersToggled(const QString &enabled) {
213+
void _Window::remotePrintersToggled(const QString &enabled)
214+
{
204215
qDebug() << enabled;
205216
}
206217

0 commit comments

Comments
 (0)