Merge remote-tracking branch 'upstream/2.2'

Conflicts:
	SConscript
	src/defs_version.h
	src/sources/soundsourceproxy.cpp

2 files changed, 11 insertions, 11 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;
 
 };