From 24a922cb28fac1182405636322f5772e84224839 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Sat, 18 Mar 2017 23:31:33 +0200
Subject: [PATCH] ImageViewer: De-slot

Change-Id: If488718679d31fd184b99c9ceb5004f15fb0a90b
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
---
 src/plugins/imageviewer/exportdialog.h |  3 +--
 src/plugins/imageviewer/imageview.h    | 18 +++++++-----------
 src/plugins/imageviewer/imageviewer.h  |  5 +----
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/plugins/imageviewer/exportdialog.h b/src/plugins/imageviewer/exportdialog.h
index 2c929bf4688..246ad211abd 100644
--- a/src/plugins/imageviewer/exportdialog.h
+++ b/src/plugins/imageviewer/exportdialog.h
@@ -49,12 +49,11 @@ public:
 
     void accept() override;
 
-private slots:
+private:
     void resetExportSize();
     void exportWidthChanged(int width);
     void exportHeightChanged(int height);
 
-private:
     void setExportWidthBlocked(int width);
     void setExportHeightBlocked(int height);
 
diff --git a/src/plugins/imageviewer/imageview.h b/src/plugins/imageviewer/imageview.h
index 9c9020c2c41..4e797b66015 100644
--- a/src/plugins/imageviewer/imageview.h
+++ b/src/plugins/imageviewer/imageview.h
@@ -68,11 +68,6 @@ public:
     void reset();
     void createScene();
 
-signals:
-    void scaleFactorChanged(qreal factor);
-    void imageSizeChanged(const QSize &size);
-
-public slots:
     void exportImage();
     void setViewBackground(bool enable);
     void setViewOutline(bool enable);
@@ -81,18 +76,19 @@ public slots:
     void resetToOriginalSize();
     void fitToScreen();
 
-private slots:
-    void emitScaleFactor();
+signals:
+    void scaleFactorChanged(qreal factor);
+    void imageSizeChanged(const QSize &size);
+
+private:
+    void emitScaleFactor();
+    void doScale(qreal factor);
 
-protected:
     void drawBackground(QPainter *p, const QRectF &rect);
     void hideEvent(QHideEvent *event);
     void showEvent(QShowEvent *event);
     void wheelEvent(QWheelEvent *event);
 
-private:
-    void doScale(qreal factor);
-
     ImageViewerFile *m_file;
     QGraphicsItem *m_imageItem = 0;
     QGraphicsRectItem *m_backgroundItem = 0;
diff --git a/src/plugins/imageviewer/imageviewer.h b/src/plugins/imageviewer/imageviewer.h
index 9a4baab18d7..38ee2ab0357 100644
--- a/src/plugins/imageviewer/imageviewer.h
+++ b/src/plugins/imageviewer/imageviewer.h
@@ -54,7 +54,6 @@ public:
 
     IEditor *duplicate() override;
 
-public slots:
     void exportImage();
     void imageSizeUpdated(const QSize &size);
     void scaleFactorUpdate(qreal factor);
@@ -68,12 +67,10 @@ public slots:
     void updateToolButtons();
     void togglePlay();
 
-private slots:
-    void playToggled();
-
 private:
     ImageViewer(const QSharedPointer<ImageViewerFile> &document, QWidget *parent = 0);
     void ctor();
+    void playToggled();
     void updatePauseAction();
 
     struct ImageViewerPrivate *d;