Remove additional unneeded tq method conversions

pull/1/head
Timothy Pearson 13 years ago
parent f35eb5f602
commit 6b41ad2b1c

@ -80,7 +80,7 @@ KBannerSetup::KBannerSetup( TQWidget *parent, const char *name )
label = new TQLabel( i18n("Family:"), group );
gl->addWidget(label, 1, 0);
KFontCombo* comboFonts = new KFontCombo( TQFontDatabase().tqfamilies(), group );
KFontCombo* comboFonts = new KFontCombo( TQFontDatabase().families(), group );
comboFonts->setCurrentFont( fontFamily );
gl->addWidget(comboFonts, 1, 1);
connect( comboFonts, TQT_SIGNAL( activated( const TQString& ) ),

@ -95,7 +95,7 @@
2004-01-28 Enrico Ros <eros.kde@email.it>
* firesaverparticle.cpp: keep a particle independent from the
'tqshape' of the firework it belongs to. Added depth (level) of
'shape' of the firework it belongs to. Added depth (level) of
explosion (normal particles reach level 1, splitters reach 2).
* name syntax: converted filenames to match the style of the ones

@ -479,7 +479,7 @@ void KFireSaver :: paintGL ()
glBegin( GL_QUADS );
flashedScreen = true;
}
// generating tqchildren and removing parent
// generating children and removing parent
int elementIndex = particleList.at();
explodeFirework(particle);
particleList.remove(elementIndex);

@ -220,7 +220,7 @@
<property name="text">
<string>P R E V I E W</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignCenter</set>
</property>
</widget>

@ -95,9 +95,9 @@ Writer::Writer( TQString descFileName )
return;
TQString welcomeString = i18n("Welcome to KDE %1.%2.%3")
.tqarg(TDE_VERSION_MAJOR)
.tqarg(TDE_VERSION_MINOR)
.tqarg(TDE_VERSION_RELEASE);
.arg(TDE_VERSION_MAJOR)
.arg(TDE_VERSION_MINOR)
.arg(TDE_VERSION_RELEASE);
spawnWords(welcomeString, Fun1);
}

@ -654,7 +654,7 @@ void KPendulumSaver::doTimeStep()
glArea->setEyePhi(eyePhi); // set new perspective
}
glArea->updateGL(); // tqrepaint scenery
glArea->updateGL(); // repaint scenery
timer->start(deltaT, TRUE); // restart timer
}
@ -704,28 +704,28 @@ KPendulumSetup::KPendulumSetup(TQWidget* parent, const char* name)
TQToolTip::add(
mEdit,
i18n("Ratio of 2nd mass to sum of both masses.\nValid values from %1 to %2.")
.tqarg(KPendulumSaver::massRatioLimitLower, 0, 'f', 2)
.tqarg(KPendulumSaver::massRatioLimitUpper, 0, 'f', 2));
.arg(KPendulumSaver::massRatioLimitLower, 0, 'f', 2)
.arg(KPendulumSaver::massRatioLimitUpper, 0, 'f', 2));
TQToolTip::add(
lEdit,
i18n("Ratio of 2nd pendulum part length to the sum of both part lengths.\nValid values from %1 to %2.")
.tqarg(KPendulumSaver::lengthRatioLimitLower, 0, 'f', 2)
.tqarg(KPendulumSaver::lengthRatioLimitUpper, 0, 'f', 2));
.arg(KPendulumSaver::lengthRatioLimitLower, 0, 'f', 2)
.arg(KPendulumSaver::lengthRatioLimitUpper, 0, 'f', 2));
TQToolTip::add(
gEdit,
i18n("Gravitational constant in arbitrary units.\nValid values from %1 to %2.")
.tqarg(KPendulumSaver::gLimitLower, 0, 'f', 2)
.tqarg(KPendulumSaver::gLimitUpper, 0, 'f', 2));
.arg(KPendulumSaver::gLimitLower, 0, 'f', 2)
.arg(KPendulumSaver::gLimitUpper, 0, 'f', 2));
TQToolTip::add(
eEdit,
i18n("Energy in units of the maximum potential energy of the given configuration.\nValid values from %1 to %2.")
.tqarg(KPendulumSaver::ELimitLower, 0, 'f', 2)
.tqarg(KPendulumSaver::ELimitUpper, 0, 'f', 2));
.arg(KPendulumSaver::ELimitLower, 0, 'f', 2)
.arg(KPendulumSaver::ELimitUpper, 0, 'f', 2));
TQToolTip::add(
persSpinBox,
i18n("Time in seconds after which a random perspective change occurs.\nValid values from %1 to %2.")
.tqarg(KPendulumSaver::persChangeIntervalLimitLower)
.tqarg(KPendulumSaver::persChangeIntervalLimitUpper));
.arg(KPendulumSaver::persChangeIntervalLimitLower)
.arg(KPendulumSaver::persChangeIntervalLimitUpper));
// init preview area
preview->setBackgroundColor(black);

@ -173,7 +173,7 @@ l&lt;sub&gt;1&lt;/sub&gt;+l&lt;sub&gt;2&lt;/sub&gt;
<property name="text">
<string>g</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignCenter</set>
</property>
</widget>
@ -216,7 +216,7 @@ l&lt;sub&gt;1&lt;/sub&gt;+l&lt;sub&gt;2&lt;/sub&gt;
<property name="text">
<string>E</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignCenter</set>
</property>
</widget>

@ -716,18 +716,18 @@ KRotationSetup::KRotationSetup(TQWidget* parent, const char* name)
TQToolTip::add(
lengthEdit,
i18n("Length of traces in seconds of visibility.\nValid values from %1 to %2.")
.tqarg(KRotationSaver::traceLengthSecondsLimitLower, 0, 'f', 2)
.tqarg(KRotationSaver::traceLengthSecondsLimitUpper, 0, 'f', 2));
.arg(KRotationSaver::traceLengthSecondsLimitLower, 0, 'f', 2)
.arg(KRotationSaver::traceLengthSecondsLimitUpper, 0, 'f', 2));
TQToolTip::add(
LzEdit,
i18n("Angular momentum in z direction in arbitrary units.\nValid values from %1 to %2.")
.tqarg(KRotationSaver::LzLimitLower, 0, 'f', 2)
.tqarg(KRotationSaver::LzLimitUpper, 0, 'f', 2));
.arg(KRotationSaver::LzLimitLower, 0, 'f', 2)
.arg(KRotationSaver::LzLimitUpper, 0, 'f', 2));
TQToolTip::add(
thetaEdit,
i18n("Gravitational constant in arbitrary units.\nValid values from %1 to %2.")
.tqarg(KRotationSaver::initEulerThetaLimitLower, 0, 'f', 2)
.tqarg(KRotationSaver::initEulerThetaLimitUpper, 0, 'f', 2));
.arg(KRotationSaver::initEulerThetaLimitLower, 0, 'f', 2)
.arg(KRotationSaver::initEulerThetaLimitUpper, 0, 'f', 2));
// init preview area
preview->setBackgroundColor(black);

