[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [libkcompactdisc] src: Fix minor EBN issues
From: Yuri Chornoivan <null () kde ! org>
Date: 2018-09-23 8:27:28
Message-ID: E1g3zjk-0003Sk-P5 () code ! kde ! org
[Download RAW message or body]
Git commit d53a231d2f4ed58e7cdedfb22200602ac10cd245 by Yuri Chornoivan.
Committed on 23/09/2018 at 08:27.
Pushed by yurchor into branch 'master'.
Fix minor EBN issues
M +2 -1 src/kcompactdisc.cpp
M +3 -3 src/kcompactdisc.h
M +2 -2 src/kcompactdisc_p.cpp
M +1 -1 src/phonon_interface.cpp
M +1 -1 src/wmlib/include/wm_cdtext.h
M +2 -2 src/wmlib/include/wm_platform.h
M +1 -1 src/wmlib/include/wm_struct.h
M +0 -1 src/wmlib/plat_linux.c
M +0 -1 src/wmlib/plat_openbsd.c
M +0 -1 src/wmlib/plat_sun_cdda.c
M +3 -3 src/wmlib_interface.cpp
https://commits.kde.org/libkcompactdisc/d53a231d2f4ed58e7cdedfb22200602ac10cd245
diff --git a/src/kcompactdisc.cpp b/src/kcompactdisc.cpp
index 2e297d1..2a4f549 100644
--- a/src/kcompactdisc.cpp
+++ b/src/kcompactdisc.cpp
@@ -24,7 +24,8 @@
#include <config-alsa.h>
-#include <QtDBus>
+#include <QDBusInterface>
+#include <QDBusReply>
#include <QUrl>
#include <QtGlobal>
diff --git a/src/kcompactdisc.h b/src/kcompactdisc.h
index 6c15a87..eda54cd 100644
--- a/src/kcompactdisc.h
+++ b/src/kcompactdisc.h
@@ -121,7 +121,7 @@ public:
enum InformationMode
{
Synchronous, // Return and emit signal when cdrom and cddb information arrives.
- Asynchronous // Block until cdrom and cddb infromation has been obtained
+ Asynchronous // Block until cdrom and cddb information has been obtained
};
enum DiscCommand
@@ -154,7 +154,7 @@ public:
PhononMetadata
};
- KCompactDisc(InformationMode = KCompactDisc::Synchronous);
+ explicit KCompactDisc(InformationMode = KCompactDisc::Synchronous);
virtual ~KCompactDisc();
/**
@@ -251,7 +251,7 @@ public:
unsigned discId();
/**
- * CDDB signature of disc, empty if no disc or not possible to deliever.
+ * CDDB signature of disc, empty if no disc or not possible to deliver.
*/
const QList<unsigned> &discSignature();
diff --git a/src/kcompactdisc_p.cpp b/src/kcompactdisc_p.cpp
index 4bf2af8..823702d 100644
--- a/src/kcompactdisc_p.cpp
+++ b/src/kcompactdisc_p.cpp
@@ -116,7 +116,7 @@ void KCompactDiscPrivate::make_playlist()
qCDebug(CD_PLAYLIST) << "Playlist has " << size << " entries\n";
m_playlist.clear();
- for(unsigned i = 0; i < size; i++) {
+ for(unsigned i = 0; i < size; ++i) {
if(m_randomPlaylist) {
do {
selected = 1 + m_randSequence.getLong(size);
@@ -130,7 +130,7 @@ void KCompactDiscPrivate::make_playlist()
qCDebug(CD_PLAYLIST) << "dump playlist";
QList<unsigned>::const_iterator it;
- for(it = m_playlist.constBegin(); it != m_playlist.constEnd(); it++) {
+ for(it = m_playlist.constBegin(); it != m_playlist.constEnd(); ++it) {
qCDebug(CD_PLAYLIST) << " " << *it;
}
qCDebug(CD_PLAYLIST) << "dump playlist end";
diff --git a/src/phonon_interface.cpp b/src/phonon_interface.cpp
index 5fe9526..e3b44e9 100644
--- a/src/phonon_interface.cpp
+++ b/src/phonon_interface.cpp
@@ -333,7 +333,7 @@ void KPhononCompactDiscPrivate::stateChanged(Phonon::State newstate, Phonon::Sta
m_trackArtists.append(i18n("Unknown Artist"));
m_trackTitles.append(i18n("Unknown Title"));
- for(unsigned i = 1; i <= m_tracks; i++) {
+ for(unsigned i = 1; i <= m_tracks; ++i) {
m_trackArtists.append(i18n("Unknown Artist"));
m_trackTitles.append(ki18n("Track %1").subs(i, 2).toString());
}
diff --git a/src/wmlib/include/wm_cdtext.h b/src/wmlib/include/wm_cdtext.h
index bf97caa..013370e 100644
--- a/src/wmlib/include/wm_cdtext.h
+++ b/src/wmlib/include/wm_cdtext.h
@@ -65,7 +65,7 @@ struct cdtext_info_block {
};
struct cdtext_info {
- /* somethimes i get hunderts of bytes, without anyone valid pack
+ /* sometimes i get hundreds of bytes, without anyone valid pack
my CDU-561 for example */
int count_of_entries; /* one more because album need one too */
int count_of_valid_packs;
diff --git a/src/wmlib/include/wm_platform.h b/src/wmlib/include/wm_platform.h
index d8ca5e1..e5288ce 100644
--- a/src/wmlib/include/wm_platform.h
+++ b/src/wmlib/include/wm_platform.h
@@ -55,8 +55,8 @@
#define WM_CDM_NO_DISC 10
#define WM_CDM_UNKNOWN 11
#define WM_CDM_CDDAERROR 12
-#define WM_CDM_LOADING 13 /* tribute to phonon state mashine */
-#define WM_CDM_BUFFERING 14 /* tribute to phonon state mashine */
+#define WM_CDM_LOADING 13 /* tribute to phonon state machine */
+#define WM_CDM_BUFFERING 14 /* tribute to phonon state machine */
#define WM_CDM_CDDAACK 0xF0
#endif /* WM_PLATFORM_H */
diff --git a/src/wmlib/include/wm_struct.h b/src/wmlib/include/wm_struct.h
index 2f94755..acae14d 100644
--- a/src/wmlib/include/wm_struct.h
+++ b/src/wmlib/include/wm_struct.h
@@ -138,7 +138,7 @@ struct wm_drive
{
int cdda; /* cdda 1, cdin 0 */
- /* commpn section */
+ /* common section */
char *cd_device;
char *soundsystem;
char *sounddevice;
diff --git a/src/wmlib/plat_linux.c b/src/wmlib/plat_linux.c
index 2a7a178..2b68960 100644
--- a/src/wmlib/plat_linux.c
+++ b/src/wmlib/plat_linux.c
@@ -27,7 +27,6 @@
#include "include/wm_struct.h"
#include "include/wm_cdtext.h"
#include "include/wm_cdda.h"
-#include "include/wm_struct.h"
#include "include/wm_platform.h"
#include "include/wm_cdrom.h"
#include "include/wm_scsi.h"
diff --git a/src/wmlib/plat_openbsd.c b/src/wmlib/plat_openbsd.c
index f6c4caf..93e8f92 100644
--- a/src/wmlib/plat_openbsd.c
+++ b/src/wmlib/plat_openbsd.c
@@ -34,7 +34,6 @@
#include <sys/param.h>
#include <sys/mount.h>
#include <fcntl.h>
-#include <sys/param.h>
#include <sys/stat.h>
#include "include/wm_config.h"
diff --git a/src/wmlib/plat_sun_cdda.c b/src/wmlib/plat_sun_cdda.c
index 4f34d6a..8349d88 100644
--- a/src/wmlib/plat_sun_cdda.c
+++ b/src/wmlib/plat_sun_cdda.c
@@ -27,7 +27,6 @@
#include "include/wm_struct.h"
-#include "include/wm_cdda.h"
/* types.h and cdio.h are included by wm_cdda.h */
#include <stdio.h>
diff --git a/src/wmlib_interface.cpp b/src/wmlib_interface.cpp
index 60a3ae8..82609fc 100644
--- a/src/wmlib_interface.cpp
+++ b/src/wmlib_interface.cpp
@@ -224,7 +224,7 @@ void KWMLibCompactDiscPrivate::timerExpired()
qDebug() << "New disc with " << m_tracks << " tracks";
m_discId = wm_cddb_discid(m_handle);
- for(i = 1; i <= m_tracks; i++) {
+ for(i = 1; i <= m_tracks; ++i) {
m_trackStartFrames.append(wm_cd_gettrackstart(m_handle, i));
}
m_trackStartFrames.append(wm_cd_gettrackstart(m_handle, i));
@@ -236,7 +236,7 @@ void KWMLibCompactDiscPrivate::timerExpired()
m_trackArtists.append(i18n("Unknown Artist"));
m_trackTitles.append(i18n("Unknown Title"));
- for(i = 1; i <= m_tracks; i++) {
+ for(i = 1; i <= m_tracks; ++i) {
m_trackArtists.append(i18n("Unknown Artist"));
m_trackTitles.append(ki18n("Track %1").subs(i, 2).toString());
}
@@ -313,7 +313,7 @@ void KWMLibCompactDiscPrivate::cdtext()
m_trackArtists[0] = QLatin1String( reinterpret_cast<char*>(info->blocks[0]->performer[0]) );
m_trackTitles[0] = QLatin1String( reinterpret_cast<char*>(info->blocks[0]->name[0]) );
- for(i = 1; i <= m_tracks; i++) {
+ for(i = 1; i <= m_tracks; ++i) {
m_trackArtists[i] = QLatin1String( reinterpret_cast<char*>(info->blocks[0]->performer[i]) );
m_trackTitles[i] =QLatin1String( reinterpret_cast<char*>(info->blocks[0]->name[i]) );
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic