From 252add8c2199c33b9d39c8d360e5f6e9418d8a21 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Thu, 8 Sep 2011 02:22:05 +0000 Subject: [PATCH] * style cleanup git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42722 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/devices/DevicesView.cpp | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/src/apps/devices/DevicesView.cpp b/src/apps/devices/DevicesView.cpp index 040ea43388..90743740a8 100644 --- a/src/apps/devices/DevicesView.cpp +++ b/src/apps/devices/DevicesView.cpp @@ -38,7 +38,7 @@ DevicesView::CreateLayout() BMenu* menu = new BMenu(B_TRANSLATE("Devices")); BMenuItem* item; menu->AddItem(new BMenuItem(B_TRANSLATE("Refresh devices"), - new BMessage(kMsgRefresh), 'R')); + new BMessage(kMsgRefresh), 'R')); menu->AddItem(item = new BMenuItem(B_TRANSLATE("Report compatibility"), new BMessage(kMsgReportCompatibility))); item->SetEnabled(false); @@ -133,7 +133,7 @@ DevicesView::RescanDevices() void DevicesView::DeleteDevices() { - while(fDevices.size() > 0) { + while (fDevices.size() > 0) { delete fDevices.back(); fDevices.pop_back(); } @@ -149,7 +149,7 @@ DevicesView::CreateCategoryMap() const char* categoryName = kCategoryString[category]; iter = fCategoryMap.find(category); - if( iter == fCategoryMap.end() ) { + if (iter == fCategoryMap.end()) { // This category has not yet been added, add it. fCategoryMap[category] = new Device(NULL, BUS_NONE, CAT_NONE, categoryName); @@ -162,7 +162,7 @@ void DevicesView::DeleteCategoryMap() { CategoryMapIterator iter; - for(iter = fCategoryMap.begin(); iter != fCategoryMap.end(); iter++) { + for (iter = fCategoryMap.begin(); iter != fCategoryMap.end(); iter++) { delete iter->second; } fCategoryMap.clear(); @@ -173,14 +173,14 @@ int DevicesView::SortItemsCompare(const BListItem *item1, const BListItem *item2) { - const BStringItem* stringItem1 = dynamic_cast(item1); + const BStringItem* stringItem1 = dynamic_cast(item1); const BStringItem* stringItem2 = dynamic_cast(item2); if (!(stringItem1 && stringItem2)) { // is this check necessary? std::cerr << "Could not cast BListItem to BStringItem, file a bug\n"; return 0; } - return Compare(stringItem1->Text(),stringItem2->Text()); + return Compare(stringItem1->Text(), stringItem2->Text()); } @@ -198,8 +198,7 @@ DevicesView::RebuildDevicesOutline() AddChildrenToOutlineByConnection(fDevices[i]); } } - } - else if (fOrderBy == ORDER_BY_CATEGORY) { + } else if (fOrderBy == ORDER_BY_CATEGORY) { // Add all categories to the outline CategoryMapIterator iter; for (iter = fCategoryMap.begin(); iter != fCategoryMap.end(); iter++) { @@ -211,11 +210,11 @@ DevicesView::RebuildDevicesOutline() Category category = fDevices[i]->GetCategory(); iter = fCategoryMap.find(category); - if(iter == fCategoryMap.end()) { - std::cerr << "Tried to add device without category, file a bug\n"; + if (iter == fCategoryMap.end()) { + std::cerr + << "Tried to add device without category, file a bug\n"; continue; - } - else { + } else { fDevicesOutline->AddUnder(fDevices[i], iter->second); } }