1 files changed, 49 insertions, 51 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
@@ -31,34 +31,34 @@
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #ifndef __MSVC_OBJECTMODEL_H__
 #define __MSVC_OBJECTMODEL_H__
 
 #include "project.h"
 #include <qstring.h>
 #include <qstringlist.h>
 
 /*
-    This Object model is of course VERY simplyfied, 
+    This Object model is of course VERY simplyfied,
     and does not actually follow the original MSVC
     object model. However, it fulfilles the basic
     needs for qmake
 */
 
 /*
-    If a triState value is 'unset' then the 
+    If a triState value is 'unset' then the
     corresponding property is not in the output,
-    forcing the tool to utilize default values. 
+    forcing the tool to utilize default values.
     False/True values will be in the output...
 */
 enum customBuildCheck {
     none,
     moc,
     uic,
     lexyacc
 };
 enum triState {
     unset = -1,
     _False = 0,
     _True = 1
@@ -74,25 +74,25 @@ enum asmListingOption {
     asmListingAsmMachineSrc,
     asmListingAsmMachine,
     asmListingAsmSrc
 };
 enum basicRuntimeCheckOption {
     runtimeBasicCheckNone,
     runtimeCheckStackFrame,
     runtimeCheckUninitVariables,
     runtimeBasicCheckAll
 };
 enum browseInfoOption {
     brInfoNone,
-    brAllInfo, 
+    brAllInfo,
     brNoLocalSymbols
 };
 enum callingConventionOption {
     callConventionDefault = -1,
     callConventionCDecl,
     callConventionFastCall,
     callConventionStdCall
 };
 enum charSet {
     charSetNotSet,
     charSetUnicode,
     charSetMBCS
@@ -109,31 +109,31 @@ enum CompileAsOptions{
 enum ConfigurationTypes {
     typeUnknown        = 0,
     typeApplication    = 1,
     typeDynamicLibrary = 2,
     typeStaticLibrary  = 4,
     typeGeneric        = 10
 };
 enum debugOption {
     debugDisabled,
     debugOldStyleInfo,
     debugLineInfoOnly,
     debugEnabled,
-    debugEditAndContinue 
+    debugEditAndContinue
 };
 enum eAppProtectionOption {
     eAppProtectUnchanged,
     eAppProtectLow,
     eAppProtectMedium,
-    eAppProtectHigh 
+    eAppProtectHigh
 };
 enum enumResourceLangID {
             rcUseDefault        = 0,
             rcAfrikaans                 = 1078,
             rcAlbanian          = 1052,
             rcArabicAlgeria     = 5121,
             rcArabicBahrain     = 15361,
             rcArabicEgypt       = 3073,
             rcArabicIraq        = 2049,
             rcArabicJordan      = 11265,
             rcArabicKuwait      = 13313,
             rcArabicLebanon     = 12289,
@@ -222,205 +222,203 @@ enum enumResourceLangID {
             rcThai              = 1054,
             rcTurkish           = 1055,
             rcUkrainian                 = 1058,
             rcUrdu              = 1056
 };
 enum enumSccEvent {
     eProjectInScc,
     ePreDirtyNotification
 };
 enum favorSizeOrSpeedOption {
     favorNone,
     favorSpeed,
-    favorSize 
+    favorSize
 };
 enum genProxyLanguage {
     genProxyNative,
     genProxyManaged
 };
 enum inlineExpansionOption {
     expandDisable,
     expandOnlyInline,
     expandAnySuitable
 };
 enum linkIncrementalType {
     linkIncrementalDefault,
     linkIncrementalNo,
-    linkIncrementalYes 
+    linkIncrementalYes
 };
 enum linkProgressOption {
     linkProgressNotSet,
     linkProgressAll,
-    linkProgressLibs 
+    linkProgressLibs
 };
 enum machineTypeOption {
     machineNotSet,
     machineX86
 };
 enum midlCharOption {
     midlCharUnsigned,
     midlCharSigned,
     midlCharAscii7
 };
 enum midlErrorCheckOption {
     midlEnableCustom,
     midlDisableAll,
-    midlEnableAll 
+    midlEnableAll
 };
 enum midlStructMemberAlignOption {
     midlAlignNotSet,
     midlAlignSingleByte,
     midlAlignTwoBytes,
     midlAlignFourBytes,
     midlAlignEightBytes,
     midlAlignSixteenBytes
 };
 enum midlTargetEnvironment {
     midlTargetNotSet,
     midlTargetWin32,
     midlTargetWin64
 };
 enum midlWarningLevelOption {
     midlWarningLevel_0,
     midlWarningLevel_1,
     midlWarningLevel_2,
     midlWarningLevel_3,
-    midlWarningLevel_4 
+    midlWarningLevel_4
 };
 enum optFoldingType {
     optFoldingDefault,
     optNoFolding,
     optFolding
 };
 enum optimizeOption {
     optimizeDisabled,
     optimizeMinSpace,
     optimizeMaxSpeed,
     optimizeFull,
-    optimizeCustom 
+    optimizeCustom
 };
 enum optRefType {
     optReferencesDefault,
     optNoReferences,
     optReferences
 };
 enum optWin98Type {
     optWin98Default,
     optWin98No,
     optWin98Yes
 };
 enum pchOption {
     pchNone,
     pchCreateUsingSpecific,
     pchGenerateAuto,
-    pchUseUsingSpecific 
+    pchUseUsingSpecific
 };
 enum preprocessOption {
     preprocessNo,
     preprocessYes,
-    preprocessNoLineNumbers 
+    preprocessNoLineNumbers
 };
 enum ProcessorOptimizeOption {
     procOptimizeBlended,
     procOptimizePentium,
-    procOptimizePentiumProAndAbove 
+    procOptimizePentiumProAndAbove
 };
 enum RemoteDebuggerType {
     DbgLocal,
     DbgRemote,
-    DbgRemoteTCPIP 
+    DbgRemoteTCPIP
 };
 enum runtimeLibraryOption {
     rtMultiThreaded,
     rtMultiThreadedDebug,
     rtMultiThreadedDLL,
     rtMultiThreadedDebugDLL,
     rtSingleThreaded,
-    rtSingleThreadedDebug 
+    rtSingleThreadedDebug
 };
 enum structMemberAlignOption {
     alignNotSet,
     alignSingleByte,
     alignTwoBytes,
     alignFourBytes,
     alignEightBytes,
-    alignSixteenBytes 
+    alignSixteenBytes
 };
 enum subSystemOption {
     subSystemNotSet,
     subSystemConsole,
     subSystemWindows
 };
 enum termSvrAwarenessType {
     termSvrAwareDefault,
     termSvrAwareNo,
     termSvrAwareYes
 };
 enum toolSetType {
     toolSetUtility,
     toolSetMakefile,
     toolSetLinker,
     toolSetLibrarian,
     toolSetAll
 };
 enum TypeOfDebugger {
     DbgNativeOnly,
     DbgManagedOnly,
     DbgMixed,
-    DbgAuto 
+    DbgAuto
 };
 enum useOfATL {
     useATLNotSet,
     useATLStatic,
-    useATLDynamic 
+    useATLDynamic
 };
 enum useOfMfc {
     useMfcStdWin,
     useMfcStatic,
-    useMfcDynamic 
+    useMfcDynamic
 };
 enum warningLevelOption {
     warningLevel_0,
     warningLevel_1,
     warningLevel_2,
     warningLevel_3,
     warningLevel_4
 };
 
 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;
             asmListingOption    AssemblerOutput;
     basicRuntimeCheckOption BasicRuntimeChecks;
             browseInfoOption    BrowseInformation;
             QString         BrowseInformationFile;
             triState        BufferSecurityCheck;
     callingConventionOption CallingConvention;
             CompileAsOptions    CompileAs;
@@ -471,26 +469,26 @@ public:
             pchOption       UsePrecompiledHeader;
             triState        WarnAsError;
             warningLevelOption    WarningLevel;
             triState        WholeProgramOptimization;
             VCConfiguration*    config;
 };
 
 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;
             QString         BaseAddress;
             QStringList             DelayLoadDLLs;
             optFoldingType    EnableCOMDATFolding;
             QString         EntryPointSymbol;
             QStringList             ForceSymbolReferences;
             QString         FunctionOrder;
@@ -536,26 +534,26 @@ public:
             triState        TurnOffAssemblyGeneration;
             QString         TypeLibraryFile;
             long            TypeLibraryResourceID;
             QString         Version;
             VCConfiguration*    config;
 };
 
 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;
             QString         DLLDataFileName;    // Should be list?
     midlErrorCheckOption    EnableErrorChecks;
             triState        ErrorCheckAllocations;
             triState        ErrorCheckBounds;
             triState        ErrorCheckEnumRange;
             triState        ErrorCheckRefPointers;
@@ -578,121 +576,121 @@ public:
             QStringList             UndefinePreprocessorDefinitions;
             triState        ValidateParameters;
             triState        WarnAsError;
     midlWarningLevelOption  WarningLevel;
             VCConfiguration*    config;
 };
 
 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;
             QStringList             ForceSymbolReferences;
             triState        IgnoreAllDefaultLibraries;
             QStringList             IgnoreDefaultLibraryNames;
             QString         ModuleDefinitionFile;
             QString         OutputFile;
             triState        SuppressStartupBanner;
 };
 
 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;
             QString         ToolName;
             QString         ToolPath;
 };
 
 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;
             triState        IgnoreStandardIncludePath;
             QStringList             PreprocessorDefinitions;
             QString         ResourceOutputFileName;
             linkProgressOption    ShowProgress;
             QString         ToolPath;
 };
 
 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;
             QString         ToolName;
             QString         ToolPath;
 };
 
