From a36b20f60a33b04ec69b65cfce0dd0059ff9e382 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Mon, 17 Apr 2017 10:33:37 +0200 Subject: Fix multiple definitions of the class File (bad naming anyway). --- plugingui/drumkitframecontent.cc | 15 ++++++++------- plugingui/drumkitframecontent.h | 8 ++++---- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/plugingui/drumkitframecontent.cc b/plugingui/drumkitframecontent.cc index a2d7765..c2e35b6 100644 --- a/plugingui/drumkitframecontent.cc +++ b/plugingui/drumkitframecontent.cc @@ -31,7 +31,7 @@ namespace GUI { -File::File(Widget* parent) +BrowseFile::BrowseFile(Widget* parent) : Widget(parent) { layout.setResizeChildren(false); @@ -43,7 +43,7 @@ File::File(Widget* parent) browse_button.setText("Browse..."); } -void File::resize(std::size_t width, std::size_t height) +void BrowseFile::resize(std::size_t width, std::size_t height) { Widget::resize(width, height); @@ -56,27 +56,28 @@ void File::resize(std::size_t width, std::size_t height) layout.layout(); } -std::size_t File::getLineEditWidth() +std::size_t BrowseFile::getLineEditWidth() { return lineedit_width; } -std::size_t File::getButtonWidth() +std::size_t BrowseFile::getButtonWidth() { return button_width; } -Button& File::getBrowseButton() +Button& BrowseFile::getBrowseButton() { return browse_button; } -LineEdit& File::getLineEdit() +LineEdit& BrowseFile::getLineEdit() { return lineedit; } -DrumkitframeContent::DrumkitframeContent(Widget* parent) : Widget(parent) +DrumkitframeContent::DrumkitframeContent(Widget* parent) + : Widget(parent) { layout.setHAlignment(HAlignment::left); diff --git a/plugingui/drumkitframecontent.h b/plugingui/drumkitframecontent.h index c2e515d..7f442c5 100644 --- a/plugingui/drumkitframecontent.h +++ b/plugingui/drumkitframecontent.h @@ -36,11 +36,11 @@ namespace GUI { -class File +class BrowseFile : public Widget { public: - File(Widget* parent); + BrowseFile(Widget* parent); // From Widget virtual void resize(std::size_t width, std::size_t height) override; @@ -81,8 +81,8 @@ private: Label drumkitCaption{this}; Label midimapCaption{this}; - File drumkitFile{this}; - File midimapFile{this}; + BrowseFile drumkitFile{this}; + BrowseFile midimapFile{this}; ProgressBar drumkitFileProgress{this}; ProgressBar midimapFileProgress{this}; -- cgit v1.2.3