@ -95,7 +95,7 @@ kSlideShowSaver::kSlideShowSaver( WId id ): KScreenSaver(id)
connect(&mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()));
TQDesktopWidget *d = TQApplication::desktop();
if( tqgeometry() == d->tqgeometry() && d->numScreens() > 1)
if( geometry() == d->geometry() && d->numScreens() > 1)
{
for(int i = 0; i < d->numScreens(); ++i)
{

@ -366,10 +366,10 @@
"*up.labelString: /\\\\ ",
"*frameLabel.labelString: ",
"*cmdLabel.labelString: Command Line:",
"*cmdLabel.tqalignment: ALIGNMENT_BEGINNING",
"*cmdLabel.alignment: ALIGNMENT_BEGINNING",
"*enabled.labelString: Enabled",
"*visLabel.labelString: Visual:",
"*visLabel.tqalignment: ALIGNMENT_END",
"*visLabel.alignment: ALIGNMENT_END",
"*visLabel.leftOffset: 20",
"*demo.labelString: Demo",
"*man.labelString: Documentation...",

@ -125,7 +125,7 @@ bool KXSConfigDialog::create()
// fall back to KDE's old config files.
int idx = 0;
while (true) {
TQString group = TQString("Arg%1").tqarg(idx);
TQString group = TQString("Arg%1").arg(idx);
if (config.hasGroup(group)) {
config.setGroup(group);
TQString type = config.readEntry("Type");
@ -229,7 +229,7 @@ void KXSConfigDialog::slotPreviewExited(KProcess *)
while ( !saver[i].isSpace() ) word += saver[i++];
//work around a KStandarDirs::findExe() "feature" where it looks in $TDEDIR/bin first no matter what and sometimes finds the wrong executable
TQFileInfo checkExe;
TQString saverdir = TQString("%1/%2").tqarg(XSCREENSAVER_HACKS_DIR).tqarg(word);
TQString saverdir = TQString("%1/%2").arg(XSCREENSAVER_HACKS_DIR).arg(word);
TQString path;
checkExe.setFile(saverdir);
if (checkExe.exists() && checkExe.isExecutable() && checkExe.isFile())
@ -378,7 +378,7 @@ int main(int argc, char *argv[])
app.exec();
} else {
KMessageBox::sorry(0,
i18n("No configuration available for %1").tqarg(name),
i18n("No configuration available for %1").arg(name),
name );
}

@ -65,7 +65,7 @@ KXSRangeItem::KXSRangeItem(const TQString &name, const TQXmlAttributes &attr )
TQString KXSRangeItem::command()
{
return mSwitch.tqarg(mInvert?mMaximum-(mValue-mMinimum):mValue);
return mSwitch.arg(mInvert?mMaximum-(mValue-mMinimum):mValue);
}
void KXSRangeItem::read(KConfig &config)
@ -109,7 +109,7 @@ KXSDoubleRangeItem::KXSDoubleRangeItem(const TQString &name, const TQXmlAttribut
TQString KXSDoubleRangeItem::command()
{
return mSwitch.tqarg(mInvert?mMaximum-(mValue-mMinimum):mValue);
return mSwitch.arg(mInvert?mMaximum-(mValue-mMinimum):mValue);
}
void KXSDoubleRangeItem::read(KConfig &config)
@ -232,7 +232,7 @@ KXSStringItem::KXSStringItem(const TQString &name, const TQXmlAttributes &attr )
TQString KXSStringItem::command()
{
if (!mValue.isEmpty())
return mSwitch.tqarg(mValue);
return mSwitch.arg(mValue);
return "";
}

@ -108,7 +108,7 @@ int main(int argc, char *argv[])
int idx = 0;
while (true)
{
TQString group = TQString("Arg%1").tqarg(idx);
TQString group = TQString("Arg%1").arg(idx);
if (config.hasGroup(group)) {
config.setGroup(group);
TQString type = config.readEntry("Type");
@ -135,7 +135,7 @@ int main(int argc, char *argv[])
// find the xscreensaver executable
//work around a KStandarDirs::findExe() "feature" where it looks in $TDEDIR/bin first no matter what and sometimes finds the wrong executable
TQFileInfo checkExe;
TQString saverdir = TQString("%1/%2").tqarg(XSCREENSAVER_HACKS_DIR).tqarg(filename);
TQString saverdir = TQString("%1/%2").arg(XSCREENSAVER_HACKS_DIR).arg(filename);
kdDebug() << "saverdir is" << saverdir << endl;
TQString exeFile;
checkExe.setFile(saverdir);

@ -38,7 +38,7 @@ typedef struct LockStruct_s {
ModeHook *init_hook; /* func to init a mode */
ModeHook *callback_hook; /* func to run (tick) a mode */
ModeHook *release_hook; /* func to shutdown a mode */
ModeHook *refresh_hook; /* tells mode to tqrepaint */
ModeHook *refresh_hook; /* tells mode to repaint */
ModeHook *change_hook; /* user wants mode to change */
ModeHook *unused_hook; /* for future expansion */
ModeSpecOpt *msopt; /* this mode's def resources */
@ -313,10 +313,10 @@ extern ModeHook release_galaxy;
extern ModeHook refresh_galaxy;
extern ModeSpecOpt galaxy_opts;
extern ModeHook init_tqgeometry;
extern ModeHook draw_tqgeometry;
extern ModeHook release_tqgeometry;
extern ModeHook refresh_tqgeometry;
extern ModeHook init_geometry;
extern ModeHook draw_geometry;
extern ModeHook release_geometry;
extern ModeHook refresh_geometry;
extern ModeSpecOpt geometry_opts;
extern ModeHook init_grav;
@ -504,11 +504,11 @@ extern ModeHook release_rotor;
extern ModeHook refresh_rotor;
extern ModeSpecOpt rotor_opts;
extern ModeHook init_tqshape;
extern ModeHook draw_tqshape;
extern ModeHook release_tqshape;
extern ModeHook refresh_tqshape;
extern ModeSpecOpt tqshape_opts;
extern ModeHook init_shape;
extern ModeHook draw_shape;
extern ModeHook release_shape;
extern ModeHook refresh_shape;
extern ModeSpecOpt shape_opts;
extern ModeHook init_slip;
extern ModeHook draw_slip;

@ -275,7 +275,7 @@ static void Init(void)
glDisable(GL_DITHER);
}
void retqshape(int width, int height)
void reshape(int width, int height)
{
windW = (GLint)width;
@ -444,7 +444,7 @@ initSpace(Window window)
glClearIndex(BlackPixel(display, screen));
}
retqshape(xwa.width, xwa.height);
reshape(xwa.width, xwa.height);
Init();
}
@ -725,8 +725,8 @@ void main(int argc, char **argv)
Init();
tkExposeFunc(Retqshape);
tkRetqshapeFunc(Retqshape);
tkExposeFunc(Reshape);
tkReshapeFunc(Reshape);
tkKeyDownFunc(Key);
tkIdleFunc(Idle);
tkExec();

@ -139,7 +139,7 @@ extern char *text_pass;
extern char *text_info;
extern char *text_valid;
extern char *text_invalid;
extern char *tqgeometry;
extern char *geometry;
extern float saturation;
extern int nicelevel;
extern int delay;

@ -857,7 +857,7 @@ void dotNETstyle::drawControl(TQ_ControlElement element,
case CE_TabBarTab: {
const TQTabBar *tb = (const TQTabBar *) widget;
bool cornerWidget = false;
TQTabBar::Shape tbs = tb->tqshape();
TQTabBar::Shape tbs = tb->shape();
bool selected = flags & Style_Selected;
int x, x2, y, y2, w, h;
r.rect(&x, &y, &w, &h);
@ -1794,8 +1794,8 @@ int dotNETstyle::pixelMetric(PixelMetric m, const TQWidget *widget) const
// ----
case PM_TabBarTabVSpace: {
const TQTabBar * tb = (const TQTabBar *) widget;
if (tb->tqshape() == TQTabBar::RoundedAbove ||
tb->tqshape() == TQTabBar::RoundedBelow)
if (tb->shape() == TQTabBar::RoundedAbove ||
tb->shape() == TQTabBar::RoundedBelow)
return 12;
else
return 0;
@ -1803,8 +1803,8 @@ int dotNETstyle::pixelMetric(PixelMetric m, const TQWidget *widget) const
case PM_TabBarTabOverlap: {
const TQTabBar* tb = (const TQTabBar*)widget;
if (tb->tqshape() != TQTabBar::RoundedAbove &&
tb->tqshape() != TQTabBar::RoundedBelow)
if (tb->shape() != TQTabBar::RoundedAbove &&
tb->shape() != TQTabBar::RoundedBelow)
return 3; // Leave standard size alone
else
return 1; // Change size for our tabs only

@ -421,7 +421,7 @@ void PhaseStyle::drawPhaseTab(TQPainter *painter,
edge = false;
}
switch (TQTabBar::Shape(bar->tqshape())) {
switch (TQTabBar::Shape(bar->shape())) {
case TQTabBar::RoundedAbove:
case TQTabBar::TriangularAbove: {
// is there a corner widget?
@ -1259,8 +1259,8 @@ void PhaseStyle::drawControl(TQ_ControlElement element,
const TQButton *b = ::tqqt_cast<const TQButton*>(widget);
if (!b) return;
int tqalignment = reverse_ ? AlignRight : AlignLeft;
drawItem(painter, rect, tqalignment | AlignVCenter | ShowPrefix,
int alignment = reverse_ ? AlignRight : AlignLeft;
drawItem(painter, rect, alignment | AlignVCenter | ShowPrefix,
group, flags & Style_Enabled, b->pixmap(), b->text());
// only draw focus if content (forms on html won't)
@ -1973,7 +1973,7 @@ int PhaseStyle::pixelMetric(PixelMetric metric, const TQWidget *widget) const
case PM_TabBarTabVSpace:
if (const TQTabBar *tb = ::tqqt_cast<const TQTabBar*>(widget)) {
if (tb->tqshape() == TQTabBar::RoundedAbove) {
if (tb->shape() == TQTabBar::RoundedAbove) {
return 10;
} else {
return 6;
@ -2323,17 +2323,17 @@ bool PhaseStyle::eventFilter(TQObject *object, TQEvent *event)
// TQFrame lines (do this guy last)
else if (0 != (frame = ::tqqt_cast<TQFrame*>(object))) {
TQFrame::Shape tqshape = frame->frameShape();
switch (tqshape) {
TQFrame::Shape shape = frame->frameShape();
switch (shape) {
case TQFrame::HLine:
case TQFrame::VLine: {
// NOTE: assuming lines have no content
TQPainter painter(frame);
TQT_TQRECT_OBJECT(frame->rect()).rect(&x, &y, &w, &h);
painter.setPen(frame->colorGroup().dark());
if (tqshape == TQFrame::HLine) {
if (shape == TQFrame::HLine) {
painter.drawLine(0, h/2, w, h/2);
} else if (tqshape == TQFrame::VLine) {
} else if (shape == TQFrame::VLine) {
painter.drawLine(w/2, 0, w/2, h);
}
return true;
@ -2355,12 +2355,12 @@ bool PhaseStyle::eventFilter(TQObject *object, TQEvent *event)
if (0 != (widget = ::tqqt_cast<TQWidget*>(object)) &&
widget->isEnabled()) {
hover_ = widget;
widget->tqrepaint(false);
widget->repaint(false);
}
} else if (event->type() == TQEvent::Leave) {
if (0 != (widget = ::tqqt_cast<TQWidget*>(object))) {
hover_ = 0;
widget->tqrepaint(false);
widget->repaint(false);
}
}
} else if (::tqqt_cast<TQTabBar*>(object)) { // special case for qtabbar
@ -2369,13 +2369,13 @@ bool PhaseStyle::eventFilter(TQObject *object, TQEvent *event)
widget->isEnabled()) {
hover_ = widget;
hovertab_ = 0;;
widget->tqrepaint(false);
widget->repaint(false);
}
} else if (event->type() == TQEvent::Leave) {
if (0 != (widget = ::tqqt_cast<TQWidget*>(object))) {
hover_ = 0;
hovertab_ = 0;;
widget->tqrepaint(false);
widget->repaint(false);
}
} else if (event->type() == TQEvent::MouseMove) {
TQTabBar *tabbar;
@ -2385,7 +2385,7 @@ bool PhaseStyle::eventFilter(TQObject *object, TQEvent *event)
TQTab *tab = tabbar->selectTab(me->pos());
if (hovertab_ != tab) {
hovertab_ = tab;
tabbar->tqrepaint(false);
tabbar->repaint(false);
}
}
}

@ -381,7 +381,7 @@ void CdeClient::addClientButtons( const TQString& s )
void CdeClient::captionChange()
{
widget()->tqrepaint(titlebar->tqgeometry(), false);
widget()->repaint(titlebar->geometry(), false);
}
void CdeClient::activeChange()
@ -389,7 +389,7 @@ void CdeClient::activeChange()
for ( int i=0; i < BtnCount; i++ )
if ( button[i] ) button[i]->reset();
widget()->tqrepaint(false);
widget()->repaint(false);
}
void CdeClient::maximizeChange()
@ -398,7 +398,7 @@ void CdeClient::maximizeChange()
bool m = maximizeMode() == MaximizeFull;
TQToolTip::remove(button[BtnMax]);
TQToolTip::add(button[BtnMax], m ? i18n("Restore") : i18n("Maximize"));
button[BtnMax]->tqrepaint();
button[BtnMax]->repaint();
}
}
@ -412,7 +412,7 @@ void CdeClient::shadeChange()
void CdeClient::showEvent(TQShowEvent *)
{
widget()->tqrepaint();
widget()->repaint();
}
void CdeClient::desktopChange()
@ -489,12 +489,12 @@ void CdeClient::resizeEvent( TQResizeEvent* e)
{
widget()->update( width() - dx + 1, 0, dx, height() );
widget()->update( TQRect( TQPoint(4,4),
titlebar->tqgeometry().bottomLeft() - TQPoint(1,0) ) );
widget()->update(TQRect(titlebar->tqgeometry().topRight(),
TQPoint(width() - 4, titlebar->tqgeometry().bottom())));
titlebar->geometry().bottomLeft() - TQPoint(1,0) ) );
widget()->update(TQRect(titlebar->geometry().topRight(),
TQPoint(width() - 4, titlebar->geometry().bottom())));
// Titlebar needs no paint event
TQApplication::postEvent( this, new TQPaintEvent( titlebar->tqgeometry(), false ) );
TQApplication::postEvent( this, new TQPaintEvent( titlebar->geometry(), false ) );
}
}
}
@ -512,7 +512,7 @@ void CdeClient::paintEvent( TQPaintEvent* )
fixColorGroup( colorGroup );
TQRect trect = titlebar->tqgeometry();
TQRect trect = titlebar->geometry();
TQRect mrect = widget()->rect();
if ( s_frameWidth > 0 )
@ -712,24 +712,24 @@ KDecoration::Position CdeClient::mousePosition( const TQPoint& p ) const
void CdeClient::mouseDoubleClickEvent( TQMouseEvent * e )
{
if ( e->button() == Qt::LeftButton && titlebar->tqgeometry().contains( e->pos() ) )
if ( e->button() == Qt::LeftButton && titlebar->geometry().contains( e->pos() ) )
titlebarDblClickOperation();
}
void CdeClient::wheelEvent( TQWheelEvent * e )
{
if (isSetShade() || titleLayout->tqgeometry().contains( e->pos() ) )
if (isSetShade() || titleLayout->geometry().contains( e->pos() ) )
titlebarMouseWheelOperation( e->delta());
}
void CdeClient::mousePressEvent( TQMouseEvent * e )
{
if ( e->button() == Qt::LeftButton && titlebar->tqgeometry().contains( e->pos() ) )
if ( e->button() == Qt::LeftButton && titlebar->geometry().contains( e->pos() ) )
{
if ( titlebarButtonMode )
{
titlebarPressed = true;
widget()->tqrepaint(titlebar->tqgeometry(), false);
widget()->repaint(titlebar->geometry(), false);
}
}
}
@ -745,7 +745,7 @@ void CdeClient::mouseReleaseEvent( TQMouseEvent * e )
if ( e->button() == Qt::LeftButton && titlebarPressed )
{
titlebarPressed = false;
widget()->tqrepaint(titlebar->tqgeometry(), false);
widget()->repaint(titlebar->geometry(), false);
}
}
@ -797,7 +797,7 @@ CdeButton::CdeButton(CdeClient* parent,
void CdeButton::reset()
{
tqrepaint( false );
repaint( false );
}
void CdeButton::drawButton( TQPainter* p )

@ -30,7 +30,7 @@ CdeConfig::CdeConfig( KConfig* conf, TQWidget* parent )
bgAlign = new TQButtonGroup( 3, Qt::Horizontal, i18n("Text &Alignment"), groupBox );
bgAlign->setExclusive( true );
TQWhatsThis::add( bgAlign, i18n("Use these buttons to set the tqalignment of the titlebar caption text.") );
TQWhatsThis::add( bgAlign, i18n("Use these buttons to set the alignment of the titlebar caption text.") );
new TQRadioButton( i18n("Left"), bgAlign, "AlignLeft" );
TQRadioButton *radio2 = new TQRadioButton( i18n("Centered"), bgAlign, "AlignHCenter" );
radio2->setChecked( true );

@ -132,7 +132,7 @@ void GlowButton::setPixmapName(const TQString& pixmapName)
// set steps
_steps = pixmap->height()/pixmap->width() - 1;
tqrepaint(false);
repaint(false);
}
void GlowButton::paintEvent( TQPaintEvent *e )
@ -180,7 +180,7 @@ void GlowButton::mousePressEvent( TQMouseEvent *e )
if( m_timer->isActive() )
m_timer->stop();
m_pos = _steps;
tqrepaint(false);
repaint(false);
// without pretending LeftButton, clicking on the button with MidButton
// or RightButton would cause unwanted titlebar action
TQMouseEvent me (e->type(), e->pos(), e->globalPos(),
@ -195,7 +195,7 @@ void GlowButton::mouseReleaseEvent( TQMouseEvent *e )
if( ! m_timer->isActive() ) {
m_timer->start(m_updateTime);
}
if( ! tqgeometry().contains(p) ) {
if( ! geometry().contains(p) ) {
m_timerStatus = Stop;
}
TQMouseEvent me (e->type(), e->pos(), e->globalPos(),
@ -205,7 +205,7 @@ void GlowButton::mouseReleaseEvent( TQMouseEvent *e )
void GlowButton::slotTimeout()
{
tqrepaint(false);
repaint(false);
if( m_pos>=_steps-1 ) {
m_pos = -m_pos;

@ -404,14 +404,14 @@ GlowClient::~GlowClient()
void GlowClient::resizeEvent( TQResizeEvent * )
{
doShape();
widget()->tqrepaint(false);
widget()->repaint(false);
}
void GlowClient::paintEvent( TQPaintEvent * )
{
GlowClientConfig *conf = GlowClientGlobals::instance()->config();
TQRect r_this = widget()->rect();
TQRect r_title = _title_spacer->tqgeometry();
TQRect r_title = _title_spacer->geometry();
TQColorGroup titleCg = options()->colorGroup(ColorTitleBar, isActive());
TQColorGroup titleBlendCg=options()->colorGroup(ColorTitleBlend, isActive());
TQColorGroup cg = widget()->colorGroup();
@ -489,7 +489,7 @@ void GlowClient::paintEvent( TQPaintEvent * )
bitBlt(widget(), 0, 0, title_buffer);
for (unsigned int i=0; i<m_buttonList.size(); ++i)
m_buttonList[i]->tqrepaint(false);
m_buttonList[i]->repaint(false);
p.begin(widget());
p.setPen(TQt::black);
@ -521,12 +521,12 @@ void GlowClient::paintEvent( TQPaintEvent * )
void GlowClient::showEvent( TQShowEvent * )
{
doShape();
widget()->tqrepaint(false);
widget()->repaint(false);
}
void GlowClient::mouseDoubleClickEvent( TQMouseEvent *e )
{
if(e->button() == Qt::LeftButton && _title_spacer->tqgeometry().contains(e->pos()))
if(e->button() == Qt::LeftButton && _title_spacer->geometry().contains(e->pos()))
titlebarDblClickOperation();
}
@ -539,7 +539,7 @@ void GlowClient::wheelEvent( TQWheelEvent *e )
void GlowClient::activeChange()
{
updateButtonPixmaps();
widget()->tqrepaint(false);
widget()->repaint(false);
}
void GlowClient::iconChange()
@ -553,7 +553,7 @@ void GlowClient::shadeChange()
void GlowClient::captionChange()
{
widget()->update(_title_spacer->tqgeometry());
widget()->update(_title_spacer->geometry());
}
TQSize GlowClient::minimumSize() const

@ -802,7 +802,7 @@ void IceWMButton::usePixmap( TQPixmap* (*p)[2] )
if (validPixmaps( *p )) {
pix = p;
setFixedSize( (*pix)[Active]->width(), titleBarHeight );
tqrepaint( false );
repaint( false );
} else
pix = NULL;
}
@ -1186,9 +1186,9 @@ void IceWMClient::resizeEvent( TQResizeEvent* e )
if ( dx )
{
widget()->update( width() - dx + 1, 0, dx, height() );
widget()->update( TQRect( TQPoint(4,4), titlebar->tqgeometry().bottomLeft() - TQPoint(1,0) ) );
widget()->update( TQRect( titlebar->tqgeometry().topRight(), TQPoint( width() - 4, titlebar->tqgeometry().bottom() ) ) );
widget()->tqrepaint(titlebar->tqgeometry(), false);
widget()->update( TQRect( TQPoint(4,4), titlebar->geometry().bottomLeft() - TQPoint(1,0) ) );
widget()->update( TQRect( titlebar->geometry().topRight(), TQPoint( width() - 4, titlebar->geometry().bottom() ) ) );
widget()->repaint(titlebar->geometry(), false);
}
}
}
@ -1377,46 +1377,46 @@ void IceWMClient::paintEvent( TQPaintEvent* )
TQPainter p2( titleBuffer, this );
titleBuffer->fill( act ? *colorActiveTitleBar : *colorInActiveTitleBar );
r = titleSpacerJ->tqgeometry();
r = titleSpacerJ->geometry();
if (!r.isEmpty() && titleJ[ act ])
p2.drawPixmap( r.x()-borderSizeX, 0, *titleJ[ act ]);
r = titleSpacerL->tqgeometry();
r = titleSpacerL->geometry();
if (!r.isEmpty() && titleL[ act ])
p2.drawPixmap( r.x()-borderSizeX, 0, *titleL[ act ]);
r = titleSpacerS->tqgeometry();
r = titleSpacerS->geometry();
if (!r.isEmpty() && titleS[ act ])
p2.drawTiledPixmap( r.x()-borderSizeX, 0, r.width(), titleBarHeight, *titleS[ act ]);
r = titleSpacerP->tqgeometry();
r = titleSpacerP->geometry();
if (!r.isEmpty() && titleP[ act ])
p2.drawPixmap( r.x()-borderSizeX, 0, *titleP[ act ]);
r = titlebar->tqgeometry();
r = titlebar->geometry();
if (!r.isEmpty() && titleT[ act ] )
p2.drawTiledPixmap( r.x()-borderSizeX, 0, r.width(), titleBarHeight, *titleT[ act ]);
r = titleSpacerM->tqgeometry();
r = titleSpacerM->geometry();
if (!r.isEmpty() && titleM[ act ])
p2.drawPixmap( r.x()-borderSizeX, 0, *titleM[ act ], 0, 0, r.width(), r.height());
r = titleSpacerB->tqgeometry();
r = titleSpacerB->geometry();
if (!r.isEmpty() && titleB[ act ])
p2.drawTiledPixmap( r.x()-borderSizeX, 0, r.width(), titleBarHeight, *titleB[ act ]);
r = titleSpacerR->tqgeometry();
r = titleSpacerR->geometry();
if (!r.isEmpty() && titleR[ act ])
p2.drawPixmap( r.x()-borderSizeX, 0, *titleR[ act ], 0, 0, r.width(), r.height());
r = titleSpacerQ->tqgeometry();
r = titleSpacerQ->geometry();
if (!r.isEmpty() && titleQ[ act ])
p2.drawPixmap( r.x()-borderSizeX, 0, *titleQ[ act ], 0, 0, r.width(), r.height());
p2.setFont( options()->font(true) );
// Pre-compute as much as possible
r = titlebar->tqgeometry();
r = titlebar->geometry();
rx = r.x() - borderSizeX;
rw = width()-(2*borderSizeX)-r.x();
@ -1432,7 +1432,7 @@ void IceWMClient::paintEvent( TQPaintEvent* )
p2.drawText(rx, 0, rw, titleBarHeight, AlignLeft|AlignVCenter, caption());
p2.end();
bitBlt( widget(), borderSizeX, hb->tqgeometry().y(), titleBuffer );
bitBlt( widget(), borderSizeX, hb->geometry().y(), titleBuffer );
delete titleBuffer;
}
@ -1486,7 +1486,7 @@ void IceWMClient::iconChange()
renderMenuIcons();
button[BtnSysMenu]->usePixmap( &menuButtonWithIconPix );
if (button[BtnSysMenu]->isVisible())
button[BtnSysMenu]->tqrepaint(false);
button[BtnSysMenu]->repaint(false);
}
}
}
@ -1497,7 +1497,7 @@ void IceWMClient::desktopChange()
if (button[BtnDepth])
{
button[BtnDepth]->turnOn( isOnAllDesktops() );
button[BtnDepth]->tqrepaint(false);
button[BtnDepth]->repaint(false);
button[BtnDepth]->setTipText(isOnAllDesktops() ? i18n("Not on all desktops") : i18n("On all desktops"));
}
}
@ -1512,7 +1512,7 @@ void IceWMClient::captionChange()
TQSizePolicy::Preferred, TQSizePolicy::Fixed );
titlebar->invalidate();
grid->activate();
widget()->tqrepaint( r, false );
widget()->repaint( r, false );
}
@ -1541,12 +1541,12 @@ void IceWMClient::shadeChange()
void IceWMClient::activeChange()
{
widget()->tqrepaint(false);
widget()->repaint(false);
// Reset the button pixmaps.
for(int i= IceWMClient::BtnSysMenu; i < IceWMClient::BtnCount; i++)
if(button[i])
button[i]->tqrepaint( false );
button[i]->repaint( false );
}

@ -398,7 +398,7 @@ void StdClient::activeChange()
button[ButtonClose]->setIconSet(on ? *close_pix : *dis_close_pix);
if (button[ButtonHelp])
button[ButtonHelp]->setIconSet(on ? *question_mark_pix : *dis_question_mark_pix);
widget()->tqrepaint( titlebar->tqgeometry(), false );
widget()->repaint( titlebar->geometry(), false );
}
@ -413,7 +413,7 @@ StdClient::~StdClient()
void StdClient::resizeEvent( TQResizeEvent* )
{
TQRegion rr = widget()->rect();
TQRect t = titlebar->tqgeometry();
TQRect t = titlebar->geometry();
// t.setTop( 0 );
// TQRegion r = rr.subtract( TQRect( t.x()+1, 0, t.width()-2, 1 ) );
// setMask( r );
@ -429,7 +429,7 @@ void StdClient::resizeEvent( TQResizeEvent* )
*/
void StdClient::captionChange()
{
widget()->tqrepaint( titlebar->tqgeometry(), FALSE );
widget()->repaint( titlebar->geometry(), FALSE );
}
@ -461,7 +461,7 @@ void StdClient::desktopChange()
void StdClient::paintEvent( TQPaintEvent* )
{
TQPainter p( widget() );
TQRect t = titlebar->tqgeometry();
TQRect t = titlebar->geometry();
TQRegion r = widget()->rect();
r = r.subtract( t );
p.setClipRegion( r );
@ -494,14 +494,14 @@ void StdClient::paintEvent( TQPaintEvent* )
void StdClient::mouseDoubleClickEvent( TQMouseEvent * e )
{
if ( e->button() == Qt::LeftButton && titlebar->tqgeometry().contains( e->pos() ) )
if ( e->button() == Qt::LeftButton && titlebar->geometry().contains( e->pos() ) )
titlebarDblClickOperation();
}
void StdClient::wheelEvent( TQWheelEvent * e )
{
if (isSetShade() || TQRect( 0, 0, width(), titlebar->tqgeometry().height() ).contains( e->pos() ) )
if (isSetShade() || TQRect( 0, 0, width(), titlebar->geometry().height() ).contains( e->pos() ) )
titlebarMouseWheelOperation( e->delta());
}
@ -513,7 +513,7 @@ void StdClient::iconChange()
button[ButtonMenu]->setIconSet(isActive() ? *menu_pix : *dis_menu_pix);
else
button[ButtonMenu]->setIconSet( icon().pixmap( TQIconSet::Small, TQIconSet::Normal ) );
button[ButtonMenu]->tqrepaint( FALSE );
button[ButtonMenu]->repaint( FALSE );
}
}
@ -636,7 +636,7 @@ StdToolClient::~StdToolClient()
void StdToolClient::resizeEvent( TQResizeEvent* )
{
// TQRegion r = rect();
// TQRect t = titlebar->tqgeometry();
// TQRect t = titlebar->geometry();
// t.setTop( 0 );
// r = r.subtract( TQRect(0, 0, width(), 1) );
// r = r.subtract (TQRect( 0, 0, 1, t.height() ) );
@ -647,7 +647,7 @@ void StdToolClient::resizeEvent( TQResizeEvent* )
void StdToolClient::paintEvent( TQPaintEvent* )
{
TQPainter p( widget() );
TQRect t = titlebar->tqgeometry();
TQRect t = titlebar->geometry();
TQRect r = widget()->rect();
qDrawWinPanel( &p, r, widget()->colorGroup() );
r.setTop( t.bottom()+1 );
@ -665,19 +665,19 @@ void StdToolClient::paintEvent( TQPaintEvent* )
void StdToolClient::mouseDoubleClickEvent( TQMouseEvent * e )
{
if ( e->button() == Qt::LeftButton && titlebar->tqgeometry().contains( e->pos() ) )
if ( e->button() == Qt::LeftButton && titlebar->geometry().contains( e->pos() ) )
titlebarDblClickOperation();
}
void StdToolClient::wheelEvent( TQWheelEvent * e )
{
if (isSetShade() || TQRect( 0, 0, width(), titlebar->tqgeometry().height() ).contains( e->pos() ) )
if (isSetShade() || TQRect( 0, 0, width(), titlebar->geometry().height() ).contains( e->pos() ) )
titlebarMouseWheelOperation( e->delta());
}
void StdToolClient::captionChange()
{
widget()->tqrepaint( titlebar->tqgeometry(), FALSE );
widget()->repaint( titlebar->geometry(), FALSE );
}
void StdToolClient::reset( unsigned long )

@ -340,14 +340,14 @@ NextButton::NextButton(NextClient *parent, const char *name,
void NextButton::reset()
{
tqrepaint(false);
repaint(false);
}
void NextButton::setBitmap(const unsigned char *bitmap, int w, int h)
{
deco = new TQBitmap(w, h, bitmap, true);
deco->setMask(*deco);
tqrepaint();
repaint();
}
void NextButton::drawButton(TQPainter *p)
@ -602,7 +602,7 @@ bool NextClient::mustDrawHandle() const
void NextClient::iconChange()
{
if (button[MENU_IDX] && button[MENU_IDX]->isVisible())
button[MENU_IDX]->tqrepaint(false);
button[MENU_IDX]->repaint(false);
}
void NextClient::menuButtonPressed()
@ -658,9 +658,9 @@ void NextClient::resizeEvent(TQResizeEvent *)
// TODO ? update border area only?
widget()->update();
#if 0
widget()->update(titlebar->tqgeometry());
widget()->update(titlebar->geometry());
TQPainter p(widget());
TQRect t = titlebar->tqgeometry();
TQRect t = titlebar->geometry();
t.setTop( 0 );
TQRegion r = widget()->rect();
r = r.subtract( t );
@ -672,7 +672,7 @@ void NextClient::resizeEvent(TQResizeEvent *)
void NextClient::captionChange()
{
widget()->tqrepaint(titlebar->tqgeometry(), false);
widget()->repaint(titlebar->geometry(), false);
}
@ -686,7 +686,7 @@ void NextClient::paintEvent( TQPaintEvent* )
p.drawRect(fr);
// Draw title bar
TQRect t = titlebar->tqgeometry();
TQRect t = titlebar->geometry();
t.setTop(1);
p.drawTiledPixmap(t.x()+1, t.y()+1, t.width()-2, t.height()-2,
isActive() ? *aTitlePix : *iTitlePix);
@ -741,7 +741,7 @@ void NextClient::paintEvent( TQPaintEvent* )
void NextClient::mouseDoubleClickEvent( TQMouseEvent * e )
{
if (e->button() == Qt::LeftButton && titlebar->tqgeometry().contains( e->pos() ) )
if (e->button() == Qt::LeftButton && titlebar->geometry().contains( e->pos() ) )
titlebarDblClickOperation();
}
@ -753,7 +753,7 @@ void NextClient::wheelEvent( TQWheelEvent * e )
void NextClient::showEvent(TQShowEvent *)
{
widget()->tqrepaint();
widget()->repaint();
}
void NextClient::desktopChange()
@ -782,7 +782,7 @@ void NextClient::maximizeChange()
void NextClient::activeChange()
{
widget()->tqrepaint(false);
widget()->repaint(false);
slotReset();
}
@ -839,7 +839,7 @@ void NextClient::keepAboveChange(bool above)
TQToolTip::remove(b);
TQToolTip::add(b, above ?
i18n("Do not keep above others") : i18n("Keep above others"));
b->tqrepaint(false);
b->repaint(false);
}
}
@ -850,7 +850,7 @@ void NextClient::keepBelowChange(bool below)
TQToolTip::remove(b);
TQToolTip::add(b, below ?
i18n("Do not keep below others") : i18n("Keep below others"));
b->tqrepaint(false);
b->repaint(false);
}
}
@ -870,7 +870,7 @@ void NextClient::reset(unsigned long)
if (button[i])
button[i]->reset();
}
widget()->tqrepaint();
widget()->repaint();
}
bool NextClient::eventFilter(TQObject *o, TQEvent *e)

@ -226,7 +226,7 @@ TQSize OpenLook::minimumSize() const
OpenLook::resize(const TQSize& s)
{
widget()->resize(s);
widget()->tqrepaint(); //there is some strange wrong tqrepaint of the frame without
widget()->repaint(); //there is some strange wrong repaint of the frame without
}
void
@ -272,7 +272,7 @@ OpenLook::paintEvent(TQPaintEvent * pe)
void
OpenLook::showEvent(TQShowEvent *)
{
widget()->tqrepaint();
widget()->repaint();
}
void
@ -302,7 +302,7 @@ OpenLook::resizeEvent(TQResizeEvent* e)
void
OpenLook::activeChange()
{
widget()->tqrepaint();
widget()->repaint();
}
KDecoration::Position
@ -333,7 +333,7 @@ OpenLook::desktopChange()
void
OpenLook::maximizeChange()
{
widget()->tqrepaint(false);
widget()->repaint(false);
}
void
@ -377,7 +377,7 @@ OpenLook::animateMinimize(bool /*iconify*/)
if (!icongeom.isValid())
return false;
TQRect wingeom(tqgeometry());
TQRect wingeom(geometry());
TQPainter p(workspaceWidget());
@ -694,7 +694,7 @@ OpenLook::paintBorder(TQPainter & p) const
TQRect
OpenLook::titleRect() const
{
return titleSpacer_->tqgeometry();
return titleSpacer_->geometry();
}
bool
@ -704,7 +704,7 @@ OpenLook::isButtonPress(TQMouseEvent * e)
buttonDown_ = buttonRect().contains(mousePressPoint_);
widget()->tqrepaint(buttonRect());
widget()->repaint(buttonRect());
return buttonDown_;
}
@ -717,7 +717,7 @@ OpenLook::isButtonRelease(TQMouseEvent * e)
return true;
}
buttonDown_ = false;
widget()->tqrepaint(buttonRect());
widget()->repaint(buttonRect());
return false;
}