-class VCPostBuildEventTool : public VCEventTool 
+class VCPostBuildEventTool : public VCEventTool
 {
 public:
     VCPostBuildEventTool();
-    ~VCPostBuildEventTool(){};
+    ~VCPostBuildEventTool(){}
 };
 
-class VCPreBuildEventTool : public VCEventTool 
+class VCPreBuildEventTool : public VCEventTool
 {
 public:
     VCPreBuildEventTool();
-    ~VCPreBuildEventTool(){};
+    ~VCPreBuildEventTool(){}
 };
 
-class VCPreLinkEventTool : public VCEventTool 
+class VCPreLinkEventTool : public VCEventTool
 {
 public:
     VCPreLinkEventTool();
-    ~VCPreLinkEventTool(){};
+    ~VCPreLinkEventTool(){}
 };
 
 class VCConfiguration
 {
 public:
     // Functions
     VCConfiguration();
-    ~VCConfiguration(){};
+    ~VCConfiguration(){}
 
     // Variables
             triState    ATLMinimizesCRunTimeLibraryUsage;
             triState    BuildBrowserInformation;
             charSet     CharacterSet;
             ConfigurationTypesConfigurationType;
             QString     DeleteExtensionsOnClean;
             QString     ImportLibrary;
             QString     IntermediateDirectory;
             QString     Name;
             QString     OutputDirectory;
             QString     PrimaryOutput;
@@ -711,44 +709,44 @@ public:
     VCPostBuildEventTool    postBuild;
             VCPreBuildEventTool    preBuild;
             VCPreLinkEventTool    preLink;
     VCResourceCompilerTool  resource;
 };
 
 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;
             triState    ParseFiles;
             QStringList         Files;
             VcprojGenerator*Project;
             VCConfiguration*Config;
             customBuildCheckCustomBuild;
 };
 
 class VCProject
 {
 public:
     // Functions
     VCProject();
-    ~VCProject(){};
+    ~VCProject(){}
 
     // Variables
             QString     Name;
             QString     Version;
             QString     ProjectGUID;
             QString     SccProjectName;
             QString     SccLocalPath;
             QString     PlatformName;
 
     // XML sub-parts
             VCConfigurationConfiguration;
             VCFilter    SourceFiles;