summaryrefslogtreecommitdiff
path: root/plugingui/drumkitframecontent.h
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2017-04-17 10:33:37 +0200
committerBent Bisballe Nyeng <deva@aasimon.org>2017-04-17 10:33:37 +0200
commita36b20f60a33b04ec69b65cfce0dd0059ff9e382 (patch)
tree79f96c4c4eaa6448dbb8ea52e77d63ed4f7405ba /plugingui/drumkitframecontent.h
parent33fbeeb2ec7c308fc48fc7ef0df01cd4a3a43f0c (diff)
Fix multiple definitions of the class File (bad naming anyway).
Diffstat (limited to 'plugingui/drumkitframecontent.h')
-rw-r--r--plugingui/drumkitframecontent.h8
1 files changed, 4 insertions, 4 deletions
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};