@ -51,16 +51,16 @@ Button::~Button()
void Button::setAlignment(Alignment a)
{
alignment_ = a;
tqrepaint();
repaint();
}
void Button::setActive(bool b)
{
active_ = b;
tqrepaint();
repaint();
}
Button::Alignment Button::tqalignment() const
Button::Alignment Button::alignment() const
{
return alignment_;
}
@ -69,7 +69,7 @@ void Button::mousePressEvent(TQMouseEvent *e)
{
down_ = true;
lastButton_ = e->button();
tqrepaint();
repaint();
TQMouseEvent me(e->type(), e->pos(), e->globalPos(),
(e->button()&realizeButtons_) ? Qt::LeftButton : Qt::NoButton,
@ -81,7 +81,7 @@ void Button::mouseReleaseEvent(TQMouseEvent *e)
{
down_ = false;
lastButton_ = e->button();
tqrepaint();
repaint();
TQMouseEvent me(e->type(), e->pos(), e->globalPos(),
(e->button()&realizeButtons_) ? Qt::LeftButton : Qt::NoButton,
e->state());
@ -133,7 +133,7 @@ void Button::setPixmap(const TQPixmap &p)
iPixmap_.setMask(*p.mask());
}
}
tqrepaint();
repaint();
}
void Button::paintEvent(TQPaintEvent *)

