From e3cf09f4025296b2518846f824458564c3e801a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Fri, 11 Dec 2015 19:14:50 +0100 Subject: [PATCH] removed no longer needed includes --- YACReader/YACReader.pro | 2 -- YACReader/goto_flow.cpp | 1 - YACReader/goto_flow_gl.cpp | 2 +- YACReader/goto_flow_toolbar.cpp | 19 ++++++++++--------- YACReader/goto_flow_toolbar.h | 3 ++- YACReader/goto_flow_widget.cpp | 1 - 6 files changed, 13 insertions(+), 15 deletions(-) diff --git a/YACReader/YACReader.pro b/YACReader/YACReader.pro index a5d8f3d0..4d10f7e1 100644 --- a/YACReader/YACReader.pro +++ b/YACReader/YACReader.pro @@ -115,7 +115,6 @@ HEADERS += ../common/comic.h \ goto_flow_widget.h \ page_label_widget.h \ goto_flow_toolbar.h \ - goto_flow_decorationbar.h \ width_slider.h \ notifications_label_widget.h \ ../common/pictureflow.h \ @@ -159,7 +158,6 @@ SOURCES += ../common/comic.cpp \ goto_flow_widget.cpp \ page_label_widget.cpp \ goto_flow_toolbar.cpp \ - goto_flow_decorationbar.cpp \ width_slider.cpp \ notifications_label_widget.cpp \ ../common/pictureflow.cpp \ diff --git a/YACReader/goto_flow.cpp b/YACReader/goto_flow.cpp index 3463e91c..dd72adf0 100644 --- a/YACReader/goto_flow.cpp +++ b/YACReader/goto_flow.cpp @@ -24,7 +24,6 @@ #include "yacreader_flow.h" #include "goto_flow_toolbar.h" -#include "goto_flow_decorationbar.h" GoToFlow::GoToFlow(QWidget *parent,FlowType flowType) diff --git a/YACReader/goto_flow_gl.cpp b/YACReader/goto_flow_gl.cpp index 746da88b..8404d3d6 100644 --- a/YACReader/goto_flow_gl.cpp +++ b/YACReader/goto_flow_gl.cpp @@ -10,7 +10,7 @@ #include "configuration.h" #include "goto_flow_toolbar.h" -#include "goto_flow_decorationbar.h" + GoToFlowGL::GoToFlowGL(QWidget* parent, FlowType flowType) :GoToFlowWidget(parent) diff --git a/YACReader/goto_flow_toolbar.cpp b/YACReader/goto_flow_toolbar.cpp index d1e4fe62..9b891446 100644 --- a/YACReader/goto_flow_toolbar.cpp +++ b/YACReader/goto_flow_toolbar.cpp @@ -1,12 +1,6 @@ #include "goto_flow_toolbar.h" -#include -#include -#include -#include -#include -#include -#include +#include GoToFlowToolBar::GoToFlowToolBar(QWidget * parent) :QWidget(parent) @@ -90,7 +84,14 @@ GoToFlowToolBar::GoToFlowToolBar(QWidget * parent) bar->setGeometry(QRect(0,0,400,50)); } - + +void GoToFlowToolBar::paintEvent(QPaintEvent *) +{ + QPainter painter(this); + + painter.fillRect(0,0,width(),height(),QColor("#BB000000")); +} + void GoToFlowToolBar::setPage(int pageNumber) { edit->setText(QString::number(pageNumber+1)); @@ -119,4 +120,4 @@ void GoToFlowToolBar::centerSlide() { if(edit->text().toInt()!=0) emit(setCenter(edit->text().toInt()-1)); -} \ No newline at end of file +} diff --git a/YACReader/goto_flow_toolbar.h b/YACReader/goto_flow_toolbar.h index 0fe6694d..aafbe857 100644 --- a/YACReader/goto_flow_toolbar.h +++ b/YACReader/goto_flow_toolbar.h @@ -17,6 +17,7 @@ class GoToFlowToolBar : public QWidget QPushButton * goToButton; QWidget * bar; void resizeEvent(QResizeEvent * event); + void paintEvent(QPaintEvent *); public: GoToFlowToolBar(QWidget * parent = 0); @@ -30,4 +31,4 @@ class GoToFlowToolBar : public QWidget void goTo(unsigned int); }; -#endif \ No newline at end of file +#endif diff --git a/YACReader/goto_flow_widget.cpp b/YACReader/goto_flow_widget.cpp index b9d8ad5c..6d42eba7 100644 --- a/YACReader/goto_flow_widget.cpp +++ b/YACReader/goto_flow_widget.cpp @@ -6,7 +6,6 @@ #include #include "goto_flow_toolbar.h" -#include "goto_flow_decorationbar.h" GoToFlowWidget::GoToFlowWidget(QWidget * parent) :QWidget(parent)