From 5a9cf3b4b9c26344bb7c5c6c6de17eb84370c11a Mon Sep 17 00:00:00 2001 From: danomatika Date: Wed, 2 Dec 2015 00:08:07 -0700 Subject: [PATCH] pointer whitespace formatting --- appUtilsExample/src/scenes/LineScene.h | 4 +- appUtilsExample/src/scenes/ParticleScene.h | 2 +- src/ofxApp.cpp | 26 ++++++------ src/ofxApp.h | 30 +++++++------- src/ofxAppUtils.h | 8 ++-- src/ofxBitmapString.h | 6 +-- src/ofxParticle.cpp | 6 +-- src/ofxParticle.h | 4 +- src/ofxParticleManager.h | 2 +- src/ofxScene.cpp | 2 +- src/ofxScene.h | 6 +-- src/ofxSceneManager.cpp | 46 +++++++++++----------- src/ofxSceneManager.h | 34 ++++++++-------- src/ofxTimer.h | 4 +- 14 files changed, 90 insertions(+), 90 deletions(-) diff --git a/appUtilsExample/src/scenes/LineScene.h b/appUtilsExample/src/scenes/LineScene.h index 1b798b5..9684b0d 100644 --- a/appUtilsExample/src/scenes/LineScene.h +++ b/appUtilsExample/src/scenes/LineScene.h @@ -86,7 +86,7 @@ class LineScene : public ofxFadeScene { // cleanup void exit() { for(unsigned int i = 0; i < lines.size(); ++i) { - Line* l = lines[i]; + Line *l = lines[i]; delete l; } lines.clear(); @@ -108,7 +108,7 @@ class LineScene : public ofxFadeScene { // you can also cast the ofxApp reference to your own derived // class to pass custom data: // - // TestApp* testApp = (TestApp*) (ofxGetAppPtr()); + // TestApp *testApp = (TestApp*) (ofxGetAppPtr()); // // NOTE: you must use "ofxGetAppPtr()" <-- note the "x", // this is a replacement for "ofGetAppPtr()" which does not diff --git a/appUtilsExample/src/scenes/ParticleScene.h b/appUtilsExample/src/scenes/ParticleScene.h index e73f145..6f2f743 100644 --- a/appUtilsExample/src/scenes/ParticleScene.h +++ b/appUtilsExample/src/scenes/ParticleScene.h @@ -114,7 +114,7 @@ class ParticleScene : public ofxFadeScene { // you can also cast the ofxApp reference to your own derived // class to pass custom data: // - // TestApp* testApp = (TestApp*) (ofxGetAppPtr()); + // TestApp *testApp = (TestApp*) (ofxGetAppPtr()); // // NOTE: you must use "ofxGetAppPtr()" <-- note the "x", // this is a replacement for "ofGetAppPtr()" which does not diff --git a/src/ofxApp.cpp b/src/ofxApp.cpp index d657b1f..e977a43 100644 --- a/src/ofxApp.cpp +++ b/src/ofxApp.cpp @@ -62,7 +62,7 @@ float ofxApp::getRenderHeight() { // SCENE MANAGER //-------------------------------------------------------------- -void ofxApp::setSceneManager(ofxSceneManager* manager) { +void ofxApp::setSceneManager(ofxSceneManager *manager) { if(manager == NULL) { ofLogWarning("ofxApp") << "cannot add NULL scene manager"; return; @@ -91,7 +91,7 @@ void ofxApp::drawFramerate(float x, float y) { // RUNNER APP //-------------------------------------------------------------- -ofxApp::RunnerApp::RunnerApp(ofxApp* app) { +ofxApp::RunnerApp::RunnerApp(ofxApp *app) { this->app = app; } @@ -255,20 +255,20 @@ void ofxApp::RunnerApp::gotMessage(ofMessage msg){ // ofBaseSoundInput //-------------------------------------------------------------- -void ofxApp::RunnerApp::audioIn(float * input, int bufferSize, int nChannels, int deviceID, long unsigned long tickCount) { +void ofxApp::RunnerApp::audioIn(float *input, int bufferSize, int nChannels, int deviceID, long unsigned long tickCount) { if(app->_sceneManager) { app->_sceneManager->audioIn(input, bufferSize, nChannels, deviceID, tickCount); } app->audioIn(input, bufferSize, nChannels, deviceID, tickCount); } -void ofxApp::RunnerApp::audioIn(float * input, int bufferSize, int nChannel ) { +void ofxApp::RunnerApp::audioIn(float *input, int bufferSize, int nChannel ) { if(app->_sceneManager) { app->_sceneManager->audioIn(input, bufferSize, nChannel); } app->audioIn(input, bufferSize, nChannel); } -void ofxApp::RunnerApp::audioReceived(float * input, int bufferSize, int nChannels) { +void ofxApp::RunnerApp::audioReceived(float *input, int bufferSize, int nChannels) { if(app->_sceneManager) { app->_sceneManager->audioIn(input, bufferSize, nChannels); } @@ -277,21 +277,21 @@ void ofxApp::RunnerApp::audioReceived(float * input, int bufferSize, int nChanne // ofBaseSoundOutput //-------------------------------------------------------------- -void ofxApp::RunnerApp::audioOut(float * output, int bufferSize, int nChannels, int deviceID, long unsigned long tickCount) { +void ofxApp::RunnerApp::audioOut(float *output, int bufferSize, int nChannels, int deviceID, long unsigned long tickCount) { if(app->_sceneManager) { app->_sceneManager->audioOut(output, bufferSize, nChannels, deviceID, tickCount); } app->audioOut(output, bufferSize, nChannels, deviceID, tickCount); } -void ofxApp::RunnerApp::audioOut(float * output, int bufferSize, int nChannels) { +void ofxApp::RunnerApp::audioOut(float *output, int bufferSize, int nChannels) { if(app->_sceneManager) { app->_sceneManager->audioOut(output, bufferSize, nChannels); } app->audioOut(output, bufferSize, nChannels); } -void ofxApp::RunnerApp::audioRequested(float * output, int bufferSize, int nChannels) { +void ofxApp::RunnerApp::audioRequested(float *output, int bufferSize, int nChannels) { if(app->_sceneManager) { app->_sceneManager->audioOut(output, bufferSize, nChannels); } @@ -301,35 +301,35 @@ void ofxApp::RunnerApp::audioRequested(float * output, int bufferSize, int nChan #ifdef TARGET_OF_IOS // ofxiOSApp //-------------------------------------------------------------- -void ofxApp::RunnerApp::touchDown(ofTouchEventArgs & touch) { +void ofxApp::RunnerApp::touchDown(ofTouchEventArgs &touch) { if(app->_sceneManager) { app->_sceneManager->touchDown(touch); } app->touchDown(touch); } -void ofxApp::RunnerApp::touchMoved(ofTouchEventArgs & touch) { +void ofxApp::RunnerApp::touchMoved(ofTouchEventArgs &touch) { if(app->_sceneManager) { app->_sceneManager->touchMoved(touch); } app->touchMoved(touch); } -void ofxApp::RunnerApp::touchUp(ofTouchEventArgs & touch) { +void ofxApp::RunnerApp::touchUp(ofTouchEventArgs &touch) { if(app->_sceneManager) { app->_sceneManager->touchUp(touch); } app->touchUp(touch); } -void ofxApp::RunnerApp::touchDoubleTap(ofTouchEventArgs & touch) { +void ofxApp::RunnerApp::touchDoubleTap(ofTouchEventArgs &touch) { if(app->_sceneManager) { app->_sceneManager->touchDoubleTap(touch); } app->touchDoubleTap(touch); } -void ofxApp::RunnerApp::touchCancelled(ofTouchEventArgs & touch) { +void ofxApp::RunnerApp::touchCancelled(ofTouchEventArgs &touch) { if(app->_sceneManager) { app->_sceneManager->touchCancelled(touch); } diff --git a/src/ofxApp.h b/src/ofxApp.h index 2862036..38265c6 100644 --- a/src/ofxApp.h +++ b/src/ofxApp.h @@ -94,7 +94,7 @@ class ofxApp : /// the scene manager's update, draw, and input callback functions are /// called automatically which, in turn, calls those of the current scene /// - void setSceneManager(ofxSceneManager* manager); + void setSceneManager(ofxSceneManager *manager); ofxSceneManager* getSceneManager(); void clearSceneManager(); @@ -140,7 +140,7 @@ class ofxApp : bool _bDrawFramerate; //< draw the dramerate in debug mode? default: true ofColor _framerateColor; //< framerate text color - ofxSceneManager* _sceneManager; //< optional built in scene manager + ofxSceneManager *_sceneManager; //< optional built in scene manager bool _bSceneManagerUpdate; //< call scene manager update automatically? bool _bSceneManagerDraw; //< call scene manager draw automatically? @@ -158,7 +158,7 @@ class ofxApp : public: - RunnerApp(ofxApp* app); + RunnerApp(ofxApp *app); ~RunnerApp(); // ofBaseApp callbacks @@ -181,11 +181,11 @@ class ofxApp : #ifdef TARGET_OF_IOS // ofxIOS callbacks - void touchDown(ofTouchEventArgs & touch); - void touchMoved(ofTouchEventArgs & touch); - void touchUp(ofTouchEventArgs & touch); - void touchDoubleTap(ofTouchEventArgs & touch); - void touchCancelled(ofTouchEventArgs & touch); + void touchDown(ofTouchEventArgs &touch); + void touchMoved(ofTouchEventArgs &touch); + void touchUp(ofTouchEventArgs &touch); + void touchDoubleTap(ofTouchEventArgs &touch); + void touchCancelled(ofTouchEventArgs &touch); void lostFocus(); void gotFocus(); @@ -194,20 +194,20 @@ class ofxApp : #endif // ofBaseSoundInput callbacks - void audioIn(float * input, int bufferSize, int nChannels, int deviceID, long unsigned long tickCount); - void audioIn(float * input, int bufferSize, int nChannels ); - void audioReceived(float * input, int bufferSize, int nChannels); + void audioIn(float *input, int bufferSize, int nChannels, int deviceID, long unsigned long tickCount); + void audioIn(float *input, int bufferSize, int nChannels ); + void audioReceived(float *input, int bufferSize, int nChannels); // ofBaseSoundOutput callbacks - void audioOut(float * output, int bufferSize, int nChannels, int deviceID, long unsigned long tickCount); - void audioOut(float * output, int bufferSize, int nChannels); - void audioRequested(float * output, int bufferSize, int nChannels); + void audioOut(float *output, int bufferSize, int nChannels, int deviceID, long unsigned long tickCount); + void audioOut(float *output, int bufferSize, int nChannels); + void audioRequested(float *output, int bufferSize, int nChannels); ofxApp* getAppPtr() {return app;} private: - ofxApp* app; + ofxApp *app; }; friend class RunnerApp; ///< used to wrap this app diff --git a/src/ofxAppUtils.h b/src/ofxAppUtils.h index b39bd05..b512a88 100644 --- a/src/ofxAppUtils.h +++ b/src/ofxAppUtils.h @@ -22,18 +22,18 @@ /// replace ofRunApp with this in main.cpp, make sure to call ofxGetAppPtr() /// instead of ofGetAppPtr() if you need access to the global ofxApp pointer -inline void ofRunAppWithAppUtils(ofxApp* app) { +inline void ofRunAppWithAppUtils(ofxApp *app) { // wrap up user app with runner #ifdef TARGET_OF_IOS - ofRunApp((ofxiOSApp*) new ofxApp::RunnerApp(app)); + ofRunApp((ofxiOSApp *) new ofxApp::RunnerApp(app)); #else - ofRunApp((ofBaseApp*) new ofxApp::RunnerApp(app)); + ofRunApp((ofBaseApp *) new ofxApp::RunnerApp(app)); #endif } /// get the global ofxApp ptr, important! use this INSTEAD of ofGetAppPtr() /// if you started your app with ofRunAppWithAppUtils() inline ofxApp* ofxGetAppPtr() { - return ((ofxApp::RunnerApp*) ofGetAppPtr())->getAppPtr(); + return ((ofxApp::RunnerApp *) ofGetAppPtr())->getAppPtr(); } diff --git a/src/ofxBitmapString.h b/src/ofxBitmapString.h index 122b9ad..5c1a124 100644 --- a/src/ofxBitmapString.h +++ b/src/ofxBitmapString.h @@ -30,7 +30,7 @@ class ofxBitmapString { public: - ofxBitmapString(const ofPoint & p) { + ofxBitmapString(const ofPoint &p) { pos = p; } @@ -45,13 +45,13 @@ class ofxBitmapString { /// catch the << ostream with a template class to read any type of data template - ofxBitmapString& operator<<(const T& value) { + ofxBitmapString& operator<<(const T &value) { message << value; return *this; } /// catch the << ostream function pointers such as std::endl and std::hex - ofxBitmapString& operator<<(std::ostream& (*func)(std::ostream&)) { + ofxBitmapString& operator<<(std::ostream& (*func)(std::ostream &)) { func(message); return *this; } diff --git a/src/ofxParticle.cpp b/src/ofxParticle.cpp index bcb62c2..f2a7cc3 100644 --- a/src/ofxParticle.cpp +++ b/src/ofxParticle.cpp @@ -39,13 +39,13 @@ ofxParticle::ofxParticle(ofRectangle rect) : ofxParticle::~ofxParticle() {} //-------------------------------------------------------------- -ofxParticle::ofxParticle(const ofxParticle& from) { +ofxParticle::ofxParticle(const ofxParticle &from) { this->ofxParticle::operator=(from); } //-------------------------------------------------------------- -ofxParticle& ofxParticle::operator=(const ofxParticle& from) { - (ofRectangle&) *this = from; // call ofRectangle copy operator +ofxParticle& ofxParticle::operator=(const ofxParticle &from) { + (ofRectangle &)*this = from; // call ofRectangle copy operator bAlive = from.bAlive; lifespan = from.lifespan; age = from.age; diff --git a/src/ofxParticle.h b/src/ofxParticle.h index 59b22f6..8d7a6d9 100644 --- a/src/ofxParticle.h +++ b/src/ofxParticle.h @@ -26,10 +26,10 @@ class ofxParticle : public ofRectangle { virtual ~ofxParticle(); /// copy constructor - ofxParticle(const ofxParticle& from); + ofxParticle(const ofxParticle &from); /// copy operator - ofxParticle& operator=(const ofxParticle& from); + ofxParticle& operator=(const ofxParticle &from); /// \section Main diff --git a/src/ofxParticleManager.h b/src/ofxParticleManager.h index eced155..a28cc68 100644 --- a/src/ofxParticleManager.h +++ b/src/ofxParticleManager.h @@ -27,7 +27,7 @@ class ofxParticleManager { /// add a particle to the particle list, /// note: the particle will be destroyed by this object - void addParticle(ofxParticle* particle) { + void addParticle(ofxParticle *particle) { if(particle == NULL) { ofLogWarning("ofxParticleManager") << "cannot add NULL particle"; return; diff --git a/src/ofxScene.cpp b/src/ofxScene.cpp index c0fd5bc..8eea57b 100644 --- a/src/ofxScene.cpp +++ b/src/ofxScene.cpp @@ -13,7 +13,7 @@ /// RUNNER SCENE //-------------------------------------------------------------- -ofxScene::RunnerScene::RunnerScene(ofxScene* scene) { +ofxScene::RunnerScene::RunnerScene(ofxScene *scene) { this->scene = scene; } diff --git a/src/ofxScene.h b/src/ofxScene.h index 4814249..4a8f2b7 100644 --- a/src/ofxScene.h +++ b/src/ofxScene.h @@ -121,7 +121,7 @@ class ofxScene : public: - RunnerScene(ofxScene* scene); + RunnerScene(ofxScene *scene); ~RunnerScene(); // need these for proper entering/exit, etc @@ -130,7 +130,7 @@ class ofxScene : void draw(); void exit(); - ofxScene* scene; + ofxScene *scene; }; friend class RunnerScene; //< used to wrap this app @@ -145,7 +145,7 @@ class ofxFadeScene : public ofxScene { public: - ofxFadeScene(const string& name) : ofxScene(name) { + ofxFadeScene(const string &name) : ofxScene(name) { fadeIn = 0; fadeOut = 0; fadeTimer.set(); diff --git a/src/ofxSceneManager.cpp b/src/ofxSceneManager.cpp index 7fcbfbd..0ec0e59 100644 --- a/src/ofxSceneManager.cpp +++ b/src/ofxSceneManager.cpp @@ -25,7 +25,7 @@ ofxSceneManager::ofxSceneManager() { } //-------------------------------------------------------------- -ofxScene* ofxSceneManager::add(ofxScene* scene) { +ofxScene* ofxSceneManager::add(ofxScene *scene) { if(scene == NULL) { ofLogWarning("ofxSceneManager") << "cannot add NULL scene"; return NULL; @@ -40,7 +40,7 @@ ofxScene* ofxSceneManager::add(ofxScene* scene) { } //-------------------------------------------------------------- -void ofxSceneManager::remove(ofxScene* scene) { +void ofxSceneManager::remove(ofxScene *scene) { if(scene == NULL) { ofLogWarning("ofxSceneManager") << "cannot remove NULL scene"; return; @@ -48,7 +48,7 @@ void ofxSceneManager::remove(ofxScene* scene) { map::iterator iter; map::iterator diter; for(iter = _scenes.begin(); iter != _scenes.end(); ++iter) { - ofxScene::RunnerScene* s = (*iter).second; + ofxScene::RunnerScene *s = (*iter).second; if(s->scene == scene) { if(s != NULL) { s->exit(); @@ -65,7 +65,7 @@ void ofxSceneManager::remove(ofxScene* scene) { void ofxSceneManager::clear() { map::iterator iter; for(iter = _scenes.begin(); iter != _scenes.end(); ++iter) { - ofxScene::RunnerScene* s = (*iter).second; + ofxScene::RunnerScene *s = (*iter).second; if(s != NULL) { s->exit(); delete s; @@ -80,7 +80,7 @@ void ofxSceneManager::setup(bool loadAll) { if(loadAll) { map::iterator iter; for(iter = _scenes.begin(); iter != _scenes.end(); ++iter) { - ofxScene::RunnerScene* s = (*iter).second; + ofxScene::RunnerScene *s = (*iter).second; s->setup(); } } else { // load the current one only @@ -150,7 +150,7 @@ void ofxSceneManager::gotoScene(unsigned int index, bool now) { return; } - ofxScene* s; + ofxScene *s; if(_currentScene == (int) index) { ofLogWarning("ofxSceneManager") << "ignoring duplicate goto scene change"; return; @@ -192,12 +192,12 @@ ofxScene* ofxSceneManager::getScene(std::string name) { } ofxScene* ofxSceneManager::getSceneAt(unsigned int index) { - ofxScene::RunnerScene* rs = _getRunnerSceneAt(index); + ofxScene::RunnerScene *rs = _getRunnerSceneAt(index); return rs == NULL ? NULL : rs->scene; } std::string ofxSceneManager::getSceneName(unsigned int index) { - ofxScene* s = getSceneAt(index); + ofxScene *s = getSceneAt(index); return s == NULL ? "" : s->getName(); } @@ -247,7 +247,7 @@ void ofxSceneManager::update() { // update the current main scene if(!_scenes.empty() && _currentScene >= 0) { - ofxScene* s = _currentScenePtr; + ofxScene *s = _currentScenePtr; // call setup if scene is not setup yet if(!s->isSetup()) { @@ -264,7 +264,7 @@ void ofxSceneManager::update() { // update the new scene, if there is one if(_bOverlap && !_scenes.empty() && _newScene != SCENE_NOCHANGE && _newScene >= 0) { - ofxScene* next_s = getSceneAt(_newScene); + ofxScene *next_s = getSceneAt(_newScene); if(!next_s->isSetup()) { _newRunnerScenePtr->setup(); } @@ -322,7 +322,7 @@ void ofxSceneManager::mouseReleased(int x, int y, int button) { void ofxSceneManager::windowResized(int w, int h) { map::iterator iter; for(iter = _scenes.begin(); iter != _scenes.end(); ++iter) { - ofxScene::RunnerScene* s = (*iter).second; + ofxScene::RunnerScene *s = (*iter).second; s->windowResized(w, h); } } @@ -342,31 +342,31 @@ void ofxSceneManager::gotMessage(ofMessage msg){ #ifdef TARGET_OF_IOS // ofxIOSApp //-------------------------------------------------------------- -void ofxSceneManager::touchDown(ofTouchEventArgs & touch) { +void ofxSceneManager::touchDown(ofTouchEventArgs &touch) { if(!_scenes.empty() && _currentScene >= 0) { _currentScenePtr->touchDown(touch); } } -void ofxSceneManager::touchMoved(ofTouchEventArgs & touch) { +void ofxSceneManager::touchMoved(ofTouchEventArgs &touch) { if(!_scenes.empty() && _currentScene >= 0) { _currentScenePtr->touchMoved(touch); } } -void ofxSceneManager::touchUp(ofTouchEventArgs & touch) { +void ofxSceneManager::touchUp(ofTouchEventArgs &touch) { if(!_scenes.empty() && _currentScene >= 0) { _currentScenePtr->touchUp(touch); } } -void ofxSceneManager::touchDoubleTap(ofTouchEventArgs & touch) { +void ofxSceneManager::touchDoubleTap(ofTouchEventArgs &touch) { if(!_scenes.empty() && _currentScene >= 0) { _currentScenePtr->touchDoubleTap(touch); } } -void ofxSceneManager::touchCancelled(ofTouchEventArgs & touch) { +void ofxSceneManager::touchCancelled(ofTouchEventArgs &touch) { if(!_scenes.empty() && _currentScene >= 0) { _currentScenePtr->touchCancelled(touch); } @@ -394,7 +394,7 @@ void ofxSceneManager::gotMemoryWarning() { void ofxSceneManager::deviceOrientationChanged(int newOrientation) { map::iterator iter; for(iter = _scenes.begin(); iter != _scenes.end(); ++iter) { - ofxScene::RunnerScene* s = (*iter).second; + ofxScene::RunnerScene *s = (*iter).second; s->deviceOrientationChanged(newOrientation); } } @@ -402,18 +402,18 @@ void ofxSceneManager::deviceOrientationChanged(int newOrientation) { // ofBaseSoundInput //-------------------------------------------------------------- -void ofxSceneManager::audioIn(float * input, int bufferSize, int nChannels, int deviceID, long unsigned long tickCount) { +void ofxSceneManager::audioIn(float *input, int bufferSize, int nChannels, int deviceID, long unsigned long tickCount) { if(!_scenes.empty() && _currentScene >= 0) { _currentScenePtr->audioIn(input, bufferSize, nChannels, deviceID, tickCount); } } -void ofxSceneManager::audioIn(float * input, int bufferSize, int nChannel ) { +void ofxSceneManager::audioIn(float *input, int bufferSize, int nChannel ) { if(!_scenes.empty() && _currentScene >= 0) { _currentScenePtr->audioIn(input, bufferSize, nChannel); } } -void ofxSceneManager::audioReceived(float * input, int bufferSize, int nChannels) { +void ofxSceneManager::audioReceived(float *input, int bufferSize, int nChannels) { if(!_scenes.empty() && _currentScene >= 0) { _currentScenePtr->audioIn(input, bufferSize, nChannels); } @@ -421,19 +421,19 @@ void ofxSceneManager::audioReceived(float * input, int bufferSize, int nChannels // ofBaseSoundOutput //-------------------------------------------------------------- -void ofxSceneManager::audioOut(float * output, int bufferSize, int nChannels, int deviceID, long unsigned long tickCount) { +void ofxSceneManager::audioOut(float *output, int bufferSize, int nChannels, int deviceID, long unsigned long tickCount) { if(!_scenes.empty() && _currentScene >= 0) { _currentScenePtr->audioOut(output, bufferSize, nChannels, deviceID, tickCount); } } -void ofxSceneManager::audioOut(float * output, int bufferSize, int nChannels) { +void ofxSceneManager::audioOut(float *output, int bufferSize, int nChannels) { if(!_scenes.empty() && _currentScene >= 0) { _currentScenePtr->audioOut(output, bufferSize, nChannels); } } -void ofxSceneManager::audioRequested(float * output, int bufferSize, int nChannels) { +void ofxSceneManager::audioRequested(float *output, int bufferSize, int nChannels) { if(!_scenes.empty() && _currentScene >= 0) { _currentScenePtr->audioOut(output, bufferSize, nChannels); } diff --git a/src/ofxSceneManager.h b/src/ofxSceneManager.h index ec86b49..7aac7ac 100644 --- a/src/ofxSceneManager.h +++ b/src/ofxSceneManager.h @@ -29,10 +29,10 @@ class ofxSceneManager { /// add a scene /// returns a pointer to the scene or NULL if the scene could not be added - ofxScene* add(ofxScene* scene); + ofxScene* add(ofxScene *scene); // remove a scene - void remove(ofxScene* scene); + void remove(ofxScene *scene); // clear all scenes void clear(); @@ -119,11 +119,11 @@ class ofxSceneManager { #ifdef TARGET_OF_IOS /// ofxIOSApp callbacks - void touchDown(ofTouchEventArgs & touch); - void touchMoved(ofTouchEventArgs & touch); - void touchUp(ofTouchEventArgs & touch); - void touchDoubleTap(ofTouchEventArgs & touch); - void touchCancelled(ofTouchEventArgs & touch); + void touchDown(ofTouchEventArgs &touch); + void touchMoved(ofTouchEventArgs &touch); + void touchUp(ofTouchEventArgs &touch); + void touchDoubleTap(ofTouchEventArgs &touch); + void touchCancelled(ofTouchEventArgs &touch); void lostFocus(); void gotFocus(); @@ -135,14 +135,14 @@ class ofxSceneManager { #endif /// ofBaseSoundInput callbacks - void audioIn(float * input, int bufferSize, int nChannels, int deviceID, long unsigned long tickCount); - void audioIn(float * input, int bufferSize, int nChannels ); - void audioReceived(float * input, int bufferSize, int nChannels); + void audioIn(float *input, int bufferSize, int nChannels, int deviceID, long unsigned long tickCount); + void audioIn(float *input, int bufferSize, int nChannels ); + void audioReceived(float *input, int bufferSize, int nChannels); /// ofBaseSoundOutput callbacks - void audioOut(float * output, int bufferSize, int nChannels, int deviceID, long unsigned long tickCount); - void audioOut(float * output, int bufferSize, int nChannels); - void audioRequested(float * output, int bufferSize, int nChannels); + void audioOut(float *output, int bufferSize, int nChannels, int deviceID, long unsigned long tickCount); + void audioOut(float *output, int bufferSize, int nChannels); + void audioRequested(float *output, int bufferSize, int nChannels); private: @@ -161,15 +161,15 @@ class ofxSceneManager { SCENE_NONE = -1, }; - ofxScene* _currentScenePtr; //< pointer to the current scene - ofxScene::RunnerScene* _currentRunnerScenePtr; //< pointer to the current runner scene - ofxScene::RunnerScene* _newRunnerScenePtr; //< pointer to the next runner scene (when overlapping) + ofxScene *_currentScenePtr; //< pointer to the current scene + ofxScene::RunnerScene *_currentRunnerScenePtr; //< pointer to the current runner scene + ofxScene::RunnerScene *_newRunnerScenePtr; //< pointer to the next runner scene (when overlapping) int _currentScene; //< the current scene, < 0 if none int _newScene; //< scene to change to bool _bChangeNow; //< ignore enter and exit when changing scenes? bool _bOverlap; //< make new scenes start entering while current scene is finishing? - std::map _scenes; //< scenes + std::map _scenes; //< scenes bool _bSignalledAutoChange; //< has an automatic change been called? unsigned int _minChangeTimeMS; //< minimum ms to wait before accepting scene change commands diff --git a/src/ofxTimer.h b/src/ofxTimer.h index e3d17da..2833ead 100644 --- a/src/ofxTimer.h +++ b/src/ofxTimer.h @@ -22,11 +22,11 @@ class ofxTimer { virtual ~ofxTimer() {} /// copy constructor - ofxTimer(const ofxTimer& from) { + ofxTimer(const ofxTimer &from) { this->ofxTimer::operator=(from); } /// copy operator - ofxTimer& operator=(const ofxTimer& from) { + ofxTimer& operator=(const ofxTimer &from) { alarmMS = from.alarmMS; alarmstamp = from.alarmstamp; timestamp = from.timestamp;