github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-08-07 22:03:42 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

.cosmetics

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@6402 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2013-10-07 09:08:31 +00:00
parent 2e1804d0c8
commit d30fd0425e
3 changed files with 8 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

16
uppsrc/CtrlLib/EditCtrl.h
View file

@ -207,7 +207,7 @@ public:
operator const WString&() const { return text; }
operator String() const { return text.ToString(); }
void operator=(const WString& s) { SetText(s); }
void operator=(const WString& s) { SetText(s); } // Deprecated, use operator<<=
int GetLength() const { return text.GetLength(); }
int GetChar(int i) const { return text[i]; }
@ -259,7 +259,7 @@ public:
template <class DataType, class Cv>
class EditValue : public EditField, public Cv {
public:
EditValue& operator=(const DataType& t) { EditField::SetData(t); return *this; }
EditValue& operator=(const DataType& t) { EditField::SetData(t); return *this; } // Deprecated, use operator<<=
operator DataType() const { return EditField::GetData(); }
EditValue() { SetConvert(*this); }
@ -268,7 +268,7 @@ public:
template <class DataType, class Cv>
class EditMinMax : public EditValue<DataType, Cv> {
public:
EditMinMax& operator=(const DataType& t) { EditField::SetData(t); return *this; }
EditMinMax& operator=(const DataType& t) { EditField::SetData(t); return *this; } // Deprecated, use operator<<=
EditMinMax() {}
EditMinMax(DataType min, DataType max) { Cv::MinMax(min, max); }
@ -282,7 +282,7 @@ public:
template <class DataType, class Base>
class EditMinMaxNotNull : public Base {
public:
EditMinMaxNotNull& operator=(const DataType& t) { EditField::SetData(t); return *this; }
EditMinMaxNotNull& operator=(const DataType& t) { EditField::SetData(t); return *this; } // Deprecated, use operator<<=
EditMinMaxNotNull() { Base::NotNull(); }
EditMinMaxNotNull(DataType min, DataType max) { Base::NotNull(); Base::MinMax(min, max); }
@ -308,8 +308,8 @@ class EditString : public EditValue<WString, ConvertString> {
public:
operator const WString&() const { return GetText(); }
EditString& operator=(const WString& data) { SetData(data); return *this; }
EditString& operator=(const String& data) { SetData(data); return *this; }
EditString& operator=(const WString& data) { SetData(data); return *this; } // Deprecated, use operator<<=
EditString& operator=(const String& data) { SetData(data); return *this; } // Deprecated, use operator<<=
EditString() {}
EditString(int maxlen) { MaxLen(maxlen); }
@ -323,8 +323,8 @@ public:
class EditStringNotNull : public EditString {
public:
EditStringNotNull& operator=(const WString& data) { SetData(data); return *this; }
EditStringNotNull& operator=(const String& data) { SetData(data); return *this; }
EditStringNotNull& operator=(const WString& data) { SetData(data); return *this; } // Deprecated, use operator<<=
EditStringNotNull& operator=(const String& data) { SetData(data); return *this; } // Deprecated, use operator<<=
EditStringNotNull() { NotNull(); }
EditStringNotNull(int maxlen) { NotNull(); MaxLen(maxlen); }

2
uppsrc/CtrlLib/src.tpp/EditField$en-us.tpp
View file

@ -177,8 +177,6 @@ enu])&]
[s4; &]
[s5;:EditField`:`:SetText`(const WString`&`): [@(0.0.255) void]_[* SetText]([@(0.0.255) con
st]_[_^WString^ WString][@(0.0.255) `&]_[*@3 text])&]
[s5;:EditField`:`:operator`=`(const WString`&`): [@(0.0.255) void]_[* operator`=]([@(0.0.255) c
onst]_[_^WString^ WString][@(0.0.255) `&]_[*@3 s])&]
[s2;%% [%- Sets the] [%-*@3 text].&]
[s3; &]
[s4; &]

39
uppsrc/CtrlLib/src.tpp/ValueEditors$en-us.tpp
View file

