diff options
author | Mike Buland <eichlan@xagasoft.com> | 2011-01-20 02:14:08 +0000 |
---|---|---|
committer | Mike Buland <eichlan@xagasoft.com> | 2011-01-20 02:14:08 +0000 |
commit | f5aca1a1b402bd7ebc944dc6e6fe65828d863365 (patch) | |
tree | 4a0fdd8e166d5c4b03543279d332b9a858ef62df /src/tafgroup.cpp | |
parent | 10c557562e1d67c55314c212371ea9cb7f802863 (diff) | |
download | libbu++-f5aca1a1b402bd7ebc944dc6e6fe65828d863365.tar.gz libbu++-f5aca1a1b402bd7ebc944dc6e6fe65828d863365.tar.bz2 libbu++-f5aca1a1b402bd7ebc944dc6e6fe65828d863365.tar.xz libbu++-f5aca1a1b402bd7ebc944dc6e6fe65828d863365.zip |
Bu::FString is now String, and there's a shell script to fix any other programs
that were using fstring, I hope.
Diffstat (limited to 'src/tafgroup.cpp')
-rw-r--r-- | src/tafgroup.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/tafgroup.cpp b/src/tafgroup.cpp index c3f5b1e..42f4610 100644 --- a/src/tafgroup.cpp +++ b/src/tafgroup.cpp | |||
@@ -32,7 +32,7 @@ Bu::TafGroup::TafGroup( const TafGroup &rSrc ) : | |||
32 | } | 32 | } |
33 | } | 33 | } |
34 | 34 | ||
35 | Bu::TafGroup::TafGroup( const Bu::FString &sName ) : | 35 | Bu::TafGroup::TafGroup( const Bu::String &sName ) : |
36 | TafNode( typeGroup ), | 36 | TafNode( typeGroup ), |
37 | sName( sName ) | 37 | sName( sName ) |
38 | { | 38 | { |
@@ -46,12 +46,12 @@ Bu::TafGroup::~TafGroup() | |||
46 | } | 46 | } |
47 | } | 47 | } |
48 | 48 | ||
49 | const Bu::FString &Bu::TafGroup::getName() const | 49 | const Bu::String &Bu::TafGroup::getName() const |
50 | { | 50 | { |
51 | return sName; | 51 | return sName; |
52 | } | 52 | } |
53 | 53 | ||
54 | void Bu::TafGroup::setName( const Bu::FString &sName ) | 54 | void Bu::TafGroup::setName( const Bu::String &sName ) |
55 | { | 55 | { |
56 | this->sName = sName; | 56 | this->sName = sName; |
57 | } | 57 | } |
@@ -102,23 +102,23 @@ Bu::TafComment *Bu::TafGroup::addChild( TafComment *pNode ) | |||
102 | return pNode; | 102 | return pNode; |
103 | } | 103 | } |
104 | 104 | ||
105 | Bu::TafGroup *Bu::TafGroup::addGroup( const Bu::FString &sName ) | 105 | Bu::TafGroup *Bu::TafGroup::addGroup( const Bu::String &sName ) |
106 | { | 106 | { |
107 | return addChild( new TafGroup( sName ) ); | 107 | return addChild( new TafGroup( sName ) ); |
108 | } | 108 | } |
109 | 109 | ||
110 | Bu::TafProperty *Bu::TafGroup::addProperty( | 110 | Bu::TafProperty *Bu::TafGroup::addProperty( |
111 | const Bu::FString &sName, const Bu::FString &sValue ) | 111 | const Bu::String &sName, const Bu::String &sValue ) |
112 | { | 112 | { |
113 | return addChild( new TafProperty( sName, sValue ) ); | 113 | return addChild( new TafProperty( sName, sValue ) ); |
114 | } | 114 | } |
115 | 115 | ||
116 | bool Bu::TafGroup::hasChild( const Bu::FString &sName ) const | 116 | bool Bu::TafGroup::hasChild( const Bu::String &sName ) const |
117 | { | 117 | { |
118 | return hChildren.has( sName ); | 118 | return hChildren.has( sName ); |
119 | } | 119 | } |
120 | 120 | ||
121 | const Bu::TafGroup::GroupList &Bu::TafGroup::getChildren( const Bu::FString &sName ) const | 121 | const Bu::TafGroup::GroupList &Bu::TafGroup::getChildren( const Bu::String &sName ) const |
122 | { | 122 | { |
123 | try { | 123 | try { |
124 | return hChildren.get( sName ); | 124 | return hChildren.get( sName ); |
@@ -134,7 +134,7 @@ const Bu::TafGroup::NodeList &Bu::TafGroup::getChildren() const | |||
134 | return lChildren; | 134 | return lChildren; |
135 | } | 135 | } |
136 | 136 | ||
137 | const Bu::TafGroup *Bu::TafGroup::getChild( const Bu::FString &sName ) const | 137 | const Bu::TafGroup *Bu::TafGroup::getChild( const Bu::String &sName ) const |
138 | { | 138 | { |
139 | try { | 139 | try { |
140 | return hChildren.get( sName ).first(); | 140 | return hChildren.get( sName ).first(); |
@@ -145,12 +145,12 @@ const Bu::TafGroup *Bu::TafGroup::getChild( const Bu::FString &sName ) const | |||
145 | } | 145 | } |
146 | } | 146 | } |
147 | 147 | ||
148 | bool Bu::TafGroup::hasProperty( const Bu::FString &sName ) const | 148 | bool Bu::TafGroup::hasProperty( const Bu::String &sName ) const |
149 | { | 149 | { |
150 | return hProp.has( sName ); | 150 | return hProp.has( sName ); |
151 | } | 151 | } |
152 | 152 | ||
153 | const Bu::TafGroup::PropList &Bu::TafGroup::getProperties( const Bu::FString &sName ) const | 153 | const Bu::TafGroup::PropList &Bu::TafGroup::getProperties( const Bu::String &sName ) const |
154 | { | 154 | { |
155 | try { | 155 | try { |
156 | return hProp.get( sName ); | 156 | return hProp.get( sName ); |
@@ -161,7 +161,7 @@ const Bu::TafGroup::PropList &Bu::TafGroup::getProperties( const Bu::FString &sN | |||
161 | } | 161 | } |
162 | } | 162 | } |
163 | 163 | ||
164 | const Bu::FString &Bu::TafGroup::getProperty( const Bu::FString &sName ) const | 164 | const Bu::String &Bu::TafGroup::getProperty( const Bu::String &sName ) const |
165 | { | 165 | { |
166 | try { | 166 | try { |
167 | return hProp.get( sName ).first(); | 167 | return hProp.get( sName ).first(); |
@@ -172,8 +172,8 @@ const Bu::FString &Bu::TafGroup::getProperty( const Bu::FString &sName ) const | |||
172 | } | 172 | } |
173 | } | 173 | } |
174 | 174 | ||
175 | const Bu::FString &Bu::TafGroup::getProperty( const Bu::FString &sName, | 175 | const Bu::String &Bu::TafGroup::getProperty( const Bu::String &sName, |
176 | const Bu::FString &sDef ) const | 176 | const Bu::String &sDef ) const |
177 | { | 177 | { |
178 | try | 178 | try |
179 | { | 179 | { |
@@ -186,7 +186,7 @@ const Bu::FString &Bu::TafGroup::getProperty( const Bu::FString &sName, | |||
186 | } | 186 | } |
187 | 187 | ||
188 | const Bu::TafGroup *Bu::TafGroup::getChildByPath( | 188 | const Bu::TafGroup *Bu::TafGroup::getChildByPath( |
189 | const Bu::FString &sPath ) const | 189 | const Bu::String &sPath ) const |
190 | { | 190 | { |
191 | return getChildByPath( sPath.split('/') ); | 191 | return getChildByPath( sPath.split('/') ); |
192 | } | 192 | } |
@@ -203,12 +203,12 @@ const Bu::TafGroup *Bu::TafGroup::getChildByPath( Bu::StrList lPath ) const | |||
203 | return cur; | 203 | return cur; |
204 | } | 204 | } |
205 | 205 | ||
206 | const Bu::FString &Bu::TafGroup::getByPath( const Bu::FString &sPath ) const | 206 | const Bu::String &Bu::TafGroup::getByPath( const Bu::String &sPath ) const |
207 | { | 207 | { |
208 | return getByPath( sPath.split('/') ); | 208 | return getByPath( sPath.split('/') ); |
209 | } | 209 | } |
210 | 210 | ||
211 | const Bu::FString &Bu::TafGroup::getByPath( Bu::StrList lPath ) const | 211 | const Bu::String &Bu::TafGroup::getByPath( Bu::StrList lPath ) const |
212 | { | 212 | { |
213 | const Bu::TafGroup *cur = this; | 213 | const Bu::TafGroup *cur = this; |
214 | 214 | ||