diff --git a/src/kits/tracker/ContainerWindow.cpp b/src/kits/tracker/ContainerWindow.cpp index c2fe445c1a..772ed939e5 100644 --- a/src/kits/tracker/ContainerWindow.cpp +++ b/src/kits/tracker/ContainerWindow.cpp @@ -2858,7 +2858,7 @@ BContainerWindow::ShowContextMenu(BPoint loc, const entry_ref* ref, BView*) ejectableVolumeSelected = true; EnableNamedMenuItem(fContextMenu, - B_TRANSLATE("Unmount"), ejectableVolumeSelected); + B_TRANSLATE("Unmount"), ejectableVolumeSelected); } } @@ -2912,7 +2912,7 @@ BContainerWindow::AddFileContextMenus(BMenu* menu) if (!IsTrash() && !InTrash()) { menu->AddItem(new BMenuItem(TrackerSettings().DontMoveFilesToTrash() - ? B_TRANSLATE("Delete") : B_TRANSLATE("Move to Trash"), + ? B_TRANSLATE("Delete") : B_TRANSLATE("Move to Trash"), new BMessage(kMoveToTrash), 'T')); if (!IsPrintersDir()) { // add separator for copy to/move to items (navigation items) @@ -3365,7 +3365,7 @@ BContainerWindow::LoadAddOn(BMessage* message) buffer.ReplaceFirst("%error", strerror(result)); buffer.ReplaceFirst("%name", addonRef.name); - BAlert* alert = new BAlert("", buffer.String(), B_TRANSLATE("Cancel"), + BAlert* alert = new BAlert("", buffer.String(), B_TRANSLATE("Cancel"), 0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT); alert->SetFlags(alert->Flags() | B_CLOSE_ON_ESCAPE); alert->Go(); diff --git a/src/kits/tracker/DesktopPoseView.h b/src/kits/tracker/DesktopPoseView.h index bbc19dba57..b87d94aad1 100644 --- a/src/kits/tracker/DesktopPoseView.h +++ b/src/kits/tracker/DesktopPoseView.h @@ -32,8 +32,8 @@ names are registered trademarks or trademarks of their respective holders. All rights reserved. */ -// DesktopPoseView adds support for displaying integrated desktops -// from multiple volumes to BPoseView +// DesktopPoseView adds support for displaying integrated desktops +// from multiple volumes to BPoseView #ifndef _DESKTOP_POSE_VIEW_H #define _DESKTOP_POSE_VIEW_H diff --git a/src/kits/tracker/FSUtils.cpp b/src/kits/tracker/FSUtils.cpp index 56be639ac9..357ec88811 100644 --- a/src/kits/tracker/FSUtils.cpp +++ b/src/kits/tracker/FSUtils.cpp @@ -358,13 +358,13 @@ TrackerCopyLoopControl::FileError(const char* message, const char* name, buffer.ReplaceFirst("%error", strerror(error)); if (allowContinue) { - BAlert* alert = new BAlert("", buffer.String(), B_TRANSLATE("Cancel"), + BAlert* alert = new BAlert("", buffer.String(), B_TRANSLATE("Cancel"), B_TRANSLATE("OK"), 0, B_WIDTH_AS_USUAL, B_STOP_ALERT); alert->SetShortcut(0, B_ESCAPE); return alert->Go() != 0; } - BAlert* alert = new BAlert("", buffer.String(), B_TRANSLATE("Cancel"), 0, 0, + BAlert* alert = new BAlert("", buffer.String(), B_TRANSLATE("Cancel"), 0, 0, B_WIDTH_AS_USUAL, B_STOP_ALERT); alert->SetFlags(alert->Flags() | B_CLOSE_ON_ESCAPE); alert->Go(); @@ -1308,7 +1308,7 @@ LowLevelCopy(BEntry* srcEntry, StatStruct* srcStat, BDirectory* destDir, size_t bufsize = kMinBufferSize; if ((off_t)bufsize < srcStat->st_size) { - // File bigger than the buffer size: determine an optimal buffer size + // File bigger than the buffer size: determine an optimal buffer size system_info sinfo; get_system_info(&sinfo); size_t freesize = static_cast( @@ -1940,8 +1940,8 @@ MoveEntryToTrash(BEntry* entry, BPoint* loc, Undo &undo) // if it's a volume, try to unmount if (dir.IsRootDirectory()) { - BVolume volume(nodeRef.device); - BVolume boot; + BVolume volume(nodeRef.device); + BVolume boot; BVolumeRoster().GetBootVolume(&boot); if (volume == boot) { @@ -2060,7 +2060,7 @@ PreFlightNameCheck(BObjectList* srcList, const BDirectory* destDir, // single collision case will be handled as a "Prompt" case by CheckName if (*collisionCount > 1) { const char* verb = (moveMode == kMoveSelectionTo) - ? B_TRANSLATE("moving") : B_TRANSLATE("copying"); + ? B_TRANSLATE("moving") : B_TRANSLATE("copying"); BString replaceMsg(B_TRANSLATE_NOCOLLECT(kReplaceManyStr)); replaceMsg.ReplaceAll("%verb", verb); @@ -2159,7 +2159,7 @@ CheckName(uint32 moveMode, const BEntry* sourceEntry, return B_OK; } - if (moveMode == kCreateLink || moveMode == kCreateRelativeLink) { + if (moveMode == kCreateLink || moveMode == kCreateRelativeLink) { // if we are creating link in the same directory, the conflict will // be handled later by giving the link a unique name sourceEntry->GetParent(&srcDirectory); @@ -2192,7 +2192,7 @@ CheckName(uint32 moveMode, const BEntry* sourceEntry, ? B_TRANSLATE("You cannot replace a file with a folder or a " "symbolic link.") : B_TRANSLATE("You cannot replace a folder or a symbolic link " - "with a file."), B_TRANSLATE("OK"), 0, 0, B_WIDTH_AS_USUAL, + "with a file."), B_TRANSLATE("OK"), 0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT); alert->SetFlags(alert->Flags() | B_CLOSE_ON_ESCAPE); alert->Go(); diff --git a/src/kits/tracker/FilePanel.cpp b/src/kits/tracker/FilePanel.cpp index e296ec938c..78255a745d 100644 --- a/src/kits/tracker/FilePanel.cpp +++ b/src/kits/tracker/FilePanel.cpp @@ -329,7 +329,7 @@ BFilePanel::SetPanelDirectory(const BEntry* entry) void BFilePanel::SetPanelDirectory(const BDirectory* dir) { - BEntry entry; + BEntry entry; if (dir && (dir->GetEntry(&entry) == B_OK)) SetPanelDirectory(&entry); diff --git a/src/kits/tracker/Model.cpp b/src/kits/tracker/Model.cpp index f68d6e0101..0109661ea5 100644 --- a/src/kits/tracker/Model.cpp +++ b/src/kits/tracker/Model.cpp @@ -426,8 +426,8 @@ Model::OpenNodeCommon(bool writable) SetupBaseType(); switch (fBaseType) { - case kPlainNode: case kExecutableNode: + case kPlainNode: case kQueryNode: case kQueryTemplateNode: case kVirtualDirectoryNode: @@ -437,11 +437,11 @@ Model::OpenNodeCommon(bool writable) (uint32)(writable ? O_RDWR : O_RDONLY)); break; + case kDesktopNode: case kDirectoryNode: - case kVolumeNode: case kRootNode: case kTrashNode: - case kDesktopNode: + case kVolumeNode: if (!IsNodeOpen()) fNode = new BDirectory(&fEntryRef); diff --git a/src/kits/tracker/Model.h b/src/kits/tracker/Model.h index 838c41f9af..71d285ebd1 100644 --- a/src/kits/tracker/Model.h +++ b/src/kits/tracker/Model.h @@ -229,18 +229,18 @@ private: CanHandleResult CanHandleDrops() const; enum NodeType { - kPlainNode, - kExecutableNode, + kDesktopNode, kDirectoryNode, + kExecutableNode, kLinkNode, + kPlainNode, kQueryNode, kQueryTemplateNode, - kVolumeNode, kRootNode, + kVolumeNode, kTrashNode, - kDesktopNode, - kVirtualDirectoryNode, - kUnknownNode + kUnknownNode, + kVirtualDirectoryNode }; entry_ref fEntryRef; diff --git a/src/kits/tracker/Pose.h b/src/kits/tracker/Pose.h index 75b0b2762b..0c7ef19c88 100644 --- a/src/kits/tracker/Pose.h +++ b/src/kits/tracker/Pose.h @@ -192,7 +192,7 @@ BPose::Select(bool on) inline bigtime_t -BPose::SelectionTime() const +BPose::SelectionTime() const { return fSelectionTime; } diff --git a/src/kits/tracker/PoseView.cpp b/src/kits/tracker/PoseView.cpp index 3b2b2c0fc4..14d664d0de 100644 --- a/src/kits/tracker/PoseView.cpp +++ b/src/kits/tracker/PoseView.cpp @@ -4465,11 +4465,11 @@ BPoseView::HandleMessageDropped(BMessage* message) BContainerWindow* window = dynamic_cast(Window()); if (window != NULL && message->HasData("RGBColor", 'RGBC')) { - // do not handle roColor-style drops here, pass them on to the desktop + // do not handle roColor-style drops here, pass them on to the desktop BMessenger((BHandler*)window).SendMessage(message); return true; - } + } if (fDropTarget && !DragSelectionContains(fDropTarget, message)) HiliteDropTarget(false); @@ -6186,7 +6186,7 @@ CheckVolumeReadOnly(const entry_ref* ref) { BVolume volume (ref->device); if (volume.IsReadOnly()) { - BAlert* alert = new BAlert ("", + BAlert* alert = new BAlert("", B_TRANSLATE("Files cannot be moved or deleted from a read-only " "volume."), B_TRANSLATE("Cancel"), NULL, NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT); diff --git a/src/kits/tracker/VirtualDirectoryPoseView.cpp b/src/kits/tracker/VirtualDirectoryPoseView.cpp index 252237cc12..4cdf17106b 100644 --- a/src/kits/tracker/VirtualDirectoryPoseView.cpp +++ b/src/kits/tracker/VirtualDirectoryPoseView.cpp @@ -60,8 +60,8 @@ VirtualDirectoryPoseView::MessageReceived(BMessage* message) // ignore all edit operations case B_CUT: case kCutMoreSelectionToClipboard: - case kDuplicateSelection: case kDelete: + case kDuplicateSelection: case kMoveToTrash: case kNewEntryFromTemplate: case kNewFolder: diff --git a/src/kits/tracker/infowindow/AttributesView.cpp b/src/kits/tracker/infowindow/AttributesView.cpp index 62b3af7cb0..75a0388a80 100644 --- a/src/kits/tracker/infowindow/AttributesView.cpp +++ b/src/kits/tracker/infowindow/AttributesView.cpp @@ -406,7 +406,7 @@ AttributesView::AttributesView(Model* model) break; case B_RGB_32_BIT_TYPE: row->SetField(new BStringField(B_TRANSLATE( - "True-color picture")), kTypeColumn); + "True-color picture")), kTypeColumn); break; case B_RGB_COLOR_TYPE: row->SetField(new BStringField(B_TRANSLATE("Color")), diff --git a/src/kits/tracker/infowindow/FilePermissionsView.cpp b/src/kits/tracker/infowindow/FilePermissionsView.cpp index ddecbc5a63..35c92722c8 100644 --- a/src/kits/tracker/infowindow/FilePermissionsView.cpp +++ b/src/kits/tracker/infowindow/FilePermissionsView.cpp @@ -73,7 +73,7 @@ public: BRect rectArray[1]; escapement_delta delta = { 0.0, 0.0 }; currentFont.GetBoundingBoxesForStrings(stringArray, 1, B_SCREEN_METRIC, - &delta, rectArray); + &delta, rectArray); // Adjust the size to avoid partial drawing of first and last chars // due to the orientation diff --git a/src/kits/tracker/infowindow/HeaderView.cpp b/src/kits/tracker/infowindow/HeaderView.cpp index d3b44816d7..775c55e60a 100644 --- a/src/kits/tracker/infowindow/HeaderView.cpp +++ b/src/kits/tracker/infowindow/HeaderView.cpp @@ -113,7 +113,6 @@ HeaderView::HeaderView(Model* model) else delete resolvedModel; } - } @@ -713,5 +712,3 @@ HeaderView::CurrentFontHeight() return fontHeight.ascent + fontHeight.descent + fontHeight.leading + 2; } - -