From 4f7b21282f34f38090cb6e25c60f80264192faea Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 2 Aug 2016 17:32:03 +0300 Subject: Fix compilation with some options. --- src/gui/gui.cpp | 4 ++-- src/gui/widgets/label.cpp | 2 +- src/gui/widgets/label.h | 3 ++- src/gui/widgets/tabs/tab.cpp | 2 +- src/gui/widgets/tabs/tab.h | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index 294f4fc89..f0a4137c1 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -292,8 +292,8 @@ Gui::~Gui() setTop(nullptr); delete2(mFocusHandler); - Label::final(); - Tab::final(); + Label::finalCleanup(); + Tab::finalCleanup(); } void Gui::logic() diff --git a/src/gui/widgets/label.cpp b/src/gui/widgets/label.cpp index c32b72b99..af6fa973d 100644 --- a/src/gui/widgets/label.cpp +++ b/src/gui/widgets/label.cpp @@ -285,7 +285,7 @@ void Label::widgetHidden(const Event &event A_UNUSED) mTextChunk.deleteImage(); } -void Label::final() +void Label::finalCleanup() { mSkin = nullptr; } diff --git a/src/gui/widgets/label.h b/src/gui/widgets/label.h index 028d1e8d5..b0240b74c 100644 --- a/src/gui/widgets/label.h +++ b/src/gui/widgets/label.h @@ -172,7 +172,8 @@ class Label final : public Widget, static int mInstances; - static void final(); + static void finalCleanup(); + private: /** * Holds the caption of the label. diff --git a/src/gui/widgets/tabs/tab.cpp b/src/gui/widgets/tabs/tab.cpp index 39e966886..25cab2221 100644 --- a/src/gui/widgets/tabs/tab.cpp +++ b/src/gui/widgets/tabs/tab.cpp @@ -479,7 +479,7 @@ void Tab::mouseExited(MouseEvent& event A_UNUSED) mHasMouse = false; } -void Tab::final() +void Tab::finalCleanup() { for (int f = 0; f < TAB_COUNT; f ++) { diff --git a/src/gui/widgets/tabs/tab.h b/src/gui/widgets/tabs/tab.h index 74b9f46be..042d0e0a8 100644 --- a/src/gui/widgets/tabs/tab.h +++ b/src/gui/widgets/tabs/tab.h @@ -202,7 +202,7 @@ class Tab notfinal : public BasicContainer, void setImage(Image *const image); - static void final(); + static void finalCleanup(); protected: friend class TabbedArea; -- cgit v1.2.3-70-g09d2