From be812877eb9dfa9b921df4f6d88df98af73328c3 Mon Sep 17 00:00:00 2001 From: guigues Date: Wed, 29 Apr 2009 11:01:23 +0000 Subject: [PATCH] Various fixes on argument passing: * If a method takes a NON const reference you cannot provide a temporary (e.g. the return value of another method ) * The same passing pointers as references is both useless and problematic for temporaries --- src2/creaImageIOGimmick.cpp | 9 ++++++--- src2/creaImageIOGimmick.h | 10 ++++++---- src2/creaImageIOGimmickView.h | 2 +- src2/creaImageIOTreeDescriptor.cpp | 4 ++-- src2/creaImageIOTreeDescriptor.h | 2 +- src2/creaImageIOTreeHandlerImageAdder.cpp | 2 +- src2/creaImageIOTreeHandlerImageAdder.h | 2 +- src2/creaImageIOWxGimmickView.cpp | 18 +++++++++--------- src2/creaImageIOWxGimmickView.h | 4 ++-- src2/icons/synchronize.xpm | 2 +- 10 files changed, 30 insertions(+), 25 deletions(-) diff --git a/src2/creaImageIOGimmick.cpp b/src2/creaImageIOGimmick.cpp index 9b8c924..e38db81 100644 --- a/src2/creaImageIOGimmick.cpp +++ b/src2/creaImageIOGimmick.cpp @@ -80,7 +80,8 @@ namespace creaImageIO // @param i_location : DB location // // return : - // /////////////////////////////////////////////////////////////////////// - void Gimmick::addDB(std::string &i_name, std::string &i_location) + void Gimmick::addDB(const std::string &i_name, + const std::string &i_location) { if(mTreeHandlerMap.find(i_name) == mTreeHandlerMap.end()) { @@ -97,7 +98,9 @@ namespace creaImageIO // @param i_locDB : location of DB // // return : the SQLiteTreeHandler object on DB // ///////////////////////////////////////////////////////////////////////// - SQLiteTreeHandler *Gimmick::createDB(std::string &i_name, std::string &i_locDesc, std::string &i_locDB) + SQLiteTreeHandler *Gimmick::createDB(const std::string &i_name, + const std::string &i_locDesc, + const std::string &i_locDB) { SQLiteTreeHandler *sqlTreeH = new SQLiteTreeHandler(i_locDB); // Create or open local database @@ -301,7 +304,7 @@ namespace creaImageIO //======================================================================== void Gimmick::RemoveFile(const std::string& d, - const tree::Node* & node) + tree::Node* node) { mImageAdder.SetSynchronizer(mSynchronizer); mTimestampDatabase->RemoveNode("PATH",node); diff --git a/src2/creaImageIOGimmick.h b/src2/creaImageIOGimmick.h index f93bac1..1265ca1 100644 --- a/src2/creaImageIOGimmick.h +++ b/src2/creaImageIOGimmick.h @@ -93,7 +93,7 @@ namespace creaImageIO /// Removes a file from the given TreeHandler void RemoveFile(const std::string& d, - const tree::Node* & filename); + tree::Node* filename); ///Synchronizes the loaded data with the database. If remove is true the database will be updated, otherwise ///only a warning sign will be issued @@ -102,11 +102,13 @@ namespace creaImageIO /// Prints the tree handled by the handler void Print(const std::string& handler); - ///create a DB from a given descriptor file and for a specific location - SQLiteTreeHandler *createDB(std::string &i_name, std::string &i_locDesc, std::string &i_locDB); + ///create a DB from a given descriptor file and for a specific location + SQLiteTreeHandler *createDB(const std::string &i_name, + const std::string &i_locDesc, + const std::string &i_locDB); // add an existent DB - void addDB(std::string &i_nameDB, std::string &i_locationDB); + void addDB(const std::string &i_nameDB, const std::string &i_locationDB); /// Returns the TreeHandler with a given name TreeHandler* GetTreeHandler(const std::string& name) const; diff --git a/src2/creaImageIOGimmickView.h b/src2/creaImageIOGimmickView.h index ec888e3..ef435c1 100644 --- a/src2/creaImageIOGimmickView.h +++ b/src2/creaImageIOGimmickView.h @@ -80,7 +80,7 @@ namespace creaImageIO { GimmickError("INTERNAL ERROR : ClearSelection not implemented"); } ///Adds a file to ignore - virtual void AddIgnoreFile(const tree::Node* & toRemove) + virtual void AddIgnoreFile(tree::Node* toRemove) { GimmickError("INTERNAL ERROR : AddIgnoreFile not implemented"); } diff --git a/src2/creaImageIOTreeDescriptor.cpp b/src2/creaImageIOTreeDescriptor.cpp index cdbdc15..0d77286 100644 --- a/src2/creaImageIOTreeDescriptor.cpp +++ b/src2/creaImageIOTreeDescriptor.cpp @@ -5,7 +5,7 @@ #include - +#include namespace creaImageIO @@ -145,7 +145,7 @@ namespace creaImageIO // @param : file path // // return : - // ////////////////////////////////////////////////////////////// - void Descriptor::createDescriptorfromFile(std::string &i_name) + void Descriptor::createDescriptorfromFile(const std::string &i_name) { Clear(); diff --git a/src2/creaImageIOTreeDescriptor.h b/src2/creaImageIOTreeDescriptor.h index c2fb7ae..e6863b1 100644 --- a/src2/creaImageIOTreeDescriptor.h +++ b/src2/creaImageIOTreeDescriptor.h @@ -64,7 +64,7 @@ namespace creaImageIO void Clear(); //Create Attribute Descriptors from a file - void createDescriptorfromFile(std::string &i_file); + void createDescriptorfromFile(const std::string &i_file); private: LevelDescriptorListType mLevelDescriptorList; diff --git a/src2/creaImageIOTreeHandlerImageAdder.cpp b/src2/creaImageIOTreeHandlerImageAdder.cpp index 679e156..22c727b 100644 --- a/src2/creaImageIOTreeHandlerImageAdder.cpp +++ b/src2/creaImageIOTreeHandlerImageAdder.cpp @@ -104,7 +104,7 @@ namespace creaImageIO } //===================================================================== - void TreeHandlerImageAdder::RemoveFile( const tree::Node*& node) + void TreeHandlerImageAdder::RemoveFile( tree::Node* node) { int n=node->GetNumberOfChildren(); if(n>0) diff --git a/src2/creaImageIOTreeHandlerImageAdder.h b/src2/creaImageIOTreeHandlerImageAdder.h index c3024dd..6065491 100644 --- a/src2/creaImageIOTreeHandlerImageAdder.h +++ b/src2/creaImageIOTreeHandlerImageAdder.h @@ -108,7 +108,7 @@ namespace creaImageIO void AddDirectory( const std::string& directory, bool recurse); /// Removes a file from the databases - void RemoveFile(const tree::Node*& node); + void RemoveFile(tree::Node* node); /// Removes files from the databases void RemoveFiles(const std::vector& nodes); /// Synchronizes the DB and disk by repeating the operations the user has done and returns a report diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp index ce9c01e..8243867 100644 --- a/src2/creaImageIOWxGimmickView.cpp +++ b/src2/creaImageIOWxGimmickView.cpp @@ -606,7 +606,7 @@ namespace creaImageIO //================================================= - void WxGimmickView::AddIgnoreFile(const tree::Node* & toRemove) + void WxGimmickView::AddIgnoreFile(tree::Node* toRemove) { mGimmick->RemoveFile("Local database",toRemove); GetTreeViewMap()["Local database"]->UpdateLevel(1); @@ -722,14 +722,14 @@ namespace creaImageIO for(int i = 0; i< files.size(); i++) { //get name of DB (file name) - size_t pos = files[i].find_last_of("\\"); - std::string name = crea::wx2std(files[i].substr(pos+1)); - pos = name.find_last_of("."); - name = name.substr(0,pos); - //create TreeHandler - mGimmick->addDB(name, crea::wx2std(files[i])); - //create TreeView - CreateSingleTreeView(name); + size_t pos = files[i].find_last_of(_T("\\")); + std::string name = crea::wx2std(files[i].substr(pos+1)); + pos = name.find_last_of("."); + name = name.substr(0,pos); + //create TreeHandler + mGimmick->addDB(name, crea::wx2std(files[i])); + //create TreeView + CreateSingleTreeView(name); } } } diff --git a/src2/creaImageIOWxGimmickView.h b/src2/creaImageIOWxGimmickView.h index 33870d1..fd22e48 100644 --- a/src2/creaImageIOWxGimmickView.h +++ b/src2/creaImageIOWxGimmickView.h @@ -59,8 +59,8 @@ namespace creaImageIO bool isSelection, int selection, bool mProcess); ///Stops the player void StopPlayer(){mViewer->StopPlayer();} - ///Adds a file to ignore - void AddIgnoreFile(const tree::Node* & toRemove); + ///Adds a file to ignore + void AddIgnoreFile(tree::Node* toRemove); ///Resets the default image void ClearSelection(); diff --git a/src2/icons/synchronize.xpm b/src2/icons/synchronize.xpm index e5d342f..c112456 100644 --- a/src2/icons/synchronize.xpm +++ b/src2/icons/synchronize.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char *synchronize_xpm[] = { +static const char *synchronize_xpm[] = { /* columns rows colors chars-per-pixel */ "48 50 155 2", " c #2FBF25", -- 2.46.1