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

Replaced various '#define' with actual strings - part 5

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/35/head
Michele Calgaro 6 months ago
parent 5e5046aefa
commit 3c87f89058
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
4 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File

42
tdescreensaver/kdesavers/slideshow.cpp
Unescape View File

@ -285,7 +285,7 @@ int kSlideShowSaver::effectSpiralIn(bool aInit)
my0 += miy; my0 += miy;
} }
bitBlt(TQT_TQPAINTDEVICE(this), mx, my, TQT_TQPAINTDEVICE(&mNextScreen), mx, my, mix, miy, CopyROP, true); bitBlt(this, mx, my, &mNextScreen, mx, my, mix, miy, CopyROP, true);
mx += mdx; mx += mdx;
my += mdy; my += mdy;
@ -321,8 +321,8 @@ int kSlideShowSaver::effectMeltdown(bool aInit)
if (y >= mh) continue; if (y >= mh) continue;
done = false; done = false;
if ((TDEApplication::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(this, x, y+mdy, this, x, y, mdx, mh-y-mdy, CopyROP, true);
bitBlt(TQT_TQPAINTDEVICE(this), x, y, TQT_TQPAINTDEVICE(&mNextScreen), x, y, mdx, mdy, CopyROP, true); bitBlt(this, x, y, &mNextScreen, x, y, mdx, mdy, CopyROP, true);
mIntArray[i] += mdy; mIntArray[i] += mdy;
} }
@ -407,7 +407,7 @@ int kSlideShowSaver::effectSweep(bool aInit)
} }
for (w=2,i=4,x=mx; i>0; i--, w<<=1, x-=mdx) for (w=2,i=4,x=mx; i>0; i--, w<<=1, x-=mdx)
{ {
bitBlt(TQT_TQPAINTDEVICE(this), x, 0, TQT_TQPAINTDEVICE(&mNextScreen), x, 0, w, mh, CopyROP, true); bitBlt(this, x, 0, &mNextScreen, x, 0, w, mh, CopyROP, true);
} }
mx += mdx; mx += mdx;
} }
@ -421,7 +421,7 @@ int kSlideShowSaver::effectSweep(bool aInit)
} }
for (h=2,i=4,y=my; i>0; i--, h<<=1, y-=mdy) for (h=2,i=4,y=my; i>0; i--, h<<=1, y-=mdy)
{ {
bitBlt(TQT_TQPAINTDEVICE(this), 0, y, TQT_TQPAINTDEVICE(&mNextScreen), 0, y, mw, h, CopyROP, true); bitBlt(this, 0, y, &mNextScreen, 0, y, mw, h, CopyROP, true);
} }
my += mdy; my += mdy;
} }
@ -477,7 +477,7 @@ int kSlideShowSaver::effectRandom(bool /*aInit*/)
{ {
x = (TDEApplication::random() % w) << fact; x = (TDEApplication::random() % w) << fact;
y = (TDEApplication::random() % h) << fact; y = (TDEApplication::random() % h) << fact;
bitBlt(TQT_TQPAINTDEVICE(this), x, y, TQT_TQPAINTDEVICE(&mNextScreen), x, y, sz, sz, CopyROP, true); bitBlt(this, x, y, &mNextScreen, x, y, sz, sz, CopyROP, true);
} }
showNextScreen(); showNextScreen();
@ -509,7 +509,7 @@ int kSlideShowSaver::effectGrowing(bool aInit)
return -1; return -1;
} }
bitBlt(TQT_TQPAINTDEVICE(this), mx, my, TQT_TQPAINTDEVICE(&mNextScreen), mx, my, bitBlt(this, mx, my, &mNextScreen, mx, my,
mw - (mx<<1), mh - (my<<1), CopyROP, true); mw - (mx<<1), mh - (my<<1), CopyROP, true);
return 20; return 20;
@ -548,9 +548,9 @@ int kSlideShowSaver::effectChessboard(bool aInit)
for (y=0; y<mw; y+=(mdy<<1)) for (y=0; y<mw; y+=(mdy<<1))
{ {
bitBlt(TQT_TQPAINTDEVICE(this), mix, y+miy, TQT_TQPAINTDEVICE(&mNextScreen), mix, y+miy, bitBlt(this, mix, y+miy, &mNextScreen, mix, y+miy,
mdx, mdy, CopyROP, true); mdx, mdy, CopyROP, true);
bitBlt(TQT_TQPAINTDEVICE(this), mx, y+my, TQT_TQPAINTDEVICE(&mNextScreen), mx, y+my, bitBlt(this, mx, y+my, &mNextScreen, mx, y+my,
mdx, mdy, CopyROP, true); mdx, mdy, CopyROP, true);
} }
@ -591,18 +591,18 @@ int kSlideShowSaver::effectIncomingEdges(bool aInit)
if (mSubType) if (mSubType)
{ {
// moving image edges // moving image edges
bitBlt(TQT_TQPAINTDEVICE(this), 0, 0, TQT_TQPAINTDEVICE(&mNextScreen), mix-mx, miy-my, mx, my, CopyROP, true); bitBlt(this, 0, 0, &mNextScreen, mix-mx, miy-my, mx, my, CopyROP, true);
bitBlt(TQT_TQPAINTDEVICE(this), x1, 0, TQT_TQPAINTDEVICE(&mNextScreen), mix, miy-my, mx, my, CopyROP, true); bitBlt(this, x1, 0, &mNextScreen, mix, miy-my, mx, my, CopyROP, true);
bitBlt(TQT_TQPAINTDEVICE(this), 0, y1, TQT_TQPAINTDEVICE(&mNextScreen), mix-mx, miy, mx, my, CopyROP, true); bitBlt(this, 0, y1, &mNextScreen, mix-mx, miy, mx, my, CopyROP, true);
bitBlt(TQT_TQPAINTDEVICE(this), x1, y1, TQT_TQPAINTDEVICE(&mNextScreen), mix, miy, mx, my, CopyROP, true); bitBlt(this, x1, y1, &mNextScreen, mix, miy, mx, my, CopyROP, true);
} }
else else
{ {
// fixed image edges // fixed image edges
bitBlt(TQT_TQPAINTDEVICE(this), 0, 0, TQT_TQPAINTDEVICE(&mNextScreen), 0, 0, mx, my, CopyROP, true); bitBlt(this, 0, 0, &mNextScreen, 0, 0, mx, my, CopyROP, true);
bitBlt(TQT_TQPAINTDEVICE(this), x1, 0, TQT_TQPAINTDEVICE(&mNextScreen), x1, 0, mx, my, CopyROP, true); bitBlt(this, x1, 0, &mNextScreen, x1, 0, mx, my, CopyROP, true);
bitBlt(TQT_TQPAINTDEVICE(this), 0, y1, TQT_TQPAINTDEVICE(&mNextScreen), 0, y1, mx, my, CopyROP, true); bitBlt(this, 0, y1, &mNextScreen, 0, y1, mx, my, CopyROP, true);
bitBlt(TQT_TQPAINTDEVICE(this), x1, y1, TQT_TQPAINTDEVICE(&mNextScreen), x1, y1, mx, my, CopyROP, true); bitBlt(this, x1, y1, &mNextScreen, x1, y1, mx, my, CopyROP, true);
} }
return 20; return 20;
} }
@ -625,7 +625,7 @@ int kSlideShowSaver::effectHorizLines(bool aInit)
for (y=iyPos[mi]; y<mh; y+=8) for (y=iyPos[mi]; y<mh; y+=8)
{ {
bitBlt(TQT_TQPAINTDEVICE(this), 0, y, TQT_TQPAINTDEVICE(&mNextScreen), 0, y, mw, 1, CopyROP, true); bitBlt(this, 0, y, &mNextScreen, 0, y, mw, 1, CopyROP, true);
} }
mi++; mi++;
@ -651,7 +651,7 @@ int kSlideShowSaver::effectVertLines(bool aInit)
for (x=ixPos[mi]; x<mw; x+=8) for (x=ixPos[mi]; x<mw; x+=8)
{ {
bitBlt(TQT_TQPAINTDEVICE(this), x, 0, TQT_TQPAINTDEVICE(&mNextScreen), x, 0, 1, mh, CopyROP, true); bitBlt(this, x, 0, &mNextScreen, x, 0, 1, mh, CopyROP, true);
} }
mi++; mi++;
@ -716,7 +716,7 @@ void kSlideShowSaver::slotTimeout()
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void kSlideShowSaver::showNextScreen() void kSlideShowSaver::showNextScreen()
{ {
bitBlt(TQT_TQPAINTDEVICE(this), 0, 0, TQT_TQPAINTDEVICE(&mNextScreen), 0, 0, bitBlt(this, 0, 0, &mNextScreen, 0, 0,
mNextScreen.width(), mNextScreen.height(), CopyROP, true); mNextScreen.width(), mNextScreen.height(), CopyROP, true);
} }
@ -798,7 +798,7 @@ void kSlideShowSaver::createNextScreen()
y = ((wh - ih) >> 1) + geoptr->mYorg; y = ((wh - ih) >> 1) + geoptr->mYorg;
} }
// bitBlt(TQT_TQPAINTDEVICE(&mNextScreen), x, y, TQT_TQPAINTDEVICE(&mImage), 0, 0, iw, ih, CopyROP, false); // bitBlt(&mNextScreen, x, y, &mImage, 0, 0, iw, ih, CopyROP, false);
p.drawImage(x, y, mImage); p.drawImage(x, y, mImage);
} }
} }

