Skip to content

Commit 692cfb4

Browse files
authored
[[deprecated]] PR (#7792)
#changelog #deprecated
1 parent 59ad680 commit 692cfb4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1315
-1175
lines changed

addons/ofxAssimpModelLoader/src/ofxAssimpModelLoader.h

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,15 @@ class ofxAssimpModelLoader{
4747
bool load(std::string modelName, int assimpOptimizeFlags=OPTIMIZE_DEFAULT);
4848
bool load(ofBuffer & buffer, int assimpOptimizeFlags=OPTIMIZE_DEFAULT, const char * extension="");
4949

50-
OF_DEPRECATED_MSG("ofxAssimpModelLoader::load(std::string modelName, bool bOptimize) is deprecated, use load(std::string modelName, int assimpOptimizeFlags) instead.", bool load(std::string modelName, bool optimize));
51-
OF_DEPRECATED_MSG("ofxAssimpModelLoader::load(ofBuffer & buffer, bool optimize=false, const char * extension="") is deprecated, use load(std::string modelName, int assimpOptimizeFlags) instead.", bool load(ofBuffer & buffer, bool optimize, const char * extension));
50+
[[deprecated("use load(std::string modelName, int assimpOptimizeFlags)")]]
51+
bool load(std::string modelName, bool optimize);
52+
[[deprecated("use load(std::string modelName, int assimpOptimizeFlags)")]]
53+
bool load(ofBuffer & buffer, bool optimize, const char * extension);
5254

53-
OF_DEPRECATED_MSG("ofxAssimpModelLoader::loadModel() is deprecated, use load() instead.", bool loadModel(std::string modelName, bool optimize=false));
54-
OF_DEPRECATED_MSG("ofxAssimpModelLoader::loadModel() is deprecated, use load() instead.", bool loadModel(ofBuffer & buffer, bool optimize=false, const char * extension=""));
55+
[[deprecated("use load()")]]
56+
bool loadModel(std::string modelName, bool optimize=false);
57+
[[deprecated("use load()")]]
58+
bool loadModel(ofBuffer & buffer, bool optimize=false, const char * extension="");
5559

5660
void createEmptyModel();
5761
void createLightsFromAiModel();
@@ -72,10 +76,14 @@ class ofxAssimpModelLoader{
7276
void setPausedForAllAnimations(bool pause);
7377
void setLoopStateForAllAnimations(ofLoopType state);
7478
void setPositionForAllAnimations(float position);
75-
OF_DEPRECATED_MSG("Use ofxAssimpAnimation instead", void setAnimation(int animationIndex));
76-
OF_DEPRECATED_MSG("Use ofxAssimpAnimation instead", void setNormalizedTime(float time));
77-
OF_DEPRECATED_MSG("Use ofxAssimpAnimation instead", void setTime(float time));
78-
OF_DEPRECATED_MSG("Use ofxAssimpAnimation instead", float getDuration(int animationIndex));
79+
[[deprecated("Use ofxAssimpAnimation")]]
80+
void setAnimation(int animationIndex);
81+
[[deprecated("Use ofxAssimpAnimation")]]
82+
void setNormalizedTime(float time);
83+
[[deprecated("Use ofxAssimpAnimation")]]
84+
void setTime(float time);
85+
[[deprecated("Use ofxAssimpAnimation")]]
86+
float getDuration(int animationIndex);
7987

8088
bool hasMeshes();
8189
unsigned int getMeshCount();

addons/ofxKinect/src/ofxKinect.h

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -175,16 +175,20 @@ class ofxKinect : public ofxBase3DVideo, protected ofThread {
175175
const ofFloatPixels & getDistancePixels() const;
176176

177177
/// get the video (ir or rgb) texture
178-
ofTexture& getTexture();
179-
const ofTexture& getTexture() const;
180-
OF_DEPRECATED_MSG("Use getTexture() instead", ofTexture& getTextureReference());
181-
OF_DEPRECATED_MSG("Use getTexture() instead", const ofTexture& getTextureReference() const);
178+
ofTexture & getTexture();
179+
const ofTexture & getTexture() const;
180+
[[deprecated("Use getTexture()")]]
181+
ofTexture & getTextureReference();
182+
[[deprecated("Use getTexture()")]]
183+
const ofTexture & getTextureReference() const;
182184

183185
/// get the grayscale depth texture
184-
ofTexture& getDepthTexture();
185-
const ofTexture& getDepthTexture() const;
186-
OF_DEPRECATED_MSG("Use getDepthTexture() instead", ofTexture& getDepthTextureReference());
187-
OF_DEPRECATED_MSG("Use getDepthTexture() instead", const ofTexture& getDepthTextureReference() const);
186+
ofTexture & getDepthTexture();
187+
const ofTexture & getDepthTexture() const;
188+
[[deprecated("Use getDepthTexture()")]]
189+
ofTexture & getDepthTextureReference();
190+
[[deprecated("Use getDepthTexture()")]]
191+
const ofTexture & getDepthTextureReference() const;
188192

189193
/// \section Grayscale Depth Value
190194

addons/ofxNetwork/src/ofxNetworkUtils.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ void ofxNetworkLogError(int err, const char* file=__FILE__, int line=__LINE__-1)
5757
* @param line the line where the error happened, generally __LINE__
5858
* @return int the last network error
5959
*/
60-
OF_DEPRECATED_MSG("use ofxNetworkLogError(ofxNetworkGetLastError(), file, line) instead", int ofxNetworkCheckErrno(const char* file, int line) );
60+
[[deprecated("use ofxNetworkLogError(ofxNetworkGetLastError(), file, line)")]]
61+
int ofxNetworkCheckErrno(const char* file, int line) ;
6162

6263

0 commit comments

Comments
 (0)