From faa7f72c417b4ccd9b794b32b988312186d62e59 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Fri, 28 Dec 2012 16:50:41 +0100 Subject: Krazy Fixes, first shot --- src/sync/ftpsynchandler.h | 2 +- src/sync/googlesynchandler.h | 2 +- src/sync/operasynchandler.cpp | 4 ++-- src/sync/operasynchandler.h | 2 +- src/sync/synccheckwidget.h | 3 ++- src/sync/syncdatawidget.h | 2 +- src/sync/syncftpsettingswidget.h | 2 +- src/sync/syncgooglesettingswidget.h | 2 +- src/sync/synchandler.h | 2 +- src/sync/synchosttypewidget.h | 2 +- src/sync/syncmanager.cpp | 4 ++-- src/sync/syncoperasettingswidget.cpp | 6 ++++-- src/sync/syncoperasettingswidget.h | 2 +- 13 files changed, 19 insertions(+), 16 deletions(-) (limited to 'src/sync') diff --git a/src/sync/ftpsynchandler.h b/src/sync/ftpsynchandler.h index 2cb1227a..9122b9eb 100644 --- a/src/sync/ftpsynchandler.h +++ b/src/sync/ftpsynchandler.h @@ -43,7 +43,7 @@ class FTPSyncHandler : public SyncHandler Q_OBJECT public: - FTPSyncHandler(QObject *parent = 0); + explicit FTPSyncHandler(QObject *parent = 0); void syncHistory(); void syncBookmarks(); diff --git a/src/sync/googlesynchandler.h b/src/sync/googlesynchandler.h index 459ce16e..f0671b78 100644 --- a/src/sync/googlesynchandler.h +++ b/src/sync/googlesynchandler.h @@ -46,7 +46,7 @@ class GoogleSyncHandler : public SyncHandler Q_OBJECT public: - GoogleSyncHandler(QObject *parent = 0); + explicit GoogleSyncHandler(QObject *parent = 0); void syncHistory(); void syncBookmarks(); diff --git a/src/sync/operasynchandler.cpp b/src/sync/operasynchandler.cpp index ee3fb20d..085f5693 100644 --- a/src/sync/operasynchandler.cpp +++ b/src/sync/operasynchandler.cpp @@ -168,7 +168,7 @@ void OperaSyncHandler::startLogin() if (_qoauth.error() != QOAuth::NoError) { - kDebug() << "Error occured while fetching request tokens. Error code is : " << _qoauth.error(); + kDebug() << "Error occurred while fetching request tokens. Error code is : " << _qoauth.error(); emit syncStatus(Rekonq::Bookmarks, false, i18n("OAuth : Error fetching request token.")); _isSyncing = false; return; @@ -460,7 +460,7 @@ void OperaSyncHandler::createBookmarkFolderResultSlot(KJob* job) if (job->error() != 0) { - kDebug() << "Error occured while creating bookmark folder on server. Error code : " << job->error(); + kDebug() << "Error occurred while creating bookmark folder on server. Error code : " << job->error(); decreaseRequestCount(); return; } diff --git a/src/sync/operasynchandler.h b/src/sync/operasynchandler.h index 794164c1..12b05d47 100644 --- a/src/sync/operasynchandler.h +++ b/src/sync/operasynchandler.h @@ -52,7 +52,7 @@ class OperaSyncHandler : public SyncHandler Q_OBJECT public: - OperaSyncHandler(QObject *parent = 0); + explicit OperaSyncHandler(QObject *parent = 0); void syncHistory(); void syncBookmarks(); diff --git a/src/sync/synccheckwidget.h b/src/sync/synccheckwidget.h index 312fe9b4..9e0232bc 100644 --- a/src/sync/synccheckwidget.h +++ b/src/sync/synccheckwidget.h @@ -43,7 +43,8 @@ class SyncCheckWidget : public QWizardPage, private Ui::SyncCheck Q_OBJECT public: - SyncCheckWidget(QWidget *parent = 0); + explicit SyncCheckWidget(QWidget *parent = 0); + void initializePage(); private Q_SLOTS: diff --git a/src/sync/syncdatawidget.h b/src/sync/syncdatawidget.h index cfec1d49..b5c3eb78 100644 --- a/src/sync/syncdatawidget.h +++ b/src/sync/syncdatawidget.h @@ -43,7 +43,7 @@ class SyncDataWidget : public QWizardPage, private Ui::SyncData Q_OBJECT public: - SyncDataWidget(QWidget *parent = 0); + explicit SyncDataWidget(QWidget *parent = 0); int nextId() const; diff --git a/src/sync/syncftpsettingswidget.h b/src/sync/syncftpsettingswidget.h index d067eef4..14f4fdb9 100644 --- a/src/sync/syncftpsettingswidget.h +++ b/src/sync/syncftpsettingswidget.h @@ -43,7 +43,7 @@ class SyncFTPSettingsWidget : public QWizardPage, private Ui::SyncFTPSettings Q_OBJECT public: - SyncFTPSettingsWidget(QWidget *parent = 0); + explicit SyncFTPSettingsWidget(QWidget *parent = 0); int nextId() const; }; diff --git a/src/sync/syncgooglesettingswidget.h b/src/sync/syncgooglesettingswidget.h index a51b1d2c..65a70318 100644 --- a/src/sync/syncgooglesettingswidget.h +++ b/src/sync/syncgooglesettingswidget.h @@ -44,7 +44,7 @@ class SyncGoogleSettingsWidget : public QWizardPage, private Ui::SyncGoogleSetti Q_OBJECT public: - SyncGoogleSettingsWidget(QWidget *parent = 0); + explicit SyncGoogleSettingsWidget(QWidget *parent = 0); int nextId() const; }; diff --git a/src/sync/synchandler.h b/src/sync/synchandler.h index 32266d7c..ae1d9ac0 100644 --- a/src/sync/synchandler.h +++ b/src/sync/synchandler.h @@ -40,7 +40,7 @@ class SyncHandler : public QObject Q_OBJECT public: - SyncHandler(QObject *parent = 0); + explicit SyncHandler(QObject *parent = 0); virtual ~SyncHandler(); virtual void syncHistory() = 0; diff --git a/src/sync/synchosttypewidget.h b/src/sync/synchosttypewidget.h index 4f577958..b05fd54c 100644 --- a/src/sync/synchosttypewidget.h +++ b/src/sync/synchosttypewidget.h @@ -43,7 +43,7 @@ class SyncHostTypeWidget : public QWizardPage, private Ui::SyncHostType Q_OBJECT public: - SyncHostTypeWidget(QWidget *parent = 0); + explicit SyncHostTypeWidget(QWidget *parent = 0); int nextId() const; bool changed(); diff --git a/src/sync/syncmanager.cpp b/src/sync/syncmanager.cpp index e31c226d..7a1cb782 100644 --- a/src/sync/syncmanager.cpp +++ b/src/sync/syncmanager.cpp @@ -32,8 +32,8 @@ #include "rekonq.h" // Config Includes -#include "config-qca2.h" -#include "config-qtoauth.h" +#include +#include // Local Includes #include "application.h" diff --git a/src/sync/syncoperasettingswidget.cpp b/src/sync/syncoperasettingswidget.cpp index a45ae70c..dbeb0555 100644 --- a/src/sync/syncoperasettingswidget.cpp +++ b/src/sync/syncoperasettingswidget.cpp @@ -33,13 +33,15 @@ #include "rekonq.h" // Config Includes -#include "config-qca2.h" -#include "config-qtoauth.h" +#include +#include // Local Includes #include "syncassistant.h" + + SyncOperaSettingsWidget::SyncOperaSettingsWidget(QWidget *parent) : QWizardPage(parent) { diff --git a/src/sync/syncoperasettingswidget.h b/src/sync/syncoperasettingswidget.h index 53e95699..47c157b8 100644 --- a/src/sync/syncoperasettingswidget.h +++ b/src/sync/syncoperasettingswidget.h @@ -44,7 +44,7 @@ class SyncOperaSettingsWidget : public QWizardPage, private Ui::SyncOperaSetting Q_OBJECT public: - SyncOperaSettingsWidget(QWidget *parent = 0); + explicit SyncOperaSettingsWidget(QWidget *parent = 0); int nextId() const; }; -- cgit v1.2.1