Remove extra ';'
This commit is contained in:
parent
f9627c2084
commit
d09c27f719
|
@ -65,6 +65,6 @@ typedef QSharedPointer<AddRemoveResult> AddRemoveResultPtr;
|
|||
|
||||
}
|
||||
|
||||
Q_DECLARE_METATYPE( mygpo::AddRemoveResultPtr );
|
||||
Q_DECLARE_METATYPE( mygpo::AddRemoveResultPtr )
|
||||
|
||||
#endif // LIBMYGPO_QT_ADDREMOVERESULT_H
|
||||
|
|
|
@ -66,6 +66,6 @@ typedef QSharedPointer<Device> DevicePtr;
|
|||
|
||||
}
|
||||
|
||||
Q_DECLARE_METATYPE( mygpo::DevicePtr );
|
||||
Q_DECLARE_METATYPE( mygpo::DevicePtr )
|
||||
|
||||
#endif //LIBMYGPO_QT_DEVICE_H
|
||||
|
|
|
@ -63,6 +63,6 @@ typedef QSharedPointer<DeviceList> DeviceListPtr;
|
|||
|
||||
}
|
||||
|
||||
Q_DECLARE_METATYPE( mygpo::DeviceListPtr );
|
||||
Q_DECLARE_METATYPE( mygpo::DeviceListPtr )
|
||||
|
||||
#endif //LIBMYGPO_QT_DEVICELIST_H
|
||||
|
|
|
@ -91,6 +91,6 @@ typedef QSharedPointer<Episode> EpisodePtr;
|
|||
|
||||
}
|
||||
|
||||
Q_DECLARE_METATYPE( mygpo::EpisodePtr );
|
||||
Q_DECLARE_METATYPE( mygpo::EpisodePtr )
|
||||
|
||||
#endif // LIBMYGPO_QT_EPISODE_H
|
||||
|
|
|
@ -75,6 +75,6 @@ typedef QSharedPointer<EpisodeAction> EpisodeActionPtr;
|
|||
|
||||
}
|
||||
|
||||
Q_DECLARE_METATYPE( mygpo::EpisodeActionPtr );
|
||||
Q_DECLARE_METATYPE( mygpo::EpisodeActionPtr )
|
||||
|
||||
#endif // LIBMYGPO_QT_EPISODEACTION_H
|
||||
|
|
|
@ -66,6 +66,6 @@ typedef QSharedPointer<EpisodeActionList> EpisodeActionListPtr;
|
|||
|
||||
}
|
||||
|
||||
Q_DECLARE_METATYPE( mygpo::EpisodeActionListPtr );
|
||||
Q_DECLARE_METATYPE( mygpo::EpisodeActionListPtr )
|
||||
|
||||
#endif // LIBMYGPO_QT_EPISODEACTIONLIST_H
|
||||
|
|
|
@ -52,6 +52,6 @@ private slots:
|
|||
|
||||
};
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
#endif // EPISODELIST_PRIVATE_H
|
||||
|
|
|
@ -66,6 +66,6 @@ private slots:
|
|||
|
||||
};
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
#endif // EPISODE_PRIVATE_H
|
||||
|
|
|
@ -79,6 +79,6 @@ typedef QSharedPointer<Podcast> PodcastPtr;
|
|||
|
||||
}
|
||||
|
||||
Q_DECLARE_METATYPE( mygpo::PodcastPtr );
|
||||
Q_DECLARE_METATYPE( mygpo::PodcastPtr )
|
||||
|
||||
#endif // LIBMYGPO_QT_PODCAST_H
|
||||
|
|
|
@ -66,6 +66,6 @@ private slots:
|
|||
void error( QNetworkReply::NetworkError error );
|
||||
};
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
#endif // PODCAST_PRIVATE_H
|
||||
|
|
|
@ -54,6 +54,6 @@ typedef QSharedPointer<Tag> TagPtr;
|
|||
|
||||
}
|
||||
|
||||
Q_DECLARE_METATYPE( mygpo::TagPtr );
|
||||
Q_DECLARE_METATYPE( mygpo::TagPtr )
|
||||
|
||||
#endif // LIBMYGPO_QT_TAG_H
|
||||
|
|
|
@ -61,6 +61,6 @@ typedef QSharedPointer<TagList> TagListPtr;
|
|||
|
||||
}
|
||||
|
||||
Q_DECLARE_METATYPE( mygpo::TagListPtr );
|
||||
Q_DECLARE_METATYPE( mygpo::TagListPtr )
|
||||
|
||||
#endif // LIBMYGPO_QT_TAGLIST_H
|
||||
|
|
|
@ -35,7 +35,7 @@ private:
|
|||
friend class QSearchFieldPrivate;
|
||||
QPointer <QSearchFieldPrivate> pimpl;
|
||||
|
||||
Q_PROPERTY(QString placeholderText READ placeholderText WRITE setPlaceholderText);
|
||||
Q_PROPERTY(QString placeholderText READ placeholderText WRITE setPlaceholderText)
|
||||
};
|
||||
|
||||
#endif // QSEARCHFIELD_H
|
||||
|
|
|
@ -58,7 +58,7 @@ class CrashReporting {
|
|||
void* context, bool succeeded);
|
||||
|
||||
private:
|
||||
Q_DISABLE_COPY(CrashReporting);
|
||||
Q_DISABLE_COPY(CrashReporting)
|
||||
|
||||
static const char* kSendCrashReportOption;
|
||||
static char* sPath;
|
||||
|
|
|
@ -42,14 +42,14 @@ struct MprisPlaylist {
|
|||
QString icon; // Uri
|
||||
};
|
||||
typedef QList<MprisPlaylist> MprisPlaylistList;
|
||||
Q_DECLARE_METATYPE(MprisPlaylist);
|
||||
Q_DECLARE_METATYPE(MprisPlaylistList);
|
||||
Q_DECLARE_METATYPE(MprisPlaylist)
|
||||
Q_DECLARE_METATYPE(MprisPlaylistList)
|
||||
|
||||
struct MaybePlaylist {
|
||||
bool valid;
|
||||
MprisPlaylist playlist;
|
||||
};
|
||||
Q_DECLARE_METATYPE(MaybePlaylist);
|
||||
Q_DECLARE_METATYPE(MaybePlaylist)
|
||||
|
||||
QDBusArgument& operator<<(QDBusArgument& arg, const MprisPlaylist& playlist);
|
||||
const QDBusArgument& operator>>(const QDBusArgument& arg,
|
||||
|
|
|
@ -85,7 +85,7 @@ class MusicStorage {
|
|||
virtual void Eject() {}
|
||||
};
|
||||
|
||||
Q_DECLARE_METATYPE(MusicStorage*);
|
||||
Q_DECLARE_METATYPE(std::shared_ptr<MusicStorage>);
|
||||
Q_DECLARE_METATYPE(MusicStorage*)
|
||||
Q_DECLARE_METATYPE(std::shared_ptr<MusicStorage>)
|
||||
|
||||
#endif // CORE_MUSICSTORAGE_H_
|
||||
|
|
|
@ -318,10 +318,10 @@ class Song {
|
|||
struct Private;
|
||||
QSharedDataPointer<Private> d;
|
||||
};
|
||||
Q_DECLARE_METATYPE(Song);
|
||||
Q_DECLARE_METATYPE(Song)
|
||||
|
||||
typedef QList<Song> SongList;
|
||||
Q_DECLARE_METATYPE(QList<Song>);
|
||||
Q_DECLARE_METATYPE(QList<Song>)
|
||||
|
||||
uint qHash(const Song& song);
|
||||
// Hash function using field checked in IsSimilar function
|
||||
|
|
|
@ -50,7 +50,7 @@ class TaskManager : public QObject {
|
|||
const int task_id_;
|
||||
TaskManager* task_manager_;
|
||||
|
||||
Q_DISABLE_COPY(ScopedTask);
|
||||
Q_DISABLE_COPY(ScopedTask)
|
||||
};
|
||||
|
||||
// Everything here is thread safe
|
||||
|
@ -74,7 +74,7 @@ class TaskManager : public QObject {
|
|||
QMap<int, Task> tasks_;
|
||||
int next_task_id_;
|
||||
|
||||
Q_DISABLE_COPY(TaskManager);
|
||||
Q_DISABLE_COPY(TaskManager)
|
||||
};
|
||||
|
||||
#endif // CORE_TASKMANAGER_H_
|
||||
|
|
|
@ -172,7 +172,7 @@ class ScopedWCharArray {
|
|||
int bytes() const { return (chars_ + 1) * sizeof(wchar_t); }
|
||||
|
||||
private:
|
||||
Q_DISABLE_COPY(ScopedWCharArray);
|
||||
Q_DISABLE_COPY(ScopedWCharArray)
|
||||
|
||||
int chars_;
|
||||
std::unique_ptr<wchar_t[]> data_;
|
||||
|
|
|
@ -71,12 +71,12 @@ struct CoverSearchResult {
|
|||
// an URL of a cover image described by this CoverSearchResult
|
||||
QUrl image_url;
|
||||
};
|
||||
Q_DECLARE_METATYPE(CoverSearchResult);
|
||||
Q_DECLARE_METATYPE(CoverSearchResult)
|
||||
|
||||
// This is a complete result of a single search request (a list of results, each
|
||||
// describing one image, actually).
|
||||
typedef QList<CoverSearchResult> CoverSearchResults;
|
||||
Q_DECLARE_METATYPE(QList<CoverSearchResult>);
|
||||
Q_DECLARE_METATYPE(QList<CoverSearchResult>)
|
||||
|
||||
// This class searches for album covers for a given query or artist/album and
|
||||
// returns URLs. It's NOT thread-safe.
|
||||
|
|
|
@ -53,7 +53,7 @@ class CoverProviders : public QObject {
|
|||
void ProviderDestroyed();
|
||||
|
||||
private:
|
||||
Q_DISABLE_COPY(CoverProviders);
|
||||
Q_DISABLE_COPY(CoverProviders)
|
||||
|
||||
QMap<CoverProvider*, QString> cover_providers_;
|
||||
QMutex mutex_;
|
||||
|
|
|
@ -31,7 +31,7 @@ class MtpConnection {
|
|||
LIBMTP_mtpdevice_t* device() const { return device_; }
|
||||
|
||||
private:
|
||||
Q_DISABLE_COPY(MtpConnection);
|
||||
Q_DISABLE_COPY(MtpConnection)
|
||||
|
||||
LIBMTP_mtpdevice_t* device_;
|
||||
};
|
||||
|
|
|
@ -32,7 +32,7 @@ enum TrackChangeType {
|
|||
// Any of:
|
||||
SameAlbum = 0x10,
|
||||
};
|
||||
Q_DECLARE_FLAGS(TrackChangeFlags, TrackChangeType);
|
||||
Q_DECLARE_FLAGS(TrackChangeFlags, TrackChangeType)
|
||||
}
|
||||
|
||||
typedef Engine::Base EngineBase;
|
||||
|
|
|
@ -153,7 +153,7 @@ signals:
|
|||
|
||||
private:
|
||||
bool about_to_end_emitted_;
|
||||
Q_DISABLE_COPY(Base);
|
||||
Q_DISABLE_COPY(Base)
|
||||
};
|
||||
|
||||
struct SimpleMetaBundle {
|
||||
|
|
|
@ -63,6 +63,6 @@ class Geolocator : public QObject {
|
|||
};
|
||||
|
||||
QDebug operator<<(QDebug dbg, const Geolocator::LatLng& ll);
|
||||
Q_DECLARE_METATYPE(Geolocator::LatLng);
|
||||
Q_DECLARE_METATYPE(Geolocator::LatLng)
|
||||
|
||||
#endif // INTERNET_CORE_GEOLOCATOR_H_
|
||||
|
|
|
@ -143,6 +143,6 @@ signals:
|
|||
Lazy<QAction> separator_;
|
||||
};
|
||||
|
||||
Q_DECLARE_METATYPE(InternetService*);
|
||||
Q_DECLARE_METATYPE(InternetService*)
|
||||
|
||||
#endif // INTERNET_CORE_INTERNETSERVICE_H_
|
||||
|
|
|
@ -58,7 +58,7 @@
|
|||
#include "spotifyblobdownloader.h"
|
||||
#endif
|
||||
|
||||
Q_DECLARE_METATYPE(QStandardItem*);
|
||||
Q_DECLARE_METATYPE(QStandardItem*)
|
||||
|
||||
const char* SpotifyService::kServiceName = "Spotify";
|
||||
const char* SpotifyService::kSettingsGroup = "Spotify";
|
||||
|
|
|
@ -45,7 +45,7 @@ class QSettings;
|
|||
|
||||
class LibraryModel : public SimpleTreeModel<LibraryItem> {
|
||||
Q_OBJECT
|
||||
Q_ENUMS(GroupBy);
|
||||
Q_ENUMS(GroupBy)
|
||||
|
||||
public:
|
||||
LibraryModel(LibraryBackend* backend, Application* app,
|
||||
|
@ -304,7 +304,7 @@ signals:
|
|||
QSet<QString> pending_cache_keys_;
|
||||
};
|
||||
|
||||
Q_DECLARE_METATYPE(LibraryModel::Grouping);
|
||||
Q_DECLARE_METATYPE(LibraryModel::Grouping)
|
||||
|
||||
QDataStream& operator<<(QDataStream& s, const LibraryModel::Grouping& g);
|
||||
QDataStream& operator>>(QDataStream& s, LibraryModel::Grouping& g);
|
||||
|
|
|
@ -49,8 +49,8 @@ class ShuffleItems;
|
|||
}
|
||||
|
||||
typedef QMap<int, Qt::Alignment> ColumnAlignmentMap;
|
||||
Q_DECLARE_METATYPE(Qt::Alignment);
|
||||
Q_DECLARE_METATYPE(ColumnAlignmentMap);
|
||||
Q_DECLARE_METATYPE(Qt::Alignment)
|
||||
Q_DECLARE_METATYPE(ColumnAlignmentMap)
|
||||
|
||||
// Objects that may prevent a song being added to the playlist. When there
|
||||
// is something about to be inserted into it, Playlist notifies all of it's
|
||||
|
|
|
@ -52,7 +52,7 @@ class PlaylistItem : public std::enable_shared_from_this<PlaylistItem> {
|
|||
// Disables the seek slider.
|
||||
SeekDisabled = 0x04,
|
||||
};
|
||||
Q_DECLARE_FLAGS(Options, Option);
|
||||
Q_DECLARE_FLAGS(Options, Option)
|
||||
|
||||
virtual QString type() const { return type_; }
|
||||
|
||||
|
|
|
@ -29,7 +29,7 @@ namespace PlaylistUndoCommands {
|
|||
enum Types { Type_RemoveItems = 0, };
|
||||
|
||||
class Base : public QUndoCommand {
|
||||
Q_DECLARE_TR_FUNCTIONS(PlaylistUndoCommands);
|
||||
Q_DECLARE_TR_FUNCTIONS(PlaylistUndoCommands)
|
||||
|
||||
public:
|
||||
Base(Playlist* playlist);
|
||||
|
|
|
@ -41,7 +41,7 @@ class XMLParser : public ParserBase {
|
|||
|
||||
private:
|
||||
QXmlStreamWriter* stream_;
|
||||
Q_DISABLE_COPY(StreamElement);
|
||||
Q_DISABLE_COPY(StreamElement)
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
@ -33,7 +33,7 @@ namespace smart_playlists {
|
|||
class SearchTermWidget : public QWidget {
|
||||
Q_OBJECT
|
||||
Q_PROPERTY(float overlay_opacity READ overlay_opacity WRITE
|
||||
set_overlay_opacity);
|
||||
set_overlay_opacity)
|
||||
|
||||
public:
|
||||
SearchTermWidget(LibraryBackend* library, QWidget* parent);
|
||||
|
|
|
@ -25,7 +25,7 @@ class QPropertyAnimation;
|
|||
|
||||
class CollapsibleInfoHeader : public QWidget {
|
||||
Q_OBJECT
|
||||
Q_PROPERTY(float opacity READ opacity WRITE set_opacity);
|
||||
Q_PROPERTY(float opacity READ opacity WRITE set_opacity)
|
||||
|
||||
public:
|
||||
CollapsibleInfoHeader(QWidget* parent = nullptr);
|
||||
|
|
|
@ -30,7 +30,7 @@ class QPropertyAnimation;
|
|||
class TagWidgetTag : public QWidget {
|
||||
Q_OBJECT
|
||||
Q_PROPERTY(float background_opacity READ background_opacity WRITE
|
||||
set_background_opacity);
|
||||
set_background_opacity)
|
||||
|
||||
public:
|
||||
TagWidgetTag(const QIcon& icon, const QString& text, QWidget* parent);
|
||||
|
|
|
@ -41,7 +41,7 @@ struct TranscoderPreset {
|
|||
QString codec_mimetype_;
|
||||
QString muxer_mimetype_;
|
||||
};
|
||||
Q_DECLARE_METATYPE(TranscoderPreset);
|
||||
Q_DECLARE_METATYPE(TranscoderPreset)
|
||||
|
||||
class Transcoder : public QObject {
|
||||
Q_OBJECT
|
||||
|
|
|
@ -89,7 +89,7 @@ signals:
|
|||
|
||||
QMap<QString, Params> presets_;
|
||||
};
|
||||
Q_DECLARE_METATYPE(Equalizer::Params);
|
||||
Q_DECLARE_METATYPE(Equalizer::Params)
|
||||
|
||||
QDataStream& operator<<(QDataStream& s, const Equalizer::Params& p);
|
||||
QDataStream& operator>>(QDataStream& s, Equalizer::Params& p);
|
||||
|
|
|
@ -52,7 +52,7 @@ class MacSystemTrayIcon : public SystemTrayIcon {
|
|||
QPixmap orange_icon_;
|
||||
QPixmap grey_icon_;
|
||||
std::unique_ptr<MacSystemTrayIconPrivate> p_;
|
||||
Q_DISABLE_COPY(MacSystemTrayIcon);
|
||||
Q_DISABLE_COPY(MacSystemTrayIcon)
|
||||
};
|
||||
|
||||
#endif // MACSYSTEMTRAYICON_H
|
||||
|
|
|
@ -37,7 +37,7 @@ class GroupedIconView : public QListView {
|
|||
Q_PROPERTY(int item_indent READ item_indent WRITE set_item_indent)
|
||||
|
||||
// The text of each group's header. Must contain "%1".
|
||||
Q_PROPERTY(QString header_text READ header_text WRITE set_header_text);
|
||||
Q_PROPERTY(QString header_text READ header_text WRITE set_header_text)
|
||||
|
||||
public:
|
||||
GroupedIconView(QWidget* parent = nullptr);
|
||||
|
|
|
@ -92,13 +92,13 @@ class ExtendedEditor : public LineEditInterface {
|
|||
|
||||
class LineEdit : public QLineEdit, public ExtendedEditor {
|
||||
Q_OBJECT
|
||||
Q_PROPERTY(QString hint READ hint WRITE set_hint);
|
||||
Q_PROPERTY(QString hint READ hint WRITE set_hint)
|
||||
Q_PROPERTY(qreal font_point_size READ font_point_size WRITE
|
||||
set_font_point_size);
|
||||
set_font_point_size)
|
||||
Q_PROPERTY(bool has_clear_button READ has_clear_button WRITE
|
||||
set_clear_button);
|
||||
set_clear_button)
|
||||
Q_PROPERTY(bool has_reset_button READ has_reset_button WRITE
|
||||
set_reset_button);
|
||||
set_reset_button)
|
||||
|
||||
public:
|
||||
LineEdit(QWidget* parent = nullptr);
|
||||
|
@ -126,11 +126,11 @@ signals:
|
|||
|
||||
class TextEdit : public QPlainTextEdit, public ExtendedEditor {
|
||||
Q_OBJECT
|
||||
Q_PROPERTY(QString hint READ hint WRITE set_hint);
|
||||
Q_PROPERTY(QString hint READ hint WRITE set_hint)
|
||||
Q_PROPERTY(bool has_clear_button READ has_clear_button WRITE
|
||||
set_clear_button);
|
||||
set_clear_button)
|
||||
Q_PROPERTY(bool has_reset_button READ has_reset_button WRITE
|
||||
set_reset_button);
|
||||
set_reset_button)
|
||||
|
||||
public:
|
||||
TextEdit(QWidget* parent = nullptr);
|
||||
|
@ -151,11 +151,11 @@ signals:
|
|||
|
||||
class SpinBox : public QSpinBox, public ExtendedEditor {
|
||||
Q_OBJECT
|
||||
Q_PROPERTY(QString hint READ hint WRITE set_hint);
|
||||
Q_PROPERTY(QString hint READ hint WRITE set_hint)
|
||||
Q_PROPERTY(bool has_clear_button READ has_clear_button WRITE
|
||||
set_clear_button);
|
||||
set_clear_button)
|
||||
Q_PROPERTY(bool has_reset_button READ has_reset_button WRITE
|
||||
set_reset_button);
|
||||
set_reset_button)
|
||||
|
||||
public:
|
||||
SpinBox(QWidget* parent = nullptr);
|
||||
|
|
|
@ -38,7 +38,7 @@ class RatingPainter {
|
|||
|
||||
class RatingWidget : public QWidget {
|
||||
Q_OBJECT
|
||||
Q_PROPERTY(float rating READ rating WRITE set_rating);
|
||||
Q_PROPERTY(float rating READ rating WRITE set_rating)
|
||||
|
||||
public:
|
||||
RatingWidget(QWidget* parent = nullptr);
|
||||
|
|
|
@ -22,9 +22,9 @@
|
|||
|
||||
class StickySlider : public QSlider {
|
||||
Q_OBJECT
|
||||
Q_PROPERTY(int sticky_center READ sticky_center WRITE set_sticky_center);
|
||||
Q_PROPERTY(int sticky_center READ sticky_center WRITE set_sticky_center)
|
||||
Q_PROPERTY(int sticky_threshold READ sticky_threshold WRITE
|
||||
set_sticky_threshold);
|
||||
set_sticky_threshold)
|
||||
|
||||
public:
|
||||
StickySlider(QWidget* parent = nullptr);
|
||||
|
|
Loading…
Reference in New Issue