diff options
author | Daniel Schürmann <daschuer@mixxx.org> | 2018-11-05 22:45:55 +0100 |
---|---|---|
committer | Daniel Schürmann <daschuer@mixxx.org> | 2018-11-05 22:45:55 +0100 |
commit | 54261f3b8f3221578aa95c928ca5217852eeac9b (patch) | |
tree | c1c88dca105dae05d09f0d6a2ccc21ed6525bb99 /src/library | |
parent | 4fbb87560e64aa77242f2d4fd79ed68ed6f95a99 (diff) | |
parent | 6420867cc8a73d3845bf25d5b98babb142386da4 (diff) |
Merge remote-tracking branch 'upstream/2.2'
Conflicts:
SConscript
src/defs_version.h
src/sources/soundsourceproxy.cpp
Diffstat (limited to 'src/library')
-rw-r--r-- | src/library/banshee/bansheedbconnection.cpp | 12 | ||||
-rw-r--r-- | src/library/banshee/bansheedbconnection.h | 10 | ||||
-rw-r--r-- | src/library/dlgtrackmetadataexport.h | 1 | ||||
-rw-r--r-- | src/library/scanner/libraryscannerdlg.cpp | 2 |
4 files changed, 13 insertions, 12 deletions
diff --git a/src/library/banshee/bansheedbconnection.cpp b/src/library/banshee/bansheedbconnection.cpp index ddd985a46c..3d28ecb9ea 100644 --- a/src/library/banshee/bansheedbconnection.cpp +++ b/src/library/banshee/bansheedbconnection.cpp @@ -53,10 +53,10 @@ int BansheeDbConnection::getSchemaVersion() { return -1; } -QList<struct BansheeDbConnection::Playlist> BansheeDbConnection::getPlaylists() { +QList<BansheeDbConnection::Playlist> BansheeDbConnection::getPlaylists() { - QList<struct BansheeDbConnection::Playlist> list; - struct BansheeDbConnection::Playlist playlist; + QList<BansheeDbConnection::Playlist> list; + BansheeDbConnection::Playlist playlist; QSqlQuery query(m_database); query.prepare("SELECT PlaylistID, Name FROM CorePlaylists ORDER By Name"); @@ -73,13 +73,13 @@ QList<struct BansheeDbConnection::Playlist> BansheeDbConnection::getPlaylists() return list; } -QList<struct BansheeDbConnection::PlaylistEntry> BansheeDbConnection::getPlaylistEntries(int playlistId) { +QList<BansheeDbConnection::PlaylistEntry> BansheeDbConnection::getPlaylistEntries(int playlistId) { PerformanceTimer time; time.start(); - QList<struct BansheeDbConnection::PlaylistEntry> list; - struct BansheeDbConnection::PlaylistEntry entry; + QList<BansheeDbConnection::PlaylistEntry> list; + BansheeDbConnection::PlaylistEntry entry; QSqlQuery query(m_database); query.setForwardOnly(true); // Saves about 50% time diff --git a/src/library/banshee/bansheedbconnection.h b/src/library/banshee/bansheedbconnection.h index b0d12d6d67..d7e2df6ddd 100644 --- a/src/library/banshee/bansheedbconnection.h +++ b/src/library/banshee/bansheedbconnection.h @@ -54,14 +54,14 @@ public: bool open(const QString& databaseFile); int getSchemaVersion(); - QList<struct Playlist> getPlaylists(); - QList<struct PlaylistEntry> getPlaylistEntries(int playlistId); + QList<Playlist> getPlaylists(); + QList<PlaylistEntry> getPlaylistEntries(int playlistId); private: QSqlDatabase m_database; - QMap<int, struct Track> m_trackMap; - QMap<int, struct Artist> m_artistMap; - QMap<int, struct Album> m_albumMap; + QMap<int, Track> m_trackMap; + QMap<int, Artist> m_artistMap; + QMap<int, Album> m_albumMap; }; diff --git a/src/library/dlgtrackmetadataexport.h b/src/library/dlgtrackmetadataexport.h index b0d3df298f..58343b671b 100644 --- a/src/library/dlgtrackmetadataexport.h +++ b/src/library/dlgtrackmetadataexport.h @@ -10,6 +10,7 @@ namespace mixxx { // needed for i18n message strings. The class contains mutable // static data and must only be used within the UI thread. class DlgTrackMetadataExport: private QDialog { + Q_OBJECT public: static void showMessageBoxOncePerSession(); diff --git a/src/library/scanner/libraryscannerdlg.cpp b/src/library/scanner/libraryscannerdlg.cpp index 404cf977ef..fd3fc78911 100644 --- a/src/library/scanner/libraryscannerdlg.cpp +++ b/src/library/scanner/libraryscannerdlg.cpp @@ -26,7 +26,7 @@ LibraryScannerDlg::LibraryScannerDlg(QWidget* parent, Qt::WindowFlags f) : QWidget(parent, f), m_bCancelled(false) { - setWindowIcon(QIcon(":/images/ic_mixxx_window.png")); + setWindowIcon(QIcon(":/images/mixxx_icon.svg")); QVBoxLayout* pLayout = new QVBoxLayout(this); |