From 37cebf6883e52061e1c31f263eacdd2d04078e4e Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Tue, 17 Aug 2010 16:41:28 +0000 Subject: [PATCH] * fixed all warnings in FileTypes preflet and enabled -Werror git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38199 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/BuildSetup | 2 +- src/preferences/filetypes/IconView.cpp | 30 +++++++++++++++++++++----- src/preferences/filetypes/IconView.h | 9 ++++++++ 3 files changed, 35 insertions(+), 6 deletions(-) diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup index 264cad83f5..2bb4fae96d 100644 --- a/build/jam/BuildSetup +++ b/build/jam/BuildSetup @@ -1396,7 +1396,7 @@ if $(HAIKU_NO_WERROR) != 1 { EnableWerror src preferences cpufrequency ; EnableWerror src preferences datatranslations ; EnableWerror src preferences deskbar ; -# EnableWerror src preferences filetypes ; + EnableWerror src preferences filetypes ; EnableWerror src preferences fonts ; EnableWerror src preferences joysticks ; EnableWerror src preferences keyboard ; diff --git a/src/preferences/filetypes/IconView.cpp b/src/preferences/filetypes/IconView.cpp index 156e3f5f81..577ef982df 100644 --- a/src/preferences/filetypes/IconView.cpp +++ b/src/preferences/filetypes/IconView.cpp @@ -696,12 +696,12 @@ IconView::AcceptsDrag(const BMessage* message) return true; } - if (message->GetInfo("icon/large", &type) == B_OK - && type == B_MESSAGE_TYPE - || message->GetInfo("icon", &type) == B_OK - && type == B_VECTOR_ICON_TYPE - || message->GetInfo("icon/mini", &type) == B_OK + if ((message->GetInfo("icon/large", &type) == B_OK && type == B_MESSAGE_TYPE) + || (message->GetInfo("icon", &type) == B_OK + && type == B_VECTOR_ICON_TYPE) + || (message->GetInfo("icon/mini", &type) == B_OK + && type == B_MESSAGE_TYPE)) return true; return false; @@ -1377,3 +1377,23 @@ IconView::_StopWatching() else if (fHasType) BMimeType::StopWatching(this); } + + +#if __GNUC__ == 2 + +status_t +IconView::SetTarget(BMessenger target) +{ + return BControl::SetTarget(target); +} + + +status_t +IconView::SetTarget(const BHandler* handler, const BLooper* looper = NULL) +{ + return BControl::SetTarget(handler, + looper); +} + +#endif + diff --git a/src/preferences/filetypes/IconView.h b/src/preferences/filetypes/IconView.h index dfc1e82315..d7f3762e9c 100644 --- a/src/preferences/filetypes/IconView.h +++ b/src/preferences/filetypes/IconView.h @@ -118,6 +118,15 @@ public: status_t GetRef(entry_ref& ref) const; status_t GetMimeType(BMimeType& type) const; +#if __GNUC__ == 2 + virtual status_t SetTarget(BMessenger target); + virtual status_t SetTarget(const BHandler* handler, + const BLooper* looper = NULL); +#else + using BControl::SetTarget; +#endif + + protected: virtual bool AcceptsDrag(const BMessage* message); virtual BRect BitmapRect() const;