summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorUwe Klotz <uklotz@mixxx.org>2020-05-05 13:25:26 +0200
committerUwe Klotz <uklotz@mixxx.org>2020-05-05 13:25:26 +0200
commit09339cd7dea9d69ec7afc697952b67a7601db91e (patch)
treea3772f25fe73093408f4aa527e4e561a812b6937 /src
parentb8cdb552a7ce977a0604d3eeb5ac28d1f607e84e (diff)
Revert "Rename unspecific setup() method"
Diffstat (limited to 'src')
-rw-r--r--src/skin/legacyskinparser.cpp2
-rw-r--r--src/widget/wsearchlineedit.cpp4
-rw-r--r--src/widget/wsearchlineedit.h4
3 files changed, 3 insertions, 7 deletions
diff --git a/src/skin/legacyskinparser.cpp b/src/skin/legacyskinparser.cpp
index 70c1e338a6..890fc57707 100644
--- a/src/skin/legacyskinparser.cpp
+++ b/src/skin/legacyskinparser.cpp
@@ -1230,7 +1230,7 @@ QWidget* LegacySkinParser::parseSearchBox(const QDomElement& node) {
WSearchLineEdit* pLineEditSearch = new WSearchLineEdit(m_pParent);
commonWidgetSetup(node, pLineEditSearch, false);
- pLineEditSearch->setupSkin(node, *m_pContext);
+ pLineEditSearch->setup(node, *m_pContext);
m_pLibrary->bindSearchboxWidget(pLineEditSearch);
diff --git a/src/widget/wsearchlineedit.cpp b/src/widget/wsearchlineedit.cpp
index 09df0d9265..6724361afd 100644
--- a/src/widget/wsearchlineedit.cpp
+++ b/src/widget/wsearchlineedit.cpp
@@ -134,9 +134,7 @@ WSearchLineEdit::WSearchLineEdit(QWidget* pParent)
showPlaceholder();
}
-void WSearchLineEdit::setupSkin(
- const QDomNode& node,
- const SkinContext& context) {
+void WSearchLineEdit::setup(const QDomNode& node, const SkinContext& context) {
auto backgroundColor = kDefaultBackgroundColor;
QString bgColorName;
if (context.hasNodeSelectString(node, "BgColor", &bgColorName)) {
diff --git a/src/widget/wsearchlineedit.h b/src/widget/wsearchlineedit.h
index 6de7bf747c..d81d1ff04c 100644
--- a/src/widget/wsearchlineedit.h
+++ b/src/widget/wsearchlineedit.h
@@ -28,9 +28,7 @@ class WSearchLineEdit : public QLineEdit, public WBaseWidget {
explicit WSearchLineEdit(QWidget* pParent);
~WSearchLineEdit() override = default;
- void setupSkin(
- const QDomNode& node,
- const SkinContext& context);
+ void setup(const QDomNode& node, const SkinContext& context);
protected:
void resizeEvent(QResizeEvent*) override;