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

* more cleanup in Sounds preflet, replaced occurences of the deprecated cast_as macro, added missing checks.

Browse Source 
* took the opportunity to do the same for all occurences as reported by OpenGrok 


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35600 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Alexandre Deckner
2010-02-24 14:10:17 +00:00
parent c35b7b937b
commit e7f640f25f
3 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/icon-o-matic/generic/property/view/PropertyListView.cpp
+2 -3
View File
@@ -11,7 +11,6 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <ClassInfo.h>
#include <Clipboard.h> #include <Clipboard.h>
#ifdef __HAIKU__ #ifdef __HAIKU__
# include <LayoutUtils.h> # include <LayoutUtils.h>
@@ -191,8 +190,8 @@ PropertyListView::MessageReceived(BMessage* message)
if (!archivable) if (!archivable)
continue; continue;
// see if this is actually a property // see if this is actually a property
Property* property = cast_as(archivable, Property); Property* property = dynamic_cast<Property*>(archivable);
if (!property || !propertyObject.AddProperty(property)) if (property == NULL || !propertyObject.AddProperty(property))
delete archivable; delete archivable;
} }
if (propertyObject.CountProperties() > 0) if (propertyObject.CountProperties() > 0)
src/apps/mail/ComboBox.cpp
+7 -9
View File
@@ -64,7 +64,6 @@ All rights reserved.
*/ */
#include <Button.h> #include <Button.h>
#include <ClassInfo.h>
#include <Debug.h> #include <Debug.h>
#include <InterfaceDefs.h> #include <InterfaceDefs.h>
#include <ListItem.h> #include <ListItem.h>
@@ -613,8 +612,7 @@ BComboBox::TextInput::KeyDown(const char *bytes, int32 numBytes)
switch (aKey) { switch (aKey) {
case B_RETURN: case B_RETURN:
cb = cast_as(Parent(), BComboBox); cb = dynamic_cast<BComboBox*>(Parent());
ASSERT(cb); ASSERT(cb);
if (!cb->IsEnabled()) if (!cb->IsEnabled())
@@ -639,7 +637,7 @@ BComboBox::TextInput::KeyDown(const char *bytes, int32 numBytes)
} }
break; break;
case B_TAB: case B_TAB:
// cb = cast_as(Parent(), BComboBox); // cb = dynamic_cast<BComboBox*>Parent());
// ASSERT(cb); // ASSERT(cb);
// if (cb->fAutoComplete && cb->fCompletionIndex >= 0) { // if (cb->fAutoComplete && cb->fCompletionIndex >= 0) {
// int32 from, to; // int32 from, to;
@@ -678,10 +676,10 @@ BComboBox::TextInput::KeyDown(const char *bytes, int32 numBytes)
#if 0 #if 0
case B_UP_ARROW: // fall through case B_UP_ARROW: // fall through
case B_DOWN_ARROW: case B_DOWN_ARROW:
cb = cast_as(Parent(), BComboBox); cb = dynamic_cast<BComboBox*>(Parent());
ASSERT(cb); ASSERT(cb);
if (cb->fChoiceList) { if (cb->fChoiceList) {
cb = cast_as(Parent(), BComboBox); cb = dynamic_cast<BComboBox*>(Parent());
ASSERT(cb); ASSERT(cb);
if (!(cb->fPopupWindow)) { if (!(cb->fPopupWindow)) {
cb->fPopupWindow = cb->CreatePopupWindow(); cb->fPopupWindow = cb->CreatePopupWindow();
@@ -709,11 +707,11 @@ BComboBox::TextInput::KeyDown(const char *bytes, int32 numBytes)
break; break;
#endif #endif
case B_ESCAPE: case B_ESCAPE:
cb = cast_as(Parent(), BComboBox); cb = dynamic_cast<BComboBox*>(Parent());
ASSERT(cb); ASSERT(cb);
if (cb->fChoiceList) if (cb->fChoiceList)
{ {
cb = cast_as(Parent(), BComboBox); cb = dynamic_cast<BComboBox*>(Parent());
ASSERT(cb); ASSERT(cb);
if (cb->fPopupWindow && cb->fPopupWindow->Lock()) if (cb->fPopupWindow && cb->fPopupWindow->Lock())
{ {
@@ -749,7 +747,7 @@ BComboBox::TextInput::MakeFocus(bool state)
if (state == IsFocus()) if (state == IsFocus())
return; return;
BComboBox* parent = cast_as(Parent(), BComboBox); BComboBox* parent = dynamic_cast<BComboBox*>(Parent());
ASSERT(parent); ASSERT(parent);
BTextView::MakeFocus(state); BTextView::MakeFocus(state);
src/preferences/sounds/HWindow.cpp
+19 -10
View File
@@ -19,7 +19,6 @@
#include <Beep.h> #include <Beep.h>
#include <Box.h> #include <Box.h>
#include <Button.h> #include <Button.h>
#include <ClassInfo.h>
#include <FindDirectory.h> #include <FindDirectory.h>
#include <fs_attr.h> #include <fs_attr.h>
#include <MediaFiles.h> #include <MediaFiles.h>
@@ -173,7 +172,10 @@ HWindow::MessageReceived(BMessage* message)
switch (message->what) { switch (message->what) {
case M_OTHER_MESSAGE: case M_OTHER_MESSAGE:
{ {
BMenuField* menufield = cast_as(FindView("filemenu"), BMenuField); BMenuField* menufield
= dynamic_cast<BMenuField*>(FindView("filemenu"));
if (menufield == NULL)
return;
BMenu* menu = menufield->Menu(); BMenu* menu = menufield->Menu();
HEventRow* row = (HEventRow*)fEventList->CurrentSelection(); HEventRow* row = (HEventRow*)fEventList->CurrentSelection();
@@ -199,8 +201,10 @@ HWindow::MessageReceived(BMessage* message)
entry_ref ref; entry_ref ref;
HEventRow* row = (HEventRow*)fEventList->CurrentSelection(); HEventRow* row = (HEventRow*)fEventList->CurrentSelection();
if (message->FindRef("refs", &ref) == B_OK && row != NULL) { if (message->FindRef("refs", &ref) == B_OK && row != NULL) {
BMenuField* menufield = cast_as(FindView("filemenu"), BMenuField* menufield
BMenuField); = dynamic_cast<BMenuField*>(FindView("filemenu"));
if (menufield == NULL)
return;
BMenu* menu = menufield->Menu(); BMenu* menu = menufield->Menu();
// check audio file // check audio file
@@ -267,7 +271,10 @@ HWindow::MessageReceived(BMessage* message)
case M_EVENT_CHANGED: case M_EVENT_CHANGED:
{ {
const char* path; const char* path;
BMenuField* menufield = cast_as(FindView("filemenu"), BMenuField); BMenuField* menufield
= dynamic_cast<BMenuField*>(FindView("filemenu"));
if (menufield == NULL)
return;
BMenu* menu = menufield->Menu(); BMenu* menu = menufield->Menu();
if (message->FindString("path", &path) == B_OK) { if (message->FindString("path", &path) == B_OK) {
@@ -308,7 +315,9 @@ HWindow::MessageReceived(BMessage* message)
void void
HWindow::SetupMenuField() HWindow::SetupMenuField()
{ {
BMenuField* menufield = cast_as(FindView("filemenu"), BMenuField); BMenuField* menufield = dynamic_cast<BMenuField*>(FindView("filemenu"));
if (menufield == NULL)
return;
BMenu* menu = menufield->Menu(); BMenu* menu = menufield->Menu();
int32 count = fEventList->CountRows(); int32 count = fEventList->CountRows();
for (int32 i = 0; i < count; i++) { for (int32 i = 0; i < count; i++) {
@@ -403,11 +412,11 @@ void
HWindow::Pulse() HWindow::Pulse()
{ {
HEventRow* row = (HEventRow*)fEventList->CurrentSelection(); HEventRow* row = (HEventRow*)fEventList->CurrentSelection();
BMenuField* menufield = cast_as(FindView("filemenu"), BMenuField); BMenuField* menufield = dynamic_cast<BMenuField*>(FindView("filemenu"));
BButton* button = cast_as(FindView("play"), BButton); BButton* button = dynamic_cast<BButton*>(FindView("play"));
BButton* stop = cast_as(FindView("stop"), BButton); BButton* stop = dynamic_cast<BButton*>(FindView("stop"));
if (menufield == NULL) if (menufield == NULL || button == NULL || stop == NULL)
return; return;
if (row != NULL) { if (row != NULL) {