From 57f4d38841c40cad3c206abdd16eebaed753aa1c Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Sun, 18 Mar 2018 18:18:57 +0100 Subject: Update all fiels to adhere to style-guide --- src/canvas.h | 87 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 43 insertions(+), 44 deletions(-) (limited to 'src/canvas.h') diff --git a/src/canvas.h b/src/canvas.h index c83a726..425e38d 100644 --- a/src/canvas.h +++ b/src/canvas.h @@ -24,8 +24,7 @@ * along with DrumGizmo; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#ifndef __DRUMGIZMO_CANVAS_H__ -#define __DRUMGIZMO_CANVAS_H__ +#pragma once #include #include @@ -34,62 +33,62 @@ #include "mipmap.h" #include "canvastool.h" -class Canvas : public QWidget { -Q_OBJECT +class Canvas + : public QWidget +{ + Q_OBJECT public: - Canvas(QWidget *parent); - ~Canvas(); + Canvas(QWidget* parent); + ~Canvas(); - void load(QString file); - - void addTool(CanvasTool *tool); + void load(QString file); - float mapX(float x); - float unmapX(float x); - float mapY(float y); - float unmapY(float y); + void addTool(CanvasTool* tool); + + float mapX(float x); + float unmapX(float x); + float mapY(float y); + float unmapY(float y); public slots: - void setXScale(float scale); - void setYScale(float scale); - void setXOffset(float scroll); - void setYOffset(float scroll); + void setXScale(float scale); + void setYScale(float scale); + void setXOffset(float scroll); + void setYOffset(float scroll); protected: - void mouseMoveEvent(QMouseEvent *event); - void mousePressEvent(QMouseEvent *event); - void mouseReleaseEvent(QMouseEvent *event); - void resizeEvent(QResizeEvent *event); - void paintEvent(QPaintEvent *event); - void keyReleaseEvent(QKeyEvent *event); + void mouseMoveEvent(QMouseEvent* event); + void mousePressEvent(QMouseEvent* event); + void mouseReleaseEvent(QMouseEvent* event); + void resizeEvent(QResizeEvent* event); + void paintEvent(QPaintEvent* event); + void keyReleaseEvent(QKeyEvent* event); private: - MipMap *mipmap; + MipMap* mipmap; - void updateWav(); - void getWavValues(int last, int lx, float *vu, float *vl, - float *avgu, float *avgl); + void updateWav(); + void getWavValues(int last, int lx, float* vu, float* vl, + float* avgu, float* avgl); - QImage wav; + QImage wav; public: - float *data; - size_t size; + float* data; + size_t size; - QVector tools; + QVector tools; private: - float xscale; - float yscale; - float xoffset; - float yoffset; - - QColor colBg; - QColor colSec; - QColor colMax; - QColor colHalf; - QColor colWavMax; - QColor colWavAvg; + float xscale; + float yscale; + float xoffset; + float yoffset; + + QColor colBg; + QColor colSec; + QColor colMax; + QColor colHalf; + QColor colWavMax; + QColor colWavAvg; }; - -#endif/*__DRUMGIZMO_CANVAS_H__*/ -- cgit v1.2.3