Changeset 503 for branches


Ignore:
Timestamp:
04/03/14 17:27:58 (5 years ago)
Author:
jls17
Message:
Location:
branches/work_311
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/work_311/doc/DocSchemaDetails.cpp

    r498 r503  
    2020#include "../output/CsvPage.h" 
    2121#include "../output/TabControl.h" 
    22 #include "../output/WOrkflowReferenceTable.h" 
     22#include "../output/WorkflowReferenceTable.h" 
    2323#include "../core/ARDayStructHelper.h" 
    2424#include "DocActionOpenWindowHelper.h" 
  • branches/work_311/output/ImageTag.cpp

    r502 r503  
    1818#include "ImageTag.h" 
    1919#include "../core/ARServerObject.h" 
    20 #include "../util/RootLevel.h" 
     20#include "../output/RootLevel.h" 
    2121 
    2222namespace OUTPUT 
     
    6464        } 
    6565 
    66         ostream& ImageTag::ToStream(std::ostream &strm) 
     66        ostream& ImageTag::ToStream(std::ostream &strm) const 
    6767        { 
    6868                if (imageId != NoImage) 
    6969                { 
    7070                        const char* imageName = GetImageName(imageId); 
    71                         ImageDimensions &imageDim = GetImageDimensions(imageId); 
     71                        ImageDimensions imageDim = GetImageDimensions(imageId); 
    7272 
    7373                        strm << "<img "; 
     
    8585} 
    8686 
    87 ostream& operator <<(ostream &strm, OUTPUT::ImageTag &image) 
     87ostream& operator <<(ostream &strm, const OUTPUT::ImageTag &image) 
    8888{ 
    8989        return image.ToStream(strm); 
  • branches/work_311/output/ImageTag.h

    r502 r503  
    3939                ImageTag(ImageEnum image, int rootLevel); 
    4040 
    41                 std::ostream& ToStream(std::ostream &strm); 
     41                std::ostream& ToStream(std::ostream &strm) const; 
    4242        private: 
    4343                int rootLevel; 
     
    4848 
    4949std::ostream& operator<<(std::ostream& strm, OUTPUT::ImageTag::ImageEnum image); 
    50 std::ostream& operator<<(std::ostream& strm, OUTPUT::ImageTag &image); 
     50std::ostream& operator<<(std::ostream& strm, const OUTPUT::ImageTag &image); 
  • branches/work_311/output/RootLevel.cpp

    r502 r503  
    3939}; // end namespace OUTPUT; 
    4040 
    41 ostream& operator <<(ostream &stream, OUTPUT::RootLevel &rootLevelObj) 
     41ostream& operator <<(ostream &stream, const OUTPUT::RootLevel &rootLevelObj) 
    4242{ 
    4343        stream << rootLevelObj.GetRootPath(); 
  • branches/work_311/output/RootLevel.h

    r502 r503  
    3131}; // end namespace OUTPUT 
    3232 
    33 std::ostream& operator <<(std::ostream &stream, OUTPUT::RootLevel &rootLevelObj); 
     33std::ostream& operator <<(std::ostream &stream, const OUTPUT::RootLevel &rootLevelObj); 
Note: See TracChangeset for help on using the changeset viewer.