Diffstat (limited to 'qmake/generators/win32/msvc_objectmodel.h') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | qmake/generators/win32/msvc_objectmodel.h | 100 |
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 @@ -42,3 +42,3 @@ /* - This Object model is of course VERY simplyfied, + This Object model is of course VERY simplyfied, and does not actually follow the original MSVC @@ -49,5 +49,5 @@ /* - 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... @@ -85,3 +85,3 @@ enum browseInfoOption { brInfoNone, - brAllInfo, + brAllInfo, brNoLocalSymbols @@ -120,3 +120,3 @@ enum debugOption { debugEnabled, - debugEditAndContinue + debugEditAndContinue }; @@ -126,3 +126,3 @@ enum eAppProtectionOption { eAppProtectMedium, - eAppProtectHigh + eAppProtectHigh }; @@ -233,3 +233,3 @@ enum favorSizeOrSpeedOption { favorSpeed, - favorSize + favorSize }; @@ -247,3 +247,3 @@ enum linkIncrementalType { linkIncrementalNo, - linkIncrementalYes + linkIncrementalYes }; @@ -252,3 +252,3 @@ enum linkProgressOption { linkProgressAll, - linkProgressLibs + linkProgressLibs }; @@ -266,3 +266,3 @@ enum midlErrorCheckOption { midlDisableAll, - midlEnableAll + midlEnableAll }; @@ -286,3 +286,3 @@ enum midlWarningLevelOption { midlWarningLevel_3, - midlWarningLevel_4 + midlWarningLevel_4 }; @@ -298,3 +298,3 @@ enum optimizeOption { optimizeFull, - optimizeCustom + optimizeCustom }; @@ -314,3 +314,3 @@ enum pchOption { pchGenerateAuto, - pchUseUsingSpecific + pchUseUsingSpecific }; @@ -319,3 +319,3 @@ enum preprocessOption { preprocessYes, - preprocessNoLineNumbers + preprocessNoLineNumbers }; @@ -324,3 +324,3 @@ enum ProcessorOptimizeOption { procOptimizePentium, - procOptimizePentiumProAndAbove + procOptimizePentiumProAndAbove }; @@ -329,3 +329,3 @@ enum RemoteDebuggerType { DbgRemote, - DbgRemoteTCPIP + DbgRemoteTCPIP }; @@ -337,3 +337,3 @@ enum runtimeLibraryOption { rtSingleThreaded, - rtSingleThreadedDebug + rtSingleThreadedDebug }; @@ -345,3 +345,3 @@ enum structMemberAlignOption { alignEightBytes, - alignSixteenBytes + alignSixteenBytes }; @@ -368,3 +368,3 @@ enum TypeOfDebugger { DbgMixed, - DbgAuto + DbgAuto }; @@ -373,3 +373,3 @@ enum useOfATL { useATLStatic, - useATLDynamic + useATLDynamic }; @@ -378,3 +378,3 @@ enum useOfMfc { useMfcStatic, - useMfcDynamic + useMfcDynamic }; @@ -392,10 +392,8 @@ protected: 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() ); } @@ -411,5 +409,5 @@ public: VCCLCompilerTool(); - ~VCCLCompilerTool(){}; - virtual bool parseOption( const char* option ); - + virtual ~VCCLCompilerTool(){} + bool parseOption( const char* option ); + // Variables @@ -482,4 +480,4 @@ public: VCLinkerTool(); - ~VCLinkerTool(){}; - virtual bool parseOption( const char* option ); + virtual ~VCLinkerTool(){} + bool parseOption( const char* option ); @@ -547,4 +545,4 @@ public: VCMIDLTool(); - ~VCMIDLTool(){}; - virtual bool parseOption( const char* option ); + virtual ~VCMIDLTool(){} + bool parseOption( const char* option ); @@ -589,4 +587,4 @@ public: VCLibrarianTool(); - ~VCLibrarianTool(){}; - virtual bool parseOption( const char* option ){ return FALSE; }; + virtual ~VCLibrarianTool(){} + bool parseOption( const char* ){ return FALSE; }; @@ -610,4 +608,4 @@ public: VCCustomBuildTool(); - ~VCCustomBuildTool(){}; - virtual bool parseOption( const char* option ){ return FALSE; }; + virtual ~VCCustomBuildTool(){} + bool parseOption( const char* ){ return FALSE; }; @@ -627,4 +625,4 @@ public: VCResourceCompilerTool(); - ~VCResourceCompilerTool(){}; - virtual bool parseOption( const char* option ){ return FALSE; }; + virtual ~VCResourceCompilerTool(){} + bool parseOption( const char* ){ return FALSE; }; @@ -647,4 +645,4 @@ protected: VCEventTool() : ExcludedFromBuild( unset ){}; - ~VCEventTool(){}; - virtual bool parseOption( const char* option ){ return FALSE; }; + virtual ~VCEventTool(){} + bool parseOption( const char* ){ return FALSE; }; @@ -659,3 +657,3 @@ public: -class VCPostBuildEventTool : public VCEventTool +class VCPostBuildEventTool : public VCEventTool { @@ -663,6 +661,6 @@ public: VCPostBuildEventTool(); - ~VCPostBuildEventTool(){}; + ~VCPostBuildEventTool(){} }; -class VCPreBuildEventTool : public VCEventTool +class VCPreBuildEventTool : public VCEventTool { @@ -670,6 +668,6 @@ public: VCPreBuildEventTool(); - ~VCPreBuildEventTool(){}; + ~VCPreBuildEventTool(){} }; -class VCPreLinkEventTool : public VCEventTool +class VCPreLinkEventTool : public VCEventTool { @@ -677,3 +675,3 @@ public: VCPreLinkEventTool(); - ~VCPreLinkEventTool(){}; + ~VCPreLinkEventTool(){} }; @@ -685,3 +683,3 @@ public: VCConfiguration(); - ~VCConfiguration(){}; + ~VCConfiguration(){} @@ -722,3 +720,3 @@ public: VCFilter(); - ~VCFilter(){}; + ~VCFilter(){} void generateMOC( QTextStream &strm, QString str ) const; @@ -741,3 +739,3 @@ public: VCProject(); - ~VCProject(){}; + ~VCProject(){} |