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_HOUR,
B_MINUTE, B_MINUTE,
B_SECOND B_SECOND
} BDateField; } BDateElement;
class BCountry { class BCountry {
@@ -53,7 +53,7 @@ class BCountry {
bool longFormat); bool longFormat);
status_t FormatTime(BString* string, int*& fieldPositions, status_t FormatTime(BString* string, int*& fieldPositions,
int& fieldCount, time_t time, bool longFormat); int& fieldCount, time_t time, bool longFormat);
status_t TimeFields(BDateField*& fields, int& fieldCount, status_t TimeFields(BDateElement*& fields, int& fieldCount,
bool longFormat); bool longFormat);
bool DateFormat(BString&, bool longFormat) const; bool DateFormat(BString&, bool longFormat) const;
src/kits/locale/Country.cpp
+2 -2
View File
@@ -241,7 +241,7 @@ BCountry::FormatTime(BString* string, int*& fieldPositions, int& fieldCount,
status_t status_t
BCountry::TimeFields(BDateField*& fields, int& fieldCount, bool longFormat) BCountry::TimeFields(BDateElement*& fields, int& fieldCount, bool longFormat)
{ {
fields = NULL; fields = NULL;
UErrorCode error = U_ZERO_ERROR; UErrorCode error = U_ZERO_ERROR;
@@ -264,7 +264,7 @@ BCountry::TimeFields(BDateField*& fields, int& fieldCount, bool longFormat)
fieldCount ++; fieldCount ++;
} }
fields = (BDateField*) malloc(fieldCount * sizeof(BDateField)); fields = (BDateElement*) malloc(fieldCount * sizeof(BDateElement));
for (int i = 0 ; i < fieldCount ; i++ ) { for (int i = 0 ; i < fieldCount ; i++ ) {
switch (fieldPosStorage[i]) { switch (fieldPosStorage[i]) {
src/preferences/time/DateTimeEdit.cpp
+4 -4
View File
@@ -269,7 +269,7 @@ TTimeEdit::BuildDispatch(BMessage *message)
message->AddBool("time", true); message->AddBool("time", true);
BDateField* dateFormat; BDateElement* dateFormat;
int fieldCount; int fieldCount;
BCountry* here; BCountry* here;
be_locale_roster->GetDefaultCountry(&here); be_locale_roster->GetDefaultCountry(&here);
@@ -297,7 +297,7 @@ void
TTimeEdit::_CheckRange() TTimeEdit::_CheckRange()
{ {
int32 value = fHoldValue; int32 value = fHoldValue;
BDateField* fields; BDateElement* fields;
int fieldCount; int fieldCount;
BCountry* here; BCountry* here;
be_locale_roster->GetDefaultCountry(&here); be_locale_roster->GetDefaultCountry(&here);
@@ -363,7 +363,7 @@ bool
TTimeEdit::_IsValidDoubleDigi(int32 value) TTimeEdit::_IsValidDoubleDigi(int32 value)
{ {
bool isInRange = false; bool isInRange = false;
BDateField* fields; BDateElement* fields;
int fieldCount; int fieldCount;
BCountry* here; BCountry* here;
be_locale_roster->GetDefaultCountry(&here); be_locale_roster->GetDefaultCountry(&here);
@@ -402,7 +402,7 @@ int32
TTimeEdit::_SectionValue(int32 index) const TTimeEdit::_SectionValue(int32 index) const
{ {
int32 value; int32 value;
BDateField* fields; BDateElement* fields;
int fieldCount; int fieldCount;
BCountry* here; BCountry* here;
be_locale_roster->GetDefaultCountry(&here); be_locale_roster->GetDefaultCountry(&here);