@ -48,7 +48,7 @@ class Button : public TQWidget
void setAlignment(Alignment);
Alignment tqalignment() const;
Alignment alignment() const;
protected slots:

@ -142,14 +142,14 @@ TQSize Manager::minimumSize() const
void Manager::activeChange()
{
updateTitleBuffer();
widget()->tqrepaint();
widget()->repaint();
emit(activeChanged(isActive()));
}
void Manager::captionChange()
{
updateTitleBuffer();
widget()->tqrepaint();
widget()->repaint();
}
void Manager::iconChange()
@ -197,7 +197,7 @@ void Manager::paintEvent(TQPaintEvent *e)
// Title bar.
TQRect tr = titleSpacer_->tqgeometry();
TQRect tr = titleSpacer_->geometry();
bitBlt(widget(), tr.topLeft(), &titleBuf_);
// Resize bar.
@ -224,7 +224,7 @@ void Manager::resizeEvent(TQResizeEvent*)
{
updateButtonVisibility();
updateTitleBuffer();
widget()->tqrepaint();
widget()->repaint();
}
void Manager::updateButtonVisibility()
@ -292,7 +292,7 @@ void Manager::updateTitleBuffer()
Static * s = Static::instance();
TQRect tr = titleSpacer_->tqgeometry();
TQRect tr = titleSpacer_->geometry();
if (tr.width() == 0 || tr.height() == 0)
titleBuf_.resize(8, 8);
@ -352,13 +352,13 @@ KDecoration::Position Manager::mousePosition(const TQPoint& p) const
void Manager::mouseDoubleClickEvent(TQMouseEvent *e)
{
if (e->button() == Qt::LeftButton && titleSpacer_->tqgeometry().contains(e->pos()))
if (e->button() == Qt::LeftButton && titleSpacer_->geometry().contains(e->pos()))
titlebarDblClickOperation();
}
void Manager::wheelEvent(TQWheelEvent *e)
{
if (isSetShade() || titleLayout_->tqgeometry().contains(e->pos()) )
if (isSetShade() || titleLayout_->geometry().contains(e->pos()) )
titlebarMouseWheelOperation( e->delta());
}

