From ab05d36868610c8bce69e732e9cb3befb3d52c6b Mon Sep 17 00:00:00 2001 From: sushilhub Date: Mon, 18 Mar 2019 01:53:14 +0530 Subject: [PATCH] src/apps: style fixes * add break statement to the last clause of switch/cases * fix some other minor issues Change-Id: I9ac3dac0cda0b14043b975938caea88b79bb749f Reviewed-on: https://review.haiku-os.org/c/haiku/+/1299 Reviewed-by: Adrien Destugues --- src/apps/mail/Enclosures.cpp | 2 +- src/apps/mail/FindWindow.cpp | 2 +- src/apps/mail/MailApp.cpp | 2 +- src/apps/mail/Signature.cpp | 4 +++- src/apps/mediaconverter/MediaConverterApp.cpp | 1 + .../mediaconverter/MediaConverterWindow.cpp | 1 + src/apps/mediaconverter/MediaFileListView.cpp | 2 +- src/apps/musiccollection/FileMonitor.cpp | 4 ++-- .../musiccollection/MusicCollectionWindow.cpp | 23 ++++++++----------- src/apps/networkstatus/NetworkStatusView.cpp | 2 +- src/apps/powerstatus/PowerStatusView.cpp | 2 ++ src/apps/serialconnect/SerialWindow.cpp | 4 ++-- src/apps/sudoku/ProgressWindow.cpp | 2 +- 13 files changed, 27 insertions(+), 24 deletions(-) diff --git a/src/apps/mail/Enclosures.cpp b/src/apps/mail/Enclosures.cpp index 25f5a492ec..1c4aaec9ae 100644 --- a/src/apps/mail/Enclosures.cpp +++ b/src/apps/mail/Enclosures.cpp @@ -361,6 +361,7 @@ TEnclosuresView::MessageReceived(BMessage *msg) default: BView::MessageReceived(msg); + break; } } @@ -566,4 +567,3 @@ TListItem::DrawItem(BView *owner, BRect r, bool /* complete */) } else owner->DrawString(""); } - diff --git a/src/apps/mail/FindWindow.cpp b/src/apps/mail/FindWindow.cpp index 2ee3155c2f..6437a4a6d0 100644 --- a/src/apps/mail/FindWindow.cpp +++ b/src/apps/mail/FindWindow.cpp @@ -192,6 +192,7 @@ void FindPanel::MessageReceived(BMessage* msg) } default: BView::MessageReceived(msg); + break; } } @@ -271,4 +272,3 @@ const char* FindWindow::GetFindString() { return sPreviousFind.String(); } - diff --git a/src/apps/mail/MailApp.cpp b/src/apps/mail/MailApp.cpp index 6536324b67..7d416c1977 100644 --- a/src/apps/mail/MailApp.cpp +++ b/src/apps/mail/MailApp.cpp @@ -423,6 +423,7 @@ TMailApp::MessageReceived(BMessage *msg) default: BApplication::MessageReceived(msg); + break; } } @@ -1276,4 +1277,3 @@ main() TMailApp().Run(); return B_OK; } - diff --git a/src/apps/mail/Signature.cpp b/src/apps/mail/Signature.cpp index 1ed5b679df..44c287cc2b 100644 --- a/src/apps/mail/Signature.cpp +++ b/src/apps/mail/Signature.cpp @@ -249,6 +249,7 @@ TSignatureWindow::MessageReceived(BMessage* msg) default: BWindow::MessageReceived(msg); + break; } } @@ -536,6 +537,7 @@ TSigTextView::KeyDown(const char *key, int32 count) default: BTextView::KeyDown(key, count); + break; } } @@ -584,6 +586,6 @@ TSigTextView::MessageReceived(BMessage *msg) default: BTextView::MessageReceived(msg); + break; } } - diff --git a/src/apps/mediaconverter/MediaConverterApp.cpp b/src/apps/mediaconverter/MediaConverterApp.cpp index b97817060d..1c3fb32be8 100644 --- a/src/apps/mediaconverter/MediaConverterApp.cpp +++ b/src/apps/mediaconverter/MediaConverterApp.cpp @@ -89,6 +89,7 @@ MediaConverterApp::MessageReceived(BMessage *msg) default: BApplication::MessageReceived(msg); + break; } } diff --git a/src/apps/mediaconverter/MediaConverterWindow.cpp b/src/apps/mediaconverter/MediaConverterWindow.cpp index e223595948..e0c6a34c70 100644 --- a/src/apps/mediaconverter/MediaConverterWindow.cpp +++ b/src/apps/mediaconverter/MediaConverterWindow.cpp @@ -510,6 +510,7 @@ MediaConverterWindow::MessageReceived(BMessage* message) default: BWindow::MessageReceived(message); + break; } } diff --git a/src/apps/mediaconverter/MediaFileListView.cpp b/src/apps/mediaconverter/MediaFileListView.cpp index 1aa9b1fe49..2850fb15e4 100644 --- a/src/apps/mediaconverter/MediaFileListView.cpp +++ b/src/apps/mediaconverter/MediaFileListView.cpp @@ -106,6 +106,7 @@ MediaFileListView::KeyDown(const char *bytes, int32 numBytes) break; default: BListView::KeyDown(bytes, numBytes); + break; } } @@ -117,4 +118,3 @@ MediaFileListView::SelectionChanged() if (win != NULL) win->SourceFileSelectionChanged(); } - diff --git a/src/apps/musiccollection/FileMonitor.cpp b/src/apps/musiccollection/FileMonitor.cpp index 620ded5a6b..a3cf4ce8b0 100644 --- a/src/apps/musiccollection/FileMonitor.cpp +++ b/src/apps/musiccollection/FileMonitor.cpp @@ -79,7 +79,7 @@ FileMonitor::MessageReceived(BMessage* msg) } if (fCurrentReadList) Looper()->PostMessage(kMsgAddRefs, this); - + break; } @@ -89,6 +89,7 @@ FileMonitor::MessageReceived(BMessage* msg) default: NodeMonitorHandler::MessageReceived(msg); + break; } } @@ -307,4 +308,3 @@ ReadThread::_PublishEntrys(BMessenger& messenger) fNReaded = 0; messenger.SendMessage(kMsgAddRefs); } - diff --git a/src/apps/musiccollection/MusicCollectionWindow.cpp b/src/apps/musiccollection/MusicCollectionWindow.cpp index a84f681707..40bad47880 100644 --- a/src/apps/musiccollection/MusicCollectionWindow.cpp +++ b/src/apps/musiccollection/MusicCollectionWindow.cpp @@ -278,6 +278,7 @@ MusicCollectionWindow::MessageReceived(BMessage* message) default: BWindow::MessageReceived(message); + break; } } @@ -286,26 +287,22 @@ void CaseInsensitiveString(BString &instring, BString &outstring) { outstring = ""; - int i = 0; - while (instring[i]) - { - if (instring[i] >= 65 && instring[i] <= 90) // capital letters - { - int ch = instring[i] + 32; + + for (int i = 0; instring[i]; i++) { + if (isupper(instring[i])) { + int ch = tolower(instring[i]); outstring += "["; outstring += ch; outstring += instring[i]; outstring += "]"; - } else if (instring[i] >= 97 && instring[i] <= 122) - { - int ch = instring[i]-32; + } else if (islower(instring[i])) { + int ch = toupper(instring[i]); outstring += "["; outstring += instring[i]; outstring += ch; outstring += "]"; } else outstring += instring[i]; - i++; } } @@ -346,12 +343,12 @@ MusicCollectionWindow::_CreateQuery(BString& orgString) query->PushAttr("Media:Title"); query->PushString(queryString); query->PushOp(B_CONTAINS); - + query->PushAttr("Audio:Album"); query->PushString(queryString); query->PushOp(B_CONTAINS); query->PushOp(B_OR); - + query->PushAttr("Audio:Artist"); query->PushString(queryString); query->PushOp(B_CONTAINS); @@ -367,7 +364,7 @@ MusicCollectionWindow::_CreateQuery(BString& orgString) query->PushAttr("BEOS:TYPE"); query->PushString("audio/"); query->PushOp(B_BEGINS_WITH); - + query->PushAttr("name"); query->PushString(queryString); query->PushOp(B_CONTAINS); diff --git a/src/apps/networkstatus/NetworkStatusView.cpp b/src/apps/networkstatus/NetworkStatusView.cpp index 66f2a9fcc7..fef76daf34 100644 --- a/src/apps/networkstatus/NetworkStatusView.cpp +++ b/src/apps/networkstatus/NetworkStatusView.cpp @@ -299,6 +299,7 @@ NetworkStatusView::MessageReceived(BMessage* message) default: BView::MessageReceived(message); + break; } } @@ -569,4 +570,3 @@ instantiate_deskbar_item(float maxWidth, float maxHeight) return new NetworkStatusView(BRect(0, 0, maxHeight - 1, maxHeight - 1), B_FOLLOW_LEFT | B_FOLLOW_TOP, true); } - diff --git a/src/apps/powerstatus/PowerStatusView.cpp b/src/apps/powerstatus/PowerStatusView.cpp index 59622328a9..de04028266 100644 --- a/src/apps/powerstatus/PowerStatusView.cpp +++ b/src/apps/powerstatus/PowerStatusView.cpp @@ -150,6 +150,7 @@ PowerStatusView::MessageReceived(BMessage *message) default: BView::MessageReceived(message); + break; } } @@ -705,6 +706,7 @@ PowerStatusReplicant::MessageReceived(BMessage *message) default: PowerStatusView::MessageReceived(message); + break; } } diff --git a/src/apps/serialconnect/SerialWindow.cpp b/src/apps/serialconnect/SerialWindow.cpp index 7349dc7d55..9d5eac0393 100644 --- a/src/apps/serialconnect/SerialWindow.cpp +++ b/src/apps/serialconnect/SerialWindow.cpp @@ -492,7 +492,7 @@ void SerialWindow::MessageReceived(BMessage* message) } return; } + default: + BWindow::MessageReceived(message); } - - BWindow::MessageReceived(message); } diff --git a/src/apps/sudoku/ProgressWindow.cpp b/src/apps/sudoku/ProgressWindow.cpp index 50cb6402ea..98deb6dd13 100644 --- a/src/apps/sudoku/ProgressWindow.cpp +++ b/src/apps/sudoku/ProgressWindow.cpp @@ -145,6 +145,6 @@ ProgressWindow::MessageReceived(BMessage *message) default: BWindow::MessageReceived(message); + break; } } -