summaryrefslogtreecommitdiffstats
path: root/tdm/kfrontend/themer
diff options
context:
space:
mode:
Diffstat (limited to 'tdm/kfrontend/themer')
-rw-r--r--tdm/kfrontend/themer/tdmitem.cpp22
-rw-r--r--tdm/kfrontend/themer/tdmitem.h2
-rw-r--r--tdm/kfrontend/themer/tdmlabel.cpp4
-rw-r--r--tdm/kfrontend/themer/tdmlabel.h2
-rw-r--r--tdm/kfrontend/themer/tdmpixmap.cpp4
-rw-r--r--tdm/kfrontend/themer/tdmpixmap.h2
-rw-r--r--tdm/kfrontend/themer/tdmrect.cpp2
-rw-r--r--tdm/kfrontend/themer/tdmrect.h2
-rw-r--r--tdm/kfrontend/themer/tdmthemer.cpp26
-rw-r--r--tdm/kfrontend/themer/tdmthemer.h2
10 files changed, 34 insertions, 34 deletions
diff --git a/tdm/kfrontend/themer/tdmitem.cpp b/tdm/kfrontend/themer/tdmitem.cpp
index ce5904a26..befcb7c35 100644
--- a/tdm/kfrontend/themer/tdmitem.cpp
+++ b/tdm/kfrontend/themer/tdmitem.cpp
@@ -232,13 +232,13 @@ KdmItem::setWidget( TQWidget *widget )
myWidget->show();
// Remove borders so that it blends nicely with the theme background
- TQFrame* frame = ::tqqt_cast<TQFrame *>( widget );
+ TQFrame* frame = ::tqt_cast<TQFrame *>( widget );
if (frame)
frame->setFrameStyle( TQFrame::NoFrame );
setGeometry(area, true);
- connect( myWidget, TQT_SIGNAL(destroyed()), TQT_SLOT(widgetGone()) );
+ connect( myWidget, TQ_SIGNAL(destroyed()), TQ_SLOT(widgetGone()) );
}
void
@@ -253,11 +253,11 @@ KdmItem::setLayoutItem( TQLayoutItem *item )
myLayoutItem = item;
// XXX hiding not supported - it think it's pointless here
if (myLayoutItem->widget())
- connect( myLayoutItem->widget(), TQT_SIGNAL(destroyed()),
- TQT_SLOT(layoutItemGone()) );
+ connect( myLayoutItem->widget(), TQ_SIGNAL(destroyed()),
+ TQ_SLOT(layoutItemGone()) );
else if (myLayoutItem->layout())
- connect( myLayoutItem->layout(), TQT_SIGNAL(destroyed()),
- TQT_SLOT(layoutItemGone()) );
+ connect( myLayoutItem->layout(), TQ_SIGNAL(destroyed()),
+ TQ_SLOT(layoutItemGone()) );
}
void
@@ -307,7 +307,7 @@ KdmItem::paint( TQPainter *p, const TQRect &rect )
}
if (myWidget || (myLayoutItem && myLayoutItem->widget())) {
- // TDEListView because it's missing a Q_OBJECT
+ // TDEListView because it's missing a TQ_OBJECT
// FIXME: This is a nice idea in theory, but in practice it is
// very confusing for the user not to see the empty list box
// delineated from the rest of the greeter.
@@ -379,7 +379,7 @@ KdmItem::paint( TQPainter *p, const TQRect &rect )
#ifdef DRAW_OUTLINE
// Draw bounding rect for this item
- p->setPen( Qt::white );
+ p->setPen( TQt::white );
p->drawRect( area );
#endif
@@ -583,8 +583,8 @@ KdmItem::addChildItem( KdmItem *item )
}
// signal bounce from child to parent
- connect( item, TQT_SIGNAL(needUpdate( int, int, int, int )), TQT_SIGNAL(needUpdate( int, int, int, int )) );
- connect( item, TQT_SIGNAL(activated( const TQString & )), TQT_SIGNAL(activated( const TQString & )) );
+ connect( item, TQ_SIGNAL(needUpdate( int, int, int, int )), TQ_SIGNAL(needUpdate( int, int, int, int )) );
+ connect( item, TQ_SIGNAL(activated( const TQString & )), TQ_SIGNAL(activated( const TQString & )) );
}
void
@@ -663,7 +663,7 @@ KdmItem::parentWidget() const
if (!this->parent())
return 0;
- if (parent()->tqt_cast(TQWIDGET_OBJECT_NAME_STRING))
+ if (parent()->tqt_cast("TQWidget"))
return (TQWidget*)parent();
return ((KdmItem*)parent())->parentWidget();
}
diff --git a/tdm/kfrontend/themer/tdmitem.h b/tdm/kfrontend/themer/tdmitem.h
index d2aeed69c..ad07f16cb 100644
--- a/tdm/kfrontend/themer/tdmitem.h
+++ b/tdm/kfrontend/themer/tdmitem.h
@@ -81,7 +81,7 @@ class TQLayoutItem;
*/
class KdmItem : public TQObject {
- Q_OBJECT
+ TQ_OBJECT
friend class KdmThemer;
diff --git a/tdm/kfrontend/themer/tdmlabel.cpp b/tdm/kfrontend/themer/tdmlabel.cpp
index f2fae90a6..1af382819 100644
--- a/tdm/kfrontend/themer/tdmlabel.cpp
+++ b/tdm/kfrontend/themer/tdmlabel.cpp
@@ -100,7 +100,7 @@ KdmLabel::KdmLabel( KdmItem *parent, const TQDomNode &node, const char *name )
if (label.isTimer) {
timer = new TQTimer( this );
timer->start( 1000 );
- connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(update()) );
+ connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(update()) );
}
setTextInt( lookupText( label.text ) );
}
@@ -117,7 +117,7 @@ KdmLabel::setTextInt( const TQString &txt)
cText.remove('&');
myAccel = new TQAccel(parentWidget());
myAccel->insertItem(ALT + UNICODE_ACCEL + cText.at(cAccel).lower().unicode());
- connect(myAccel, TQT_SIGNAL(activated(int)), TQT_SLOT(slotAccel()));
+ connect(myAccel, TQ_SIGNAL(activated(int)), TQ_SLOT(slotAccel()));
}
}
diff --git a/tdm/kfrontend/themer/tdmlabel.h b/tdm/kfrontend/themer/tdmlabel.h
index e45d68091..37b10be56 100644
--- a/tdm/kfrontend/themer/tdmlabel.h
+++ b/tdm/kfrontend/themer/tdmlabel.h
@@ -34,7 +34,7 @@ class TQTimer;
*/
class KdmLabel : public KdmItem {
- Q_OBJECT
+ TQ_OBJECT
public:
KdmLabel( KdmItem *parent, const TQDomNode &node, const char *name = 0 );
diff --git a/tdm/kfrontend/themer/tdmpixmap.cpp b/tdm/kfrontend/themer/tdmpixmap.cpp
index 079135c1d..fa9e0fcf5 100644
--- a/tdm/kfrontend/themer/tdmpixmap.cpp
+++ b/tdm/kfrontend/themer/tdmpixmap.cpp
@@ -303,9 +303,9 @@ KdmPixmap::drawContents( TQPainter *p, const TQRect &r )
float tint_alpha = pClass->alpha;
for (int y = 0; y < h; ++y) {
- QRgb *ls = (QRgb *)scaledImage.scanLine( y );
+ TQRgb *ls = (TQRgb *)scaledImage.scanLine( y );
for (int x = 0; x < w; ++x) {
- QRgb l = ls[x];
+ TQRgb l = ls[x];
int r = int( tqRed( l ) * tint_red );
int g = int( tqGreen( l ) * tint_green );
int b = int( tqBlue( l ) * tint_blue );
diff --git a/tdm/kfrontend/themer/tdmpixmap.h b/tdm/kfrontend/themer/tdmpixmap.h
index faa71a034..90d0a38aa 100644
--- a/tdm/kfrontend/themer/tdmpixmap.h
+++ b/tdm/kfrontend/themer/tdmpixmap.h
@@ -35,7 +35,7 @@
*/
class KdmPixmap : public KdmItem {
- Q_OBJECT
+ TQ_OBJECT
public:
KdmPixmap( KdmItem *parent, const TQDomNode &node, const char *name = 0 );
diff --git a/tdm/kfrontend/themer/tdmrect.cpp b/tdm/kfrontend/themer/tdmrect.cpp
index a92b0f679..bb4023cd4 100644
--- a/tdm/kfrontend/themer/tdmrect.cpp
+++ b/tdm/kfrontend/themer/tdmrect.cpp
@@ -182,7 +182,7 @@ KdmRect::setWidget( TQWidget *widget )
if ( rect.normal.color.isValid() && widget )
{
TQPalette p = widget->palette();
- p.setColor( TQPalette::Normal, TQColorGroup::Text, rect.normal.color );
+ p.setColor( TQPalette::Active, TQColorGroup::Text, rect.normal.color );
widget->setPalette(p);
}
KdmItem::setWidget( widget );
diff --git a/tdm/kfrontend/themer/tdmrect.h b/tdm/kfrontend/themer/tdmrect.h
index 6dfdc126a..8c436ccda 100644
--- a/tdm/kfrontend/themer/tdmrect.h
+++ b/tdm/kfrontend/themer/tdmrect.h
@@ -32,7 +32,7 @@
*/
class KdmRect : public KdmItem {
- Q_OBJECT
+ TQ_OBJECT
public:
KdmRect( KdmItem *parent, const TQDomNode &node, const char *name = 0 );
diff --git a/tdm/kfrontend/themer/tdmthemer.cpp b/tdm/kfrontend/themer/tdmthemer.cpp
index 6c27b7629..f064e384a 100644
--- a/tdm/kfrontend/themer/tdmthemer.cpp
+++ b/tdm/kfrontend/themer/tdmthemer.cpp
@@ -78,24 +78,24 @@ KdmThemer::KdmThemer( const TQString &_filename, const TQString &mode, TQWidget
// Set the root (screen) item
rootItem = new KdmRect( parent, TQDomNode(), "tdm root" );
- connect( rootItem, TQT_SIGNAL(needUpdate( int, int, int, int )),
- widget(), TQT_SLOT(update( int, int, int, int )) );
+ connect( rootItem, TQ_SIGNAL(needUpdate( int, int, int, int )),
+ widget(), TQ_SLOT(update( int, int, int, int )) );
rootItem->setBaseDir( TQFileInfo( filename ).dirPath( true ) );
// generate all the items defined in the theme
generateItems( rootItem );
- connect( rootItem, TQT_SIGNAL(activated( const TQString & )), TQT_SIGNAL(activated( const TQString & )) );
- connect( rootItem, TQT_SIGNAL(activated( const TQString & )), TQT_SLOT(slotActivated( const TQString & )) );
+ connect( rootItem, TQ_SIGNAL(activated( const TQString & )), TQ_SIGNAL(activated( const TQString & )) );
+ connect( rootItem, TQ_SIGNAL(activated( const TQString & )), TQ_SLOT(slotActivated( const TQString & )) );
- TQTimer::singleShot(800, this, TQT_SLOT(slotPaintRoot()));
+ TQTimer::singleShot(800, this, TQ_SLOT(slotPaintRoot()));
/* *TODO*
// Animation timer
TQTimer *time = new TQTimer( this );
time->start( 500 );
- connect( time, TQT_SIGNAL(timeout()), TQT_SLOT(update()) )
+ connect( time, TQ_SIGNAL(timeout()), TQ_SLOT(update()) )
*/
}
@@ -139,19 +139,19 @@ KdmThemer::widgetEvent( TQEvent *e )
switch (e->type()) {
case TQEvent::MouseMove:
{
- TQMouseEvent *me = TQT_TQMOUSEEVENT(e);
+ TQMouseEvent *me = static_cast<TQMouseEvent*>(e);
rootItem->mouseEvent( me->x(), me->y() );
}
break;
case TQEvent::MouseButtonPress:
{
- TQMouseEvent *me = TQT_TQMOUSEEVENT(e);
+ TQMouseEvent *me = static_cast<TQMouseEvent*>(e);
rootItem->mouseEvent( me->x(), me->y(), true );
}
break;
case TQEvent::MouseButtonRelease:
{
- TQMouseEvent *me = TQT_TQMOUSEEVENT(e);
+ TQMouseEvent *me = static_cast<TQMouseEvent*>(e);
rootItem->mouseEvent( me->x(), me->y(), false, true );
}
break;
@@ -164,7 +164,7 @@ KdmThemer::widgetEvent( TQEvent *e )
break;
case TQEvent::Paint:
{
- TQRect paintRect = TQT_TQPAINTEVENT(e)->rect();
+ TQRect paintRect = static_cast<TQPaintEvent*>(e)->rect();
kdDebug() << timestamp() << " paint on: " << paintRect << endl;
if (!argb_visual_available) {
@@ -411,7 +411,7 @@ KdmThemer::slotActivated( const TQString &id )
}
item->widget()->setFocus();
- TQLineEdit *le = (TQLineEdit*)item->widget()->tqt_cast(TQLINEEDIT_OBJECT_NAME_STRING);
+ TQLineEdit *le = (TQLineEdit*)item->widget()->tqt_cast("TQLineEdit");
if (le) {
le->selectAll();
}
@@ -432,8 +432,8 @@ KdmThemer::slotPaintRoot()
}
else return;
- TQT_TQWIDGET(TQApplication::desktop()->screen())->setErasePixmap(pm);
- TQT_TQWIDGET(TQApplication::desktop()->screen())->erase();
+ TQApplication::desktop()->screen()->setErasePixmap(pm);
+ TQApplication::desktop()->screen()->erase();
}
#include "tdmthemer.moc"
diff --git a/tdm/kfrontend/themer/tdmthemer.h b/tdm/kfrontend/themer/tdmthemer.h
index 785a116da..7b9cd2049 100644
--- a/tdm/kfrontend/themer/tdmthemer.h
+++ b/tdm/kfrontend/themer/tdmthemer.h
@@ -49,7 +49,7 @@ class TQEvent;
class KdmThemer : public TQObject {
- Q_OBJECT
+ TQ_OBJECT
public:
/*
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 04:11:59 +0000