From 358ba86fc8e383c2907c5c83658a0568435ebee0 Mon Sep 17 00:00:00 2001 From: Tim Deagan Date: Fri, 2 Jan 2015 01:32:37 -0600 Subject: [PATCH] Swap out spaces for tabs modified: src/GLView.h modified: src/MainWindow.h modified: src/QGLView.h modified: src/mainwin.cc QtCreator ignores the prefs and will only put in spaces instead of tabs. These are manual fixes in Notepad++ to try and keep the indents in the standard mode. --- src/GLView.h | 6 +++--- src/MainWindow.h | 4 ++-- src/QGLView.h | 7 +++---- src/mainwin.cc | 4 ++-- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/GLView.h b/src/GLView.h index c3f93f03..734139c6 100644 --- a/src/GLView.h +++ b/src/GLView.h @@ -62,7 +62,7 @@ public: bool showfaces; bool showedges; bool showcrosshairs; - bool showscale; + bool showscale; #ifdef ENABLE_OPENCSG GLint shaderinfo[11]; @@ -77,6 +77,6 @@ private: void showCrosshairs(); void showAxes(const Color4f &col); void showSmallaxes(const Color4f &col); - void showScalemarkers(const Color4f &col); - void decodeMarkerValue(double i, double l, int size_div_sm); + void showScalemarkers(const Color4f &col); + void decodeMarkerValue(double i, double l, int size_div_sm); }; diff --git a/src/MainWindow.h b/src/MainWindow.h index e4aa2304..32717d74 100644 --- a/src/MainWindow.h +++ b/src/MainWindow.h @@ -213,8 +213,8 @@ public slots: void viewModeShowEdges(); void viewModeShowAxes(); void viewModeShowCrosshairs(); - void viewModeShowScaleProportional(); - void viewModeAnimate(); + void viewModeShowScaleProportional(); + void viewModeAnimate(); void viewAngleTop(); void viewAngleBottom(); void viewAngleLeft(); diff --git a/src/QGLView.h b/src/QGLView.h index 29147aab..3891ee51 100644 --- a/src/QGLView.h +++ b/src/QGLView.h @@ -17,7 +17,7 @@ class QGLView : public QGLWidget, public GLView Q_PROPERTY(bool showAxes READ showAxes WRITE setShowAxes); Q_PROPERTY(bool showCrosshairs READ showCrosshairs WRITE setShowCrosshairs); Q_PROPERTY(bool orthoMode READ orthoMode WRITE setOrthoMode); - Q_PROPERTY(double showScaleProportional READ showScaleProportional WRITE setShowScaleProportional); + Q_PROPERTY(double showScaleProportional READ showScaleProportional WRITE setShowScaleProportional); public: QGLView(QWidget *parent = NULL); @@ -36,9 +36,8 @@ public: void setShowCrosshairs(bool enabled) { this->showcrosshairs = enabled; } bool orthoMode() const { return (this->cam.projection == Camera::ORTHOGONAL); } void setOrthoMode(bool enabled); - bool showScaleProportional() const { return this->showscale; } - void setShowScaleProportional(bool enabled) { this->showscale = enabled; } - + bool showScaleProportional() const { return this->showscale; } + void setShowScaleProportional(bool enabled) { this->showscale = enabled; } std::string getRendererInfo() const; #if QT_VERSION >= 0x050100 float getDPI() { return this->devicePixelRatio(); } diff --git a/src/mainwin.cc b/src/mainwin.cc index 6a4d14b2..b00b3758 100644 --- a/src/mainwin.cc +++ b/src/mainwin.cc @@ -371,8 +371,8 @@ MainWindow::MainWindow(const QString &filename) connect(this->viewActionShowEdges, SIGNAL(triggered()), this, SLOT(viewModeShowEdges())); connect(this->viewActionShowAxes, SIGNAL(triggered()), this, SLOT(viewModeShowAxes())); connect(this->viewActionShowCrosshairs, SIGNAL(triggered()), this, SLOT(viewModeShowCrosshairs())); - connect(this->viewActionShowScaleProportional, SIGNAL(triggered()), this, SLOT(viewModeShowScaleProportional())); - connect(this->viewActionAnimate, SIGNAL(triggered()), this, SLOT(viewModeAnimate())); + connect(this->viewActionShowScaleProportional, SIGNAL(triggered()), this, SLOT(viewModeShowScaleProportional())); + connect(this->viewActionAnimate, SIGNAL(triggered()), this, SLOT(viewModeAnimate())); connect(this->viewActionTop, SIGNAL(triggered()), this, SLOT(viewAngleTop())); connect(this->viewActionBottom, SIGNAL(triggered()), this, SLOT(viewAngleBottom())); connect(this->viewActionLeft, SIGNAL(triggered()), this, SLOT(viewAngleLeft()));