From f1b84fbdc5b1377cc88e56b5e0f95b62a7531a35 Mon Sep 17 00:00:00 2001
From: Sergiusz Bazanski <q3k@q3k.org>
Date: Thu, 26 Jul 2018 16:26:05 +0100
Subject: gui: style fixes

---
 gui/basewindow.cc     |  8 ++++----
 gui/fpgaviewwidget.cc |  8 ++++----
 gui/fpgaviewwidget.h  | 17 +++++------------
 3 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/gui/basewindow.cc b/gui/basewindow.cc
index 11a7fe8d..e07200de 100644
--- a/gui/basewindow.cc
+++ b/gui/basewindow.cc
@@ -166,19 +166,19 @@ void BaseMainWindow::createGraphicsBar()
 {
     QAction *actionZoomIn = new QAction("Zoom In", this);
     actionZoomIn->setIcon(QIcon(":/icons/resources/zoom_in.png"));
-    connect(actionZoomIn, SIGNAL(triggered()), fpgaView, SLOT(zoom_in()));
+    connect(actionZoomIn, SIGNAL(triggered()), fpgaView, SLOT(zoomIn()));
 
     QAction *actionZoomOut = new QAction("Zoom Out", this);
     actionZoomOut->setIcon(QIcon(":/icons/resources/zoom_out.png"));
-    connect(actionZoomOut, SIGNAL(triggered()), fpgaView, SLOT(zoom_out()));
+    connect(actionZoomOut, SIGNAL(triggered()), fpgaView, SLOT(zoomOut()));
 
     QAction *actionZoomSelected = new QAction("Zoom Selected", this);
     actionZoomSelected->setIcon(QIcon(":/icons/resources/shape_handles.png"));
-    connect(actionZoomSelected, SIGNAL(triggered()), fpgaView, SLOT(zoom_selected()));
+    connect(actionZoomSelected, SIGNAL(triggered()), fpgaView, SLOT(zoomSelected()));
 
     QAction *actionZoomOutbound = new QAction("Zoom Outbound", this);
     actionZoomOutbound->setIcon(QIcon(":/icons/resources/shape_square.png"));
-    connect(actionZoomOutbound, SIGNAL(triggered()), fpgaView, SLOT(zoom_outbound()));
+    connect(actionZoomOutbound, SIGNAL(triggered()), fpgaView, SLOT(zoomOutbound()));
 
     graphicsToolBar = new QToolBar();
     addToolBar(Qt::TopToolBarArea, graphicsToolBar);
diff --git a/gui/fpgaviewwidget.cc b/gui/fpgaviewwidget.cc
index e08667f6..6637f2b7 100644
--- a/gui/fpgaviewwidget.cc
+++ b/gui/fpgaviewwidget.cc
@@ -600,12 +600,12 @@ void FPGAViewWidget::zoom(int level)
     update();
 }
 
-void FPGAViewWidget::zoom_in() { zoom(10); }
+void FPGAViewWidget::zoomIn() { zoom(10); }
 
-void FPGAViewWidget::zoom_out() { zoom(-10); }
+void FPGAViewWidget::zoomOut() { zoom(-10); }
 
-void FPGAViewWidget::zoom_selected() {}
+void FPGAViewWidget::zoomSelected() {}
 
-void FPGAViewWidget::zoom_outbound() {}
+void FPGAViewWidget::zoomOutbound() {}
 
 NEXTPNR_NAMESPACE_END
diff --git a/gui/fpgaviewwidget.h b/gui/fpgaviewwidget.h
index 36d4a3f2..46231b16 100644
--- a/gui/fpgaviewwidget.h
+++ b/gui/fpgaviewwidget.h
@@ -270,14 +270,6 @@ class FPGAViewWidget : public QOpenGLWidget, protected QOpenGLFunctions
     QSize minimumSizeHint() const override;
     QSize sizeHint() const override;
 
-    void setXTranslation(float t_x);
-    void setYTranslation(float t_y);
-    void setZoom(float t_z);
-
-    void xRotationChanged(int angle);
-    void yRotationChanged(int angle);
-    void zRotationChanged(int angle);
-
   protected:
     void initializeGL() Q_DECL_OVERRIDE;
     void paintGL() Q_DECL_OVERRIDE;
@@ -287,15 +279,16 @@ class FPGAViewWidget : public QOpenGLWidget, protected QOpenGLFunctions
     void wheelEvent(QWheelEvent *event) Q_DECL_OVERRIDE;
     void drawDecal(LineShaderData &data, const DecalXY &decal);
     void drawDecal(LineShaderData out[], const DecalXY &decal);
+
   public Q_SLOTS:
     void newContext(Context *ctx);
     void onSelectedArchItem(std::vector<DecalXY> decals);
     void onHighlightGroupChanged(std::vector<DecalXY> decals, int group);
     void pokeRenderer(void);
-    void zoom_in();
-    void zoom_out();
-    void zoom_selected();
-    void zoom_outbound();
+    void zoomIn();
+    void zoomOut();
+    void zoomSelected();
+    void zoomOutbound();
 
   private:
     void renderLines(void);
-- 
cgit v1.2.3