diff options
author | Mike Buland <eichlan@xagasoft.com> | 2011-01-20 18:21:03 +0000 |
---|---|---|
committer | Mike Buland <eichlan@xagasoft.com> | 2011-01-20 18:21:03 +0000 |
commit | c435c7daa9df1b08dc85132fcd1c154bea9b69e2 (patch) | |
tree | 5537f3c91a67b35c4c8aa918b708b7e4aad8f146 /src/main.cpp | |
parent | 59690513123de8904eef2a03fe7fcaaed98b1b7b (diff) | |
download | build-c435c7daa9df1b08dc85132fcd1c154bea9b69e2.tar.gz build-c435c7daa9df1b08dc85132fcd1c154bea9b69e2.tar.bz2 build-c435c7daa9df1b08dc85132fcd1c154bea9b69e2.tar.xz build-c435c7daa9df1b08dc85132fcd1c154bea9b69e2.zip |
Fixes to use libbu++ Bu::String
Diffstat (limited to '')
-rw-r--r-- | src/main.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/main.cpp b/src/main.cpp index 7637443..caa33e6 100644 --- a/src/main.cpp +++ b/src/main.cpp | |||
@@ -40,7 +40,7 @@ public: | |||
40 | bool bClean = false; | 40 | bool bClean = false; |
41 | addHelpBanner("build mark 3\n"); | 41 | addHelpBanner("build mark 3\n"); |
42 | 42 | ||
43 | Bu::FString sViews("Select a view from: "); | 43 | Bu::String sViews("Select a view from: "); |
44 | StrList lViews = ViewPlugger::getInstance().getPluginList(); | 44 | StrList lViews = ViewPlugger::getInstance().getPluginList(); |
45 | for( StrList::iterator i = lViews.begin(); i; i++ ) | 45 | for( StrList::iterator i = lViews.begin(); i; i++ ) |
46 | { | 46 | { |
@@ -159,10 +159,10 @@ public: | |||
159 | return 0; | 159 | return 0; |
160 | } | 160 | } |
161 | 161 | ||
162 | Bu::FString sView; | 162 | Bu::String sView; |
163 | Bu::FString sAction; | 163 | Bu::String sAction; |
164 | Bu::FString sConfig; | 164 | Bu::String sConfig; |
165 | Bu::FString sCacheFile; | 165 | Bu::String sCacheFile; |
166 | bool bDot; | 166 | bool bDot; |
167 | bool bDebug; | 167 | bool bDebug; |
168 | bool bAutoInclude; | 168 | bool bAutoInclude; |
@@ -174,7 +174,7 @@ public: | |||
174 | 174 | ||
175 | int main( int argc, char *argv[] ) | 175 | int main( int argc, char *argv[] ) |
176 | { | 176 | { |
177 | typedef Bu::List<Bu::FString> StrList; | 177 | typedef Bu::List<Bu::String> StrList; |
178 | StrList lShareList; | 178 | StrList lShareList; |
179 | lShareList.append("/usr/share/build/").append("./share/"); | 179 | lShareList.append("/usr/share/build/").append("./share/"); |
180 | Ast ast; | 180 | Ast ast; |
@@ -221,8 +221,8 @@ int main( int argc, char *argv[] ) | |||
221 | int iSplit; | 221 | int iSplit; |
222 | for( iSplit = 0; (*env)[iSplit] != '='; iSplit++ ) { } | 222 | for( iSplit = 0; (*env)[iSplit] != '='; iSplit++ ) { } |
223 | cnt.addVariable( | 223 | cnt.addVariable( |
224 | FString( *env, iSplit ), | 224 | String( *env, iSplit ), |
225 | FString( *env+iSplit+1 ) | 225 | String( *env+iSplit+1 ) |
226 | ); | 226 | ); |
227 | } | 227 | } |
228 | } | 228 | } |
@@ -230,7 +230,7 @@ int main( int argc, char *argv[] ) | |||
230 | if( opts.bAutoInclude ) | 230 | if( opts.bAutoInclude ) |
231 | { | 231 | { |
232 | DIR *d; | 232 | DIR *d; |
233 | Bu::FString sAutoDir; | 233 | Bu::String sAutoDir; |
234 | for( StrList::iterator i = lShareList.begin(); i; i++ ) | 234 | for( StrList::iterator i = lShareList.begin(); i; i++ ) |
235 | { | 235 | { |
236 | sAutoDir = *i + "autoinclude"; | 236 | sAutoDir = *i + "autoinclude"; |