Fix various coding style problems

To make sure we have a clean start for the new style script ;-)

Reviewed-by: Ademar Reis

8 files changed, 16 insertions, 24 deletions

diff --git a/src/BookmarkFilter.h b/src/BookmarkFilter.h
index 557582d..c5cca8f 100644
--- a/src/BookmarkFilter.h
+++ b/src/BookmarkFilter.h
@@ -19,8 +19,7 @@
 
 #include <QtGui/QSortFilterProxyModel>
 
-class BookmarkFilter : public QSortFilterProxyModel
-{
+class BookmarkFilter : public QSortFilterProxyModel {
     Q_OBJECT
     Q_PROPERTY(QAbstractItemModel* sourceModel READ sourceModel WRITE setSourceModel)
     Q_PROPERTY(int startRow READ startRow WRITE setStartRow NOTIFY startRowChanged)
@@ -33,10 +32,10 @@ public:
     bool filterAcceptsRow(int, const QModelIndex&) const;
 
     int startRow() const;
-    void setStartRow(int row);
+    void setStartRow(int);
 
     int endRow() const;
-    void setEndRow(int row);
+    void setEndRow(int);
 
 signals:
     void startRowChanged();
diff --git a/src/BookmarkModel.h b/src/BookmarkModel.h
index 7489c6b..d9fe3d8 100644
--- a/src/BookmarkModel.h
+++ b/src/BookmarkModel.h
@@ -20,12 +20,11 @@
 #include <QtSql/QSqlDatabase>
 #include <QtSql/QSqlTableModel>
 
-class BookmarkModel : public QSqlTableModel
-{
+class BookmarkModel : public QSqlTableModel {
     Q_OBJECT
 
 public:
-    BookmarkModel(QSqlDatabase database, QObject* parent = 0);
+    BookmarkModel(QSqlDatabase, QObject* parent = 0);
     void generateRoleNames();
     QString tableCreateQuery() const;
 
diff --git a/src/BrowserObject.h b/src/BrowserObject.h
index 329bdb6..4d713fd 100644
--- a/src/BrowserObject.h
+++ b/src/BrowserObject.h
@@ -32,14 +32,14 @@ public:
 
     Q_INVOKABLE QUrl urlFromUserInput(const QString&);
     Q_INVOKABLE bool isUrlValid(const QUrl&);
-    Q_INVOKABLE bool isUrlEmpty(const QUrl& url);
+    Q_INVOKABLE bool isUrlEmpty(const QUrl&);
 
 signals:
     void windowTitleChanged();
 
 private:
     friend class BrowserWindow;
-    BrowserObject(BrowserWindow* window);
+    BrowserObject(BrowserWindow*);
     BrowserWindow* m_window;
 };
 
diff --git a/src/DatabaseManager.h b/src/DatabaseManager.h
index fdf8181..814de08 100644
--- a/src/DatabaseManager.h
+++ b/src/DatabaseManager.h
@@ -21,9 +21,7 @@
 
 class BookmarkModel;
 
-class DatabaseManager
-{
-
+class DatabaseManager {
 public:
     static DatabaseManager* instance();
     static void destroy();
diff --git a/src/PopupMenu.cpp b/src/PopupMenu.cpp
index 7431584..eb31462 100644
--- a/src/PopupMenu.cpp
+++ b/src/PopupMenu.cpp
@@ -21,11 +21,9 @@
 #include <QtGui/QApplication>
 #include <QtGui/QDesktopWidget>
 
-class SGView : public QSGView
-{
+class SGView : public QSGView {
 public:
-    SGView(QWidget* parent = 0) : QSGView(parent)
-    {}
+    SGView(QWidget* parent = 0) : QSGView(parent) { }
 protected:
     void resizeEvent(QResizeEvent* event)
     {
@@ -66,7 +64,7 @@ QString PopupMenu::qmlComponent() const
 
 int PopupMenu::maxWidth() const
 {
-   return QApplication::desktop()->screenGeometry().width();
+    return QApplication::desktop()->screenGeometry().width();
 }
 
 int PopupMenu::maxHeight() const
diff --git a/src/PopupMenu.h b/src/PopupMenu.h
index 25d04ba..56e7a38 100644
--- a/src/PopupMenu.h
+++ b/src/PopupMenu.h
@@ -23,12 +23,11 @@ QT_BEGIN_NAMESPACE
 class QSGView;
 QT_END_NAMESPACE
 
-class PopupMenu : public QDialog
-{
+class PopupMenu : public QDialog {
+    Q_OBJECT
     Q_PROPERTY(QString qmlComponent READ qmlComponent WRITE setQmlComponent NOTIFY qmlComponentChanged)
     Q_PROPERTY(int maxWidth READ maxWidth NOTIFY maxWidthChanged)
     Q_PROPERTY(int maxHeight READ maxHeight NOTIFY maxHeightChanged)
-    Q_OBJECT
 public:
     PopupMenu(QWidget* parent = 0);
 
diff --git a/src/TripleClickMonitor.h b/src/TripleClickMonitor.h
index 38596c0..bdd6269 100644
--- a/src/TripleClickMonitor.h
+++ b/src/TripleClickMonitor.h
@@ -38,7 +38,7 @@ signals:
     void tripleClicked();
 
 protected:
-    bool eventFilter(QObject* object, QEvent* event);
+    bool eventFilter(QObject*, QEvent*);
 
 private:
     bool isWatching() const;
diff --git a/tests/database/tst_database.cpp b/tests/database/tst_database.cpp
index 995bb37..0ffb14e 100644
--- a/tests/database/tst_database.cpp
+++ b/tests/database/tst_database.cpp
@@ -25,8 +25,7 @@
 #include "DatabaseManager.h"
 #include "BookmarkModel.h"
 
-class tst_DataBase : public QObject
-{
+class tst_DataBase : public QObject {
     Q_OBJECT
 
 public:
@@ -103,7 +102,7 @@ void tst_DataBase::insert()
         QVERIFY(bookmarkModel->contains("http://www.nokia.com"));
 
         const int date = record.value("dateAdded").toInt();
-        QVERIFY(date != 0);
+        QVERIFY(date);
     }
 }