Add const & in good places to avoid promoe to copy that much data.
This commit is contained in:
parent
403b9257cc
commit
429cf316ed
7 changed files with 25 additions and 25 deletions
|
@ -48,8 +48,8 @@ MainDisplay::MainDisplay (QWidget *parent) : SkinDisplay(parent)
|
||||||
m_playstatus = new PlayStatus (this);
|
m_playstatus = new PlayStatus (this);
|
||||||
m_playstatus->move (24, 28);
|
m_playstatus->move (24, 28);
|
||||||
|
|
||||||
connect (xmmsh, SIGNAL(currentSong (QHash<QString, QString>)),
|
connect (xmmsh, SIGNAL(currentSong (const QHash<QString, QString> &)),
|
||||||
this, SLOT(setMediainfo (QHash<QString, QString>)));
|
this, SLOT(setMediainfo (const QHash<QString, QString> &)));
|
||||||
connect (xmmsh, SIGNAL(playbackStatusChanged(uint)),
|
connect (xmmsh, SIGNAL(playbackStatusChanged(uint)),
|
||||||
this, SLOT(setStatus(uint)));
|
this, SLOT(setStatus(uint)));
|
||||||
connect (xmmsh, SIGNAL(playtimeChanged(uint)),
|
connect (xmmsh, SIGNAL(playtimeChanged(uint)),
|
||||||
|
@ -96,7 +96,7 @@ MainDisplay::setPlaytime (uint time)
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
MainDisplay::setMediainfo (QHash<QString, QString> h)
|
MainDisplay::setMediainfo (const QHash<QString, QString> &h)
|
||||||
{
|
{
|
||||||
QString n;
|
QString n;
|
||||||
if (h.contains ("artist") && h.contains ("album") && h.contains ("title")) {
|
if (h.contains ("artist") && h.contains ("album") && h.contains ("title")) {
|
||||||
|
|
|
@ -49,7 +49,7 @@ class MainDisplay : public SkinDisplay
|
||||||
void setPixmaps(Skin *skin);
|
void setPixmaps(Skin *skin);
|
||||||
void setStatus (uint status);
|
void setStatus (uint status);
|
||||||
void setPlaytime (uint time);
|
void setPlaytime (uint time);
|
||||||
void setMediainfo (QHash<QString,QString>);
|
void setMediainfo (const QHash<QString,QString> &);
|
||||||
void togglePL(void);
|
void togglePL(void);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|
|
@ -64,17 +64,17 @@ PlaylistList::PlaylistList (QWidget *parent) : QWidget (parent)
|
||||||
m_status = XMMS_PLAYBACK_STATUS_STOP;
|
m_status = XMMS_PLAYBACK_STATUS_STOP;
|
||||||
m_bar = -2;
|
m_bar = -2;
|
||||||
|
|
||||||
connect (xmmsh, SIGNAL(playlistList(QList<uint>)),
|
connect (xmmsh, SIGNAL(playlistList(const QList<uint> &)),
|
||||||
this, SLOT(playlistList(QList<uint>)));
|
this, SLOT(playlistList(const QList<uint> &)));
|
||||||
|
|
||||||
connect (xmmsh, SIGNAL(currentID(uint)),
|
connect (xmmsh, SIGNAL(currentID(uint)),
|
||||||
this, SLOT(currentID(uint)));
|
this, SLOT(currentID(uint)));
|
||||||
|
|
||||||
connect (xmmsh, SIGNAL(mediainfoChanged(uint, QHash<QString, QString>)),
|
connect (xmmsh, SIGNAL(mediainfoChanged(uint, const QHash<QString, QString> &)),
|
||||||
this, SLOT(mediainfoChanged(uint, QHash<QString, QString>)));
|
this, SLOT(mediainfoChanged(uint, const QHash<QString, QString> &)));
|
||||||
|
|
||||||
connect (xmmsh, SIGNAL(playlistChanged(QHash<QString, QString>)),
|
connect (xmmsh, SIGNAL(playlistChanged(const QHash<QString, QString> &)),
|
||||||
this, SLOT(playlistChanged(QHash<QString, QString>)));
|
this, SLOT(playlistChanged(const QHash<QString, QString> &)));
|
||||||
|
|
||||||
connect (xmmsh, SIGNAL(playbackStatusChanged(uint)),
|
connect (xmmsh, SIGNAL(playbackStatusChanged(uint)),
|
||||||
this, SLOT(setStatus(uint)));
|
this, SLOT(setStatus(uint)));
|
||||||
|
@ -103,7 +103,7 @@ PlaylistList::setStatus (uint s)
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
PlaylistList::playlistChanged (QHash<QString,QString> h)
|
PlaylistList::playlistChanged (const QHash<QString,QString> &h)
|
||||||
{
|
{
|
||||||
int signal = h.value("type").toUInt();
|
int signal = h.value("type").toUInt();
|
||||||
XMMSHandler *xmmsh = XMMSHandler::getInstance ();
|
XMMSHandler *xmmsh = XMMSHandler::getInstance ();
|
||||||
|
@ -188,7 +188,7 @@ PlaylistList::currentID (uint id)
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
PlaylistList::mediainfoChanged (uint id, QHash<QString, QString> h)
|
PlaylistList::mediainfoChanged (uint id, const QHash<QString, QString> &h)
|
||||||
{
|
{
|
||||||
PlaylistItem *i = m_itemmap->value (id);
|
PlaylistItem *i = m_itemmap->value (id);
|
||||||
if (i) {
|
if (i) {
|
||||||
|
@ -212,7 +212,7 @@ PlaylistList::mediainfoChanged (uint id, QHash<QString, QString> h)
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
PlaylistList::playlistList (QList<uint> l)
|
PlaylistList::playlistList (const QList<uint> &l)
|
||||||
{
|
{
|
||||||
for (int i = 0; i < l.count(); i++) {
|
for (int i = 0; i < l.count(); i++) {
|
||||||
if (m_itemmap->contains (l.value(i))) {
|
if (m_itemmap->contains (l.value(i))) {
|
||||||
|
|
|
@ -24,9 +24,9 @@ class PlaylistList : public QWidget {
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
void setPixmaps (Skin *skin);
|
void setPixmaps (Skin *skin);
|
||||||
void playlistList (QList<uint>);
|
void playlistList (const QList<uint> &);
|
||||||
void mediainfoChanged (uint, QHash<QString,QString>);
|
void mediainfoChanged (uint, const QHash<QString,QString> &);
|
||||||
void playlistChanged (QHash<QString,QString>);
|
void playlistChanged (const QHash<QString,QString> &);
|
||||||
void currentID (uint);
|
void currentID (uint);
|
||||||
void setStatus (uint);
|
void setStatus (uint);
|
||||||
void settingsSaved ();
|
void settingsSaved ();
|
||||||
|
|
|
@ -55,12 +55,12 @@ ShadedDisplay::ShadedDisplay (QWidget *parent) : SkinDisplay (parent)
|
||||||
this, SLOT(setStatus(uint)));
|
this, SLOT(setStatus(uint)));
|
||||||
connect (xmmsh, SIGNAL(playtimeChanged(uint)),
|
connect (xmmsh, SIGNAL(playtimeChanged(uint)),
|
||||||
this, SLOT(setPlaytime(uint)));
|
this, SLOT(setPlaytime(uint)));
|
||||||
connect (xmmsh, SIGNAL(currentSong (QHash<QString, QString>)),
|
connect (xmmsh, SIGNAL(currentSong (const QHash<QString, QString> &)),
|
||||||
this, SLOT(setMediainfo (QHash<QString, QString>)));
|
this, SLOT(setMediainfo (const QHash<QString, QString> &)));
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
ShadedDisplay::setMediainfo (QHash<QString, QString> h)
|
ShadedDisplay::setMediainfo (const QHash<QString, QString> &h)
|
||||||
{
|
{
|
||||||
QString n;
|
QString n;
|
||||||
if (h.contains ("artist") && h.contains ("album") && h.contains ("title")) {
|
if (h.contains ("artist") && h.contains ("album") && h.contains ("title")) {
|
||||||
|
|
|
@ -31,7 +31,7 @@ class ShadedDisplay : public SkinDisplay
|
||||||
public slots:
|
public slots:
|
||||||
void setStatus (uint status);
|
void setStatus (uint status);
|
||||||
void setPlaytime (uint time);
|
void setPlaytime (uint time);
|
||||||
void setMediainfo (QHash<QString, QString> h);
|
void setMediainfo (const QHash<QString, QString> &h);
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -59,12 +59,12 @@ class XMMSHandler : public QObject, public sigc::trackable {
|
||||||
void settingsSaved (void);
|
void settingsSaved (void);
|
||||||
void playbackStatusChanged (uint status);
|
void playbackStatusChanged (uint status);
|
||||||
void playtimeChanged (uint time);
|
void playtimeChanged (uint time);
|
||||||
void mediainfoChanged (uint, QHash<QString, QString>);
|
void mediainfoChanged (uint, const QHash<QString, QString> &);
|
||||||
void currentSong (QHash<QString, QString>);
|
void currentSong (const QHash<QString, QString> &);
|
||||||
void playlistList (QList<uint>);
|
void playlistList (const QList<uint> &);
|
||||||
void currentID (uint);
|
void currentID (uint);
|
||||||
void playlistChanged (QHash<QString, QString>);
|
void playlistChanged (const QHash<QString, QString> &);
|
||||||
void medialibResponse (uint, QList<QHash<QString, QString> >);
|
void medialibResponse (uint, const QList<QHash<QString, QString> > &);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
XMMSHandler (void);
|
XMMSHandler (void);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue