Author: aldeck Date: 2011-07-17 12:31:50 +0200 (Sun, 17 Jul 2011) New Revision: 42442 Changeset: https://dev.haiku-os.org/changeset/42442 Modified: haiku/trunk/src/kits/tracker/ContainerWindow.cpp haiku/trunk/src/kits/tracker/PoseView.cpp Log: * Slight renamings, no functional changes. Modified: haiku/trunk/src/kits/tracker/ContainerWindow.cpp =================================================================== --- haiku/trunk/src/kits/tracker/ContainerWindow.cpp 2011-07-17 09:51:22 UTC (rev 42441) +++ haiku/trunk/src/kits/tracker/ContainerWindow.cpp 2011-07-17 10:31:50 UTC (rev 42442) @@ -3788,19 +3788,19 @@ status_t -BContainerWindow::DragStart(const BMessage *incoming) +BContainerWindow::DragStart(const BMessage* dragMessage) { - if (incoming == NULL) + if (dragMessage == NULL) return B_ERROR; // if already dragging, or // if all the refs match - if (Dragging() && SpringLoadedFolderCompareMessages(incoming, fDragMessage)) + if (Dragging() && SpringLoadedFolderCompareMessages(dragMessage, fDragMessage)) return B_OK; // cache the current drag message // build a list of the mimetypes in the message - SpringLoadedFolderCacheDragData(incoming, &fDragMessage, &fCachedTypesList); + SpringLoadedFolderCacheDragData(dragMessage, &fDragMessage, &fCachedTypesList); fWaitingForRefs = true; Modified: haiku/trunk/src/kits/tracker/PoseView.cpp =================================================================== --- haiku/trunk/src/kits/tracker/PoseView.cpp 2011-07-17 09:51:22 UTC (rev 42441) +++ haiku/trunk/src/kits/tracker/PoseView.cpp 2011-07-17 10:31:50 UTC (rev 42442) @@ -6704,12 +6704,12 @@ void -BPoseView::MouseMoved(BPoint mouseLoc, uint32 moveCode, const BMessage *message) +BPoseView::MouseMoved(BPoint where, uint32 transit, const BMessage* dragMessage) { if (fSelectionRectInfo.isDragging) - _UpdateSelectionRect(mouseLoc); + _UpdateSelectionRect(where); - if (!fDropEnabled || message == NULL) + if (!fDropEnabled || dragMessage == NULL) return; BContainerWindow* window = ContainerWindow(); @@ -6717,12 +6717,12 @@ return; if (!window->Dragging()) - window->DragStart(message); + window->DragStart(dragMessage); - switch (moveCode) { + switch (transit) { case B_INSIDE_VIEW: case B_ENTERED_VIEW: - UpdateDropTarget(mouseLoc, message, window->ContextMenu()); + UpdateDropTarget(where, dragMessage, window->ContextMenu()); if (fAutoScrollState == kAutoScrollOff) { // turn on auto scrolling if it's not yet on fAutoScrollState = kWaitForTransition;