i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tracker: style fixes to Utilities

Browse Source
This commit is contained in:
John Scipione
2014-06-20 21:30:00 -04:00
parent e29e8b3b27
commit a4c3bbd3f5
2 changed files with 220 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/tracker/Utilities.cpp
+18 -15
View File
@@ -241,7 +241,6 @@ PeriodicUpdatePoses::DoPeriodicUpdate(bool forceRedraw)
PeriodicUpdatePoses gPeriodicUpdatePoses;
} // namespace BPrivate
@@ -276,7 +275,7 @@ PoseInfo::PrintToStream()
}
// #pragma mark -
// #pragma mark - ExtendedPoseInfo
size_t
@@ -296,8 +295,7 @@ ExtendedPoseInfo::Size(int32 count)
size_t
ExtendedPoseInfo::SizeWithHeadroom() const
{
return sizeof(ExtendedPoseInfo) + (fNumFrames + 1)
* sizeof(FrameLocation);
return sizeof(ExtendedPoseInfo) + (fNumFrames + 1) * sizeof(FrameLocation);
}
@@ -394,7 +392,7 @@ ExtendedPoseInfo::PrintToStream()
}
// #pragma mark -
// #pragma mark - OffscreenBitmap
OffscreenBitmap::OffscreenBitmap(BRect frame)
@@ -475,7 +473,7 @@ OffscreenBitmap::View() const
}
// #pragma mark -
// #pragma mark - BPrivate functions
namespace BPrivate {
@@ -553,7 +551,7 @@ FadeRGBA32Vertical(uint32* bits, int32 width, int32 height, int32 from,
} // namespace BPrivate
// #pragma mark -
// #pragma mark - DraggableIcon
DraggableIcon::DraggableIcon(BRect rect, const char* name,
@@ -657,7 +655,7 @@ DraggableIcon::Draw(BRect)
}
// #pragma mark -
// #pragma mark - FlickerFreeStringView
FlickerFreeStringView::FlickerFreeStringView(BRect bounds, const char* name,
@@ -695,7 +693,7 @@ FlickerFreeStringView::Draw(BRect)
BView* offscreen = fBitmap->BeginUsing(bounds);
if (Parent()) {
if (Parent() != NULL) {
fViewColor = Parent()->ViewColor();
fLowColor = Parent()->ViewColor();
}
@@ -714,7 +712,7 @@ FlickerFreeStringView::Draw(BRect)
else
offscreen->FillRect(bounds, B_SOLID_LOW);
if (Text()) {
if (Text() != NULL) {
BPoint loc;
font_height height;
@@ -762,7 +760,7 @@ void
FlickerFreeStringView::AttachedToWindow()
{
_inherited::AttachedToWindow();
if (Parent()) {
if (Parent() != NULL) {
fViewColor = Parent()->ViewColor();
fLowColor = Parent()->ViewColor();
}
@@ -793,7 +791,7 @@ FlickerFreeStringView::SetLowColor(rgb_color color)
}
// #pragma mark -
// #pragma mark - TitledSeparatorItem
TitledSeparatorItem::TitledSeparatorItem(const char* label)
@@ -925,7 +923,7 @@ TitledSeparatorItem::Draw()
}
// #pragma mark -
// #pragma mark - ShortcutFilter
ShortcutFilter::ShortcutFilter(uint32 shortcutKey, uint32 shortcutModifier,
@@ -970,12 +968,11 @@ ShortcutFilter::Filter(BMessage* message, BHandler**)
}
// #pragma mark -
// #pragma mark - BPrivate functions
namespace BPrivate {
void
EmbedUniqueVolumeInfo(BMessage* message, const BVolume* volume)
{
@@ -1522,6 +1519,9 @@ EachMenuItem(const BMenu* menu, bool recursive,
}
// #pragma mark - PositionPassingMenuItem
PositionPassingMenuItem::PositionPassingMenuItem(const char* title,
BMessage* message, char shortcut, uint32 modifiers)
:
@@ -1581,6 +1581,9 @@ PositionPassingMenuItem::Invoke(BMessage* message)
}
// #pragma mark - BPrivate functions
bool
BootedInSafeMode()
{
src/kits/tracker/Utilities.h
+35 -32
View File
@@ -94,12 +94,11 @@ extern bool gLocalizedNamePreferred;
// misc typedefs, constants and structs
// Periodically updated poses (ones with a volume space bar) register
// themselfs in this global list. This way they can be iterated over instead
// of sending around update messages.
class PeriodicUpdatePoses {
public:
// Periodically updated poses (ones with a volume space bar) register
// themselfs in this global list. This way they can be iterated over instead
// of sending around update messages.
public:
PeriodicUpdatePoses();
~PeriodicUpdatePoses();
@@ -111,7 +110,7 @@ class PeriodicUpdatePoses {
void DoPeriodicUpdate(bool forceRedraw);
private:
private:
struct periodic_pose {
BPose* pose;
BPoseView* pose_view;
@@ -126,10 +125,10 @@ class PeriodicUpdatePoses {
extern PeriodicUpdatePoses gPeriodicUpdatePoses;
// PoseInfo is the structure that gets saved as attributes for every node on
// disk, defining the node's position and visibility
class PoseInfo {
public:
// PoseInfo is the structure that gets saved as attributes for every node
// on disk, defining the node's position and visibility
public:
static void EndianSwap(void* castToThis);
void PrintToStream();
@@ -145,10 +144,10 @@ class PoseInfo {
};
// extends PoseInfo adding workspace support; used for desktop
// poses only
class ExtendedPoseInfo {
public:
// extends PoseInfo adding workspace support; used for desktop
// poses only
public:
size_t Size() const;
static size_t Size(int32);
size_t SizeWithHeadroom() const;
@@ -224,7 +223,7 @@ extern void FadeRGBA32Vertical(uint32* bits, int32 width, int32 height,
class FlickerFreeStringView : public BStringView {
// adds support for offscreen bitmap drawing for string views that update
// often this would be better implemented as an option of BStringView
public:
public:
FlickerFreeStringView(BRect bounds, const char* name,
const char* text, uint32 resizeFlags = B_FOLLOW_LEFT | B_FOLLOW_TOP,
uint32 flags = B_WILL_DRAW);
@@ -238,7 +237,7 @@ class FlickerFreeStringView : public BStringView {
virtual void SetViewColor(rgb_color);
virtual void SetLowColor(rgb_color);
private:
private:
OffscreenBitmap* fBitmap;
rgb_color fViewColor;
rgb_color fLowColor;
@@ -250,7 +249,7 @@ class FlickerFreeStringView : public BStringView {
class DraggableIcon : public BView {
// used to determine a save location for a file
public:
public:
DraggableIcon(BRect, const char*, const char* mimeType, icon_size,
const BMessage*, BMessenger,
uint32 resizeFlags = B_FOLLOW_LEFT | B_FOLLOW_TOP,
@@ -260,14 +259,14 @@ class DraggableIcon : public BView {
static BRect PreferredRect(BPoint offset, icon_size);
void SetTarget(BMessenger);
protected:
protected:
virtual void AttachedToWindow();
virtual void MouseDown(BPoint);
virtual void Draw(BRect);
virtual bool DragStarted(BMessage* dragMessage);
protected:
protected:
BBitmap* fBitmap;
BMessage fMessage;
BMessenger fTarget;
@@ -275,24 +274,24 @@ class DraggableIcon : public BView {
class PositionPassingMenuItem : public BMenuItem {
public:
public:
PositionPassingMenuItem(const char* title, BMessage*,
char shortcut = 0, uint32 modifiers = 0);
PositionPassingMenuItem(BMenu*, BMessage*);
protected:
protected:
virtual status_t Invoke(BMessage* = 0);
// appends the invoke location for NewFolder, etc. to use
private:
private:
typedef BMenuItem _inherited;
};
class Benaphore {
// aka benaphore
public:
public:
Benaphore(const char* name = "Light Lock")
: fSemaphore(create_sem(0, name)),
fCount(1)
@@ -323,37 +322,37 @@ class Benaphore {
return fCount <= 0;
}
private:
private:
sem_id fSemaphore;
int32 fCount;
};
class SeparatorLine : public BView {
public:
public:
SeparatorLine(BPoint, float, bool vertical, const char* name = "");
virtual void Draw(BRect bounds);
};
class TitledSeparatorItem : public BMenuItem {
public:
public:
TitledSeparatorItem(const char*);
virtual ~TitledSeparatorItem();
virtual void SetEnabled(bool state);
protected:
protected:
virtual void GetContentSize(float* width, float* height);
virtual void Draw();
private:
private:
typedef BMenuItem _inherited;
};
class LooperAutoLocker {
public:
public:
LooperAutoLocker(BHandler* handler)
: fHandler(handler),
fHasLock(handler->LockLooper())
@@ -376,27 +375,28 @@ class LooperAutoLocker {
return fHasLock;
}
private:
private:
BHandler* fHandler;
bool fHasLock;
};
class ShortcutFilter : public BMessageFilter {
public:
public:
ShortcutFilter(uint32 shortcutKey, uint32 shortcutModifier,
uint32 shortcutWhat, BHandler* target);
protected:
protected:
filter_result Filter(BMessage*, BHandler**);
private:
private:
uint32 fShortcutKey;
uint32 fShortcutModifier;
uint32 fShortcutWhat;
BHandler* fTarget;
};
// iterates over all the refs in a message
entry_ref* EachEntryRef(BMessage*, entry_ref* (*)(entry_ref*, void*),
void* passThru = 0);
@@ -447,6 +447,7 @@ bool operator!=(const rgb_color&, const rgb_color&);
#endif
inline rgb_color
Color(int32 r, int32 g, int32 b, int32 alpha = 255)
{
@@ -561,9 +562,10 @@ inline void PrintDirToStream(const BDirectory*, const char* = 0) {}
va_end(ap);
}
#define WRITELOG(_ARGS_) \
#define WRITELOG(_ARGS_) \
if (logFile == 0) \
logFile = fopen("/var/log/tracker.log", "a+"); \
\
if (logFile != 0) { \
thread_info info; \
get_thread_info(find_thread(NULL), &info); \
@@ -605,4 +607,5 @@ float ComputeTypeAheadScore(const char* text, const char* match,
} // namespace BPrivate
#endif // _UTILITIES_H