2
tdescreensaver/kxsconfig/kxsxml.cpp
Unescape View File

@ -36,7 +36,7 @@ bool KXSXml::parse( const TQString &filename )
{ {
TQFile file( filename ); TQFile file( filename );
handler = new KXSXmlHandler( parent ); handler = new KXSXmlHandler( parent );
TQXmlInputSource source( TQT_TQIODEVICE(&file) ); TQXmlInputSource source( &file );
TQXmlSimpleReader reader; TQXmlSimpleReader reader;
reader.setContentHandler( handler ); reader.setContentHandler( handler );
if ( !reader.parse( &source, FALSE ) ) if ( !reader.parse( &source, FALSE ) )

8
twin-styles/kstep/nextclient.cpp
Unescape View File

@ -256,13 +256,13 @@ static void create_pixmaps(NextClientFactory *f)
KPixmapEffect::DiagonalGradient); KPixmapEffect::DiagonalGradient);
KPixmapEffect::gradient(internal, c.dark(120), c.light(120), KPixmapEffect::gradient(internal, c.dark(120), c.light(120),
KPixmapEffect::DiagonalGradient); KPixmapEffect::DiagonalGradient);
bitBlt(TQT_TQPAINTDEVICE(iBtn), 3, 3, TQT_TQPAINTDEVICE(&internal), 0, 0, internalHeight, internalHeight, TQt::CopyROP, true); bitBlt(iBtn, 3, 3, &internal, 0, 0, internalHeight, internalHeight, TQt::CopyROP, true);
KPixmapEffect::gradient(*iBtnDown, c.dark(120), c.light(120), KPixmapEffect::gradient(*iBtnDown, c.dark(120), c.light(120),
KPixmapEffect::DiagonalGradient); KPixmapEffect::DiagonalGradient);
KPixmapEffect::gradient(internal, c.light(120), c.dark(120), KPixmapEffect::gradient(internal, c.light(120), c.dark(120),
KPixmapEffect::DiagonalGradient); KPixmapEffect::DiagonalGradient);
bitBlt(TQT_TQPAINTDEVICE(iBtnDown), 3, 3, TQT_TQPAINTDEVICE(&internal), 0, 0, internalHeight, internalHeight, TQt::CopyROP, true); bitBlt(iBtnDown, 3, 3, &internal, 0, 0, internalHeight, internalHeight, TQt::CopyROP, true);
// active buttons // active buttons
c = options()->color(KDecoration::ColorButtonBg, true); c = options()->color(KDecoration::ColorButtonBg, true);
@ -270,13 +270,13 @@ static void create_pixmaps(NextClientFactory *f)
KPixmapEffect::DiagonalGradient); KPixmapEffect::DiagonalGradient);
KPixmapEffect::gradient(internal, c.dark(120), c.light(120), KPixmapEffect::gradient(internal, c.dark(120), c.light(120),
KPixmapEffect::DiagonalGradient); KPixmapEffect::DiagonalGradient);
bitBlt(TQT_TQPAINTDEVICE(aBtn), 3, 3, TQT_TQPAINTDEVICE(&internal), 0, 0, internalHeight, internalHeight, TQt::CopyROP, true); bitBlt(aBtn, 3, 3, &internal, 0, 0, internalHeight, internalHeight, TQt::CopyROP, true);
KPixmapEffect::gradient(*aBtnDown, c.dark(120), c.light(120), KPixmapEffect::gradient(*aBtnDown, c.dark(120), c.light(120),
KPixmapEffect::DiagonalGradient); KPixmapEffect::DiagonalGradient);
KPixmapEffect::gradient(internal, c.light(120), c.dark(120), KPixmapEffect::gradient(internal, c.light(120), c.dark(120),
KPixmapEffect::DiagonalGradient); KPixmapEffect::DiagonalGradient);
bitBlt(TQT_TQPAINTDEVICE(aBtnDown), 3, 3, TQT_TQPAINTDEVICE(&internal), 0, 0, internalHeight, internalHeight, TQt::CopyROP, true); bitBlt(aBtnDown, 3, 3, &internal, 0, 0, internalHeight, internalHeight, TQt::CopyROP, true);
TQPainter p; TQPainter p;
p.begin(aBtn); p.begin(aBtn);