@ -78,7 +78,7 @@ void MaximiseButton::setOn(bool on)
on_ = on;
setPixmap(on_ ? TQPixmap((const char **)unmaximise_xpm)
: TQPixmap((const char **)maximise_xpm));
tqrepaint();
repaint();
TQToolTip::remove(this);
TQToolTip::add(this, on_ ? i18n("Restore") : i18n("Maximize"));
}

@ -77,7 +77,7 @@ void StickyButton::setOn(bool on)
on_ = on;
setPixmap(on_ ? TQPixmap((const char **)unsticky_xpm) :
TQPixmap((const char **)sticky_xpm));
tqrepaint();
repaint();
TQToolTip::remove(this);
TQToolTip::add(this, on_ ? i18n("Not on all desktops")
: i18n("On all desktops"));

@ -197,7 +197,7 @@
<cstring>textLabel1_3</cstring>
</property>
<property name="text">
<string>Text tqalignment:</string>
<string>Text alignment:</string>
</property>
</widget>
<widget class="TQLabel" row="3" column="0">
@ -274,14 +274,14 @@
<property name="title">
<string></string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop</set>
</property>
<property name="toolTip" stdset="0">
<string></string>
</property>
<property name="whatsThis" stdset="0">
<string>Use these buttons to set the tqalignment of the window title</string>
<string>Use these buttons to set the alignment of the window title</string>
</property>
<hbox>
<property name="name">

