1 files changed, 29 insertions, 14 deletions

diff --git a/qmake/generators/win32/msvc_objectmodel.h b/qmake/generators/win32/msvc_objectmodel.h
index 1dca68d..9ce38d2 100644
--- a/qmake/generators/win32/msvc_objectmodel.h
+++ b/qmake/generators/win32/msvc_objectmodel.h
@@ -1,14 +1,14 @@
 /****************************************************************************
-** $Id$
 **
-** Definition of ________ class.
 **
-** Copyright (C) 2002 Trolltech AS.  All rights reserved.
+** Definition of VCProject class.
 **
-** This file is part of the network module of the Qt GUI Toolkit.
+** Copyright (C) 2002-2003 Trolltech AS.  All rights reserved.
+**
+** This file is part of qmake.
 **
 ** This file may be distributed under the terms of the Q Public License
 ** as defined by Trolltech AS of Norway and appearing in the file
 ** LICENSE.QPL included in the packaging of this file.
 **
 ** This file may be distributed and/or modified under the terms of the
@@ -29,12 +29,13 @@
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** 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>
@@ -53,13 +54,14 @@
     False/True values will be in the output...
 */
 enum customBuildCheck {
     none,
     moc,
     uic,
-    lexyacc
+    lexyacc,
+    resource
 };
 enum triState {
     unset = -1,
     _False = 0,
     _True = 1
 };
@@ -111,12 +113,13 @@ enum ConfigurationTypes {
     typeApplication    = 1,
     typeDynamicLibrary = 2,
     typeStaticLibrary  = 4,
     typeGeneric        = 10
 };
 enum debugOption {
+    debugUnknown = -1,
     debugDisabled,
     debugOldStyleInfo,
     debugLineInfoOnly,
     debugEnabled,
     debugEditAndContinue
 };
@@ -237,13 +240,14 @@ enum genProxyLanguage {
     genProxyNative,
     genProxyManaged
 };
 enum inlineExpansionOption {
     expandDisable,
     expandOnlyInline,
-    expandAnySuitable
+    expandAnySuitable,
+    expandDefault // Not useful number, but stops the output
 };
 enum linkIncrementalType {
     linkIncrementalDefault,
     linkIncrementalNo,
     linkIncrementalYes
 };
@@ -293,13 +297,14 @@ enum optFoldingType {
 };
 enum optimizeOption {
     optimizeDisabled,
     optimizeMinSpace,
     optimizeMaxSpeed,
     optimizeFull,
-    optimizeCustom
+    optimizeCustom,
+    optimizeDefault // Not useful number, but stops the output
 };
 enum optRefType {
     optReferencesDefault,
     optNoReferences,
     optReferences
 };
@@ -312,12 +317,13 @@ enum pchOption {
     pchNone,
     pchCreateUsingSpecific,
     pchGenerateAuto,
     pchUseUsingSpecific
 };
 enum preprocessOption {
+    preprocessUnknown = -1,
     preprocessNo,
     preprocessYes,
     preprocessNoLineNumbers
 };
 enum ProcessorOptimizeOption {
     procOptimizeBlended,
@@ -327,12 +333,13 @@ enum ProcessorOptimizeOption {
 enum RemoteDebuggerType {
     DbgLocal,
     DbgRemote,
     DbgRemoteTCPIP
 };
 enum runtimeLibraryOption {
+    rtUnknown = -1,
     rtMultiThreaded,
     rtMultiThreadedDebug,
     rtMultiThreadedDLL,
     rtMultiThreadedDebugDLL,
     rtSingleThreaded,
     rtSingleThreadedDebug
@@ -376,12 +383,13 @@ enum useOfATL {
 enum useOfMfc {
     useMfcStdWin,
     useMfcStatic,
     useMfcDynamic
 };
 enum warningLevelOption {
+    warningLevelUnknown = -1,
     warningLevel_0,
     warningLevel_1,
     warningLevel_2,
     warningLevel_3,
     warningLevel_4
 };
@@ -608,15 +616,15 @@ public:
     VCCustomBuildTool();
     virtual ~VCCustomBuildTool(){}
     bool parseOption( const char* ){ return FALSE; };
 
     // Variables
             QStringList             AdditionalDependencies;
-            QString         CommandLine;
+            QStringList             CommandLine;
             QString         Description;
-            QString         Outputs;
+            QStringList             Outputs;
             QString         ToolName;
             QString         ToolPath;
 };
 
 class VCResourceCompilerTool : public VCToolBase
 {
@@ -716,23 +724,30 @@ class VcprojGenerator;
 class VCFilter
 {
 public:
     // Functions
     VCFilter();
     ~VCFilter(){}
-    void generateMOC( QTextStream &strm, QString str ) const;
-    void generateUIC( QTextStream &strm, const QString& str ) const;
+    void addMOCstage( QTextStream &strm, QString str );
+    void addUICstage( QTextStream &strm, QString str );
+    bool addIMGstage( QTextStream &strm, QString str );
+    void modifyPCHstage( QTextStream &strm, QString str );
 
     // Variables
             QString     Name;
             QString     Filter;
             triState    ParseFiles;
             QStringList         Files;
             VcprojGenerator*Project;
-            VCConfiguration*Config;
+    QValueList<VCConfiguration> *Config;
             customBuildCheckCustomBuild;
+            bool        useCustomBuildTool;
+    VCCustomBuildTool   CustomBuildTool;
+            bool        useCompilerTool;
+    VCCLCompilerTool    CompilerTool;
+            bool        flat_files;
 };
 
 class VCProject
 {
 public:
     // Functions
@@ -745,13 +760,13 @@ public:
             QString     ProjectGUID;
             QString     SccProjectName;
             QString     SccLocalPath;
             QString     PlatformName;
 
     // XML sub-parts
-            VCConfigurationConfiguration;
+    QValueList<VCConfiguration> Configuration;
             VCFilter    SourceFiles;
             VCFilter    HeaderFiles;
             VCFilter    MOCFiles;
             VCFilter    UICFiles;
             VCFilter    FormFiles;
             VCFilter    TranslationFiles;
@@ -764,10 +779,10 @@ QTextStream &operator<<( QTextStream &, const VCLinkerTool & );
 QTextStream &operator<<( QTextStream &, const VCMIDLTool & );
 QTextStream &operator<<( QTextStream &, const VCCustomBuildTool & );
 QTextStream &operator<<( QTextStream &, const VCLibrarianTool & );
 QTextStream &operator<<( QTextStream &, const VCResourceCompilerTool & );
 QTextStream &operator<<( QTextStream &, const VCEventTool & );
 QTextStream &operator<<( QTextStream &, const VCConfiguration & );
-QTextStream &operator<<( QTextStream &, const VCFilter & );
+QTextStream &operator<<( QTextStream &, VCFilter & );
 QTextStream &operator<<( QTextStream &, const VCProject & );
 
 #endif //__MSVC_OBJECTMODEL_H__