diff options
| author | Timothy Pearson <[email protected]> | 2013-01-20 00:16:02 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-20 00:16:02 -0600 |
| commit | ca76618006d430d1253cc6cc0a20dc2c6ca666f9 (patch) | |
| tree | 2040fc1d273d66067b34cc67e97f06c2e2602aa1 /kscreensaver/kdesavers/fountain.cpp | |
| parent | de2e00ccad5e4f0ef40e88290954c8ccb7d518a5 (diff) | |
| download | tdeartwork-ca76618006d430d1253cc6cc0a20dc2c6ca666f9.tar.gz tdeartwork-ca76618006d430d1253cc6cc0a20dc2c6ca666f9.zip | |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kscreensaver/kdesavers/fountain.cpp')
| -rw-r--r-- | kscreensaver/kdesavers/fountain.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/kscreensaver/kdesavers/fountain.cpp b/kscreensaver/kdesavers/fountain.cpp index 729e8aa4..47b66998 100644 --- a/kscreensaver/kdesavers/fountain.cpp +++ b/kscreensaver/kdesavers/fountain.cpp @@ -296,13 +296,13 @@ void Fountain::initializeGL () { particle[loop].active=true; // Make All The Particles Active particle[loop].life=1.0f; // Give All The Particles Full Life - particle[loop].fade=float(KApplication::random()%100)/1000.0f+0.003f; // Random Fade Speed + particle[loop].fade=float(TDEApplication::random()%100)/1000.0f+0.003f; // Random Fade Speed particle[loop].r=colors[(loop+1)/(MAX_PARTICLES/12)][0]; // Select Red Rainbow Color particle[loop].g=colors[(loop+1)/(MAX_PARTICLES/12)][1]; // Select Green Rainbow Color particle[loop].b=colors[(loop+1)/(MAX_PARTICLES/12)][2]; // Select Blue Rainbow Color - particle[loop].xi=float((KApplication::random()%50)-26.0f)*10.0f; // Random Speed On X Axis - particle[loop].yi=float((KApplication::random()%50)-25.0f)*10.0f; // Random Speed On Y Axis - particle[loop].zi=float((KApplication::random()%50)-25.0f)*10.0f; // Random Speed On Z Axis + particle[loop].xi=float((TDEApplication::random()%50)-26.0f)*10.0f; // Random Speed On X Axis + particle[loop].yi=float((TDEApplication::random()%50)-25.0f)*10.0f; // Random Speed On Y Axis + particle[loop].zi=float((TDEApplication::random()%50)-25.0f)*10.0f; // Random Speed On Z Axis particle[loop].xg=0.0f; // SetQt::Horizontal Pull To Zero particle[loop].yg=-0.8f; // SetQt::Vertical Pull Downward particle[loop].zg=0.0f; // Set Pull On Z Axis To Zero @@ -401,13 +401,13 @@ void Fountain::paintGL () if (particle[loop].life<0.0f) // If Particle Is Burned Out { particle[loop].life=2.0f; // Give It New Life - particle[loop].fade=float(KApplication::random()%100)/1000.0f+0.003f; // Random Fade Value + particle[loop].fade=float(TDEApplication::random()%100)/1000.0f+0.003f; // Random Fade Value particle[loop].x=0.0f; // Center On X Axis particle[loop].y=0.0f; // Center On Y Axis particle[loop].z=0.0f; // Center On Z Axis - particle[loop].xi=xspeed+float((KApplication::random()%60)-32.0f); // X Axis Speed And Direction - particle[loop].yi=yspeed+float((KApplication::random()%60)-30.0f); // Y Axis Speed And Direction - particle[loop].zi=float((KApplication::random()%60)-30.0f); // Z Axis Speed And Direction + particle[loop].xi=xspeed+float((TDEApplication::random()%60)-32.0f); // X Axis Speed And Direction + particle[loop].yi=yspeed+float((TDEApplication::random()%60)-30.0f); // Y Axis Speed And Direction + particle[loop].zi=float((TDEApplication::random()%60)-30.0f); // Z Axis Speed And Direction particle[loop].r=colors[col][0]; // Select Red From Color Table particle[loop].g=colors[col][1]; // Select Green From Color Table particle[loop].b=colors[col][2]; // Select Blue From Color Table @@ -417,13 +417,13 @@ void Fountain::paintGL () // Explode particle[loop].active=true; // Make All The Particles Active particle[loop].life=1.0f; // Give All The Particles Full Life - particle[loop].fade=float(KApplication::random()%100)/1000.0f+0.003f; // Random Fade Speed + particle[loop].fade=float(TDEApplication::random()%100)/1000.0f+0.003f; // Random Fade Speed particle[loop].r=colors[(loop+1)/(MAX_PARTICLES/12)][0]; // Select Red Rainbow Color particle[loop].g=colors[(loop+1)/(MAX_PARTICLES/12)][1]; // Select Green Rainbow Color particle[loop].b=colors[(loop+1)/(MAX_PARTICLES/12)][2]; // Select Blue Rainbow Color - particle[loop].xi=float((KApplication::random()%50)-26.0f)*10.0f; // Random Speed On X Axis - particle[loop].yi=float((KApplication::random()%50)-25.0f)*10.0f; // Random Speed On Y Axis - particle[loop].zi=float((KApplication::random()%50)-25.0f)*10.0f; // Random Speed On Z Axis + particle[loop].xi=float((TDEApplication::random()%50)-26.0f)*10.0f; // Random Speed On X Axis + particle[loop].yi=float((TDEApplication::random()%50)-25.0f)*10.0f; // Random Speed On Y Axis + particle[loop].zi=float((TDEApplication::random()%50)-25.0f)*10.0f; // Random Speed On Z Axis particle[loop].xg=0.0f; // SetQt::Horizontal Pull To Zero particle[loop].yg=-0.8f; // SetQt::Vertical Pull Downward particle[loop].zg=0.0f; // Set Pull On Z Axis To Zero |