update qmake to 1.05a

1 files changed, 24 insertions, 26 deletions

diff --git a/qmake/generators/win32/msvc_objectmodel.h b/qmake/generators/win32/msvc_objectmodel.h
index 2d09280..1dca68d 100644
--- a/qmake/generators/win32/msvc_objectmodel.h
+++ b/qmake/generators/win32/msvc_objectmodel.h
@@ -387,33 +387,31 @@ enum warningLevelOption {
 };
 
 class VCToolBase {
 protected:
     // Functions
     VCToolBase(){};
-    ~VCToolBase(){};
+    virtual ~VCToolBase(){}
     virtual bool parseOption( const char* option ) = 0;
 public:
-    bool parseOptions( QStringList& options ) {
-        bool result = TRUE;
-        for ( QStringList::ConstIterator it=options.begin(); (it!=options.end()) && result; it++ )
-            result = parseOption( (*it).latin1() );
-        return result;
+    void parseOptions( QStringList& options ) {
+        for ( QStringList::ConstIterator it=options.begin(); (it!=options.end()); it++ )
+            parseOption( (*it).latin1() );
     }
 };
 
 class VCConfiguration;
 class VCProject;
 
 class VCCLCompilerTool : public VCToolBase
 {
 public:
     // Functions
     VCCLCompilerTool();
-    ~VCCLCompilerTool(){};
-    virtual bool parseOption( const char* option );
+    virtual ~VCCLCompilerTool(){}
+    bool parseOption( const char* option );
     
     // Variables
             QStringList             AdditionalIncludeDirectories;
             QStringList             AdditionalOptions;
             QStringList             AdditionalUsingDirectories;
             QString         AssemblerListingLocation;
@@ -477,14 +475,14 @@ public:
 
 class VCLinkerTool : public VCToolBase
 {
 public:
     // Functions
     VCLinkerTool();
-    ~VCLinkerTool(){};
-    virtual bool parseOption( const char* option );
+    virtual ~VCLinkerTool(){}
+    bool parseOption( const char* option );
 
     // Variables
             QStringList             AdditionalDependencies;
             QStringList             AdditionalLibraryDirectories;
             QStringList             AdditionalOptions;
             QStringList             AddModuleNamesToAssembly;
@@ -542,14 +540,14 @@ public:
 
 class VCMIDLTool : public VCToolBase
 {
 public:
     // Functions
     VCMIDLTool();
-    ~VCMIDLTool(){};
-    virtual bool parseOption( const char* option );
+    virtual ~VCMIDLTool(){}
+    bool parseOption( const char* option );
 
     // Variables
             QStringList             AdditionalIncludeDirectories;
             QStringList             AdditionalOptions;
             QStringList             CPreprocessOptions;
             midlCharOption    DefaultCharType;
@@ -584,14 +582,14 @@ public:
 
 class VCLibrarianTool : public VCToolBase
 {
 public:
     // Functions
     VCLibrarianTool();
-    ~VCLibrarianTool(){};
-    virtual bool parseOption( const char* option ){ return FALSE; };
+    virtual ~VCLibrarianTool(){}
+    bool parseOption( const char* ){ return FALSE; };
 
     // Variables
             QStringList             AdditionalDependencies;
             QStringList             AdditionalLibraryDirectories;
             QStringList             AdditionalOptions;
             QStringList             ExportNamedFunctions;
@@ -605,14 +603,14 @@ public:
 
 class VCCustomBuildTool : public VCToolBase
 {
 public:
     // Functions
     VCCustomBuildTool();
-    ~VCCustomBuildTool(){};
-    virtual bool parseOption( const char* option ){ return FALSE; };
+    virtual ~VCCustomBuildTool(){}
+    bool parseOption( const char* ){ return FALSE; };
 
     // Variables
             QStringList             AdditionalDependencies;
             QString         CommandLine;
             QString         Description;
             QString         Outputs;
@@ -622,14 +620,14 @@ public:
 
 class VCResourceCompilerTool : public VCToolBase
 {
 public:
     // Functions
     VCResourceCompilerTool();
-    ~VCResourceCompilerTool(){};
-    virtual bool parseOption( const char* option ){ return FALSE; };
+    virtual ~VCResourceCompilerTool(){}
+    bool parseOption( const char* ){ return FALSE; };
 
     // Variables
             QStringList             AdditionalIncludeDirectories;
             QStringList             AdditionalOptions;
             enumResourceLangID    Culture;
             QStringList             FullIncludePath;
@@ -642,14 +640,14 @@ public:
 
 class VCEventTool : public VCToolBase
 {
 protected:
     // Functions
     VCEventTool() : ExcludedFromBuild( unset ){};
-    ~VCEventTool(){};
-    virtual bool parseOption( const char* option ){ return FALSE; };
+    virtual ~VCEventTool(){}
+    bool parseOption( const char* ){ return FALSE; };
 
 public:
     // Variables
             QString         CommandLine;
             QString         Description;
             triState        ExcludedFromBuild;
@@ -658,35 +656,35 @@ public:
 };
 
 class VCPostBuildEventTool : public VCEventTool 
 {
 public:
     VCPostBuildEventTool();
-    ~VCPostBuildEventTool(){};
+    ~VCPostBuildEventTool(){}
 };
 
 class VCPreBuildEventTool : public VCEventTool 
 {
 public:
     VCPreBuildEventTool();
-    ~VCPreBuildEventTool(){};
+    ~VCPreBuildEventTool(){}
 };
 
 class VCPreLinkEventTool : public VCEventTool 
 {
 public:
     VCPreLinkEventTool();
-    ~VCPreLinkEventTool(){};
+    ~VCPreLinkEventTool(){}
 };
 
 class VCConfiguration
 {
 public:
     // Functions
     VCConfiguration();
-    ~VCConfiguration(){};
+    ~VCConfiguration(){}
 
     // Variables
             triState    ATLMinimizesCRunTimeLibraryUsage;
             triState    BuildBrowserInformation;
             charSet     CharacterSet;
             ConfigurationTypesConfigurationType;
@@ -717,13 +715,13 @@ public:
 class VcprojGenerator;
 class VCFilter
 {
 public:
     // Functions
     VCFilter();
-    ~VCFilter(){};
+    ~VCFilter(){}
     void generateMOC( QTextStream &strm, QString str ) const;
     void generateUIC( QTextStream &strm, const QString& str ) const;
 
     // Variables
             QString     Name;
             QString     Filter;
@@ -736,13 +734,13 @@ public:
 
 class VCProject
 {
 public:
     // Functions
     VCProject();
-    ~VCProject(){};
+    ~VCProject(){}
 
     // Variables
             QString     Name;
             QString     Version;
             QString     ProjectGUID;
             QString     SccProjectName;