summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2013-06-19 10:20:16 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2013-06-19 10:20:56 -0700
commit07a16574e9263fc2e30a7c0aec18df33d54a70dc (patch)
treef35e59a8c7528b8f9d0e1bd54b93aa1c39aec9e9
parent0a9205276586deb0ec000bb211384e2d415eb38b (diff)
downloadsubsurface-07a16574e9263fc2e30a7c0aec18df33d54a70dc.tar.gz
Consistently use slots / signals
We started out using Q_SLOTS and Q_SIGNALS but then changed our mind. Let's make this consistent again. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--qt-ui/divelistview.h2
-rw-r--r--qt-ui/downloadfromdivecomputer.h2
-rw-r--r--qt-ui/globe.h2
-rw-r--r--qt-ui/maintab.h2
-rw-r--r--qt-ui/mainwindow.h4
-rw-r--r--qt-ui/profilegraphics.h4
-rw-r--r--qt-ui/starwidget.h4
7 files changed, 10 insertions, 10 deletions
diff --git a/qt-ui/divelistview.h b/qt-ui/divelistview.h
index 88f52ba7d..3aee19128 100644
--- a/qt-ui/divelistview.h
+++ b/qt-ui/divelistview.h
@@ -41,7 +41,7 @@ public slots:
void testSlot();
void fixMessyQtModelBehaviour();
-Q_SIGNALS:
+signals:
void currentDiveChanged(int divenr);
private:
diff --git a/qt-ui/downloadfromdivecomputer.h b/qt-ui/downloadfromdivecomputer.h
index de80c4028..444c03e81 100644
--- a/qt-ui/downloadfromdivecomputer.h
+++ b/qt-ui/downloadfromdivecomputer.h
@@ -27,7 +27,7 @@ public:
InterfaceThread(QObject *parent, device_data_t *data) ;
virtual void run();
-Q_SIGNALS:
+signals:
void updateInterface(int value);
private:
device_data_t *data;
diff --git a/qt-ui/globe.h b/qt-ui/globe.h
index 41e95735c..eef01244b 100644
--- a/qt-ui/globe.h
+++ b/qt-ui/globe.h
@@ -29,7 +29,7 @@ private:
struct dive* editingDiveCoords;
KMessageWidget* messageWidget;
-public Q_SLOTS:
+public slots:
void changeDiveGeoPosition(qreal lon,qreal lat,GeoDataCoordinates::Unit);
void mouseClicked(qreal lon, qreal lat, GeoDataCoordinates::Unit);
};
diff --git a/qt-ui/maintab.h b/qt-ui/maintab.h
index 124bcff7e..739c089ec 100644
--- a/qt-ui/maintab.h
+++ b/qt-ui/maintab.h
@@ -45,7 +45,7 @@ public:
void initialUiSetup();
-public Q_SLOTS:
+public slots:
void addCylinder_clicked();
void addWeight_clicked();
void updateDiveInfo(int dive);
diff --git a/qt-ui/mainwindow.h b/qt-ui/mainwindow.h
index 0b3812469..0693f07fd 100644
--- a/qt-ui/mainwindow.h
+++ b/qt-ui/mainwindow.h
@@ -44,7 +44,7 @@ public:
GlobeGPS *globe();
void showError(QString message);
-private Q_SLOTS:
+private slots:
/* file menu action */
@@ -90,7 +90,7 @@ private Q_SLOTS:
protected:
void closeEvent(QCloseEvent *);
-public Q_SLOTS:
+public slots:
void readSettings();
void refreshDisplay();
diff --git a/qt-ui/profilegraphics.h b/qt-ui/profilegraphics.h
index ccc4841cb..6a5413d4f 100644
--- a/qt-ui/profilegraphics.h
+++ b/qt-ui/profilegraphics.h
@@ -42,7 +42,7 @@ public:
void mousePressEvent(QGraphicsSceneMouseEvent* event);
void mouseReleaseEvent(QGraphicsSceneMouseEvent* event);
bool eventFilter(QObject* , QEvent* );
-public Q_SLOTS:
+public slots:
void setRect(const QRectF& rect);
private:
@@ -98,7 +98,7 @@ protected:
void wheelEvent(QWheelEvent* event);
void showEvent(QShowEvent* event);
-public Q_SLOTS:
+public slots:
void refresh();
void edit_dive_time(const QString& time);
diff --git a/qt-ui/starwidget.h b/qt-ui/starwidget.h
index 68e3b2017..10a8a3073 100644
--- a/qt-ui/starwidget.h
+++ b/qt-ui/starwidget.h
@@ -17,10 +17,10 @@ public:
static QPixmap starActive();
static QPixmap starInactive();
-Q_SIGNALS:
+signals:
void valueChanged(int stars);
-public Q_SLOTS:
+public slots:
void setCurrentStars(int value);
void setReadOnly( bool readOnly);