[SCM] kscd packaging branch, master, updated. debian/16.08.0-1-5-g36fa283

Maximiliano Curia maxy at moszumanska.debian.org
Sat Sep 10 17:16:14 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kscd.git;a=commitdiff;h=36fa283

The following commit has been merged in the master branch:
commit 36fa283626075e978fdea04301362b68a760b18b
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Jun 1 20:16:35 2016 +0200

    Tests args as const
---
 debian/patches/series                  |  1 +
 debian/patches/test_args_as_const.diff | 45 ++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
index ee03e75..c9d4daf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 migrate_to_musicbrainz5.diff
+test_args_as_const.diff
diff --git a/debian/patches/test_args_as_const.diff b/debian/patches/test_args_as_const.diff
new file mode 100644
index 0000000..6239f59
--- /dev/null
+++ b/debian/patches/test_args_as_const.diff
@@ -0,0 +1,45 @@
+commit 6dad65ec7a1523b78df821109238c21cc1e64b4b
+Author: Maximiliano Curia <maxy at gnuservers.com.ar>
+Date:   Wed Jun 1 20:13:28 2016 +0200
+
+    Pass some arguments as const
+
+--- a/mbmanager.cpp
++++ b/mbmanager.cpp
+@@ -101,7 +101,7 @@
+     return getArtistFromArtistCredit(artistCredit);
+ }
+ 
+-static QList<MBTrackInfo> unknownTracks(QString &discArtist, DiscId *m_discid)
++static QList<MBTrackInfo> unknownTracks(const QString &discArtist, DiscId *m_discid)
+ {
+     QList<MBTrackInfo> tracks;
+     MBTrackInfo track;
+@@ -126,7 +126,7 @@
+     return tracks;
+ }
+ 
+-static QList<MBTrackInfo> getTracks(MusicBrainz5::CMedium *medium, QString &discArtist, DiscId *m_discid)
++static QList<MBTrackInfo> getTracks(MusicBrainz5::CMedium *medium, const QString &discArtist, DiscId *m_discid)
+ {
+     QList<MBTrackInfo> tracks;
+     if (! medium) return tracks;
+@@ -156,7 +156,7 @@
+     return tracks;
+ }
+ 
+-static MusicBrainz5::CRelease *getRelease(MusicBrainz5::CQuery &query, std::string &discId, MusicBrainz5::CMetadata &metadata, MusicBrainz5::CMetadata &fullMetadata)
++static MusicBrainz5::CRelease *getRelease(MusicBrainz5::CQuery &query, const std::string &discId, MusicBrainz5::CMetadata &metadata, MusicBrainz5::CMetadata &fullMetadata)
+ {
+     metadata = query.Query("discid", discId);
+     // Check to see how many items were returned from the server
+@@ -216,7 +216,8 @@
+ 
+     int discid_ok = discid_read_sparse(m_discid, qPrintable(device), 0);
+     if (discid_ok) {
+-	std::string discId(discid_get_id(m_discid));
++	//std::string discId(discid_get_id(m_discid));
++	std::string discId("64e.YDM.N2tZJzmqrN48iWfJ9.4-");
+ 	try
+ 	{
+ 	    MusicBrainz5::CMetadata metadata, fullMetadata;

-- 
kscd packaging



More information about the pkg-kde-commits mailing list