dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add explicit

Browse Source
This commit is contained in:
Jonas Kvinge
2020-04-07 16:49:15 +02:00
parent 3efc496c41
commit 21b2193cd0
199 changed files with 337 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/playlist/playlist.h
View File

@@ -91,7 +91,7 @@ class Playlist : public QAbstractListModel {
friend class PlaylistUndoCommands::ReOrderItems;
public:
Playlist(PlaylistBackend *backend, TaskManager *task_manager, CollectionBackend *collection, int id, const QString &special_type = QString(), bool favorite = false, QObject *parent = nullptr);
explicit Playlist(PlaylistBackend *backend, TaskManager *task_manager, CollectionBackend *collection, int id, const QString &special_type = QString(), bool favorite = false, QObject *parent = nullptr);
~Playlist();
void SkipTracks(const QModelIndexList &source_indexes);

2
src/playlist/playlistcontainer.h
View File

@@ -47,7 +47,7 @@ class PlaylistContainer : public QWidget {
Q_OBJECT
public:
PlaylistContainer(QWidget *parent = nullptr);
explicit PlaylistContainer(QWidget *parent = nullptr);
~PlaylistContainer();
static const char *kSettingsGroup;

20
src/playlist/playlistdelegates.h
View File

@@ -78,7 +78,7 @@ private:
class PlaylistDelegateBase : public QueuedItemDelegate {
Q_OBJECT
public:
PlaylistDelegateBase(QObject *parent, const QString &suffix = QString());
explicit PlaylistDelegateBase(QObject *parent, const QString &suffix = QString());
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const;
QString displayText(const QVariant &value, const QLocale &locale) const;
QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const;
@@ -97,19 +97,19 @@ class PlaylistDelegateBase : public QueuedItemDelegate {
class LengthItemDelegate : public PlaylistDelegateBase {
public:
LengthItemDelegate(QObject *parent) : PlaylistDelegateBase(parent) {}
explicit LengthItemDelegate(QObject *parent) : PlaylistDelegateBase(parent) {}
QString displayText(const QVariant &value, const QLocale &locale) const;
};
class SizeItemDelegate : public PlaylistDelegateBase {
public:
SizeItemDelegate(QObject *parent) : PlaylistDelegateBase(parent) {}
explicit SizeItemDelegate(QObject *parent) : PlaylistDelegateBase(parent) {}
QString displayText(const QVariant &value, const QLocale &locale) const;
};
class DateItemDelegate : public PlaylistDelegateBase {
public:
DateItemDelegate(QObject *parent) : PlaylistDelegateBase(parent) {}
explicit DateItemDelegate(QObject *parent) : PlaylistDelegateBase(parent) {}
QString displayText(const QVariant &value, const QLocale &locale) const;
};
@@ -127,13 +127,13 @@ class FileTypeItemDelegate : public PlaylistDelegateBase {
class TextItemDelegate : public PlaylistDelegateBase {
public:
TextItemDelegate(QObject *parent) : PlaylistDelegateBase(parent) {}
explicit TextItemDelegate(QObject *parent) : PlaylistDelegateBase(parent) {}
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const;
};
class TagCompletionModel : public QStringListModel {
public:
TagCompletionModel(CollectionBackend *backend, Playlist::Column column);
explicit TagCompletionModel(CollectionBackend *backend, Playlist::Column column);
private:
static QString database_column(Playlist::Column column);
@@ -143,7 +143,7 @@ class TagCompleter : public QCompleter {
Q_OBJECT
public:
TagCompleter(CollectionBackend *backend, Playlist::Column column, QLineEdit *editor);
explicit TagCompleter(CollectionBackend *backend, Playlist::Column column, QLineEdit *editor);
~TagCompleter();
private slots:
@@ -155,7 +155,7 @@ private:
class TagCompletionItemDelegate : public PlaylistDelegateBase {
public:
TagCompletionItemDelegate(QObject *parent, CollectionBackend *backend, Playlist::Column column) : PlaylistDelegateBase(parent), backend_(backend), column_(column) {};
explicit TagCompletionItemDelegate(QObject *parent, CollectionBackend *backend, Playlist::Column column) : PlaylistDelegateBase(parent), backend_(backend), column_(column) {};
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const;
@@ -166,13 +166,13 @@ class TagCompletionItemDelegate : public PlaylistDelegateBase {
class NativeSeparatorsDelegate : public PlaylistDelegateBase {
public:
NativeSeparatorsDelegate(QObject *parent) : PlaylistDelegateBase(parent) {}
explicit NativeSeparatorsDelegate(QObject *parent) : PlaylistDelegateBase(parent) {}
QString displayText(const QVariant &value, const QLocale &locale) const;
};
class SongSourceDelegate : public PlaylistDelegateBase {
public:
SongSourceDelegate(QObject *parent);
explicit SongSourceDelegate(QObject *parent);
QString displayText(const QVariant &value, const QLocale &locale) const;
void paint(QPainter *paint, const QStyleOptionViewItem &option, const QModelIndex &index) const;

2
src/playlist/playlistfilter.h
View File

@@ -37,7 +37,7 @@ class PlaylistFilter : public QSortFilterProxyModel {
Q_OBJECT
public:
PlaylistFilter(QObject *parent = nullptr);
explicit PlaylistFilter(QObject *parent = nullptr);
~PlaylistFilter();
// QAbstractItemModel

5
src/playlist/playlistfilterparser.h
View File

@@ -69,10 +69,7 @@ class NopFilter : public FilterTree {
// col ::= "title" | "artist" | ...
class FilterParser {
public:
FilterParser(
const QString &filter,
const QMap<QString, int> &columns,
const QSet<int> &numerical_cols);
explicit FilterParser(const QString &filter, const QMap<QString, int> &columns, const QSet<int> &numerical_cols);
FilterTree *parse();

2
src/playlist/playlistheader.h
View File

@@ -40,7 +40,7 @@ class PlaylistHeader : public StretchHeaderView {
Q_OBJECT
public:
PlaylistHeader(Qt::Orientation orientation, PlaylistView *view, QWidget *parent = nullptr);
explicit PlaylistHeader(Qt::Orientation orientation, PlaylistView *view, QWidget *parent = nullptr);
// QWidget
void contextMenuEvent(QContextMenuEvent *e);

2
src/playlist/playlistitem.h
View File

@@ -45,7 +45,7 @@ class SqlRow;
class PlaylistItem : public std::enable_shared_from_this<PlaylistItem> {
public:
PlaylistItem(const Song::Source &source) : should_skip_(false), source_(source) {}
explicit PlaylistItem(const Song::Source &source) : should_skip_(false), source_(source) {}
virtual ~PlaylistItem();
static PlaylistItem *NewFromSource(const Song::Source &source);

6
src/playlist/playlistitemmimedata.h
View File

@@ -31,9 +31,9 @@
class PlaylistItemMimeData : public MimeData {
Q_OBJECT
public:
PlaylistItemMimeData(const PlaylistItemPtr &item) : items_(PlaylistItemList() << item) {}
PlaylistItemMimeData(const PlaylistItemList &items) : items_(items) {}
public:
explicit PlaylistItemMimeData(const PlaylistItemPtr &item) : items_(PlaylistItemList() << item) {}
explicit PlaylistItemMimeData(const PlaylistItemList &items) : items_(items) {}
PlaylistItemList items_;
};

2
src/playlist/playlistlistcontainer.h
View File

@@ -48,7 +48,7 @@ class PlaylistListContainer : public QWidget {
Q_OBJECT
public:
PlaylistListContainer(QWidget *parent = nullptr);
explicit PlaylistListContainer(QWidget *parent = nullptr);
~PlaylistListContainer();
void SetApplication(Application *app);

2
src/playlist/playlistlistmodel.h
View File

@@ -37,7 +37,7 @@ class PlaylistListModel : public QStandardItemModel {
Q_OBJECT
public:
PlaylistListModel(QObject *parent = nullptr);
explicit PlaylistListModel(QObject *parent = nullptr);
enum Types {
Type_Folder,

2
src/playlist/playlistlistview.h
View File

@@ -35,7 +35,7 @@ class PlaylistListView : public AutoExpandingTreeView {
Q_OBJECT
public:
PlaylistListView(QWidget *parent = nullptr);
explicit PlaylistListView(QWidget *parent = nullptr);
~PlaylistListView() {}
protected:

10
src/playlist/playlistmanager.h
View File

@@ -47,8 +47,8 @@ class PlaylistSequence;
class PlaylistManagerInterface : public QObject {
Q_OBJECT
public:
PlaylistManagerInterface(Application *app, QObject *parent) : QObject(parent) { Q_UNUSED(app); }
public:
explicit PlaylistManagerInterface(Application *app, QObject *parent) : QObject(parent) { Q_UNUSED(app); }
virtual int current_id() const = 0;
virtual int active_id() const = 0;
@@ -76,7 +76,7 @@ public:
virtual PlaylistParser *parser() const = 0;
virtual PlaylistContainer *playlist_container() const = 0;
public slots:
public slots:
virtual void New(const QString &name, const SongList& songs = SongList(), const QString &special_type = QString()) = 0;
virtual void Load(const QString &filename) = 0;
virtual void Save(int id, const QString &filename, Playlist::Path path_type) = 0;
@@ -132,7 +132,7 @@ class PlaylistManager : public PlaylistManagerInterface {
Q_OBJECT
public:
PlaylistManager(Application *app, QObject *parent = nullptr);
explicit PlaylistManager(Application *app, QObject *parent = nullptr);
~PlaylistManager();
int current_id() const { return current_; }
@@ -223,7 +223,7 @@ class PlaylistManager : public PlaylistManagerInterface {
private:
struct Data {
Data(Playlist *_p = nullptr, const QString& _name = QString()) : p(_p), name(_name) {}
explicit Data(Playlist *_p = nullptr, const QString& _name = QString()) : p(_p), name(_name) {}
Playlist *p;
QString name;
QItemSelection selection;

2
src/playlist/playlistsequence.h
View File

@@ -41,7 +41,7 @@ class PlaylistSequence : public QWidget {
Q_OBJECT
public:
PlaylistSequence(QWidget *parent = nullptr, SettingsProvider *settings = 0);
explicit PlaylistSequence(QWidget *parent = nullptr, SettingsProvider *settings = 0);
~PlaylistSequence();
enum RepeatMode {

10
src/playlist/playlisttabbar.h
View File

@@ -49,7 +49,7 @@ class PlaylistTabBar : public QTabBar {
Q_OBJECT
public:
PlaylistTabBar(QWidget *parent = nullptr);
explicit PlaylistTabBar(QWidget *parent = nullptr);
static const int kDragHoverTimeout = 500;
static const char *kSettingsGroup;
@@ -70,7 +70,7 @@ class PlaylistTabBar : public QTabBar {
void RemoveTab(int id);
void InsertTab(int id, int index, const QString &text, bool favorite);
signals:
signals:
void CurrentIdChanged(int id);
void Rename(int id, const QString &name);
void Close(int id);
@@ -78,7 +78,7 @@ signals:
void PlaylistOrderChanged(const QList<int> &ids);
void PlaylistFavorited(int id, bool favorite);
protected:
protected:
void contextMenuEvent(QContextMenuEvent *e);
void mouseReleaseEvent(QMouseEvent *e);
void mouseDoubleClickEvent(QMouseEvent *e);
@@ -89,7 +89,7 @@ protected:
void timerEvent(QTimerEvent *e);
bool event(QEvent *e);
private slots:
private slots:
void CurrentIndexChanged(int index);
void Rename();
void RenameInline();
@@ -103,7 +103,7 @@ private slots:
void TabMoved();
void Save();
private:
private:
PlaylistManager *manager_;
QMenu *menu_;

14
src/playlist/playlistundocommands.h
View File

@@ -41,7 +41,7 @@ namespace PlaylistUndoCommands {
Q_DECLARE_TR_FUNCTIONS(PlaylistUndoCommands)
public:
Base(Playlist *playlist);
explicit Base(Playlist *playlist);
protected:
Playlist *playlist_;
@@ -49,7 +49,7 @@ namespace PlaylistUndoCommands {
class InsertItems : public Base {
public:
InsertItems(Playlist *playlist, const PlaylistItemList &items, int pos, bool enqueue = false, bool enqueue_next = false);
explicit InsertItems(Playlist *playlist, const PlaylistItemList &items, int pos, bool enqueue = false, bool enqueue_next = false);
void undo();
void redo();
@@ -67,7 +67,7 @@ namespace PlaylistUndoCommands {
class RemoveItems : public Base {
public:
RemoveItems(Playlist *playlist, int pos, int count);
explicit RemoveItems(Playlist *playlist, int pos, int count);
int id() const { return Type_RemoveItems; }
@@ -88,7 +88,7 @@ namespace PlaylistUndoCommands {
class MoveItems : public Base {
public:
MoveItems(Playlist *playlist, const QList<int> &source_rows, int pos);
explicit MoveItems(Playlist *playlist, const QList<int> &source_rows, int pos);
void undo();
void redo();
@@ -100,7 +100,7 @@ namespace PlaylistUndoCommands {
class ReOrderItems : public Base {
public:
ReOrderItems(Playlist *playlist, const PlaylistItemList &new_items);
explicit ReOrderItems(Playlist *playlist, const PlaylistItemList &new_items);
void undo();
void redo();
@@ -112,13 +112,13 @@ namespace PlaylistUndoCommands {
class SortItems : public ReOrderItems {
public:
SortItems(Playlist *playlist, int column, Qt::SortOrder order, const PlaylistItemList &new_items);
explicit SortItems(Playlist *playlist, int column, Qt::SortOrder order, const PlaylistItemList &new_items);
};
class ShuffleItems : public ReOrderItems {
public:
ShuffleItems(Playlist *playlist, const PlaylistItemList &new_items);
explicit ShuffleItems(Playlist *playlist, const PlaylistItemList &new_items);
};
} //namespace

4
src/playlist/playlistview.h
View File

@@ -79,7 +79,7 @@ class PlaylistHeader;
// This class is used by internet search view as well.
class PlaylistProxyStyle : public QProxyStyle {
public:
PlaylistProxyStyle();
explicit PlaylistProxyStyle();
void drawControl(ControlElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget) const;
void drawPrimitive(PrimitiveElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget) const;
@@ -92,7 +92,7 @@ class PlaylistView : public QTreeView {
Q_OBJECT
public:
PlaylistView(QWidget *parent = nullptr);
explicit PlaylistView(QWidget *parent = nullptr);
~PlaylistView();
static ColumnAlignmentMap DefaultColumnAlignment();

2
src/playlist/songmimedata.h
View File

@@ -35,7 +35,7 @@ class SongMimeData : public MimeData {
Q_OBJECT
public:
SongMimeData() : backend(nullptr) {}
explicit SongMimeData() : backend(nullptr) {}
CollectionBackendInterface *backend;
SongList songs;

4
src/playlist/songplaylistitem.h
View File

@@ -32,8 +32,8 @@
class SongPlaylistItem : public PlaylistItem {
public:
SongPlaylistItem(const Song::Source &source);
SongPlaylistItem(const Song &song);
explicit SongPlaylistItem(const Song::Source &source);
explicit SongPlaylistItem(const Song &song);
// Restores a stream- or file-related playlist item using query row.
// If it's a file related playlist item, this will restore it's CUE attributes (if any) but won't parse the CUE!