General changes (namespace, deprecated loadFile function) (#7344)

#changelog #core
openframeworks · Feb 24, 2023 · 61a045c · 61a045c
1 parent f6091a0
commit 61a045c
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 19 deletions.
diff --git a/addons/ofxAssimpModelLoader/src/ofxAssimpTexture.cpp b/addons/ofxAssimpModelLoader/src/ofxAssimpTexture.cpp
@@ -6,7 +6,6 @@
 //
 
 #include "ofxAssimpTexture.h"
-#include "ofConstants.h"
 #include "ofLog.h"
 
 void ofxAssimpTexture::setup(const ofTexture & texture, std::string texturePath, bool bTexRepeat) {

diff --git a/addons/ofxGui/src/ofxSliderGroup.cpp b/addons/ofxGui/src/ofxSliderGroup.cpp
@@ -1,5 +1,4 @@
 #include "ofxSliderGroup.h"
-using namespace std;
 
 template<class VecType>
 ofxVecSlider_<VecType>::ofxVecSlider_(ofParameter<VecType> value, float width, float height){
@@ -13,7 +12,7 @@ ofxVecSlider_<VecType> * ofxVecSlider_<VecType>::setup(ofParameter<VecType> valu
 
     parameters.clear();
 	listeners.unsubscribeAll();
-    const string names[4] = {"x", "y", "z", "w"};
+    const std::string names[4] = {"x", "y", "z", "w"};
 
     this->value.makeReferenceTo(value);
 	listeners.push(this->value.newListener(this, & ofxVecSlider_::changeValue));
@@ -130,7 +129,7 @@ ofxColorSlider_<ColorType> * ofxColorSlider_<ColorType>::setup(ofParameter<ofCol
     ofxGuiGroup::setup(value.getName(), "", 0, 0);
     parameters.clear();
 
-	const string names[4] = {"r", "g", "b", "a"};
+	const std::string names[4] = {"r", "g", "b", "a"};
 
     ofColor_<ColorType> val = value;
     ofColor_<ColorType> min = value.getMin();

diff --git a/addons/ofxThreadedImageLoader/src/ofxThreadedImageLoader.cpp b/addons/ofxThreadedImageLoader/src/ofxThreadedImageLoader.cpp
@@ -19,7 +19,7 @@ ofxThreadedImageLoader::~ofxThreadedImageLoader(){
 
 // Load an image from disk.
 //--------------------------------------------------------------
-void ofxThreadedImageLoader::loadFromDisk(ofImage& image, string filename) {
+void ofxThreadedImageLoader::loadFromDisk(ofImage& image, std::string filename) {
 	nextID++;
 	ofImageLoaderEntry entry(image);
 	entry.filename = filename;
@@ -32,7 +32,7 @@ void ofxThreadedImageLoader::loadFromDisk(ofImage& image, string filename) {
 
 // Load an url asynchronously from an url.
 //--------------------------------------------------------------
-void ofxThreadedImageLoader::loadFromURL(ofImage& image, string url) {
+void ofxThreadedImageLoader::loadFromURL(ofImage& image, std::string url) {
 	nextID++;
 	ofImageLoaderEntry entry(image);
 	entry.url = url;

diff --git a/addons/ofxThreadedImageLoader/src/ofxThreadedImageLoader.h b/addons/ofxThreadedImageLoader/src/ofxThreadedImageLoader.h
@@ -3,19 +3,16 @@
 #include "ofThread.h"
 #include "ofImage.h"
 #include "ofURLFileLoader.h"
-#include "ofTypes.h" 
+#include "ofTypes.h"
 #include "ofThreadChannel.h"
 
-
-using namespace std;
-
 class ofxThreadedImageLoader : public ofThread {
 public:
     ofxThreadedImageLoader();
     ~ofxThreadedImageLoader();
 
-	void loadFromDisk(ofImage& image, string file);
-	void loadFromURL(ofImage& image, string url);
+	void loadFromDisk(ofImage& image, std::string file);
+	void loadFromURL(ofImage& image, std::string url);
 
 
 
@@ -26,6 +23,7 @@ class ofxThreadedImageLoader : public ofThread {
 
     // Entry to load.
     struct ofImageLoaderEntry {
+    public:
         ofImageLoaderEntry() {
             image = NULL;
         }
@@ -34,18 +32,18 @@ class ofxThreadedImageLoader : public ofThread {
             image = &pImage;
         }
         ofImage* image;
-        string filename;
-        string url;
-        string name;
+        std::string filename;
+        std::string url;
+        std::string name;
     };
 
 
-    typedef map<string, ofImageLoaderEntry>::iterator entry_iterator;
+    typedef std::map<std::string, ofImageLoaderEntry>::iterator entry_iterator;
 
 	int                 nextID;
     int                 lastUpdate;
 
-	map<string,ofImageLoaderEntry> images_async_loading; // keeps track of images which are loading async
+	std::map<std::string,ofImageLoaderEntry> images_async_loading; // keeps track of images which are loading async
 	ofThreadChannel<ofImageLoaderEntry> images_to_load_from_disk;
 	ofThreadChannel<ofImageLoaderEntry> images_to_update;
 };

diff --git a/addons/ofxXmlSettings/src/ofxXmlSettings.cpp b/addons/ofxXmlSettings/src/ofxXmlSettings.cpp
@@ -28,7 +28,6 @@ static vector<string> tokenize(const string & str, const string & delim)
   }
   return tokens;
 }
-//----------------------------------------
 
 //----------------------------------------
 ofxXmlSettings::ofxXmlSettings():
@@ -48,7 +47,7 @@ ofxXmlSettings::ofxXmlSettings(const string& xmlFile):
 	//we do this so that we have a valid handle
 	//without the need for loadFile
 	storedHandle   = TiXmlHandle(&doc);
-	loadFile(xmlFile);
+	load(xmlFile);
 }
 
 //---------------------------------------------------------