16
twin-styles/system/systemclient.cpp
Unescape View File

@ -118,18 +118,18 @@ static void create_pixmaps()
hColor.light(150), hColor.light(150),
hColor.dark(150), hColor.dark(150),
KPixmapEffect::DiagonalGradient); KPixmapEffect::DiagonalGradient);
bitBlt(TQT_TQPAINTDEVICE(&aPix), 1, 1, TQT_TQPAINTDEVICE(&aInternal), 0, 0, 8, 8, TQt::CopyROP, true); bitBlt(&aPix, 1, 1, &aInternal, 0, 0, 8, 8, TQt::CopyROP, true);
bitBlt(TQT_TQPAINTDEVICE(&iPix), 1, 1, TQT_TQPAINTDEVICE(&iInternal), 0, 0, 8, 8, TQt::CopyROP, true); bitBlt(&iPix, 1, 1, &iInternal, 0, 0, 8, 8, TQt::CopyROP, true);
// normal buttons // normal buttons
btnPix = new KPixmap; btnPix = new KPixmap;
btnPix->resize(14, 14); btnPix->resize(14, 14);
bitBlt(TQT_TQPAINTDEVICE(btnPix), 2, 2, TQT_TQPAINTDEVICE(&aPix), 0, 0, 10, 10, TQt::CopyROP, true); bitBlt(btnPix, 2, 2, &aPix, 0, 0, 10, 10, TQt::CopyROP, true);
drawButtonFrame(btnPix, KDecoration::options()->colorGroup(KDecorationOptions::ColorFrame, true)); drawButtonFrame(btnPix, KDecoration::options()->colorGroup(KDecorationOptions::ColorFrame, true));
iBtnPix = new KPixmap; iBtnPix = new KPixmap;
iBtnPix->resize(14, 14); iBtnPix->resize(14, 14);
bitBlt(TQT_TQPAINTDEVICE(iBtnPix), 2, 2, TQT_TQPAINTDEVICE(&iPix), 0, 0, 10, 10, TQt::CopyROP, true); bitBlt(iBtnPix, 2, 2, &iPix, 0, 0, 10, 10, TQt::CopyROP, true);
drawButtonFrame(iBtnPix, KDecoration::options()->colorGroup(KDecorationOptions::ColorFrame, false)); drawButtonFrame(iBtnPix, KDecoration::options()->colorGroup(KDecorationOptions::ColorFrame, false));
@ -153,18 +153,18 @@ static void create_pixmaps()
hColor.light(150), hColor.light(150),
hColor.dark(150), hColor.dark(150),
KPixmapEffect::DiagonalGradient); KPixmapEffect::DiagonalGradient);
bitBlt(TQT_TQPAINTDEVICE(&aPix), 1, 1, TQT_TQPAINTDEVICE(&aInternal), 0, 0, 8, 8, TQt::CopyROP, true); bitBlt(&aPix, 1, 1, &aInternal, 0, 0, 8, 8, TQt::CopyROP, true);
bitBlt(TQT_TQPAINTDEVICE(&iPix), 1, 1, TQT_TQPAINTDEVICE(&iInternal), 0, 0, 8, 8, TQt::CopyROP, true); bitBlt(&iPix, 1, 1, &iInternal, 0, 0, 8, 8, TQt::CopyROP, true);
btnPixDown = new KPixmap; btnPixDown = new KPixmap;
btnPixDown->resize(14, 14); btnPixDown->resize(14, 14);
bitBlt(TQT_TQPAINTDEVICE(btnPixDown), 2, 2, TQT_TQPAINTDEVICE(&aPix), 0, 0, 10, 10, TQt::CopyROP, true); bitBlt(btnPixDown, 2, 2, &aPix, 0, 0, 10, 10, TQt::CopyROP, true);
drawButtonFrame(btnPixDown, KDecoration::options()->colorGroup(KDecorationOptions::ColorFrame, drawButtonFrame(btnPixDown, KDecoration::options()->colorGroup(KDecorationOptions::ColorFrame,
true)); true));
iBtnPixDown = new KPixmap; iBtnPixDown = new KPixmap;
iBtnPixDown->resize(14, 14); iBtnPixDown->resize(14, 14);
bitBlt(TQT_TQPAINTDEVICE(iBtnPixDown), 2, 2, TQT_TQPAINTDEVICE(&iPix), 0, 0, 10, 10, TQt::CopyROP, true); bitBlt(iBtnPixDown, 2, 2, &iPix, 0, 0, 10, 10, TQt::CopyROP, true);
drawButtonFrame(iBtnPixDown, KDecoration::options()->colorGroup(KDecorationOptions::ColorFrame, drawButtonFrame(iBtnPixDown, KDecoration::options()->colorGroup(KDecorationOptions::ColorFrame,
false)); false));
} }

Write Preview
Loading…
Cancel
Save