summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRJ Ryan <rryan@mixxx.org>2014-10-22 20:41:10 -0400
committerRJ Ryan <rryan@mixxx.org>2014-10-22 20:41:10 -0400
commit0f3f8443048b3cfd98c4a5b348cacd6305d025bd (patch)
tree3807815cd41d0b1702557bdd799bc4a80d70a13f
parenteb265df04e7bd0bdefbce8354326c552eb6ffb10 (diff)
Remove 'widget' from method / var names.
-rw-r--r--src/skin/legacyskinparser.cpp4
-rw-r--r--src/widget/wcoverart.cpp18
-rw-r--r--src/widget/wcoverart.h6
3 files changed, 14 insertions, 14 deletions
diff --git a/src/skin/legacyskinparser.cpp b/src/skin/legacyskinparser.cpp
index 6042575fb0..17bd1a96c8 100644
--- a/src/skin/legacyskinparser.cpp
+++ b/src/skin/legacyskinparser.cpp
@@ -1022,9 +1022,9 @@ QWidget* LegacySkinParser::parseCoverArt(QDomElement node) {
// Connect cover art signals to the library
connect(m_pLibrary, SIGNAL(switchToView(const QString&)),
- pCoverArt, SLOT(slotResetWidget()));
+ pCoverArt, SLOT(slotReset()));
connect(m_pLibrary, SIGNAL(enableCoverArtDisplay(bool)),
- pCoverArt, SLOT(slotEnableWidget(bool)));
+ pCoverArt, SLOT(slotEnable(bool)));
connect(m_pLibrary, SIGNAL(loadCoverArt(CoverInfo, bool)),
pCoverArt, SLOT(slotLoadCoverArt(CoverInfo, bool)));
diff --git a/src/widget/wcoverart.cpp b/src/widget/wcoverart.cpp
index 599f888501..1adacbff1a 100644
--- a/src/widget/wcoverart.cpp
+++ b/src/widget/wcoverart.cpp
@@ -13,7 +13,7 @@ WCoverArt::WCoverArt(QWidget* parent,
TrackCollection* pTrackCollection)
: QWidget(parent),
WBaseWidget(this),
- m_bEnableWidget(true),
+ m_bEnable(true),
m_pMenu(new WCoverArtMenu(this)),
m_trackDAO(pTrackCollection->getTrackDAO()),
m_pDlgFullSize(new DlgCoverArtFullSize()) {
@@ -75,16 +75,16 @@ void WCoverArt::slotCoverLocationUpdated(const QString& newLoc,
}
}
-void WCoverArt::slotEnableWidget(bool enable) {
- m_bEnableWidget = enable;
+void WCoverArt::slotEnable(bool enable) {
+ m_bEnable = enable;
int h = (float) parentWidget()->height() / 3;
- h = m_bEnableWidget ? h : 0;
+ h = m_bEnable ? h : 0;
setMinimumHeight(h);
setMaximumHeight(h);
update();
}
-void WCoverArt::slotResetWidget() {
+void WCoverArt::slotReset() {
m_lastRequestedCover = CoverInfo();
CoverArtCache* pCache = CoverArtCache::instance();
if (pCache != NULL) {
@@ -95,7 +95,7 @@ void WCoverArt::slotResetWidget() {
}
void WCoverArt::slotPixmapFound(int trackId, QPixmap pixmap) {
- if (!m_bEnableWidget) {
+ if (!m_bEnable) {
return;
}
if (m_lastRequestedCover.trackId == trackId) {
@@ -106,7 +106,7 @@ void WCoverArt::slotPixmapFound(int trackId, QPixmap pixmap) {
}
void WCoverArt::slotLoadCoverArt(CoverInfo info, bool cachedOnly) {
- if (!m_bEnableWidget) {
+ if (!m_bEnable) {
return;
}
m_lastRequestedCover = info;
@@ -124,7 +124,7 @@ QPixmap WCoverArt::scaledCoverArt(QPixmap normal) {
}
void WCoverArt::paintEvent(QPaintEvent*) {
- if (!m_bEnableWidget) {
+ if (!m_bEnable) {
return;
}
@@ -154,7 +154,7 @@ void WCoverArt::resizeEvent(QResizeEvent*) {
}
void WCoverArt::mousePressEvent(QMouseEvent* event) {
- if (!m_bEnableWidget) {
+ if (!m_bEnable) {
return;
}
diff --git a/src/widget/wcoverart.h b/src/widget/wcoverart.h
index 98ef4b3f7b..be333df7cb 100644
--- a/src/widget/wcoverart.h
+++ b/src/widget/wcoverart.h
@@ -23,8 +23,8 @@ class WCoverArt : public QWidget, public WBaseWidget {
void setup(QDomNode node, const SkinContext& context);
public slots:
- void slotResetWidget();
- void slotEnableWidget(bool);
+ void slotReset();
+ void slotEnable(bool);
void slotLoadCoverArt(CoverInfo info, bool cachedOnly);
private slots:
@@ -42,7 +42,7 @@ class WCoverArt : public QWidget, public WBaseWidget {
private:
QPixmap scaledCoverArt(QPixmap normal);
- bool m_bEnableWidget;
+ bool m_bEnable;
WCoverArtMenu* m_pMenu;
QPixmap m_loadedCover;
QPixmap m_loadedCoverScaled;