* Added bool and double BString::operator<<() versions.

* Removed the clashing operator in JobSetupDlg. Automatic whitespace
  cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42387 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2011-07-07 10:17:15 +00:00
parent 2a3c2964f1
commit 85b41b15d9
4 changed files with 46 additions and 28 deletions
@@ -29,7 +29,6 @@ class PagesView;
class PrinterCap; class PrinterCap;
class PrinterData; class PrinterData;
extern BString& operator<<(BString& text, double value);
template<typename T, typename R> template<typename T, typename R>
class Range class Range
+3 -1
View File
@@ -307,14 +307,16 @@ public:
BString& operator<<(const char* string); BString& operator<<(const char* string);
BString& operator<<(const BString& string); BString& operator<<(const BString& string);
BString& operator<<(char c); BString& operator<<(char c);
BString& operator<<(bool value);
BString& operator<<(int value); BString& operator<<(int value);
BString& operator<<(unsigned int value); BString& operator<<(unsigned int value);
BString& operator<<(unsigned long value); BString& operator<<(unsigned long value);
BString& operator<<(long value); BString& operator<<(long value);
BString& operator<<(unsigned long long value); BString& operator<<(unsigned long long value);
BString& operator<<(long long value); BString& operator<<(long long value);
// float output hardcodes %.2f style formatting // float/double output hardcodes %.2f style formatting
BString& operator<<(float value); BString& operator<<(float value);
BString& operator<<(double value);
private: private:
class PosVect; class PosVect;
+23
View File
@@ -2028,6 +2028,18 @@ BString::operator<<(char c)
} }
BString&
BString::operator<<(bool value)
{
if (value)
_DoAppend("true", 4);
else
_DoAppend("false", 5);
return *this;
}
BString& BString&
BString::operator<<(int i) BString::operator<<(int i)
{ {
@@ -2105,6 +2117,17 @@ BString::operator<<(float f)
} }
BString&
BString::operator<<(double value)
{
char num[64];
int32 length = snprintf(num, sizeof(num), "%.2f", value);
_DoAppend(num, length);
return *this;
}
// #pragma mark - Private or reserved // #pragma mark - Private or reserved
-6
View File
@@ -134,12 +134,6 @@ enum {
}; };
BString& operator<<(BString& text, double value)
{
text << (float)value;
return text;
}
JobSetupView::JobSetupView(JobData* jobData, PrinterData* printerData, JobSetupView::JobSetupView(JobData* jobData, PrinterData* printerData,
const PrinterCap *printerCap) const PrinterCap *printerCap)
: :