Works with the minor changes that have happened to libbu++, it's ready for new

features and fixes :)

4 files changed, 8 insertions, 8 deletions

diff --git a/src/rule.cpp b/src/rule.cpp
index 7578707..2cbb2ad 100644
--- a/src/rule.cpp
+++ b/src/rule.cpp
@@ -148,7 +148,7 @@ void Rule::setDisplay( const Bu::FString &sStr )
 
 const Bu::FString &Rule::getDisplay() const
 {
-        return ((bool)sDisplay)?(sDisplay):(sName);
+        return (sDisplay.isSet())?(sDisplay):(sName);
 }
 
 void Rule::addRequires( const AstBranch *pBr )
diff --git a/src/runner.cpp b/src/runner.cpp
index 947f2f5..e1f3da9 100644
--- a/src/runner.cpp
+++ b/src/runner.cpp
@@ -748,7 +748,7 @@ Variable Runner::run( AstBranch::NodeList::const_iterator n )
                                                 else
                                                 {
                                                         Bu::FString sTag = vTags.toString();
-                                                        if( sTag )
+                                                        if( sTag.isSet() )
                                                         {
                                                                 rCont.addTargetToTag( pCurTarget, sTag );
                                                         }
@@ -775,7 +775,7 @@ Variable Runner::run( AstBranch::NodeList::const_iterator n )
                                                 else
                                                 {
                                                         Bu::FString sTag = vTags.toString();
-                                                        if( sTag )
+                                                        if( sTag.isSet() )
                                                         {
                                                                 pCurRule->addTag( sTag );
                                                         }
diff --git a/src/target.cpp b/src/target.cpp
index 4f9dd77..958fcf5 100644
--- a/src/target.cpp
+++ b/src/target.cpp
@@ -219,7 +219,7 @@ const VarHash &Target::getVars() const
 
 void Target::setDisplay( const Bu::FString &sNewDisplay )
 {
-        if( !sDisplay )
+        if( !sDisplay.isSet() )
                 sDisplay = sNewDisplay;
 }
 
@@ -292,7 +292,7 @@ void Target::mergeUnder( const Target *pSrc )
         merge( lsRequires, pSrc->lsRequires );
         merge( lsOutput, pSrc->lsOutput );
 
-        if( !sPrefix )
+        if( !sPrefix.isSet() )
                 sPrefix = pSrc->sPrefix;
 
         sRule = pSrc->sRule;
@@ -309,7 +309,7 @@ void Target::mergeUnder( const Target *pSrc )
                 }
         }
 
-        if( !sDisplay )
+        if( !sDisplay.isSet() )
                 sDisplay = pSrc->sDisplay;
 
         // Now we need to reset our vars.
diff --git a/src/viewdefault.cpp b/src/viewdefault.cpp
index df7be13..fdc1604 100644
--- a/src/viewdefault.cpp
+++ b/src/viewdefault.cpp
@@ -131,7 +131,7 @@ void ViewDefault::cmdStarted( const Bu::FString &/*sCmd*/ )
 void ViewDefault::cmdFinished( const Bu::FString &sStdOut,
         const Bu::FString &sStdErr, long /*iExit*/ )
 {
-        if( sStdOut )
+        if( sStdOut.isSet() )
         {
                 Bu::FString::const_iterator b;
                 b = sStdOut.begin();
@@ -147,7 +147,7 @@ void ViewDefault::cmdFinished( const Bu::FString &sStdOut,
                 }
                 sio << C_BR_GREEN << "\\-----" << C_RESET << sio.nl;
         }
-        if( sStdErr )
+        if( sStdErr.isSet() )
         {
                 Bu::FString::const_iterator b;
                 b = sStdErr.begin();