@ -94,7 +94,7 @@ KDecoration* smoothblendFactory::createDecoration(KDecorationBridge* b) {
// reset()
// -------
// Reset the handler. Returns true if decorations need to be remade, false if
// only a tqrepaint is necessary
// only a repaint is necessary
bool smoothblendFactory::reset(unsigned long changed) {
// read in the configuration
@ -232,7 +232,7 @@ void smoothblendButton::animate() {
animTmr->start(TIMERINTERVAL, true); // single-shot
}
}
tqrepaint(false);
repaint(false);
}
//////////////////////////////////////////////////////////////////////////////
// enterEvent()
@ -434,7 +434,7 @@ void smoothblendButton::drawButton( TQPainter *painter ) {
//that may produce pixilation of the image
painter->drawImage( dx, dy, menuButtonImage.smoothScale(newWidth, newHeight) );
} else {
//highlight on a mouse over tqrepaint
//highlight on a mouse over repaint
double factor = animProgress * 0.13;
if(!isDown())
@ -836,7 +836,7 @@ void smoothblendClient::activeChange() {
for (int n=0; n<ButtonTypeCount; n++)
if (button[n])
button[n]->reset();
widget()->tqrepaint(false);
widget()->repaint(false);
}
//////////////////////////////////////////////////////////////////////////////
@ -845,7 +845,7 @@ void smoothblendClient::activeChange() {
// The title has changed
void smoothblendClient::captionChange() {
widget()->tqrepaint(titlebar_->tqgeometry(), false);
widget()->repaint(titlebar_->geometry(), false);
}
//////////////////////////////////////////////////////////////////////////////
@ -858,7 +858,7 @@ void smoothblendClient::desktopChange() {
if (button[ButtonSticky]) {
TQToolTip::remove(button[ButtonSticky]);
TQToolTip::add(button[ButtonSticky], d ? i18n("Un-Sticky") : i18n("Sticky"));
button[ButtonSticky]->tqrepaint(false);
button[ButtonSticky]->repaint(false);
}
}
@ -869,7 +869,7 @@ void smoothblendClient::desktopChange() {
void smoothblendClient::iconChange() {
if (button[ButtonMenu]) {
button[ButtonMenu]->tqrepaint(false);
button[ButtonMenu]->repaint(false);
}
}
@ -883,7 +883,7 @@ void smoothblendClient::maximizeChange() {
if (button[ButtonMax]) {
TQToolTip::remove(button[ButtonMax]);
TQToolTip::add(button[ButtonMax], m ? i18n("Restore") : i18n("Maximize"));
button[ButtonMax]->tqrepaint(false);
button[ButtonMax]->repaint(false);
}
}
@ -897,7 +897,7 @@ void smoothblendClient::shadeChange() {
if (button[ButtonShade]) {
TQToolTip::remove(button[ButtonShade]);
TQToolTip::add(button[ButtonShade], s ? i18n("Unshade") : i18n("Shade"));
button[ButtonShade]->tqrepaint(false);
button[ButtonShade]->repaint(false);
}
}
@ -909,7 +909,7 @@ void smoothblendClient::shadeChange() {
void smoothblendClient::keepAboveChange(bool a) {
if (button[ButtonAbove]) {
button[ButtonAbove]->setOn(a);
button[ButtonAbove]->tqrepaint(false);
button[ButtonAbove]->repaint(false);
}
}
@ -921,7 +921,7 @@ void smoothblendClient::keepAboveChange(bool a) {
void smoothblendClient::keepBelowChange(bool b) {
if (button[ButtonBelow]) {
button[ButtonBelow]->setOn(b);
button[ButtonBelow]->tqrepaint(false);
button[ButtonBelow]->repaint(false);
}
}
@ -1077,7 +1077,7 @@ bool smoothblendClient::eventFilter(TQObject *obj, TQEvent *e) {
// Doubleclick on title
void smoothblendClient::mouseDoubleClickEvent(TQMouseEvent *e) {
if (titlebar_->tqgeometry().contains(e->pos()))
if (titlebar_->geometry().contains(e->pos()))
titlebarDblClickOperation();
}
@ -1088,7 +1088,7 @@ void smoothblendClient::mouseDoubleClickEvent(TQMouseEvent *e) {
void smoothblendClient::wheelEvent(TQWheelEvent *e)
{
if (titleLayout_->tqgeometry().contains(e->pos()) )
if (titleLayout_->geometry().contains(e->pos()) )
titlebarMouseWheelOperation( e->delta());
}
@ -1120,15 +1120,15 @@ void smoothblendClient::paintEvent(TQPaintEvent*) {
group = options()->colorGroup(KDecoration::ColorTitleBar, isActive());
widgetGroup = widget()->colorGroup();
TQRect topRect( topSpacer_->tqgeometry() );
TQRect titleRect( titleLayout_->tqgeometry() );
TQRect textRect( titlebar_->tqgeometry() );
TQRect Rltitle( leftTitleSpacer_->tqgeometry() );
TQRect Rrtitle( rightTitleSpacer_->tqgeometry() );
TQRect Rdeco( decoSpacer_->tqgeometry() );
TQRect Rleft( leftSpacer_->tqgeometry() );
TQRect Rright( rightSpacer_->tqgeometry() );
TQRect Rbottom( bottomSpacer_->tqgeometry() );
TQRect topRect( topSpacer_->geometry() );
TQRect titleRect( titleLayout_->geometry() );
TQRect textRect( titlebar_->geometry() );
TQRect Rltitle( leftTitleSpacer_->geometry() );
TQRect Rrtitle( rightTitleSpacer_->geometry() );
TQRect Rdeco( decoSpacer_->geometry() );
TQRect Rleft( leftSpacer_->geometry() );
TQRect Rright( rightSpacer_->geometry() );
TQRect Rbottom( bottomSpacer_->geometry() );
TQRect tempRect;
@ -1280,7 +1280,7 @@ void smoothblendClient::updateMask() {
void smoothblendClient::resizeEvent(TQResizeEvent *) {
if (widget()->isShown()) {
TQRegion region = widget()->rect();
region = region.subtract(titlebar_->tqgeometry());
region = region.subtract(titlebar_->geometry());
widget()->erase(region);
updateMask();
}
@ -1293,7 +1293,7 @@ void smoothblendClient::resizeEvent(TQResizeEvent *) {
void smoothblendClient::showEvent(TQShowEvent *) {
updateMask();
widget()->tqrepaint();
widget()->repaint();
}
//////////////////////////////////////////////////////////////////////////////

@ -171,7 +171,7 @@ inline TQt::ButtonState smoothblendButton::lastMousePress() const {
return lastmouse_;
}
inline void smoothblendButton::reset() {
tqrepaint(false);
repaint(false);
}
// smoothblendClient //////////////////////////////////////////////////////////

@ -218,14 +218,14 @@ TQSize SystemButton::sizeHint() const
void SystemButton::reset()
{
tqrepaint(false);
repaint(false);
}
void SystemButton::setBitmap(const unsigned char *bitmap)
{
deco = TQBitmap(8, 8, bitmap, true);
deco.setMask(deco);
tqrepaint();
repaint();
}
void SystemButton::drawButton(TQPainter *p)
@ -440,7 +440,7 @@ void SystemClient::reset(unsigned long)
{
titleBuffer.resize(0, 0);
recalcTitleBuffer();
widget()->tqrepaint();
widget()->repaint();
if (button[ButtonClose])
button[ButtonClose]->reset();
if (button[ButtonSticky])
@ -466,7 +466,7 @@ void SystemClient::resizeEvent( TQResizeEvent* )
/*
if ( isVisibleToTLW() && !testWFlags( WStaticContents )) {
TQPainter p( this );
TQRect t = titlebar->tqgeometry();
TQRect t = titlebar->geometry();
t.setTop( 0 );
TQRegion r = rect();
r = r.subtract( t );
@ -502,7 +502,7 @@ void SystemClient::recalcTitleBuffer()
options()->colorGroup(KDecorationOptions::ColorFrame, true).
brush(TQColorGroup::Button));
TQRect t = titlebar->tqgeometry();
TQRect t = titlebar->geometry();
t.setTop( 2 );
t.setLeft( t.left() + 4 );
t.setRight( t.right() - 2 );
@ -532,7 +532,7 @@ void SystemClient::recalcTitleBuffer()
void SystemClient::captionChange()
{
recalcTitleBuffer();
widget()->tqrepaint(titlebar->tqgeometry(), false);
widget()->repaint(titlebar->geometry(), false);
}
void SystemClient::drawRoundFrame(TQPainter &p, int x, int y, int w, int h)
@ -545,7 +545,7 @@ void SystemClient::drawRoundFrame(TQPainter &p, int x, int y, int w, int h)
void SystemClient::paintEvent( TQPaintEvent* )
{
TQPainter p(widget());
TQRect t = titlebar->tqgeometry();
TQRect t = titlebar->geometry();
TQBrush fillBrush(TQBrush(widget()->colorGroup().brush(TQColorGroup::Background)).pixmap() ?
widget()->colorGroup().brush(TQColorGroup::Background) :
@ -597,7 +597,7 @@ void SystemClient::showEvent(TQShowEvent *)
// Client::showEvent(ev);
doShape();
widget()->show();
// widget()->tqrepaint();
// widget()->repaint();
}
/*void SystemClient::windowWrapperShowEvent( TQShowEvent* )
@ -607,13 +607,13 @@ void SystemClient::showEvent(TQShowEvent *)
void SystemClient::mouseDoubleClickEvent( TQMouseEvent * e )
{
if ( e->button() == Qt::LeftButton && titlebar->tqgeometry().contains( e->pos() ) )
if ( e->button() == Qt::LeftButton && titlebar->geometry().contains( e->pos() ) )
titlebarDblClickOperation();
}
void SystemClient::wheelEvent( TQWheelEvent *e )
{
if (isSetShade() || TQRect( 0, 0, width(), titlebar->tqgeometry().height() ).contains( e->pos() ) )
if (isSetShade() || TQRect( 0, 0, width(), titlebar->geometry().height() ).contains( e->pos() ) )
titlebarMouseWheelOperation( e->delta());
}
@ -633,7 +633,7 @@ void SystemClient::maximizeChange()
void SystemClient::activeChange()
{
widget()->tqrepaint(false);
widget()->repaint(false);
if (button[ButtonClose])
button[ButtonClose]->reset();
if (button[ButtonSticky])
@ -649,7 +649,7 @@ void SystemClient::activeChange()
void SystemClient::iconChange()
{
// if (button[BtnMenu] && button[BtnMenu]->isVisible())
// button[BtnMenu]->tqrepaint(false);
// button[BtnMenu]->repaint(false);
}
void SystemClient::desktopChange()

Loading…
Cancel
Save