diff options
author | Mike Buland <eichlan@xagasoft.com> | 2009-02-24 02:32:55 +0000 |
---|---|---|
committer | Mike Buland <eichlan@xagasoft.com> | 2009-02-24 02:32:55 +0000 |
commit | bbc76396d899e6b59ce17643095c8d48f7083662 (patch) | |
tree | 1a181e4b7c12111ec7f961c215ffc3ee1bf9fbc2 | |
parent | 22277c6ffe91189cbb5d7a7d8572bf829e3a2610 (diff) | |
download | libbu++-bbc76396d899e6b59ce17643095c8d48f7083662.tar.gz libbu++-bbc76396d899e6b59ce17643095c8d48f7083662.tar.bz2 libbu++-bbc76396d899e6b59ce17643095c8d48f7083662.tar.xz libbu++-bbc76396d899e6b59ce17643095c8d48f7083662.zip |
Corrected some iterator confusion in FString and added a helper to
ProtocolTelnet. I'm going to have to do some reading and find out just where
ProtocolTelnet is...
-rw-r--r-- | src/fbasicstring.h | 20 | ||||
-rw-r--r-- | src/protocoltelnet.h | 2 |
2 files changed, 18 insertions, 4 deletions
diff --git a/src/fbasicstring.h b/src/fbasicstring.h index 8303b5a..8bbbe91 100644 --- a/src/fbasicstring.h +++ b/src/fbasicstring.h | |||
@@ -150,6 +150,12 @@ namespace Bu | |||
150 | { | 150 | { |
151 | } | 151 | } |
152 | 152 | ||
153 | const_iterator() : | ||
154 | pChunk( NULL ), | ||
155 | iPos( 0 ) | ||
156 | { | ||
157 | } | ||
158 | |||
153 | bool operator==( const const_iterator &i ) const | 159 | bool operator==( const const_iterator &i ) const |
154 | { | 160 | { |
155 | return pChunk == i.pChunk && iPos == i.iPos; | 161 | return pChunk == i.pChunk && iPos == i.iPos; |
@@ -365,6 +371,12 @@ namespace Bu | |||
365 | { | 371 | { |
366 | } | 372 | } |
367 | 373 | ||
374 | iterator() : | ||
375 | pChunk( NULL ), | ||
376 | iPos( 0 ) | ||
377 | { | ||
378 | } | ||
379 | |||
368 | operator const_iterator() const | 380 | operator const_iterator() const |
369 | { | 381 | { |
370 | return const_iterator( pChunk, iPos ); | 382 | return const_iterator( pChunk, iPos ); |
@@ -1383,7 +1395,7 @@ namespace Bu | |||
1383 | } | 1395 | } |
1384 | 1396 | ||
1385 | const_iterator find( const chr cChar, | 1397 | const_iterator find( const chr cChar, |
1386 | const_iterator iStart=begin() ) const | 1398 | const_iterator iStart=typename MyType::const_iterator() ) const |
1387 | { | 1399 | { |
1388 | for( ; iStart; iStart++ ) | 1400 | for( ; iStart; iStart++ ) |
1389 | { | 1401 | { |
@@ -1394,7 +1406,7 @@ namespace Bu | |||
1394 | } | 1406 | } |
1395 | 1407 | ||
1396 | const_iterator find( const chr *sText, int nLen, | 1408 | const_iterator find( const chr *sText, int nLen, |
1397 | const_iterator iStart=begin() ) const | 1409 | const_iterator iStart=typename MyType::const_iterator() ) const |
1398 | { | 1410 | { |
1399 | for( ; iStart; iStart++ ) | 1411 | for( ; iStart; iStart++ ) |
1400 | { | 1412 | { |
@@ -1405,7 +1417,7 @@ namespace Bu | |||
1405 | } | 1417 | } |
1406 | 1418 | ||
1407 | const_iterator find( const MyType &rStr, | 1419 | const_iterator find( const MyType &rStr, |
1408 | const_iterator iStart=begin() ) const | 1420 | const_iterator iStart=typename MyType::const_iterator() ) const |
1409 | { | 1421 | { |
1410 | for( ; iStart; iStart++ ) | 1422 | for( ; iStart; iStart++ ) |
1411 | { | 1423 | { |
@@ -1416,7 +1428,7 @@ namespace Bu | |||
1416 | } | 1428 | } |
1417 | 1429 | ||
1418 | const_iterator find( const MyType &rStr, int nLen, | 1430 | const_iterator find( const MyType &rStr, int nLen, |
1419 | const_iterator iStart=begin() ) const | 1431 | const_iterator iStart=typename MyType::const_iterator() ) const |
1420 | { | 1432 | { |
1421 | for( ; iStart; iStart++ ) | 1433 | for( ; iStart; iStart++ ) |
1422 | { | 1434 | { |
diff --git a/src/protocoltelnet.h b/src/protocoltelnet.h index 532db4b..9b25c5d 100644 --- a/src/protocoltelnet.h +++ b/src/protocoltelnet.h | |||
@@ -121,6 +121,8 @@ namespace Bu | |||
121 | void write( const char *pData, int iSize ); | 121 | void write( const char *pData, int iSize ); |
122 | void write( char cData ); | 122 | void write( char cData ); |
123 | 123 | ||
124 | const Bu::FString &getBuffer() { return sDataBuf; } | ||
125 | |||
124 | public: | 126 | public: |
125 | /** | 127 | /** |
126 | * If you wish to know the current dimensions of the client window, | 128 | * If you wish to know the current dimensions of the client window, |