Skip to content

Commit

Permalink
Automatic whitespace cleanup. No functional change.
Browse files Browse the repository at this point in the history
  • Loading branch information
mmadia committed Jan 2, 2013
1 parent 364389a commit db41683
Show file tree
Hide file tree
Showing 54 changed files with 214 additions and 214 deletions.
2 changes: 1 addition & 1 deletion src/kits/tracker/AUTHORS
Expand Up @@ -7,4 +7,4 @@ Jeff Bush,
Robert Chinn,
Doug Fulton,
Kenny Carruthers,
Dianne Hackborn
Dianne Hackborn
6 changes: 3 additions & 3 deletions src/kits/tracker/AttributeStream.h
Expand Up @@ -79,7 +79,7 @@ class AttributeInfo {
AttributeInfo(const AttributeInfo &);
AttributeInfo(const char*, attr_info);
AttributeInfo(const char*, uint32, off_t);

void SetTo(const AttributeInfo &);
void SetTo(const char*, attr_info);
void SetTo(const char*, uint32, off_t);
Expand Down Expand Up @@ -186,7 +186,7 @@ class AttributeStreamFileNode : public AttributeStreamNode {
private:
AttributeInfo fCurrentAttr;
BNode* fNode;

typedef AttributeStreamNode _inherited;
};

Expand Down Expand Up @@ -224,7 +224,7 @@ class AttributeStreamMemoryNode : public AttributeStreamNode {
{
delete [] fData;
}

AttributeInfo fAttr;
char* fData;
};
Expand Down
2 changes: 1 addition & 1 deletion src/kits/tracker/Bitmaps.h
Expand Up @@ -87,7 +87,7 @@ class BImageResources

private:
image_id find_image(void* memAddr) const;

mutable BLocker fLock;
BResources fResources;
};
Expand Down
8 changes: 4 additions & 4 deletions src/kits/tracker/DeskWindow.h
Expand Up @@ -67,9 +67,9 @@ class BDeskWindow : public BContainerWindow {

void UpdateDesktopBackgroundImages();
// Desktop window has special background image handling

void SaveDesktopPoseLocations();

protected:
virtual void AddWindowContextMenus(BMenu*);
virtual BPoseView* NewPoseView(Model*, BRect, uint32);
Expand All @@ -84,7 +84,7 @@ class BDeskWindow : public BContainerWindow {
BPopUpMenu* fTrashContextMenu;

BRect fOldFrame;

// in the desktop window addon shortcuts have to be added by AddShortcut
// and we don't always get the MenusBeginning call to check for new
// addons/update the shortcuts -- instead we need to node monitor the
Expand All @@ -93,7 +93,7 @@ class BDeskWindow : public BContainerWindow {
bool fShouldUpdateAddonShortcuts;
std::set<uint32> fCurrentAddonShortcuts;
// keeps track of which shortcuts are installed for Tracker addons

typedef BContainerWindow _inherited;
};

Expand Down
4 changes: 2 additions & 2 deletions src/kits/tracker/DesktopPoseView.cpp
Expand Up @@ -271,11 +271,11 @@ DesktopPoseView::AdaptToDesktopIntegrationChange(BMessage* message)
{
bool mountVolumesOnDesktop = true;
bool mountSharedVolumesOntoDesktop = true;

message->FindBool("MountVolumesOntoDesktop", &mountVolumesOnDesktop);
message->FindBool("MountSharedVolumesOntoDesktop",
&mountSharedVolumesOntoDesktop);

ShowVolumes(false, mountSharedVolumesOntoDesktop);
ShowVolumes(mountVolumesOnDesktop, mountSharedVolumesOntoDesktop);
}
2 changes: 1 addition & 1 deletion src/kits/tracker/DesktopPoseView.h
Expand Up @@ -31,7 +31,7 @@ of Be Incorporated in the United States and other countries. Other brand product
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
#ifndef _DESKTOP_POSE_VIEW_H
Expand Down
2 changes: 1 addition & 1 deletion src/kits/tracker/DialogPane.cpp
Expand Up @@ -505,7 +505,7 @@ PaneSwitch::DrawInState(PaneSwitch::State state)
switch (state) {
case kCollapsed:
BeginLineArray(6);

if (fLeftAligned) {
AddLine(BPoint(rect.left + 3, rect.top + 1),
BPoint(rect.left + 3, rect.bottom - 1), outlineColor);
Expand Down
14 changes: 7 additions & 7 deletions src/kits/tracker/DialogPane.h
Expand Up @@ -68,15 +68,15 @@ class DialogPane : public BView {
uint32 flags = B_WILL_DRAW);

virtual ~DialogPane();

BRect FrameForMode(int32);
BRect BoundsForMode(int32);

int32 Mode() const;
virtual void SetMode(int32, bool initialSetup = false);

void AddItem(BView*, int32 toMode);

void SetSwitch(BControl*);

virtual void AttachedToWindow();
Expand All @@ -87,18 +87,18 @@ class DialogPane : public BView {
// called only by the constructor

virtual void MessageReceived(BMessage* message);

private:
int32 fMode;

BRect fMode1Frame;
BRect fMode2Frame;
BRect fMode3Frame;

ViewList fMode2Items;
ViewList fMode3Items;
BControl* fLatch;

typedef BView _inherited;
};

Expand Down
2 changes: 1 addition & 1 deletion src/kits/tracker/FBCPadding.cpp
Expand Up @@ -145,6 +145,6 @@ SetPanelDirectory__10BFilePanelFP9entry_ref
{
self->SetPanelDirectory(r);
}

}
#endif
10 changes: 5 additions & 5 deletions src/kits/tracker/FSClipboard.cpp
Expand Up @@ -266,7 +266,7 @@ FSClipboardAddPoses(const node_ref* directory, PoseList* list,
refsAdded++;
} else {
clip->RemoveName(modeName);

clipNode.node = *node;
clipNode.moveMode = kDelete; // note removing node
updateMessage.AddData("tcnode", T_CLIPBOARD_NODE,
Expand All @@ -280,7 +280,7 @@ FSClipboardAddPoses(const node_ref* directory, PoseList* list,
if (clip->AddRef(refName, model->EntryRef()) == B_OK
&& clip->AddInt32(modeName, (int32)moveMode) == B_OK) {
pose->SetClipboardMode(moveMode);

clipNode.node = *node;
updateMessage.AddData("tcnode", T_CLIPBOARD_NODE,
&clipNode, sizeof(TClipboardNodeRef), true,
Expand Down Expand Up @@ -422,7 +422,7 @@ FSClipboardPaste(Model* model, uint32 linksMode)
uint32 newMoveMode = 0;
bool sameDirectory = destNodeRef->device == ref.device
&& destNodeRef->node == ref.directory;

if (!entry.Exists()) {
// The entry doesn't exist anymore, so we'll remove
// that entry from the clipboard as well
Expand Down Expand Up @@ -567,7 +567,7 @@ FSClipboardFindNodeMode(Model* model, bool autoLock, bool updateRefIfNeeded)
}
if (change)
be_clipboard->Commit();

if (autoLock)
be_clipboard->Unlock();

Expand Down Expand Up @@ -744,7 +744,7 @@ BClipboardRefsWatcher::UpdateNode(node_ref* node, entry_ref* ref)
clip->RemoveName(name);
MakeModeName(name);
clip->RemoveName(name);

RemoveNode(node);
}
be_clipboard->Commit();
Expand Down
4 changes: 2 additions & 2 deletions src/kits/tracker/FavoritesMenu.cpp
Expand Up @@ -166,7 +166,7 @@ FavoritesMenu::AddNextItem()
BMenuItem* item = BNavMenu::NewModelItem(&model,
model.IsDirectory() ? fOpenFolderMessage : fOpenFileMessage,
fTarget);

if (item == NULL)
return true;

Expand Down Expand Up @@ -314,7 +314,7 @@ FavoritesMenu::ShouldShowModel(const Model* model)

if (!fRefFilter || model->Node() == NULL)
return true;

struct stat_beos statBeOS;
convert_to_stat_beos(model->StatBuf(), &statBeOS);

Expand Down
6 changes: 3 additions & 3 deletions src/kits/tracker/FavoritesMenu.h
Expand Up @@ -58,7 +58,7 @@ class FavoritesMenu : public BSlowMenu {
BMessage* openFileMessage, const BMessenger &,
bool isSavePanel, BRefFilter* filter = NULL);
virtual ~FavoritesMenu();

void SetRefFilter(BRefFilter* filter);

private:
Expand All @@ -67,9 +67,9 @@ class FavoritesMenu : public BSlowMenu {
virtual bool AddNextItem();
virtual void DoneBuildingItemList();
virtual void ClearMenuBuildingState();

bool ShouldShowModel(const Model* model);

BMessage* fOpenFolderMessage;
BMessage* fOpenFileMessage;
BMessenger fTarget;
Expand Down
2 changes: 1 addition & 1 deletion src/kits/tracker/FindPanel.cpp
Expand Up @@ -219,7 +219,7 @@ FindWindow::FindWindow(const entry_ref* newRef, bool editIfTemplateOnly)

fFromTemplate = IsQueryTemplate(fFile);

fBackground = new FindPanel(Bounds(), fFile, this, fFromTemplate,
fBackground = new FindPanel(Bounds(), fFile, this, fFromTemplate,
fEditTemplateOnly);
AddChild(fBackground);
}
Expand Down
2 changes: 1 addition & 1 deletion src/kits/tracker/FunctionObject.h
Expand Up @@ -240,7 +240,7 @@ class ThreeParamFunctionObject : public FunctionObject {
p3(p3)
{
}

virtual void operator()() { (function)(p1.Pass(), p2.Pass(), p3.Pass()); }

private:
Expand Down
2 changes: 1 addition & 1 deletion src/kits/tracker/GroupedMenu.cpp
Expand Up @@ -24,7 +24,7 @@ TMenuItemGroup::TMenuItemGroup(const char* name)
TMenuItemGroup::~TMenuItemGroup()
{
free((char*)fName);

if (fMenu == NULL) {
BMenuItem* item;
while ((item = RemoveItem((int32)0)) != NULL)
Expand Down
2 changes: 1 addition & 1 deletion src/kits/tracker/IconCache.cpp
Expand Up @@ -526,7 +526,7 @@ IconCache::GetIconFromFileTypes(ModelNodeLazyOpener* modelOpener,
(SharedCacheEntry*)entry);
// OK to cast here, have a runtime check
source = kPreferredAppForNode;
// set source as preferred for node, so that next time we
// set source as preferred for node, so that next time we
// get a hit in the initial find that uses
// GetIconForPreferredApp
} else
Expand Down
28 changes: 14 additions & 14 deletions src/kits/tracker/IconCache.h
Expand Up @@ -126,15 +126,15 @@ class IconCacheEntry {
public:
IconCacheEntry();
~IconCacheEntry();

void SetAliasFor(const SharedIconCache*, const SharedCacheEntry*);
static IconCacheEntry* ResolveIfAlias(const SharedIconCache*,
IconCacheEntry*);
IconCacheEntry* ResolveIfAlias(const SharedIconCache*);

void SetIcon(BBitmap* bitmap, IconDrawMode mode, icon_size size,
bool create = false);

bool HaveIconBitmap(IconDrawMode mode, icon_size size) const;
bool CanConstructBitmap(IconDrawMode mode, icon_size size) const;
static bool AlternateModeForIconConstructing(IconDrawMode requestedMode,
Expand Down Expand Up @@ -169,9 +169,9 @@ class IconCacheEntry {
BBitmap* fHilitedLargeIcon;
BBitmap* fHilitedMiniIcon;
int32 fAliasForIndex;

// list of other icon kinds would be added here

friend class SharedIconCache;
friend class NodeIconCache;
};
Expand All @@ -191,7 +191,7 @@ class SimpleIconCache {
bool Lock();
void Unlock();
bool IsLocked() const;

private:
Benaphore fLock;
};
Expand All @@ -210,7 +210,7 @@ class SharedCacheEntry : public IconCacheEntry {

const char* FileType() const;
const char* AppSignature() const;

// hash table support
uint32 Hash() const;
static uint32 Hash(const char* fileType, const char* appSignature = 0);
Expand Down Expand Up @@ -277,19 +277,19 @@ class NodeCacheEntry : public IconCacheEntry {
NodeCacheEntry(const node_ref*, bool permanent = false);
void Draw(BView*, BPoint, IconDrawMode mode, icon_size size,
bool async = false);

void Draw(BView*, BPoint, IconDrawMode, icon_size,
void (*)(BView*, BPoint, BBitmap*, void*), void* = NULL);

const node_ref* Node() const;

uint32 Hash() const;
static uint32 Hash(const node_ref*);
bool operator==(const NodeCacheEntry&) const;
void SetTo(const node_ref*);
void MakePermanent();
bool Permanent() const;

int32 fNext;
private:
node_ref fRef;
Expand Down Expand Up @@ -348,7 +348,7 @@ const int32 kColorTransformTableSize = 256;
class IconCache {
public:
IconCache();

void Draw(Model*, BView*, BPoint where, IconDrawMode mode,
icon_size size, bool async = false);
// draw an icon for a model, load the icon from the appropriate
Expand Down Expand Up @@ -376,13 +376,13 @@ class IconCache {
void Deleting(const BView*);
// hook to manage deleting draw view caches for views that are
// going away

// icon changed calls, used when a node or a file type has an icon changed
// the icons for the node/file type will be flushed and re-cached during
// the next draw
void IconChanged(Model*);
void IconChanged(const char* mimeType, const char* appSignature);

bool IsIconFrom(const Model*, const char* mimeType,
const char* appSignature) const;
// called when metamime database changed to figure out which models
Expand Down Expand Up @@ -510,7 +510,7 @@ SharedIconCache::ResolveIfAlias(IconCacheEntry* entry) const
{
if (entry->fAliasForIndex < 0)
return entry;

return fHashTable.ElementAt(entry->fAliasForIndex);
}

Expand Down
2 changes: 1 addition & 1 deletion src/kits/tracker/InfoWindow.cpp
Expand Up @@ -2129,7 +2129,7 @@ AttributeView::BuildContextMenu(BMenu* parent)
parent->AddItem(new BMenuItem(B_TRANSLATE("Edit name"),
new BMessage(kEditItem), 'E'));
parent->AddSeparatorItem();

if (fModel->IsVolume()) {
BMenuItem* item = new BMenuItem(B_TRANSLATE("Unmount"),
new BMessage(kUnmountVolume), 'U');
Expand Down

0 comments on commit db41683

Please sign in to comment.