TDE
/
tdeartwork
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdeartwork
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KApplication to TDEApplication to avoid conflicts with KDE4

Browse Source
pull/1/head
Timothy Pearson 11 years ago
parent de2e00ccad
commit ca76618006
7 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File

24
kscreensaver/kdesavers/fountain.cpp
Unescape View File

@ -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

12
kscreensaver/kdesavers/gravity.cpp
Unescape View File

@ -398,18 +398,18 @@ void Gravity::buildParticle(int loop)
{0.5f,0.5f,1.0f},{0.75f,0.5f,1.0f},{1.0f,0.5f,1.0f},{1.0f,0.5f,0.75f}};
col = ( ++col ) % 12;
particle[loop].active=true;
particle[loop].index=KApplication::random()%100;
particle[loop].index=TDEApplication::random()%100;
particle[loop].indexo=particle[loop].index;
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].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
particle[loop].size=size;
particle[loop].x = float(KApplication::random()%100-50)*4.0;
particle[loop].y = float(KApplication::random()%20-10)*4.0;
particle[loop].z = float(KApplication::random()%100-50)*4.0;
particle[loop].x = float(TDEApplication::random()%100-50)*4.0;
particle[loop].y = float(TDEApplication::random()%20-10)*4.0;
particle[loop].z = float(TDEApplication::random()%100-50)*4.0;
particle[loop].xo = particle[loop].x;
if ((1+(KApplication::random() % 10) > 5))
if ((1+(TDEApplication::random() % 10) > 5))
particle[loop].yo = particle[loop].y;
else
particle[loop].yo = 0.0;

30
kscreensaver/kdesavers/slideshow.cpp
Unescape View File