@ -38,12 +38,6 @@ as the EditField converter.&]
[s0;%- &]
[ {{10000F(128)G(128)@1 [s0; [* Public Method List]]}}&]
[s3;%- &]
[s5;:EditValue`:`:operator`=`(const DataType`&`):%- [_^EditValue^ EditValue][@(0.0.255) `&
]_[* operator`=]([@(0.0.255) const]_[*@4 DataType][@(0.0.255) `&]_[*@3 t])&]
[s2; This helper operator allows direct assignment of value type
to the editor.&]
[s3; &]
[s4;%- &]
[s5;:EditValue`:`:operator DataType`(`)const:%- [* operator_DataType]()_[@(0.0.255) const
]&]
[s2; This helper operator allows direct retrieval of value type from
@ -75,12 +69,6 @@ in], [*@4 DataType]_[*@3 max])&]
[s0;%- &]
[ {{10000F(128)G(128)@1 [s0; [* Public Method List]]}}&]
[s3;%- &]
[s5;:EditMinMax`:`:operator`=`(const DataType`&`):%- [_^EditMinMax^ EditMinMax][@(0.0.255) `&
]_[* operator`=]([@(0.0.255) const]_[*@4 DataType][@(0.0.255) `&]_[*@3 t])&]
[s2; This helper operator allows direct assignment of value type
to the editor.&]
[s3; &]
[s4;%- &]
[s5;:EditMinMax`:`:Min`(DataType`):%- [_^EditMinMax^ EditMinMax][@(0.0.255) `&]_[* Min]([*@4 D
ataType]_[*@3 min])&]
[s5;:EditMinMax`:`:Max`(DataType`):%- [_^EditMinMax^ EditMinMax][@(0.0.255) `&]_[* Max]([*@4 D
@ -117,13 +105,6 @@ ll]([*@4 DataType]_[*@3 min], [*@4 DataType]_[*@3 max])&]
[s0;%- &]
[ {{10000F(128)G(128)@1 [s0; [* Public Method List]]}}&]
[s3;%- &]
[s5;:EditMinMaxNotNull`:`:operator`=`(const DataType`&`):%- [_^EditMinMaxNotNull^ EditM
inMaxNotNull][@(0.0.255) `&]_[* operator`=]([@(0.0.255) const]_[*@4 DataType][@(0.0.255) `&
]_[*@3 t])&]
[s2; This helper operator allows direct assignment of value type
to the editor.&]
[s3; &]
[s4;%- &]
[s5;:EditMinMaxNotNull`:`:Min`(DataType`):%- [_^EditMinMaxNotNull^ EditMinMaxNotNull][@(0.0.255) `&
]_[* Min]([*@4 DataType]_[*@3 min])&]
[s5;:EditMinMaxNotNull`:`:Max`(DataType`):%- [_^EditMinMaxNotNull^ EditMinMaxNotNull][@(0.0.255) `&
@ -222,14 +203,6 @@ text.&]
the editor.&]
[s3; &]
[s4;%- &]
[s5;:EditString`:`:operator`=`(const WString`&`):%- [_^EditString^ EditString][@(0.0.255) `&
]_[* operator`=]([@(0.0.255) const]_[_^WString^ WString][@(0.0.255) `&]_[*@3 data])&]
[s5;:EditString`:`:operator`=`(const String`&`):%- [_^EditString^ EditString][@(0.0.255) `&
]_[* operator`=]([@(0.0.255) const]_[_^String^ String][@(0.0.255) `&]_[*@3 data])&]
[s2; These helper operators allow a direct assignment of value type
to the editor.&]
[s3; &]
[s4;%- &]
[s5;:EditString`:`:MaxLen`(int`):%- [_^EditString^ EditString][@(0.0.255) `&]_[* MaxLen]([@(0.0.255) i
nt]_[*@3 maxlen])&]
[s2; Sets [%-*@3 maxlen] as maximum length of contained text.[%-*@3 maxlen]
@ -261,18 +234,6 @@ nt]_[*@3 maxlen])&]
[s2; This constructor sets [%-*@3 maxlen] as maximum length of contained
text.&]
[s3; &]
[s0;%- &]
[ {{10000F(128)G(128)@1 [s0; [* Public Method List]]}}&]
[s3;%- &]
[s5;:EditStringNotNull`:`:operator`=`(const WString`&`):%- [@(0.0.255) virtual]
[_^EditStringNotNull^ EditStringNotNull][@(0.0.255) `&]_[* operator`=]([@(0.0.255) const]_
[_^WString^ WString][@(0.0.255) `&]_[*@3 data])&]
[s5;:EditStringNotNull`:`:operator`=`(const String`&`):%- [@(0.0.255) virtual]
[_^EditStringNotNull^ EditStringNotNull][@(0.0.255) `&]_[* operator`=]([@(0.0.255) const]_
[_^String^ String][@(0.0.255) `&]_[*@3 data])&]
[s2; These helper operators allow a direct assignment of value type
to the editor.&]
[s3; &]
[s0; &]
[s0; &]
[s0;%- &]