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

A bunch of style fixes

Browse Source 
No functional changes intended
This commit is contained in:
John Scipione
2014-12-02 19:23:51 -05:00
parent dc4f88b8fb
commit 539dc1bc53
11 changed files with 386 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/interface/ColumnTypes.h
+105 -136
View File
@@ -13,7 +13,9 @@
#ifndef _COLUMN_TYPES_H
#define _COLUMN_TYPES_H
#include "ColumnListView.h"
#include <String.h>
#include <Font.h>
#include <Bitmap.h>
@@ -24,28 +26,23 @@
class BTitledColumn : public BColumn
{
public:
BTitledColumn (const char *title,
float width,
float minWidth,
float maxWidth,
alignment align = B_ALIGN_LEFT);
virtual void DrawTitle (BRect rect,
BView* parent);
virtual void GetColumnName (BString* into) const;
public:
BTitledColumn(const char* title, float width, float minWidth,
float maxWidth, alignment align = B_ALIGN_LEFT);
virtual void DrawTitle(BRect rect, BView* parent);
virtual void GetColumnName(BString* into) const;
void DrawString (const char*,
BView*,
BRect);
void SetTitle (const char* title);
void Title (BString* forTitle) const; // sets the BString arg to be the title
float FontHeight () const;
void DrawString(const char*, BView*, BRect);
void SetTitle(const char* title);
void Title(BString* forTitle) const;
// sets the BString arg to be the title
float FontHeight() const;
virtual float GetPreferredWidth(BField* field, BView* parent) const;
virtual float GetPreferredWidth(BField* field, BView* parent) const;
private:
float fFontHeight;
BString fTitle;
private:
float fFontHeight;
BString fTitle;
};
@@ -54,21 +51,21 @@ class BTitledColumn : public BColumn
class BStringField : public BField
{
public:
BStringField (const char* string);
public:
BStringField(const char* string);
void SetString (const char* string);
const char* String () const;
void SetClippedString (const char* string);
bool HasClippedString () const;
const char* ClippedString ();
void SetWidth (float);
float Width ();
void SetString(const char* string);
const char* String() const;
void SetClippedString(const char* string);
bool HasClippedString() const;
const char* ClippedString();
void SetWidth(float);
float Width();
private:
float fWidth;
BString fString;
BString fClippedString;
private:
float fWidth;
BString fString;
BString fClippedString;
};
@@ -76,23 +73,17 @@ class BStringField : public BField
class BStringColumn : public BTitledColumn
{
public:
BStringColumn (const char *title,
float width,
float minWidth,
float maxWidth,
uint32 truncate,
alignment align = B_ALIGN_LEFT);
virtual void DrawField (BField* field,
BRect rect,
BView* parent);
virtual int CompareFields (BField* field1,
BField* field2);
virtual float GetPreferredWidth(BField* field, BView* parent) const;
virtual bool AcceptsField (const BField* field) const;
public:
BStringColumn(const char* title, float width,
float minWidth, float maxWidth, uint32 truncate,
alignment align = B_ALIGN_LEFT);
virtual void DrawField(BField* field, BRect rect, BView* parent);
virtual int CompareFields(BField* field1, BField* field2);
virtual float GetPreferredWidth(BField* field, BView* parent) const;
virtual bool AcceptsField(const BField* field) const;
private:
uint32 fTruncate;
private:
uint32 fTruncate;
};
@@ -101,21 +92,21 @@ class BStringColumn : public BTitledColumn
class BDateField : public BField
{
public:
BDateField (time_t* t);
void SetWidth (float);
float Width ();
void SetClippedString (const char*);
const char* ClippedString ();
time_t Seconds ();
time_t UnixTime ();
public:
BDateField(time_t* t);
void SetWidth(float);
float Width();
void SetClippedString(const char*);
const char* ClippedString();
time_t Seconds();
time_t UnixTime();
private:
struct tm fTime;
time_t fUnixTime;
time_t fSeconds;
BString fClippedString;
float fWidth;
private:
struct tm fTime;
time_t fUnixTime;
time_t fSeconds;
BString fClippedString;
float fWidth;
};
@@ -123,19 +114,15 @@ class BDateField : public BField
class BDateColumn : public BTitledColumn
{
public:
BDateColumn (const char* title,
float width,
float minWidth,
float maxWidth,
alignment align = B_ALIGN_LEFT);
virtual void DrawField (BField* field,
BRect rect,
BView* parent);
virtual int CompareFields (BField* field1,
BField* field2);
private:
BString fTitle;
public:
BDateColumn(const char* title, float width,
float minWidth, float maxWidth,
alignment align = B_ALIGN_LEFT);
virtual void DrawField(BField* field, BRect rect, BView* parent);
virtual int CompareFields(BField* field1, BField* field2);
private:
BString fTitle;
};
@@ -144,13 +131,13 @@ class BDateColumn : public BTitledColumn
class BSizeField : public BField
{
public:
BSizeField (off_t size);
void SetSize (off_t);
off_t Size ();
public:
BSizeField(off_t size);
void SetSize(off_t);
off_t Size();
private:
off_t fSize;
private:
off_t fSize;
};
@@ -158,17 +145,12 @@ class BSizeField : public BField
class BSizeColumn : public BTitledColumn
{
public:
BSizeColumn (const char* title,
float width,
float minWidth,
float maxWidth,
alignment align = B_ALIGN_LEFT);
virtual void DrawField (BField* field,
BRect rect,
BView* parent);
virtual int CompareFields (BField* field1,
BField* field2);
public:
BSizeColumn(const char* title, float width,
float minWidth, float maxWidth,
alignment align = B_ALIGN_LEFT);
virtual void DrawField(BField* field, BRect rect, BView* parent);
virtual int CompareFields(BField* field1, BField* field2);
};
@@ -177,13 +159,13 @@ class BSizeColumn : public BTitledColumn
class BIntegerField : public BField
{
public:
BIntegerField (int32 number);
void SetValue (int32);
int32 Value ();
public:
BIntegerField(int32 number);
void SetValue(int32);
int32 Value();
private:
int32 fInteger;
private:
int32 fInteger;
};
@@ -191,17 +173,12 @@ class BIntegerField : public BField
class BIntegerColumn : public BTitledColumn
{
public:
BIntegerColumn (const char* title,
float width,
float minWidth,
float maxWidth,
alignment align = B_ALIGN_LEFT);
virtual void DrawField (BField* field,
BRect rect,
BView* parent);
virtual int CompareFields (BField* field1,
BField* field2);
public:
BIntegerColumn(const char* title, float width,
float minWidth, float maxWidth,
alignment align = B_ALIGN_LEFT);
virtual void DrawField(BField* field, BRect rect, BView* parent);
virtual int CompareFields(BField* field1, BField* field2);
};
@@ -210,13 +187,13 @@ class BIntegerColumn : public BTitledColumn
class BBitmapField : public BField
{
public:
BBitmapField (BBitmap* bitmap);
const BBitmap* Bitmap ();
void SetBitmap (BBitmap* bitmap);
public:
BBitmapField(BBitmap* bitmap);
const BBitmap* Bitmap();
void SetBitmap(BBitmap* bitmap);
private:
BBitmap* fBitmap;
private:
BBitmap* fBitmap;
};
@@ -224,17 +201,13 @@ class BBitmapField : public BField
class BBitmapColumn : public BTitledColumn
{
public:
BBitmapColumn (const char* title,
float width,
float minWidth,
float maxWidth,
alignment align = B_ALIGN_LEFT);
virtual void DrawField (BField*field,
BRect rect,
BView* parent);
virtual int CompareFields (BField* field1, BField* field2);
virtual bool AcceptsField (const BField* field) const;
public:
BBitmapColumn(const char* title, float width,
float minWidth, float maxWidth,
alignment align = B_ALIGN_LEFT);
virtual void DrawField(BField* field, BRect rect, BView* parent);
virtual int CompareFields(BField* field1, BField* field2);
virtual bool AcceptsField(const BField* field) const;
};
@@ -243,16 +216,12 @@ class BBitmapColumn : public BTitledColumn
class GraphColumn : public BIntegerColumn
{
public:
GraphColumn (const char* name,
float width,
float minWidth,
float maxWidth,
alignment align = B_ALIGN_LEFT);
virtual void DrawField (BField*field,
BRect rect,
BView* parent);
public:
GraphColumn(const char* name, float width,
float minWidth, float maxWidth,
alignment align = B_ALIGN_LEFT);
virtual void DrawField(BField* field, BRect rect, BView* parent);
};
#endif
#endif // _COLUMN_TYPES_H