diff options
Diffstat (limited to 'src/viewdefault.cpp')
-rw-r--r-- | src/viewdefault.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/viewdefault.cpp b/src/viewdefault.cpp index 49ba7e8..8b7e345 100644 --- a/src/viewdefault.cpp +++ b/src/viewdefault.cpp | |||
@@ -47,7 +47,7 @@ ViewDefault::~ViewDefault() | |||
47 | } | 47 | } |
48 | } | 48 | } |
49 | 49 | ||
50 | void ViewDefault::beginAction( const Bu::FString &/*sAction*/ ) | 50 | void ViewDefault::beginAction( const Bu::String &/*sAction*/ ) |
51 | { | 51 | { |
52 | } | 52 | } |
53 | 53 | ||
@@ -55,13 +55,13 @@ void ViewDefault::endAction() | |||
55 | { | 55 | { |
56 | } | 56 | } |
57 | 57 | ||
58 | void ViewDefault::skipTarget( const Bu::FString &/*sProfile*/, | 58 | void ViewDefault::skipTarget( const Bu::String &/*sProfile*/, |
59 | const Target &/*rTarget*/ ) | 59 | const Target &/*rTarget*/ ) |
60 | { | 60 | { |
61 | iCurrent++; | 61 | iCurrent++; |
62 | } | 62 | } |
63 | 63 | ||
64 | void ViewDefault::beginTarget( const Bu::FString &sProfile, | 64 | void ViewDefault::beginTarget( const Bu::String &sProfile, |
65 | const Target &rTarget ) | 65 | const Target &rTarget ) |
66 | { | 66 | { |
67 | if( iDepth == 0 ) | 67 | if( iDepth == 0 ) |
@@ -76,7 +76,7 @@ void ViewDefault::beginTarget( const Bu::FString &sProfile, | |||
76 | sCurProfile = sProfile; | 76 | sCurProfile = sProfile; |
77 | } | 77 | } |
78 | 78 | ||
79 | void ViewDefault::drawTargetHdr( const Bu::FString &sProfile, | 79 | void ViewDefault::drawTargetHdr( const Bu::String &sProfile, |
80 | const Target &rTarget ) | 80 | const Target &rTarget ) |
81 | { | 81 | { |
82 | if( bDispedTrg == false ) | 82 | if( bDispedTrg == false ) |
@@ -93,7 +93,7 @@ void ViewDefault::drawTargetHdr( const Bu::FString &sProfile, | |||
93 | } | 93 | } |
94 | } | 94 | } |
95 | 95 | ||
96 | void ViewDefault::processTarget( const Bu::FString &sProfile, | 96 | void ViewDefault::processTarget( const Bu::String &sProfile, |
97 | const Target &rTarget ) | 97 | const Target &rTarget ) |
98 | { | 98 | { |
99 | drawTargetHdr( sProfile, rTarget ); | 99 | drawTargetHdr( sProfile, rTarget ); |
@@ -125,23 +125,23 @@ void ViewDefault::buildRequires( const Target &rTarget ) | |||
125 | bDisped = true; | 125 | bDisped = true; |
126 | } | 126 | } |
127 | 127 | ||
128 | void ViewDefault::cmdStarted( const Bu::FString &/*sCmd*/ ) | 128 | void ViewDefault::cmdStarted( const Bu::String &/*sCmd*/ ) |
129 | { | 129 | { |
130 | } | 130 | } |
131 | 131 | ||
132 | void ViewDefault::cmdFinished( const Bu::FString &sStdOut, | 132 | void ViewDefault::cmdFinished( const Bu::String &sStdOut, |
133 | const Bu::FString &sStdErr, long /*iExit*/ ) | 133 | const Bu::String &sStdErr, long /*iExit*/ ) |
134 | { | 134 | { |
135 | if( sStdOut.isSet() ) | 135 | if( sStdOut.isSet() ) |
136 | { | 136 | { |
137 | Bu::FString::const_iterator b; | 137 | Bu::String::const_iterator b; |
138 | b = sStdOut.begin(); | 138 | b = sStdOut.begin(); |
139 | while( b ) | 139 | while( b ) |
140 | { | 140 | { |
141 | Bu::FString::const_iterator e, max; | 141 | Bu::String::const_iterator e, max; |
142 | max = b + 78; | 142 | max = b + 78; |
143 | for( e = b; e != max && *e != '\n'; e++ ) { } | 143 | for( e = b; e != max && *e != '\n'; e++ ) { } |
144 | sio << C_BR_GREEN << "| " << C_RESET << FString( b, e ) << sio.nl; | 144 | sio << C_BR_GREEN << "| " << C_RESET << String( b, e ) << sio.nl; |
145 | b = e; | 145 | b = e; |
146 | if( *b == '\n' ) | 146 | if( *b == '\n' ) |
147 | b++; | 147 | b++; |
@@ -150,14 +150,14 @@ void ViewDefault::cmdFinished( const Bu::FString &sStdOut, | |||
150 | } | 150 | } |
151 | if( sStdErr.isSet() ) | 151 | if( sStdErr.isSet() ) |
152 | { | 152 | { |
153 | Bu::FString::const_iterator b; | 153 | Bu::String::const_iterator b; |
154 | b = sStdErr.begin(); | 154 | b = sStdErr.begin(); |
155 | while( b ) | 155 | while( b ) |
156 | { | 156 | { |
157 | Bu::FString::const_iterator e, max; | 157 | Bu::String::const_iterator e, max; |
158 | max = b + 78; | 158 | max = b + 78; |
159 | for( e = b; e != max && *e != '\n'; e++ ) { } | 159 | for( e = b; e != max && *e != '\n'; e++ ) { } |
160 | sio << C_BR_RED << "| " << C_RESET << FString( b, e ) << sio.nl; | 160 | sio << C_BR_RED << "| " << C_RESET << String( b, e ) << sio.nl; |
161 | b = e; | 161 | b = e; |
162 | if( *b == '\n' ) | 162 | if( *b == '\n' ) |
163 | b++; | 163 | b++; |
@@ -169,31 +169,31 @@ void ViewDefault::cmdFinished( const Bu::FString &sStdOut, | |||
169 | bDisped = true; | 169 | bDisped = true; |
170 | } | 170 | } |
171 | 171 | ||
172 | void ViewDefault::userError( const Bu::FString &sMsg ) | 172 | void ViewDefault::userError( const Bu::String &sMsg ) |
173 | { | 173 | { |
174 | sio << C_BR_RED << "Error: " << sMsg << C_RESET << sio.nl; | 174 | sio << C_BR_RED << "Error: " << sMsg << C_RESET << sio.nl; |
175 | bDisped = true; | 175 | bDisped = true; |
176 | } | 176 | } |
177 | 177 | ||
178 | void ViewDefault::userWarning( const Bu::FString &sMsg ) | 178 | void ViewDefault::userWarning( const Bu::String &sMsg ) |
179 | { | 179 | { |
180 | sio << C_BR_YELLOW << "Warning: " << sMsg << C_RESET << sio.nl; | 180 | sio << C_BR_YELLOW << "Warning: " << sMsg << C_RESET << sio.nl; |
181 | bDisped = true; | 181 | bDisped = true; |
182 | } | 182 | } |
183 | 183 | ||
184 | void ViewDefault::userNotice( const Bu::FString &sMsg ) | 184 | void ViewDefault::userNotice( const Bu::String &sMsg ) |
185 | { | 185 | { |
186 | sio << C_BR_GREEN << "Notice: " << sMsg << C_RESET << sio.nl; | 186 | sio << C_BR_GREEN << "Notice: " << sMsg << C_RESET << sio.nl; |
187 | bDisped = true; | 187 | bDisped = true; |
188 | } | 188 | } |
189 | 189 | ||
190 | void ViewDefault::sysError( const Bu::FString &sMsg ) | 190 | void ViewDefault::sysError( const Bu::String &sMsg ) |
191 | { | 191 | { |
192 | sio << C_BR_RED << sMsg << C_RESET << sio.nl; | 192 | sio << C_BR_RED << sMsg << C_RESET << sio.nl; |
193 | bDisped = true; | 193 | bDisped = true; |
194 | } | 194 | } |
195 | 195 | ||
196 | void ViewDefault::sysWarning( const Bu::FString &sMsg ) | 196 | void ViewDefault::sysWarning( const Bu::String &sMsg ) |
197 | { | 197 | { |
198 | sio << C_BR_YELLOW << sMsg << C_RESET << sio.nl; | 198 | sio << C_BR_YELLOW << sMsg << C_RESET << sio.nl; |
199 | bDisped = true; | 199 | bDisped = true; |