summaryrefslogtreecommitdiffstats
path: root/twin/clients
diff options
context:
space:
mode:
Diffstat (limited to 'twin/clients')
-rw-r--r--twin/clients/b2/b2client.cpp20
-rw-r--r--twin/clients/b2/b2client.h2
-rw-r--r--twin/clients/default/kdedefault.cpp14
-rw-r--r--twin/clients/keramik/keramik.cpp44
-rw-r--r--twin/clients/keramik/keramik.h4
-rw-r--r--twin/clients/kwmtheme/kwmthemeclient.cpp6
-rw-r--r--twin/clients/laptop/laptopclient.cpp12
-rw-r--r--twin/clients/modernsystem/config/config.cpp2
-rw-r--r--twin/clients/modernsystem/modernsys.cpp10
-rw-r--r--twin/clients/plastik/plastik.cpp24
-rw-r--r--twin/clients/plastik/plastik.h2
-rw-r--r--twin/clients/plastik/plastikbutton.cpp22
-rw-r--r--twin/clients/plastik/plastikclient.cpp4
-rw-r--r--twin/clients/quartz/quartz.cpp2
-rw-r--r--twin/clients/redmond/redmond.cpp8
-rw-r--r--twin/clients/web/Web.cpp2
-rw-r--r--twin/clients/web/WebButton.cpp8
17 files changed, 93 insertions, 93 deletions
diff --git a/twin/clients/b2/b2client.cpp b/twin/clients/b2/b2client.cpp
index 934e250c1..6c81660ee 100644
--- a/twin/clients/b2/b2client.cpp
+++ b/twin/clients/b2/b2client.cpp
@@ -221,7 +221,7 @@ static void create_pixmaps()
TQPainter mask;
mask.begin(&normalizeMask);
- TQBrush one(Qt::color1);
+ TQBrush one(TQt::color1);
mask.fillRect(normalizeMask.width() - 12, normalizeMask.height() - 12,
12, 12, one);
mask.fillRect(0, 0, 10, 10, one);
@@ -461,7 +461,7 @@ void B2Client::addButtons(const TQString& s, const TQString tips[],
if (!isModalSystemNotification()) {
if (!button[BtnMenu]) {
button[BtnMenu] = new B2Button(this, tb, tips[BtnMenu],
- Qt::LeftButton | Qt::RightButton);
+ TQt::LeftButton | TQt::RightButton);
button[BtnMenu]->setPixmaps(P_MENU);
button[BtnMenu]->setUseMiniIcon();
connect(button[BtnMenu], TQT_SIGNAL(pressed()),
@@ -504,7 +504,7 @@ void B2Client::addButtons(const TQString& s, const TQString tips[],
case 'A': // Maximize button
if (isMaximizable() && (!button[BtnMax])) {
button[BtnMax] = new B2Button(this, tb, tips[BtnMax],
- Qt::LeftButton | Qt::MidButton | Qt::RightButton);
+ TQt::LeftButton | TQt::MidButton | TQt::RightButton);
button[BtnMax]->setPixmaps(maximizeMode() == MaximizeFull ?
P_NORMALIZE : P_MAX);
connect(button[BtnMax], TQT_SIGNAL(clicked()),
@@ -676,7 +676,7 @@ void B2Client::paintEvent(TQPaintEvent* e)
// bottom handle rect
if (mustDrawHandle()) {
- p.setPen(Qt::black);
+ p.setPen(TQt::black);
int hx = width() - 40;
int hw = 40;
@@ -981,7 +981,7 @@ static void redraw_pixmaps()
KPixmap *pix = pixmap[P_SHADE * NumStates + i];
TQColor color = is_act ? aGrp.button() : iGrp.button();
drawB2Rect(&thinBox, color, is_down);
- pix->fill(Qt::black);
+ pix->fill(TQt::black);
bitBlt(TQT_TQPAINTDEVICE(pix), 0, 0, TQT_TQPAINTDEVICE(&thinBox),
0, 0, thinBox.width(), thinBox.height(), TQt::CopyROP, true);
}
@@ -1166,7 +1166,7 @@ bool B2Client::drawbound(const TQRect& geom, bool clear)
*visible_bound = geom;
}
TQPainter p(workspaceWidget());
- p.setPen(TQPen(Qt::white, 5));
+ p.setPen(TQPen(TQt::white, 5));
p.setRasterOp(TQt::XorROP);
p.drawPolygon(bound_shape);
@@ -1280,7 +1280,7 @@ void B2Button::mousePressEvent(TQMouseEvent * e)
{
last_button = e->button();
TQMouseEvent me(e->type(), e->pos(), e->globalPos(),
- (e->button() & realizeButtons) ? Qt::LeftButton : Qt::NoButton,
+ (e->button() & realizeButtons) ? TQt::LeftButton : TQt::NoButton,
e->state());
TQButton::mousePressEvent(&me);
}
@@ -1289,7 +1289,7 @@ void B2Button::mouseReleaseEvent(TQMouseEvent * e)
{
last_button = e->button();
TQMouseEvent me(e->type(), e->pos(), e->globalPos(),
- (e->button() & realizeButtons) ? Qt::LeftButton : Qt::NoButton,
+ (e->button() & realizeButtons) ? TQt::LeftButton : TQt::NoButton,
e->state());
TQButton::mouseReleaseEvent(&me);
}
@@ -1356,7 +1356,7 @@ void B2Titlebar::drawTitlebar(TQPainter &p, bool state)
TQRect t = rect();
// black titlebar frame
- p.setPen(Qt::black);
+ p.setPen(TQt::black);
p.drawLine(0, 0, 0, t.bottom());
p.drawLine(0, 0, t.right(), 0);
p.drawLine(t.right(), 0, t.right(), t.bottom());
@@ -1405,7 +1405,7 @@ void B2Titlebar::paintEvent(TQPaintEvent *)
void B2Titlebar::mouseDoubleClickEvent(TQMouseEvent *e)
{
- if (e->button() == Qt::LeftButton && e->y() < height()) {
+ if (e->button() == TQt::LeftButton && e->y() < height()) {
client->titlebarDblClickOperation();
}
}
diff --git a/twin/clients/b2/b2client.h b/twin/clients/b2/b2client.h
index e200843a4..c9748ccd6 100644
--- a/twin/clients/b2/b2client.h
+++ b/twin/clients/b2/b2client.h
@@ -28,7 +28,7 @@ class B2Client;
class B2Button : public TQButton
{
public:
- B2Button(B2Client *_client=0, TQWidget *parent=0, const TQString& tip=NULL, const int realizeBtns = Qt::LeftButton);
+ B2Button(B2Client *_client=0, TQWidget *parent=0, const TQString& tip=NULL, const int realizeBtns = TQt::LeftButton);
~B2Button() {};
void setBg(const TQColor &c){bg = c;}
diff --git a/twin/clients/default/kdedefault.cpp b/twin/clients/default/kdedefault.cpp
index e6d742bd6..3513ca5df 100644
--- a/twin/clients/default/kdedefault.cpp
+++ b/twin/clients/default/kdedefault.cpp
@@ -267,11 +267,11 @@ void KDEDefaultHandler::createPixmaps()
int i, x, y;
titlePix = new TQPixmap(132, normalTitleHeight+2);
TQBitmap mask(132, normalTitleHeight+2);
- mask.fill(Qt::color0);
+ mask.fill(TQt::color0);
p.begin(titlePix);
maskPainter.begin(&mask);
- maskPainter.setPen(Qt::color1);
+ maskPainter.setPen(TQt::color1);
for(i=0, y=2; i < 9; ++i, y+=4)
for(x=1; x <= 132; x+=3)
{
@@ -681,9 +681,9 @@ void KDEDefaultButton::drawButton(TQPainter *p)
active).rgb() ) > 127;
if (isMouseOver)
- p->setPen( darkDeco ? Qt::darkGray : Qt::lightGray );
+ p->setPen( darkDeco ? TQt::darkGray : TQt::lightGray );
else
- p->setPen( darkDeco ? Qt::black : Qt::white );
+ p->setPen( darkDeco ? TQt::black : TQt::white );
int xOff = (width()-10)/2;
int yOff = (height()-10)/2;
@@ -905,7 +905,7 @@ void KDEDefaultClient::paintEvent( TQPaintEvent* )
titleBuffer->resize( rightOffset-3, titleHeight+1 );
// Draw an outer black frame
- p.setPen(Qt::black);
+ p.setPen(TQt::black);
p.drawRect(x,y,w,h);
// Draw part of the frame that is the titlebar color
@@ -923,7 +923,7 @@ void KDEDefaultClient::paintEvent( TQPaintEvent* )
options()->color(ColorTitleBar, isActive() ));
// Finish drawing the titlebar extension
- p.setPen(Qt::black);
+ p.setPen(TQt::black);
p.drawLine(x+1, leftFrameStart+borderWidth-4, x+borderWidth-2, leftFrameStart-1);
p.setPen(g.mid());
p.drawLine(x+borderWidth-2, y+titleHeight+3, x+borderWidth-2, leftFrameStart-2);
@@ -939,7 +939,7 @@ void KDEDefaultClient::paintEvent( TQPaintEvent* )
p.setPen(options()->color(ColorFrame, isActive()));
TQPointArray a;
- TQBrush brush( options()->color(ColorFrame, isActive()), Qt::SolidPattern );
+ TQBrush brush( options()->color(ColorFrame, isActive()), TQt::SolidPattern );
p.setBrush( brush ); // use solid, yellow brush
a.setPoints( 4, x+2, leftFrameStart+borderWidth-4,
x+borderWidth-2, leftFrameStart,
diff --git a/twin/clients/keramik/keramik.cpp b/twin/clients/keramik/keramik.cpp
index 82a6aba83..ded50a9d2 100644
--- a/twin/clients/keramik/keramik.cpp
+++ b/twin/clients/keramik/keramik.cpp
@@ -411,18 +411,18 @@ void KeramikHandler::createPixmaps()
}
// Pretile the center & border tiles for optimal performance
- pretile( activeTiles[ CaptionSmallCenter ], 64, Qt::Horizontal );
- pretile( activeTiles[ CaptionLargeCenter ], 64, Qt::Horizontal );
- pretile( activeTiles[ TitleCenter ], 64, Qt::Horizontal );
- pretile( activeTiles[ GrabBarCenter ], 128, Qt::Horizontal );
- pretile( activeTiles[ BorderLeft ], 128, Qt::Vertical );
- pretile( activeTiles[ BorderRight ], 128, Qt::Vertical );
-
- pretile( inactiveTiles[ CaptionSmallCenter ], 64, Qt::Horizontal );
- pretile( inactiveTiles[ TitleCenter ], 64, Qt::Horizontal );
- pretile( inactiveTiles[ GrabBarCenter ], 128, Qt::Horizontal );
- pretile( inactiveTiles[ BorderLeft ], 128, Qt::Vertical );
- pretile( inactiveTiles[ BorderRight ], 128, Qt::Vertical );
+ pretile( activeTiles[ CaptionSmallCenter ], 64, TQt::Horizontal );
+ pretile( activeTiles[ CaptionLargeCenter ], 64, TQt::Horizontal );
+ pretile( activeTiles[ TitleCenter ], 64, TQt::Horizontal );
+ pretile( activeTiles[ GrabBarCenter ], 128, TQt::Horizontal );
+ pretile( activeTiles[ BorderLeft ], 128, TQt::Vertical );
+ pretile( activeTiles[ BorderRight ], 128, TQt::Vertical );
+
+ pretile( inactiveTiles[ CaptionSmallCenter ], 64, TQt::Horizontal );
+ pretile( inactiveTiles[ TitleCenter ], 64, TQt::Horizontal );
+ pretile( inactiveTiles[ GrabBarCenter ], 128, TQt::Horizontal );
+ pretile( inactiveTiles[ BorderLeft ], 128, TQt::Vertical );
+ pretile( inactiveTiles[ BorderRight ], 128, TQt::Vertical );
if (heightOffset > 0) {
addHeight (heightOffset, activeTiles[TitleLeft]);
@@ -541,12 +541,12 @@ void KeramikHandler::flip( TQPixmap *&pix1, TQPixmap *&pix2 )
}
-void KeramikHandler::pretile( TQPixmap *&pix, int size, Qt::Orientation dir )
+void KeramikHandler::pretile( TQPixmap *&pix, int size, TQt::Orientation dir )
{
TQPixmap *newpix;
TQPainter p;
- if ( dir == Qt::Horizontal )
+ if ( dir == TQt::Horizontal )
newpix = new TQPixmap( size, pix->height() );
else
newpix = new TQPixmap( pix->width(), size );
@@ -759,7 +759,7 @@ TQValueList< KeramikHandler::BorderSize > KeramikHandler::borderSizes() const
KeramikButton::KeramikButton( KeramikClient* c, const char *name, Button btn, const TQString &tip, const int realizeBtns )
: TQButton( c->widget(), name ),
- client( c ), button( btn ), hover( false ), lastbutton( Qt::NoButton )
+ client( c ), button( btn ), hover( false ), lastbutton( TQt::NoButton )
{
realizeButtons = realizeBtns;
@@ -800,7 +800,7 @@ void KeramikButton::leaveEvent( TQEvent *e )
void KeramikButton::mousePressEvent( TQMouseEvent *e )
{
lastbutton = e->button();
- TQMouseEvent me( e->type(), e->pos(), e->globalPos(), (e->button()&realizeButtons)?Qt::LeftButton:Qt::NoButton, e->state() );
+ TQMouseEvent me( e->type(), e->pos(), e->globalPos(), (e->button()&realizeButtons)?TQt::LeftButton:TQt::NoButton, e->state() );
TQButton::mousePressEvent( &me );
}
@@ -808,7 +808,7 @@ void KeramikButton::mousePressEvent( TQMouseEvent *e )
void KeramikButton::mouseReleaseEvent( TQMouseEvent *e )
{
lastbutton = e->button();
- TQMouseEvent me( e->type(), e->pos(), e->globalPos(), (e->button()&realizeButtons)?Qt::LeftButton:Qt::NoButton, e->state() );
+ TQMouseEvent me( e->type(), e->pos(), e->globalPos(), (e->button()&realizeButtons)?TQt::LeftButton:TQt::NoButton, e->state() );
TQButton::mouseReleaseEvent( &me );
}
@@ -889,7 +889,7 @@ void KeramikButton::drawButton( TQPainter *p )
deco = NULL;
}
- p->setPen( Qt::black ); // ### hardcoded color
+ p->setPen( TQt::black ); // ### hardcoded color
p->drawPixmap( (size-17)/2, (size-17)/2, *deco );
}
@@ -1050,7 +1050,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s )
case 'M' :
if (!isModalSystemNotification()) {
if ( !button[MenuButton] ) {
- button[MenuButton] = new KeramikButton( this, "menu", MenuButton, i18n("Menu"), Qt::LeftButton|Qt::RightButton );
+ button[MenuButton] = new KeramikButton( this, "menu", MenuButton, i18n("Menu"), TQt::LeftButton|TQt::RightButton );
connect( button[MenuButton], TQT_SIGNAL( pressed() ), TQT_SLOT( menuButtonPressed() ) );
layout->addWidget( button[MenuButton] );
}
@@ -1092,7 +1092,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s )
// Maximize button
case 'A' :
if ( !button[MaxButton] && isMaximizable() ) {
- button[MaxButton] = new KeramikButton( this, "maximize", MaxButton, i18n("Maximize"), Qt::LeftButton|Qt::MidButton|Qt::RightButton );
+ button[MaxButton] = new KeramikButton( this, "maximize", MaxButton, i18n("Maximize"), TQt::LeftButton|TQt::MidButton|TQt::RightButton );
connect( button[MaxButton], TQT_SIGNAL( clicked() ), TQT_SLOT( slotMaximize() ) );
layout->addWidget( button[MaxButton] );
}
@@ -1277,7 +1277,7 @@ void KeramikClient::updateCaptionBuffer()
TQRect tr = TQStyle::visualRect( TQRect(xpos, 1, captionRect.width() - xpos - 10,
captionRect.height() - 4), captionBuffer.rect() );
- //p.setPen( Qt::red ); // debug
+ //p.setPen( TQt::red ); // debug
//p.drawRect( tr ); // debug
// Application icon
@@ -1670,7 +1670,7 @@ void KeramikClient::resizeEvent( TQResizeEvent *e )
void KeramikClient::mouseDoubleClickEvent( TQMouseEvent *e )
{
- if ( e->button() == Qt::LeftButton
+ if ( e->button() == TQt::LeftButton
&& TQRect( 0, 0, width(), clientHandler->titleBarHeight( largeTitlebar ) ).contains( e->pos() ) )
titlebarDblClickOperation();
}
diff --git a/twin/clients/keramik/keramik.h b/twin/clients/keramik/keramik.h
index 793531c87..7369b5346 100644
--- a/twin/clients/keramik/keramik.h
+++ b/twin/clients/keramik/keramik.h
@@ -92,7 +92,7 @@ namespace Keramik {
void addWidth (int width, TQPixmap *&pix, bool left, TQPixmap *bottomPix);
void addHeight (int height, TQPixmap *&pix);
void flip( TQPixmap *&, TQPixmap *& );
- void pretile( TQPixmap *&, int, Qt::Orientation );
+ void pretile( TQPixmap *&, int, TQt::Orientation );
TQPixmap *composite( TQImage *, TQImage * );
TQImage *loadImage( const TQString &, const TQColor & );
TQPixmap *loadPixmap( const TQString &, const TQColor & );
@@ -114,7 +114,7 @@ namespace Keramik {
class KeramikButton : public TQButton
{
public:
- KeramikButton( KeramikClient *, const char *, Button, const TQString &, const int realizeBtns = Qt::LeftButton );
+ KeramikButton( KeramikClient *, const char *, Button, const TQString &, const int realizeBtns = TQt::LeftButton );
~KeramikButton();
ButtonState lastButton() const { return lastbutton; }
diff --git a/twin/clients/kwmtheme/kwmthemeclient.cpp b/twin/clients/kwmtheme/kwmthemeclient.cpp
index 73c8feaca..4daffae7c 100644
--- a/twin/clients/kwmtheme/kwmthemeclient.cpp
+++ b/twin/clients/kwmtheme/kwmthemeclient.cpp
@@ -141,11 +141,11 @@ static void create_pixmaps()
tmpStr = config->readEntry("TitleAlignment");
if(tmpStr == "right")
- titleAlign = Qt::AlignRight | Qt::AlignVCenter;
+ titleAlign = TQt::AlignRight | TQt::AlignVCenter;
else if(tmpStr == "middle")
- titleAlign = Qt::AlignCenter;
+ titleAlign = TQt::AlignCenter;
else
- titleAlign = Qt::AlignLeft | Qt::AlignVCenter;
+ titleAlign = TQt::AlignLeft | TQt::AlignVCenter;
titleSunken = config->readBoolEntry("TitleFrameShaded", true);
// titleSunken = true; // is this fixed?
titleTransparent = config->readBoolEntry("PixmapUnderTitleText", true);
diff --git a/twin/clients/laptop/laptopclient.cpp b/twin/clients/laptop/laptopclient.cpp
index 114b03f4d..30fb76b3a 100644
--- a/twin/clients/laptop/laptopclient.cpp
+++ b/twin/clients/laptop/laptopclient.cpp
@@ -121,11 +121,11 @@ static void create_pixmaps()
int i, x, y;
titlePix = new TQPixmap(33, 12);
TQBitmap mask(33, 12);
- mask.fill(Qt::color0);
+ mask.fill(TQt::color0);
p.begin(titlePix);
maskPainter.begin(&mask);
- maskPainter.setPen(Qt::color1);
+ maskPainter.setPen(TQt::color1);
for(i=0, y=2; i < 3; ++i, y+=4){
for(x=1; x <= 33; x+=3){
p.setPen(options()->color(KDecoration::ColorTitleBar, true).light(150));
@@ -221,9 +221,9 @@ static void create_pixmaps()
drawButtonFrame(iBtnDownPix2, g, true);
if(tqGray(options()->color(KDecoration::ColorButtonBg, true).rgb()) > 128)
- btnForeground = Qt::black;
+ btnForeground = TQt::black;
else
- btnForeground = Qt::white;
+ btnForeground = TQt::white;
}
static void delete_pixmaps()
@@ -290,7 +290,7 @@ void LaptopButton::setBitmap(const unsigned char *bitmap)
deco = TQBitmap(8, 8, bitmap, true);
else {
deco = TQBitmap(8,8);
- deco.fill(Qt::color0);
+ deco.fill(TQt::color0);
}
deco.setMask(deco);
repaint();
@@ -472,7 +472,7 @@ void LaptopClient::paintEvent( TQPaintEvent* )
TQColorGroup g = options()->colorGroup(KDecoration::ColorFrame, isActive());
TQRect r(widget()->rect());
- p.setPen(Qt::black);
+ p.setPen(TQt::black);
p.drawRect(r);
// fill mid frame...
diff --git a/twin/clients/modernsystem/config/config.cpp b/twin/clients/modernsystem/config/config.cpp
index 18d6870f7..4512203c4 100644
--- a/twin/clients/modernsystem/config/config.cpp
+++ b/twin/clients/modernsystem/config/config.cpp
@@ -47,7 +47,7 @@ ModernSysConfig::ModernSysConfig(TDEConfig* conf, TQWidget* parent) : TQObject(p
connect(cbShowHandle, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectionChanged()));
sliderBox = new TQVBox(handleBox);
- handleSizeSlider = new TQSlider(0, 4, 1, 0, Qt::Horizontal, sliderBox);
+ handleSizeSlider = new TQSlider(0, 4, 1, 0, TQt::Horizontal, sliderBox);
TQWhatsThis::add(handleSizeSlider,
i18n("Here you can change the size of the resize handle."));
handleSizeSlider->setTickInterval(1);
diff --git a/twin/clients/modernsystem/modernsys.cpp b/twin/clients/modernsystem/modernsys.cpp
index f2d31ed11..94615b190 100644
--- a/twin/clients/modernsystem/modernsys.cpp
+++ b/twin/clients/modernsystem/modernsys.cpp
@@ -185,9 +185,9 @@ static void create_pixmaps()
if(tqGray(btnColor.background().rgb()) < 150)
- buttonFg = new TQColor(Qt::white);
+ buttonFg = new TQColor(TQt::white);
else
- buttonFg = new TQColor(Qt::black);
+ buttonFg = new TQColor(TQt::black);
delete lcDark1;
delete lcDark2;
@@ -342,7 +342,7 @@ void ModernButton::setBitmap(const unsigned char *bitmap)
deco = TQBitmap(8, 8, bitmap, true);
else {
deco = TQBitmap(8,8);
- deco.fill(Qt::color0);
+ deco.fill(TQt::color0);
}
deco.setMask(deco);
}
@@ -631,7 +631,7 @@ void ModernSys::paintEvent( TQPaintEvent* )
p.drawLine(width()-hw, height()-hs-1, width()-4, height()-hs-1);
p.drawLine(width()-hs-1, height()-hw, width()-hs-1, height()-4);
- p.setPen(Qt::black);
+ p.setPen(TQt::black);
p.drawRect(0, 0, w, h);
// handle outline
@@ -640,7 +640,7 @@ void ModernSys::paintEvent( TQPaintEvent* )
p.drawLine(width()-hs, height()-2, width()-2, height()-2);
p.drawLine(width()-hs, height()-hw, width()-hs, height()-2);
} else {
- p.setPen(Qt::black);
+ p.setPen(TQt::black);
p.drawRect(0, 0, w, h);
}
}
diff --git a/twin/clients/plastik/plastik.cpp b/twin/clients/plastik/plastik.cpp
index b5cdeb85b..b5a4808d7 100644
--- a/twin/clients/plastik/plastik.cpp
+++ b/twin/clients/plastik/plastik.cpp
@@ -185,9 +185,9 @@ void PlastikHandler::readConfig()
m_titleHeightTool++;
TQString value = config.readEntry("TitleAlignment", "AlignLeft");
- if (value == "AlignLeft") m_titleAlign = Qt::AlignLeft;
- else if (value == "AlignHCenter") m_titleAlign = Qt::AlignHCenter;
- else if (value == "AlignRight") m_titleAlign = Qt::AlignRight;
+ if (value == "AlignLeft") m_titleAlign = TQt::AlignLeft;
+ else if (value == "AlignHCenter") m_titleAlign = TQt::AlignHCenter;
+ else if (value == "AlignRight") m_titleAlign = TQt::AlignRight;
m_coloredBorder = config.readBoolEntry("ColoredBorder", true);
m_animateButtons = config.readBoolEntry("AnimateButtons", true);
@@ -210,27 +210,27 @@ TQColor PlastikHandler::getColor(KWinPlastik::ColorType type, const bool active)
break;
case ShadeTitleLight:
return alphaBlendColors(KDecoration::options()->color(ColorTitleBar, active),
- Qt::white, active?205:215);
+ TQt::white, active?205:215);
break;
case ShadeTitleDark:
return alphaBlendColors(KDecoration::options()->color(ColorTitleBar, active),
- Qt::black, active?205:215);
+ TQt::black, active?205:215);
break;
case Border:
return KDecoration::options()->color(ColorFrame, active);
case TitleFont:
return KDecoration::options()->color(ColorFont, active);
default:
- return Qt::black;
+ return TQt::black;
}
}
-void PlastikHandler::pretile( TQPixmap *&pix, int size, Qt::Orientation dir ) const
+void PlastikHandler::pretile( TQPixmap *&pix, int size, TQt::Orientation dir ) const
{
TQPixmap *newpix;
TQPainter p;
- if ( dir == Qt::Horizontal )
+ if ( dir == TQt::Horizontal )
newpix = new TQPixmap( size, pix->height() );
else
newpix = new TQPixmap( pix->width(), size );
@@ -300,7 +300,7 @@ const TQPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindo
painter.end();
}
- pretile(pm, 64, Qt::Horizontal);
+ pretile(pm, 64, TQt::Horizontal);
break;
}
@@ -399,7 +399,7 @@ const TQPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindo
painter.end();
- pretile(pm, 64, Qt::Vertical);
+ pretile(pm, 64, TQt::Vertical);
break;
}
@@ -433,7 +433,7 @@ const TQPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindo
}
painter.end();
- pretile(pm, 64, Qt::Vertical);
+ pretile(pm, 64, TQt::Vertical);
break;
}
@@ -523,7 +523,7 @@ const TQPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindo
painter.drawPoint(0, h-1);
painter.end();
- pretile(pm, 64, Qt::Horizontal);
+ pretile(pm, 64, TQt::Horizontal);
break;
}
diff --git a/twin/clients/plastik/plastik.h b/twin/clients/plastik/plastik.h
index 85b9e5fa0..587d93f4e 100644
--- a/twin/clients/plastik/plastik.h
+++ b/twin/clients/plastik/plastik.h
@@ -101,7 +101,7 @@ public:
private:
void readConfig();
- void pretile(TQPixmap *&pix, int size, Qt::Orientation dir) const;
+ void pretile(TQPixmap *&pix, int size, TQt::Orientation dir) const;
bool m_coloredBorder;
bool m_titleShadow;
diff --git a/twin/clients/plastik/plastikbutton.cpp b/twin/clients/plastik/plastikbutton.cpp
index 3a097be15..5fdadc8e1 100644
--- a/twin/clients/plastik/plastikbutton.cpp
+++ b/twin/clients/plastik/plastikbutton.cpp
@@ -170,17 +170,17 @@ void PlastikButton::drawButton(TQPainter *painter)
if(type() == CloseButton) {
highlightColor = TQColor(255,64,0);
} else {
- highlightColor = Qt::white;
+ highlightColor = TQt::white;
}
TQColor contourTop = alphaBlendColors(Handler()->getColor(TitleGradient2, active),
- Qt::black, 215);
+ TQt::black, 215);
TQColor contourBottom = alphaBlendColors(Handler()->getColor(TitleGradient3, active),
- Qt::black, 215);
+ TQt::black, 215);
TQColor sourfaceTop = alphaBlendColors(Handler()->getColor(TitleGradient2, active),
- Qt::white, 210);
+ TQt::white, 210);
TQColor sourfaceBottom = alphaBlendColors(Handler()->getColor(TitleGradient3, active),
- Qt::white, 210);
+ TQt::white, 210);
int highlightAlpha = static_cast<int>(255-((60/static_cast<double>(ANIMATIONSTEPS))*
static_cast<double>(animProgress) ) );
@@ -190,10 +190,10 @@ void PlastikButton::drawButton(TQPainter *painter)
sourfaceBottom = alphaBlendColors(sourfaceBottom, highlightColor, highlightAlpha);
if (isDown() ) {
- contourTop = alphaBlendColors(contourTop, Qt::black, 200);
- contourBottom = alphaBlendColors(contourBottom, Qt::black, 200);
- sourfaceTop = alphaBlendColors(sourfaceTop, Qt::black, 200);
- sourfaceBottom = alphaBlendColors(sourfaceBottom, Qt::black, 200);
+ contourTop = alphaBlendColors(contourTop, TQt::black, 200);
+ contourBottom = alphaBlendColors(contourBottom, TQt::black, 200);
+ sourfaceTop = alphaBlendColors(sourfaceTop, TQt::black, 200);
+ sourfaceBottom = alphaBlendColors(sourfaceBottom, TQt::black, 200);
}
TQPixmap buffer;
@@ -291,10 +291,10 @@ TQBitmap IconEngine::icon(ButtonIcon icon, int size)
--size;
TQBitmap bitmap(size,size);
- bitmap.fill(Qt::color0);
+ bitmap.fill(TQt::color0);
TQPainter p(&bitmap);
- p.setPen(Qt::color1);
+ p.setPen(TQt::color1);
TQRect r = bitmap.rect();
diff --git a/twin/clients/plastik/plastikclient.cpp b/twin/clients/plastik/plastikclient.cpp
index 31c9e2ad9..6fa993721 100644
--- a/twin/clients/plastik/plastikclient.cpp
+++ b/twin/clients/plastik/plastikclient.cpp
@@ -402,10 +402,10 @@ TQRect PlastikClient::captionRect() const
} else {
tW = caption.width();
}
- if (a == Qt::AlignLeft || (caption.width() > titleWidth) ) {
+ if (a == TQt::AlignLeft || (caption.width() > titleWidth) ) {
// Align left
tX = titleLeft;
- } else if (a == Qt::AlignHCenter) {
+ } else if (a == TQt::AlignHCenter) {
// Align center
tX = titleLeft+(titleWidth- caption.width() )/2;
} else {
diff --git a/twin/clients/quartz/quartz.cpp b/twin/clients/quartz/quartz.cpp
index 10f0a0a96..dff79ff4b 100644
--- a/twin/clients/quartz/quartz.cpp
+++ b/twin/clients/quartz/quartz.cpp
@@ -463,7 +463,7 @@ void QuartzButton::drawButton(TQPainter *p)
{
int xOff = (width()-10)/2;
int yOff = (height()-10)/2;
- p->setPen( Qt::black );
+ p->setPen( TQt::black );
p->drawPixmap(isDown() ? xOff+2: xOff+1, isDown() ? yOff+2 : yOff+1, *deco);
p->setPen( KDecoration::options()->color(KDecoration::ColorButtonBg, decoration()->isActive()).light(150) );
p->drawPixmap(isDown() ? xOff+1: xOff, isDown() ? yOff+1 : yOff, *deco);
diff --git a/twin/clients/redmond/redmond.cpp b/twin/clients/redmond/redmond.cpp
index c59cd48d1..6deddeaee 100644
--- a/twin/clients/redmond/redmond.cpp
+++ b/twin/clients/redmond/redmond.cpp
@@ -210,9 +210,9 @@ static void create_pixmaps ()
// Make sure button pixmaps contrast with the current colour scheme.
if (tqGray(options()->color(KDecoration::ColorButtonBg, true).rgb()) > 127)
- btnForeground = new TQColor(Qt::black);
+ btnForeground = new TQColor(TQt::black);
else
- btnForeground = new TQColor(Qt::white);
+ btnForeground = new TQColor(TQt::white);
}
void delete_pixmaps()
@@ -283,7 +283,7 @@ void RedmondButton::setBitmap(const unsigned char *bitmap)
deco = TQBitmap(10, 10, bitmap, true);
else {
deco = TQBitmap(10,10);
- deco.fill(Qt::color0);
+ deco.fill(TQt::color0);
}
deco.setMask(deco);
}
@@ -556,7 +556,7 @@ void RedmondDeco::paintEvent( TQPaintEvent* )
TQImage image = KImageEffect::gradient(titleBuffer->size(), c1, c2,
KImageEffect::HorizontalGradient);
- titleBuffer->convertFromImage(image, Qt::OrderedDither);
+ titleBuffer->convertFromImage(image, TQt::OrderedDither);
}
TQPainter p2( titleBuffer, this );
diff --git a/twin/clients/web/Web.cpp b/twin/clients/web/Web.cpp
index b40432939..5c2457e1c 100644
--- a/twin/clients/web/Web.cpp
+++ b/twin/clients/web/Web.cpp
@@ -230,7 +230,7 @@ WebClient::paintEvent(TQPaintEvent * pe)
TQPainter p(widget());
- p.setPen(Qt::black);
+ p.setPen(TQt::black);
p.setBrush(options()->colorGroup(ColorFrame, isActive()).background());
p.setClipRegion(pe->region() - titleRect);
diff --git a/twin/clients/web/WebButton.cpp b/twin/clients/web/WebButton.cpp
index f8d1c4add..eb6d8d530 100644
--- a/twin/clients/web/WebButton.cpp
+++ b/twin/clients/web/WebButton.cpp
@@ -170,7 +170,7 @@ WebButton::drawButton(TQPainter *p)
{
// Draw edge.
- p->setPen(Qt::black);
+ p->setPen(TQt::black);
p->drawLine(0, 0, width(), 0);
p->drawLine(0, 1, 0, height() - 1);
@@ -207,7 +207,7 @@ WebButton::drawButton(TQPainter *p)
{
// Draw edge.
- p->setPen(Qt::black);
+ p->setPen(TQt::black);
p->drawLine(0, 0, width(), 0);
p->drawLine(width() - 1, 1, width() - 1, height() - 1);
if (shape_)
@@ -244,7 +244,7 @@ WebButton::drawButton(TQPainter *p)
{
// Draw edge.
- p->setPen(Qt::black);
+ p->setPen(TQt::black);
p->drawLine(0, 0, width(), 0);
// Draw highlight.
@@ -266,7 +266,7 @@ WebButton::drawButton(TQPainter *p)
int bhby2(bitmap_.height() / 2); // Bitmap Height BY 2
p->setBrush(NoBrush);
- p->setPen(Qt::black);
+ p->setPen(TQt::black);
p->drawPixmap(center.x() - bwby2 + 1, center.y() - bhby2 + 1, bitmap_);
}