From 429cf316ed094590a0fbeea56a355596c1e429ac Mon Sep 17 00:00:00 2001 From: Tobias Rundstrom Date: Sun, 12 Mar 2006 11:01:53 -0400 Subject: [PATCH] Add const & in good places to avoid promoe to copy that much data. --- MainDisplay.cpp | 6 +++--- MainDisplay.h | 2 +- PlaylistList.cpp | 18 +++++++++--------- PlaylistList.h | 6 +++--- ShadedDisplay.cpp | 6 +++--- ShadedDisplay.h | 2 +- XMMSHandler.h | 10 +++++----- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/MainDisplay.cpp b/MainDisplay.cpp index b8f3209..1a8e1a2 100644 --- a/MainDisplay.cpp +++ b/MainDisplay.cpp @@ -48,8 +48,8 @@ MainDisplay::MainDisplay (QWidget *parent) : SkinDisplay(parent) m_playstatus = new PlayStatus (this); m_playstatus->move (24, 28); - connect (xmmsh, SIGNAL(currentSong (QHash)), - this, SLOT(setMediainfo (QHash))); + connect (xmmsh, SIGNAL(currentSong (const QHash &)), + this, SLOT(setMediainfo (const QHash &))); connect (xmmsh, SIGNAL(playbackStatusChanged(uint)), this, SLOT(setStatus(uint))); connect (xmmsh, SIGNAL(playtimeChanged(uint)), @@ -96,7 +96,7 @@ MainDisplay::setPlaytime (uint time) } void -MainDisplay::setMediainfo (QHash h) +MainDisplay::setMediainfo (const QHash &h) { QString n; if (h.contains ("artist") && h.contains ("album") && h.contains ("title")) { diff --git a/MainDisplay.h b/MainDisplay.h index 050687e..53c0fe5 100644 --- a/MainDisplay.h +++ b/MainDisplay.h @@ -49,7 +49,7 @@ class MainDisplay : public SkinDisplay void setPixmaps(Skin *skin); void setStatus (uint status); void setPlaytime (uint time); - void setMediainfo (QHash); + void setMediainfo (const QHash &); void togglePL(void); protected: diff --git a/PlaylistList.cpp b/PlaylistList.cpp index 8c04f4a..a4de1dc 100644 --- a/PlaylistList.cpp +++ b/PlaylistList.cpp @@ -64,17 +64,17 @@ PlaylistList::PlaylistList (QWidget *parent) : QWidget (parent) m_status = XMMS_PLAYBACK_STATUS_STOP; m_bar = -2; - connect (xmmsh, SIGNAL(playlistList(QList)), - this, SLOT(playlistList(QList))); + connect (xmmsh, SIGNAL(playlistList(const QList &)), + this, SLOT(playlistList(const QList &))); connect (xmmsh, SIGNAL(currentID(uint)), this, SLOT(currentID(uint))); - connect (xmmsh, SIGNAL(mediainfoChanged(uint, QHash)), - this, SLOT(mediainfoChanged(uint, QHash))); + connect (xmmsh, SIGNAL(mediainfoChanged(uint, const QHash &)), + this, SLOT(mediainfoChanged(uint, const QHash &))); - connect (xmmsh, SIGNAL(playlistChanged(QHash)), - this, SLOT(playlistChanged(QHash))); + connect (xmmsh, SIGNAL(playlistChanged(const QHash &)), + this, SLOT(playlistChanged(const QHash &))); connect (xmmsh, SIGNAL(playbackStatusChanged(uint)), this, SLOT(setStatus(uint))); @@ -103,7 +103,7 @@ PlaylistList::setStatus (uint s) } void -PlaylistList::playlistChanged (QHash h) +PlaylistList::playlistChanged (const QHash &h) { int signal = h.value("type").toUInt(); XMMSHandler *xmmsh = XMMSHandler::getInstance (); @@ -188,7 +188,7 @@ PlaylistList::currentID (uint id) } void -PlaylistList::mediainfoChanged (uint id, QHash h) +PlaylistList::mediainfoChanged (uint id, const QHash &h) { PlaylistItem *i = m_itemmap->value (id); if (i) { @@ -212,7 +212,7 @@ PlaylistList::mediainfoChanged (uint id, QHash h) } void -PlaylistList::playlistList (QList l) +PlaylistList::playlistList (const QList &l) { for (int i = 0; i < l.count(); i++) { if (m_itemmap->contains (l.value(i))) { diff --git a/PlaylistList.h b/PlaylistList.h index eff7e09..e078ad3 100644 --- a/PlaylistList.h +++ b/PlaylistList.h @@ -24,9 +24,9 @@ class PlaylistList : public QWidget { public slots: void setPixmaps (Skin *skin); - void playlistList (QList); - void mediainfoChanged (uint, QHash); - void playlistChanged (QHash); + void playlistList (const QList &); + void mediainfoChanged (uint, const QHash &); + void playlistChanged (const QHash &); void currentID (uint); void setStatus (uint); void settingsSaved (); diff --git a/ShadedDisplay.cpp b/ShadedDisplay.cpp index 19e2d94..ea76993 100644 --- a/ShadedDisplay.cpp +++ b/ShadedDisplay.cpp @@ -55,12 +55,12 @@ ShadedDisplay::ShadedDisplay (QWidget *parent) : SkinDisplay (parent) this, SLOT(setStatus(uint))); connect (xmmsh, SIGNAL(playtimeChanged(uint)), this, SLOT(setPlaytime(uint))); - connect (xmmsh, SIGNAL(currentSong (QHash)), - this, SLOT(setMediainfo (QHash))); + connect (xmmsh, SIGNAL(currentSong (const QHash &)), + this, SLOT(setMediainfo (const QHash &))); } void -ShadedDisplay::setMediainfo (QHash h) +ShadedDisplay::setMediainfo (const QHash &h) { QString n; if (h.contains ("artist") && h.contains ("album") && h.contains ("title")) { diff --git a/ShadedDisplay.h b/ShadedDisplay.h index b3fa6d8..686e998 100644 --- a/ShadedDisplay.h +++ b/ShadedDisplay.h @@ -31,7 +31,7 @@ class ShadedDisplay : public SkinDisplay public slots: void setStatus (uint status); void setPlaytime (uint time); - void setMediainfo (QHash h); + void setMediainfo (const QHash &h); }; #endif diff --git a/XMMSHandler.h b/XMMSHandler.h index 93c03c3..892573b 100644 --- a/XMMSHandler.h +++ b/XMMSHandler.h @@ -59,12 +59,12 @@ class XMMSHandler : public QObject, public sigc::trackable { void settingsSaved (void); void playbackStatusChanged (uint status); void playtimeChanged (uint time); - void mediainfoChanged (uint, QHash); - void currentSong (QHash); - void playlistList (QList); + void mediainfoChanged (uint, const QHash &); + void currentSong (const QHash &); + void playlistList (const QList &); void currentID (uint); - void playlistChanged (QHash); - void medialibResponse (uint, QList >); + void playlistChanged (const QHash &); + void medialibResponse (uint, const QList > &); private: XMMSHandler (void);