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.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'plugingui/drumkitframecontent.h') 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