Skip to content

Commit

Permalink
pointer whitespace formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
@danomatika
danomatika committed Dec 2, 2015
1 parent 32465b7 commit 5a9cf3b
Show file tree
Hide file tree
Showing 14 changed files with 90 additions and 90 deletions.
4 changes: 2 additions & 2 deletions appUtilsExample/src/scenes/LineScene.h
View file
Expand Up @@ -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();
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion appUtilsExample/src/scenes/ParticleScene.h
View file
Expand Up @@ -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
Expand Down
26 changes: 13 additions & 13 deletions src/ofxApp.cpp
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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);
}
Expand All @@ -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);
}
Expand All @@ -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);
}
Expand Down
30 changes: 15 additions & 15 deletions src/ofxApp.h
View file
Expand Up @@ -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();

Expand Down Expand Up @@ -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?

Expand All @@ -158,7 +158,7 @@ class ofxApp :

public:

RunnerApp(ofxApp* app);
RunnerApp(ofxApp *app);
~RunnerApp();

// ofBaseApp callbacks
Expand All @@ -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();
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions src/ofxAppUtils.h
View file
Expand Up @@ -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();
}
6 changes: 3 additions & 3 deletions src/ofxBitmapString.h
View file
Expand Up @@ -30,7 +30,7 @@
class ofxBitmapString {
public:

ofxBitmapString(const ofPoint & p) {
ofxBitmapString(const ofPoint &p) {
pos = p;
}

Expand All @@ -45,13 +45,13 @@ class ofxBitmapString {

/// catch the << ostream with a template class to read any type of data
template <class T>
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;
}
Expand Down
6 changes: 3 additions & 3 deletions src/ofxParticle.cpp
View file
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/ofxParticle.h
View file
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/ofxParticleManager.h
View file
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/ofxScene.cpp
View file
Expand Up @@ -13,7 +13,7 @@
/// RUNNER SCENE

//--------------------------------------------------------------
ofxScene::RunnerScene::RunnerScene(ofxScene* scene) {
ofxScene::RunnerScene::RunnerScene(ofxScene *scene) {
this->scene = scene;
}

Expand Down
6 changes: 3 additions & 3 deletions src/ofxScene.h
View file
Expand Up @@ -121,7 +121,7 @@ class ofxScene :

public:

RunnerScene(ofxScene* scene);
RunnerScene(ofxScene *scene);
~RunnerScene();

// need these for proper entering/exit, etc
Expand All @@ -130,7 +130,7 @@ class ofxScene :
void draw();
void exit();

ofxScene* scene;
ofxScene *scene;
};

friend class RunnerScene; //< used to wrap this app
Expand All @@ -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();
Expand Down

0 comments on commit 5a9cf3b

Please sign in to comment.