Diffstat (limited to 'qmake/generators/win32/msvc_objectmodel.h') (more/less context) (show whitespace changes)
-rw-r--r-- | qmake/generators/win32/msvc_objectmodel.h | 50 |
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 | |||
@@ -381,45 +381,43 @@ enum useOfMfc { | |||
381 | enum warningLevelOption { | 381 | enum warningLevelOption { |
382 | warningLevel_0, | 382 | warningLevel_0, |
383 | warningLevel_1, | 383 | warningLevel_1, |
384 | warningLevel_2, | 384 | warningLevel_2, |
385 | warningLevel_3, | 385 | warningLevel_3, |
386 | warningLevel_4 | 386 | warningLevel_4 |
387 | }; | 387 | }; |
388 | 388 | ||
389 | class VCToolBase { | 389 | class VCToolBase { |
390 | protected: | 390 | protected: |
391 | // Functions | 391 | // Functions |
392 | VCToolBase(){}; | 392 | VCToolBase(){}; |
393 | ~VCToolBase(){}; | 393 | virtual ~VCToolBase(){} |
394 | virtual bool parseOption( const char* option ) = 0; | 394 | virtual bool parseOption( const char* option ) = 0; |
395 | public: | 395 | public: |
396 | bool parseOptions( QStringList& options ) { | 396 | void parseOptions( QStringList& options ) { |
397 | bool result = TRUE; | 397 | for ( QStringList::ConstIterator it=options.begin(); (it!=options.end()); it++ ) |
398 | for ( QStringList::ConstIterator it=options.begin(); (it!=options.end()) && result; it++ ) | 398 | parseOption( (*it).latin1() ); |
399 | result = parseOption( (*it).latin1() ); | ||
400 | return result; | ||
401 | } | 399 | } |
402 | }; | 400 | }; |
403 | 401 | ||
404 | class VCConfiguration; | 402 | class VCConfiguration; |
405 | class VCProject; | 403 | class VCProject; |
406 | 404 | ||
407 | class VCCLCompilerTool : public VCToolBase | 405 | class VCCLCompilerTool : public VCToolBase |
408 | { | 406 | { |
409 | public: | 407 | public: |
410 | // Functions | 408 | // Functions |
411 | VCCLCompilerTool(); | 409 | VCCLCompilerTool(); |
412 | ~VCCLCompilerTool(){}; | 410 | virtual ~VCCLCompilerTool(){} |
413 | virtual bool parseOption( const char* option ); | 411 | bool parseOption( const char* option ); |
414 | 412 | ||
415 | // Variables | 413 | // Variables |
416 | QStringList AdditionalIncludeDirectories; | 414 | QStringList AdditionalIncludeDirectories; |
417 | QStringList AdditionalOptions; | 415 | QStringList AdditionalOptions; |
418 | QStringList AdditionalUsingDirectories; | 416 | QStringList AdditionalUsingDirectories; |
419 | QString AssemblerListingLocation; | 417 | QString AssemblerListingLocation; |
420 | asmListingOption AssemblerOutput; | 418 | asmListingOption AssemblerOutput; |
421 | basicRuntimeCheckOption BasicRuntimeChecks; | 419 | basicRuntimeCheckOption BasicRuntimeChecks; |
422 | browseInfoOption BrowseInformation; | 420 | browseInfoOption BrowseInformation; |
423 | QString BrowseInformationFile; | 421 | QString BrowseInformationFile; |
424 | triState BufferSecurityCheck; | 422 | triState BufferSecurityCheck; |
425 | callingConventionOption CallingConvention; | 423 | callingConventionOption CallingConvention; |
@@ -471,26 +469,26 @@ public: | |||
471 | pchOption UsePrecompiledHeader; | 469 | pchOption UsePrecompiledHeader; |
472 | triState WarnAsError; | 470 | triState WarnAsError; |
473 | warningLevelOption WarningLevel; | 471 | warningLevelOption WarningLevel; |
474 | triState WholeProgramOptimization; | 472 | triState WholeProgramOptimization; |
475 | VCConfiguration* config; | 473 | VCConfiguration* config; |
476 | }; | 474 | }; |
477 | 475 | ||
478 | class VCLinkerTool : public VCToolBase | 476 | class VCLinkerTool : public VCToolBase |
479 | { | 477 | { |
480 | public: | 478 | public: |
481 | // Functions | 479 | // Functions |
482 | VCLinkerTool(); | 480 | VCLinkerTool(); |
483 | ~VCLinkerTool(){}; | 481 | virtual ~VCLinkerTool(){} |
484 | virtual bool parseOption( const char* option ); | 482 | bool parseOption( const char* option ); |
485 | 483 | ||
486 | // Variables | 484 | // Variables |
487 | QStringList AdditionalDependencies; | 485 | QStringList AdditionalDependencies; |
488 | QStringList AdditionalLibraryDirectories; | 486 | QStringList AdditionalLibraryDirectories; |
489 | QStringList AdditionalOptions; | 487 | QStringList AdditionalOptions; |
490 | QStringList AddModuleNamesToAssembly; | 488 | QStringList AddModuleNamesToAssembly; |
491 | QString BaseAddress; | 489 | QString BaseAddress; |
492 | QStringList DelayLoadDLLs; | 490 | QStringList DelayLoadDLLs; |
493 | optFoldingType EnableCOMDATFolding; | 491 | optFoldingType EnableCOMDATFolding; |
494 | QString EntryPointSymbol; | 492 | QString EntryPointSymbol; |
495 | QStringList ForceSymbolReferences; | 493 | QStringList ForceSymbolReferences; |
496 | QString FunctionOrder; | 494 | QString FunctionOrder; |
@@ -536,26 +534,26 @@ public: | |||
536 | triState TurnOffAssemblyGeneration; | 534 | triState TurnOffAssemblyGeneration; |
537 | QString TypeLibraryFile; | 535 | QString TypeLibraryFile; |
538 | long TypeLibraryResourceID; | 536 | long TypeLibraryResourceID; |
539 | QString Version; | 537 | QString Version; |
540 | VCConfiguration* config; | 538 | VCConfiguration* config; |
541 | }; | 539 | }; |
542 | 540 | ||
543 | class VCMIDLTool : public VCToolBase | 541 | class VCMIDLTool : public VCToolBase |
544 | { | 542 | { |
545 | public: | 543 | public: |
546 | // Functions | 544 | // Functions |
547 | VCMIDLTool(); | 545 | VCMIDLTool(); |
548 | ~VCMIDLTool(){}; | 546 | virtual ~VCMIDLTool(){} |
549 | virtual bool parseOption( const char* option ); | 547 | bool parseOption( const char* option ); |
550 | 548 | ||
551 | // Variables | 549 | // Variables |
552 | QStringList AdditionalIncludeDirectories; | 550 | QStringList AdditionalIncludeDirectories; |
553 | QStringList AdditionalOptions; | 551 | QStringList AdditionalOptions; |
554 | QStringList CPreprocessOptions; | 552 | QStringList CPreprocessOptions; |
555 | midlCharOption DefaultCharType; | 553 | midlCharOption DefaultCharType; |
556 | QString DLLDataFileName; // Should be list? | 554 | QString DLLDataFileName; // Should be list? |
557 | midlErrorCheckOption EnableErrorChecks; | 555 | midlErrorCheckOption EnableErrorChecks; |
558 | triState ErrorCheckAllocations; | 556 | triState ErrorCheckAllocations; |
559 | triState ErrorCheckBounds; | 557 | triState ErrorCheckBounds; |
560 | triState ErrorCheckEnumRange; | 558 | triState ErrorCheckEnumRange; |
561 | triState ErrorCheckRefPointers; | 559 | triState ErrorCheckRefPointers; |
@@ -578,121 +576,121 @@ public: | |||
578 | QStringList UndefinePreprocessorDefinitions; | 576 | QStringList UndefinePreprocessorDefinitions; |
579 | triState ValidateParameters; | 577 | triState ValidateParameters; |
580 | triState WarnAsError; | 578 | triState WarnAsError; |
581 | midlWarningLevelOption WarningLevel; | 579 | midlWarningLevelOption WarningLevel; |
582 | VCConfiguration* config; | 580 | VCConfiguration* config; |
583 | }; | 581 | }; |
584 | 582 | ||
585 | class VCLibrarianTool : public VCToolBase | 583 | class VCLibrarianTool : public VCToolBase |
586 | { | 584 | { |
587 | public: | 585 | public: |
588 | // Functions | 586 | // Functions |
589 | VCLibrarianTool(); | 587 | VCLibrarianTool(); |
590 | ~VCLibrarianTool(){}; | 588 | virtual ~VCLibrarianTool(){} |
591 | virtual bool parseOption( const char* option ){ return FALSE; }; | 589 | bool parseOption( const char* ){ return FALSE; }; |
592 | 590 | ||
593 | // Variables | 591 | // Variables |
594 | QStringList AdditionalDependencies; | 592 | QStringList AdditionalDependencies; |
595 | QStringList AdditionalLibraryDirectories; | 593 | QStringList AdditionalLibraryDirectories; |
596 | QStringList AdditionalOptions; | 594 | QStringList AdditionalOptions; |
597 | QStringList ExportNamedFunctions; | 595 | QStringList ExportNamedFunctions; |
598 | QStringList ForceSymbolReferences; | 596 | QStringList ForceSymbolReferences; |
599 | triState IgnoreAllDefaultLibraries; | 597 | triState IgnoreAllDefaultLibraries; |
600 | QStringList IgnoreDefaultLibraryNames; | 598 | QStringList IgnoreDefaultLibraryNames; |
601 | QString ModuleDefinitionFile; | 599 | QString ModuleDefinitionFile; |
602 | QString OutputFile; | 600 | QString OutputFile; |
603 | triState SuppressStartupBanner; | 601 | triState SuppressStartupBanner; |
604 | }; | 602 | }; |
605 | 603 | ||
606 | class VCCustomBuildTool : public VCToolBase | 604 | class VCCustomBuildTool : public VCToolBase |
607 | { | 605 | { |
608 | public: | 606 | public: |
609 | // Functions | 607 | // Functions |
610 | VCCustomBuildTool(); | 608 | VCCustomBuildTool(); |
611 | ~VCCustomBuildTool(){}; | 609 | virtual ~VCCustomBuildTool(){} |
612 | virtual bool parseOption( const char* option ){ return FALSE; }; | 610 | bool parseOption( const char* ){ return FALSE; }; |
613 | 611 | ||
614 | // Variables | 612 | // Variables |
615 | QStringList AdditionalDependencies; | 613 | QStringList AdditionalDependencies; |
616 | QString CommandLine; | 614 | QString CommandLine; |
617 | QString Description; | 615 | QString Description; |
618 | QString Outputs; | 616 | QString Outputs; |
619 | QString ToolName; | 617 | QString ToolName; |
620 | QString ToolPath; | 618 | QString ToolPath; |
621 | }; | 619 | }; |
622 | 620 | ||
623 | class VCResourceCompilerTool : public VCToolBase | 621 | class VCResourceCompilerTool : public VCToolBase |
624 | { | 622 | { |
625 | public: | 623 | public: |
626 | // Functions | 624 | // Functions |
627 | VCResourceCompilerTool(); | 625 | VCResourceCompilerTool(); |
628 | ~VCResourceCompilerTool(){}; | 626 | virtual ~VCResourceCompilerTool(){} |
629 | virtual bool parseOption( const char* option ){ return FALSE; }; | 627 | bool parseOption( const char* ){ return FALSE; }; |
630 | 628 | ||
631 | // Variables | 629 | // Variables |
632 | QStringList AdditionalIncludeDirectories; | 630 | QStringList AdditionalIncludeDirectories; |
633 | QStringList AdditionalOptions; | 631 | QStringList AdditionalOptions; |
634 | enumResourceLangID Culture; | 632 | enumResourceLangID Culture; |
635 | QStringList FullIncludePath; | 633 | QStringList FullIncludePath; |
636 | triState IgnoreStandardIncludePath; | 634 | triState IgnoreStandardIncludePath; |
637 | QStringList PreprocessorDefinitions; | 635 | QStringList PreprocessorDefinitions; |
638 | QString ResourceOutputFileName; | 636 | QString ResourceOutputFileName; |
639 | linkProgressOption ShowProgress; | 637 | linkProgressOption ShowProgress; |
640 | QString ToolPath; | 638 | QString ToolPath; |
641 | }; | 639 | }; |
642 | 640 | ||
643 | class VCEventTool : public VCToolBase | 641 | class VCEventTool : public VCToolBase |
644 | { | 642 | { |
645 | protected: | 643 | protected: |
646 | // Functions | 644 | // Functions |
647 | VCEventTool() : ExcludedFromBuild( unset ){}; | 645 | VCEventTool() : ExcludedFromBuild( unset ){}; |
648 | ~VCEventTool(){}; | 646 | virtual ~VCEventTool(){} |
649 | virtual bool parseOption( const char* option ){ return FALSE; }; | 647 | bool parseOption( const char* ){ return FALSE; }; |
650 | 648 | ||
651 | public: | 649 | public: |
652 | // Variables | 650 | // Variables |
653 | QString CommandLine; | 651 | QString CommandLine; |
654 | QString Description; | 652 | QString Description; |
655 | triState ExcludedFromBuild; | 653 | triState ExcludedFromBuild; |
656 | QString ToolName; | 654 | QString ToolName; |
657 | QString ToolPath; | 655 | QString ToolPath; |
658 | }; | 656 | }; |
659 | 657 | ||
660 | class VCPostBuildEventTool : public VCEventTool | 658 | class VCPostBuildEventTool : public VCEventTool |
661 | { | 659 | { |
662 | public: | 660 | public: |
663 | VCPostBuildEventTool(); | 661 | VCPostBuildEventTool(); |
664 | ~VCPostBuildEventTool(){}; | 662 | ~VCPostBuildEventTool(){} |
665 | }; | 663 | }; |
666 | 664 | ||
667 | class VCPreBuildEventTool : public VCEventTool | 665 | class VCPreBuildEventTool : public VCEventTool |
668 | { | 666 | { |
669 | public: | 667 | public: |
670 | VCPreBuildEventTool(); | 668 | VCPreBuildEventTool(); |
671 | ~VCPreBuildEventTool(){}; | 669 | ~VCPreBuildEventTool(){} |
672 | }; | 670 | }; |
673 | 671 | ||
674 | class VCPreLinkEventTool : public VCEventTool | 672 | class VCPreLinkEventTool : public VCEventTool |
675 | { | 673 | { |
676 | public: | 674 | public: |
677 | VCPreLinkEventTool(); | 675 | VCPreLinkEventTool(); |
678 | ~VCPreLinkEventTool(){}; | 676 | ~VCPreLinkEventTool(){} |
679 | }; | 677 | }; |
680 | 678 | ||
681 | class VCConfiguration | 679 | class VCConfiguration |
682 | { | 680 | { |
683 | public: | 681 | public: |
684 | // Functions | 682 | // Functions |
685 | VCConfiguration(); | 683 | VCConfiguration(); |
686 | ~VCConfiguration(){}; | 684 | ~VCConfiguration(){} |
687 | 685 | ||
688 | // Variables | 686 | // Variables |
689 | triState ATLMinimizesCRunTimeLibraryUsage; | 687 | triState ATLMinimizesCRunTimeLibraryUsage; |
690 | triState BuildBrowserInformation; | 688 | triState BuildBrowserInformation; |
691 | charSet CharacterSet; | 689 | charSet CharacterSet; |
692 | ConfigurationTypesConfigurationType; | 690 | ConfigurationTypesConfigurationType; |
693 | QString DeleteExtensionsOnClean; | 691 | QString DeleteExtensionsOnClean; |
694 | QString ImportLibrary; | 692 | QString ImportLibrary; |
695 | QString IntermediateDirectory; | 693 | QString IntermediateDirectory; |
696 | QString Name; | 694 | QString Name; |
697 | QString OutputDirectory; | 695 | QString OutputDirectory; |
698 | QString PrimaryOutput; | 696 | QString PrimaryOutput; |
@@ -711,44 +709,44 @@ public: | |||
711 | VCPostBuildEventTool postBuild; | 709 | VCPostBuildEventTool postBuild; |
712 | VCPreBuildEventTool preBuild; | 710 | VCPreBuildEventTool preBuild; |
713 | VCPreLinkEventTool preLink; | 711 | VCPreLinkEventTool preLink; |
714 | VCResourceCompilerTool resource; | 712 | VCResourceCompilerTool resource; |
715 | }; | 713 | }; |
716 | 714 | ||
717 | class VcprojGenerator; | 715 | class VcprojGenerator; |
718 | class VCFilter | 716 | class VCFilter |
719 | { | 717 | { |
720 | public: | 718 | public: |
721 | // Functions | 719 | // Functions |
722 | VCFilter(); | 720 | VCFilter(); |
723 | ~VCFilter(){}; | 721 | ~VCFilter(){} |
724 | void generateMOC( QTextStream &strm, QString str ) const; | 722 | void generateMOC( QTextStream &strm, QString str ) const; |
725 | void generateUIC( QTextStream &strm, const QString& str ) const; | 723 | void generateUIC( QTextStream &strm, const QString& str ) const; |
726 | 724 | ||
727 | // Variables | 725 | // Variables |
728 | QString Name; | 726 | QString Name; |
729 | QString Filter; | 727 | QString Filter; |
730 | triState ParseFiles; | 728 | triState ParseFiles; |
731 | QStringList Files; | 729 | QStringList Files; |
732 | VcprojGenerator*Project; | 730 | VcprojGenerator*Project; |
733 | VCConfiguration*Config; | 731 | VCConfiguration*Config; |
734 | customBuildCheckCustomBuild; | 732 | customBuildCheckCustomBuild; |
735 | }; | 733 | }; |
736 | 734 | ||
737 | class VCProject | 735 | class VCProject |
738 | { | 736 | { |
739 | public: | 737 | public: |
740 | // Functions | 738 | // Functions |
741 | VCProject(); | 739 | VCProject(); |
742 | ~VCProject(){}; | 740 | ~VCProject(){} |
743 | 741 | ||
744 | // Variables | 742 | // Variables |
745 | QString Name; | 743 | QString Name; |
746 | QString Version; | 744 | QString Version; |
747 | QString ProjectGUID; | 745 | QString ProjectGUID; |
748 | QString SccProjectName; | 746 | QString SccProjectName; |
749 | QString SccLocalPath; | 747 | QString SccLocalPath; |
750 | QString PlatformName; | 748 | QString PlatformName; |
751 | 749 | ||
752 | // XML sub-parts | 750 | // XML sub-parts |
753 | VCConfigurationConfiguration; | 751 | VCConfigurationConfiguration; |
754 | VCFilter SourceFiles; | 752 | VCFilter SourceFiles; |