i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* fixed all warnings in FileTypes preflet and enabled -Werror

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38199 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Oliver Tappe
2010-08-17 16:41:28 +00:00
parent 1f1606e745
commit 37cebf6883
3 changed files with 35 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/BuildSetup
+1 -1
View File
@@ -1396,7 +1396,7 @@ if $(HAIKU_NO_WERROR) != 1 {
EnableWerror src preferences cpufrequency ; EnableWerror src preferences cpufrequency ;
EnableWerror src preferences datatranslations ; EnableWerror src preferences datatranslations ;
EnableWerror src preferences deskbar ; EnableWerror src preferences deskbar ;
# EnableWerror src preferences filetypes ; EnableWerror src preferences filetypes ;
EnableWerror src preferences fonts ; EnableWerror src preferences fonts ;
EnableWerror src preferences joysticks ; EnableWerror src preferences joysticks ;
EnableWerror src preferences keyboard ; EnableWerror src preferences keyboard ;
src/preferences/filetypes/IconView.cpp
+25 -5
View File
@@ -696,12 +696,12 @@ IconView::AcceptsDrag(const BMessage* message)
return true; return true;
} }
if (message->GetInfo("icon/large", &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) && 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 true;
return false; return false;
@@ -1377,3 +1377,23 @@ IconView::_StopWatching()
else if (fHasType) else if (fHasType)
BMimeType::StopWatching(this); 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
src/preferences/filetypes/IconView.h
+9
View File
@@ -118,6 +118,15 @@ public:
status_t GetRef(entry_ref& ref) const; status_t GetRef(entry_ref& ref) const;
status_t GetMimeType(BMimeType& type) 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: protected:
virtual bool AcceptsDrag(const BMessage* message); virtual bool AcceptsDrag(const BMessage* message);
virtual BRect BitmapRect() const; virtual BRect BitmapRect() const;