From fe10685de698bf19bca24767bdf48ffc2932b5e4 Mon Sep 17 00:00:00 2001 From: anaga670 Date: Wed, 7 Aug 2019 11:19:28 -0400 Subject: [PATCH] Fixed namespace in header --- src/VTSMisc.h | 144 +++++++++++++++++++++++++------------------------- 1 file changed, 72 insertions(+), 72 deletions(-) diff --git a/src/VTSMisc.h b/src/VTSMisc.h index cab6440..c28e03c 100644 --- a/src/VTSMisc.h +++ b/src/VTSMisc.h @@ -54,9 +54,9 @@ using namespace csm; #define STATTYPE stat64 #endif -extern list commandQueue; -extern vector menulist; -extern vector menutype; +extern std::list commandQueue; +extern std::vector menulist; +extern std::vector menutype; extern bool debugFlag; extern bool compareDebugFlag; extern bool nitfDebugFlag; @@ -77,119 +77,119 @@ enum ISDType FILENAME_TYPE }; -string ISDType2str(ISDType type); +std::string ISDType2str(ISDType type); -typedef list < string > NameList; +typedef std::list < std::string > NameList; void initMenuList(); -void trim(string& str); +void trim(std::string& str); -void printList(string logFile); +void printList(std::string logFile); // pre: None. -// post: The list of all currently-registered factories has been printed. -void printModelList(string pluginName); +// post: The std::list of all currently-registered factories has been printed. +void printModelList(std::string pluginName); -void makeModelListFromISD(const string isd_name, const Isd * isd, WarningList* warning = NULL); +void makeModelListFromISD(const std::string isd_name, const Isd * isd, WarningList* warning = NULL); // pre: None. // post: A subset of aList has been printed; the subset contains all // factories that can support the given isd. -void listSupportingModels(const string isd_name, +void listSupportingModels(const std::string isd_name, const Isd* isd, NameList& names, WarningList* warnings); -void compareParam(vector param_array, - vector act_val, - vector &pass_fail); +void compareParam(std::vector param_array, + std::vector act_val, + std::vector &pass_fail); -void compareParam(vector param_array, +void compareParam(std::vector param_array, map act_val, map &comp_answer, map &pass_fail); -void compareParam(vector param_array, +void compareParam(std::vector param_array, double *act_val, double *comp_answer, bool *pass_fail); -void compareParam(vector param_array, - vector act_val, +void compareParam(std::vector param_array, + std::vector act_val, map &pass_fail); -void compareParam(vector param_array, +void compareParam(std::vector param_array, map act_val, map &comp_answer, map &pass_fail); // recordLog I -void recordLog(string datafile, - string comment, - string command, - vector param_array, - vector out_param_array); +void recordLog(std::string datafile, + std::string comment, + std::string command, + std::vector param_array, + std::vector out_param_array); // recordLog II -void recordLog(string datafile, - string serialNum, - string timedata, - string comment, - string command, - vector param_array, - vector out_param_array); +void recordLog(std::string datafile, + std::string serialNum, + std::string timedata, + std::string comment, + std::string command, + std::vector param_array, + std::vector out_param_array); // recordLog III -void recordLog(string datafile, - string comment, - string command, - string text); +void recordLog(std::string datafile, + std::string comment, + std::string command, + std::string text); // recordLog IV -void recordLog(string datafile, - string serialNum, - string timedata, - string comment, - string command, - vector param_array, - string text); +void recordLog(std::string datafile, + std::string serialNum, + std::string timedata, + std::string comment, + std::string command, + std::vector param_array, + std::string text); // recordLog V -void recordLog(string datafile, - string comment, - string text); +void recordLog(std::string datafile, + std::string comment, + std::string text); // recordLog VI -void recordLog(string datafile, - const string text); +void recordLog(std::string datafile, + const std::string text); -void echo2Term(string comment, - string command, - string text); +void echo2Term(std::string comment, + std::string command, + std::string text); -void getLogfileName(const string dirName, string *name); +void getLogfileName(const std::string dirName, std::string *name); void reportWarning(WarningList warnings, const char* logFile); void reportError(Error* err, const char* logFile); // prototypes for ISD "constructors" //void initFilenameISD (Isd *isdfilename, -// string isd); +// std::string isd); -void initBytestreamISD(BytestreamIsd *bytestream, string filename) +void initBytestreamISD(BytestreamIsd *bytestream, std::string filename) throw (Error); OSSIM_PLUGINS_DLL void initNitf20ISD(Nitf20Isd *isd, - string fname, + std::string fname, const int imageIndex = -1, WarningList* warnings = NULL); OSSIM_PLUGINS_DLL void initNitf21ISD(Nitf21Isd *isd, - string fname, + std::string fname, const int imageIndex = -1, WarningList* warnings = NULL); -FILE * fillBuff (string fname, +FILE * fillBuff (std::string fname, #ifdef _WIN32 struct stat &statbuf, #else @@ -197,8 +197,8 @@ FILE * fillBuff (string fname, #endif char **buff) throw (Error); -string readStateFile( string fname) throw (Error); -void writeStateFile(string fname, string state) throw (Error); +std::string readStateFile( std::string fname) throw (Error); +void writeStateFile(std::string fname, std::string state) throw (Error); void parseFile(Nitf20Isd *isd, FILE *ifile, @@ -225,34 +225,34 @@ void parseFile(Nitf21Isd *isd, void parseImages (Nitf20Isd *isd, FILE *ifile, const int hl, - const vector imagehdrlengths, - const vector imagelengths, + const std::vector imagehdrlengths, + const std::vector imagelengths, const int imageIndex, const int NUMI); void parseImages (Nitf21Isd *isd, FILE *ifile, const int hl, - const vector imagehdrlengths, - const vector imagelengths, + const std::vector imagehdrlengths, + const std::vector imagelengths, const int imageIndex, const int NUMI); -vector parseTre(int tlen, // length of tre data - string treData); // input tre data +std::vector parseTre(int tlen, // length of tre data + std::string treData); // input tre data void parseDes(Nitf20Isd *isd, FILE *ifile, size_t des_offset, - const vector hdrlengths, - const vector datalengths, + const std::vector hdrlengths, + const std::vector datalengths, const int NUMD); void parseDes(Nitf21Isd *isd, FILE *ifile, size_t des_offset, - const vector hdrlengths, - const vector datalengths, + const std::vector hdrlengths, + const std::vector datalengths, const int NUMD); char* getSegment( FILE *ifile, @@ -263,11 +263,11 @@ void dumpHdr(Nitf20Isd *isd); void dumpHdr(Nitf21Isd *isd); -int getCommandIndex(string command); -vector loadHelpFile(); +int getCommandIndex(std::string command); +std::vector loadHelpFile(); void set_keypress(void); void reset_keypress(void); -string readDataLine(); -vector getCommands(string params); +std::string readDataLine(); +std::vector getCommands(std::string params); #endif // VTSMISC_H