From c907a2f857a2ee2b5117a71105f575020cbd4fa3 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Tue, 17 May 2016 13:32:57 +0800 Subject: [PATCH] Cleanup headers Code formatting --- src/base/scanfoldersmodel.cpp | 13 +++++-------- src/base/scanfoldersmodel.h | 11 ++++------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/base/scanfoldersmodel.cpp b/src/base/scanfoldersmodel.cpp index 9960e2f92..ea1bc6335 100644 --- a/src/base/scanfoldersmodel.cpp +++ b/src/base/scanfoldersmodel.cpp @@ -28,20 +28,17 @@ * Contact : chris@qbittorrent.org */ +#include "scanfoldersmodel.h" + #include #include -#include #include -#include #include -#include "utils/misc.h" -#include "utils/fs.h" -#include "preferences.h" -#include "logger.h" -#include "filesystemwatcher.h" #include "bittorrent/session.h" -#include "scanfoldersmodel.h" +#include "filesystemwatcher.h" +#include "preferences.h" +#include "utils/fs.h" struct ScanFoldersModel::PathData { diff --git a/src/base/scanfoldersmodel.h b/src/base/scanfoldersmodel.h index 24bd05549..41fd3a288 100644 --- a/src/base/scanfoldersmodel.h +++ b/src/base/scanfoldersmodel.h @@ -34,13 +34,10 @@ #include #include -QT_BEGIN_NAMESPACE class QStringList; -QT_END_NAMESPACE - class FileSystemWatcher; -class ScanFoldersModel : public QAbstractListModel +class ScanFoldersModel: public QAbstractListModel { Q_OBJECT Q_DISABLE_COPY(ScanFoldersModel) @@ -71,7 +68,7 @@ public: static bool initInstance(QObject *parent = 0); static void freeInstance(); - static ScanFoldersModel *instance(); + static ScanFoldersModel* instance(); static QString pathTypeDisplayName(const PathType type); @@ -83,8 +80,8 @@ public: // TODO: removePaths(); singular version becomes private helper functions; // also: remove functions should take modelindexes - PathStatus addPath(const QString &watchPath, const PathType& downloadType, const QString &downloadPath, bool addToFSWatcher = true); - PathStatus updatePath(const QString &watchPath, const PathType& downloadType, const QString &downloadPath); + PathStatus addPath(const QString &watchPath, const PathType &downloadType, const QString &downloadPath, bool addToFSWatcher = true); + PathStatus updatePath(const QString &watchPath, const PathType &downloadType, const QString &downloadPath); // PRECONDITION: The paths must have been added with addPath() first. void addToFSWatcher(const QStringList &watchPaths); void removePath(int row, bool removeFromFSWatcher = true);