@ -194,7 +194,7 @@ int kSlideShowSaver::effectMultiCircleOut(bool aInit)
pa.setPoint(0, mw>>1, mh>>1);
pa.setPoint(3, mw>>1, mh>>1);
mfy = sqrt((double)mw*mw + mh*mh) / 2;
mi = KApplication::random()%15 + 2;
mi = TDEApplication::random()%15 + 2;
mfd = M_PI*2/mi;
mAlpha = mfd;
mwait = 10 * mi;
@ -320,7 +320,7 @@ int kSlideShowSaver::effectMeltdown(bool aInit)
y = mIntArray[i];
if (y >= mh) continue;
done = false;
if ((KApplication::random()&15) < 6) continue;
if ((TDEApplication::random()&15) < 6) continue;
bitBlt(TQT_TQPAINTDEVICE(this), x, y+mdy, TQT_TQPAINTDEVICE(this), x, y, mdx, mh-y-mdy, CopyROP, true);
bitBlt(TQT_TQPAINTDEVICE(this), x, y, TQT_TQPAINTDEVICE(&mNextScreen), x, y, mdx, mdy, CopyROP, true);
mIntArray[i] += mdy;
@ -388,7 +388,7 @@ int kSlideShowSaver::effectSweep(bool aInit)
{
// subtype: 0=sweep right to left, 1=sweep left to right
// 2=sweep bottom to top, 3=sweep top to bottom
mSubType = KApplication::random() % 4;
mSubType = TDEApplication::random() % 4;
mw = width();
mh = height();
mdx = (mSubType==1 ? 16 : -16);
@ -451,9 +451,9 @@ int kSlideShowSaver::effectBlobs(bool aInit)
return -1;
}
mx = KApplication::random() % mw;
my = KApplication::random() % mh;
r = (KApplication::random() % 200) + 50;
mx = TDEApplication::random() % mw;
my = TDEApplication::random() % mh;
r = (TDEApplication::random() % 200) + 50;
mPainter.drawEllipse(mx-r, my-r, r, r);
mi--;
@ -467,7 +467,7 @@ int kSlideShowSaver::effectRandom(bool /*aInit*/)
{
int x, y, i, w, h, fact, sz;
fact = (KApplication::random() % 3) + 1;
fact = (TDEApplication::random() % 3) + 1;
w = width() >> fact;
h = height() >> fact;
@ -475,8 +475,8 @@ int kSlideShowSaver::effectRandom(bool /*aInit*/)
for (i = (w*h)<<1; i > 0; i--)
{
x = (KApplication::random() % w) << fact;
y = (KApplication::random() % h) << fact;
x = (TDEApplication::random() % w) << fact;
y = (TDEApplication::random() % h) << fact;
bitBlt(TQT_TQPAINTDEVICE(this), x, y, TQT_TQPAINTDEVICE(&mNextScreen), x, y, sz, sz, CopyROP, true);
}
showNextScreen();
@ -572,7 +572,7 @@ int kSlideShowSaver::effectIncomingEdges(bool aInit)
mfx = mix / 100.0;
mfy = miy / 100.0;
mi = 0;
mSubType = KApplication::random() & 1;
mSubType = TDEApplication::random() & 1;
}
mx = (int)(mfx * mi);
@ -697,7 +697,7 @@ void kSlideShowSaver::slotTimeout()
loadNextImage();
createNextScreen();
if (mNumEffects > 1) i = KApplication::random() % mNumEffects;
if (mNumEffects > 1) i = TDEApplication::random() % mNumEffects;
else i = 0;
mEffect = mEffectList[i];
@ -748,7 +748,7 @@ void kSlideShowSaver::createNextScreen()
if (mFileList.isEmpty())
{
p.setPen(TQColor("white"));
p.drawText(20 + (KApplication::random() % (ww>>1)), 20 + (KApplication::random() % (wh>>1)),
p.drawText(20 + (TDEApplication::random() % (ww>>1)), 20 + (TDEApplication::random() % (wh>>1)),
i18n("No images found"));
}
else
@ -789,8 +789,8 @@ void kSlideShowSaver::createNextScreen()
{
if(mRandomPosition)
{
x = (KApplication::random() % (ww - iw)) + geoptr->mXorg;
y = (KApplication::random() % (wh - ih)) + geoptr->mYorg;
x = (TDEApplication::random() % (ww - iw)) + geoptr->mXorg;
y = (TDEApplication::random() % (wh - ih)) + geoptr->mYorg;
}
else
{
@ -832,7 +832,7 @@ void kSlideShowSaver::loadNextImage()
if (mShowRandom)
{
mFileIdx = KApplication::random() % num;
mFileIdx = TDEApplication::random() % num;
fname = mFileList[mFileIdx];
mFileList.remove(fname);
if (num == 1) //we're about to run out of images

2
kscreensaver/kxsconfig/kxsconfig.cpp
Unescape View File

@ -339,7 +339,7 @@ int main(int argc, char *argv[])
TDECmdLineArgs::addCmdLineOptions(options);
KApplication app;
TDEApplication app;
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if(args->count()==0)

2
kscreensaver/kxsconfig/kxsrun.cpp
Unescape View File

@ -64,7 +64,7 @@ int main(int argc, char *argv[])
TDECmdLineArgs::addCmdLineOptions(options);
KApplication app( false, false );
TDEApplication app( false, false );
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();

2
kscreensaver/xsavers/main.cpp
Unescape View File

@ -53,7 +53,7 @@ int main(int argc, char *argv[])
TDECmdLineArgs::addCmdLineOptions(options);
KApplication app;
TDEApplication app;
KCrash::setCrashHandler( crashHandler );

2
styles/dotnet/dotnet.cpp
Unescape View File

@ -84,7 +84,7 @@ dotNETstyle::dotNETstyle() : KStyle( AllowMenuTransparency ), kickerMode(false)
winstyle = TQStyleFactory::create("B3");
}
if (tqApp->inherits("KApplication")) {
if (tqApp->inherits("TDEApplication")) {
connect( tqApp, TQT_SIGNAL( kdisplayPaletteChanged() ), TQT_SLOT( paletteChanged() ));
}

Write Preview
Loading…
Cancel
Save