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

BDateField is already used in ColumnListView, so use another name for this enum.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37518 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Adrien Destugues
2010-07-14 19:43:46 +00:00
parent 57500c639c
commit a7e183f8e5
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/locale/Country.h
+2 -2
View File
@@ -26,7 +26,7 @@ typedef enum {
B_HOUR,
B_MINUTE,
B_SECOND
} BDateField;
} BDateElement;
class BCountry {
@@ -53,7 +53,7 @@ class BCountry {
bool longFormat);
status_t FormatTime(BString* string, int*& fieldPositions,
int& fieldCount, time_t time, bool longFormat);
status_t TimeFields(BDateField*& fields, int& fieldCount,
status_t TimeFields(BDateElement*& fields, int& fieldCount,
bool longFormat);
bool DateFormat(BString&, bool longFormat) const;