Enable compilation with TQt for Qt4 3.4.0 TP2

This should not break compatibility with TQt for Qt3; if it does please fix it ASAP!


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

20 files changed, 112 insertions, 112 deletions

diff --git a/kicker/extensions/kasbar/kasaboutdlg.cpp b/kicker/extensions/kasbar/kasaboutdlg.cpp
index d32f0a1dd..d0fb3ef55 100644
--- a/kicker/extensions/kasbar/kasaboutdlg.cpp
+++ b/kicker/extensions/kasbar/kasaboutdlg.cpp
@@ -118,7 +118,7 @@ void KasAboutDialog::addDemoBar()
    box->setSpacing( spacingHint() );
    box->setMargin( marginHint() );
 
-   KasBar *bar = new KasBar( Horizontal, box );
+   KasBar *bar = new KasBar( Qt::Horizontal, box );
    bar->setItemSize( KasBar::Large );
    bar->setMasked( false );
 
@@ -131,7 +131,7 @@ void KasAboutDialog::addDemoBar()
    ci->setCustomPopup( true );
    connect( ci, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), ci, TQT_SLOT(togglePopup()) );
 
-   KasBar *groupbar = bar->createChildBar( ( bar->orientation() == Horizontal ) ? Vertical : Horizontal, pop );
+   KasBar *groupbar = bar->createChildBar( ( bar->orientation() == Qt::Horizontal ) ? Qt::Vertical : Qt::Horizontal, pop );
    KasItem *i = 0;
 
    KasClockItem *clk = new KasClockItem( groupbar );
diff --git a/kicker/extensions/kasbar/kasbar.cpp b/kicker/extensions/kasbar/kasbar.cpp
index bf2b64ba3..72dca2567 100644
--- a/kicker/extensions/kasbar/kasbar.cpp
+++ b/kicker/extensions/kasbar/kasbar.cpp
@@ -80,7 +80,7 @@ KasBar::KasBar( Orientation o, TQWidget *parent, const char *name, WFlags f )
    : TQWidget( parent, name, f ),
      master_(0),
      orient( o ),
-     direction_( o == Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ),
+     direction_( o == Qt::Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ),
      itemUnderMouse_( 0 ),
      boxesPerLine_(10), // Temp value
      inDrag( false ),
@@ -93,7 +93,7 @@ KasBar::KasBar( Orientation o, TQWidget *parent, const char *name, WFlags f )
      rootPix( 0 ),
      enableTint_( false ),
      tintAmount_( 0.1 ), 
-     tintColour_( colorGroup().mid() ),
+     tintColour_( tqcolorGroup().mid() ),
      useMask_( true ),
      res(0)
 {
@@ -102,14 +102,14 @@ KasBar::KasBar( Orientation o, TQWidget *parent, const char *name, WFlags f )
     setMouseTracking( true );
     setMaxBoxes( 0 );
 
-    connect( this, TQT_SIGNAL( configChanged() ), TQT_SLOT( repaint() ) );
+    connect( this, TQT_SIGNAL( configChanged() ), TQT_SLOT( tqrepaint() ) );
 }
 
 KasBar::KasBar( Orientation o, KasBar *master, TQWidget *parent, const char *name, WFlags f )
    : TQWidget( parent, name, f ),
      master_(master),
      orient( o ),
-     direction_( o == Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ),
+     direction_( o == Qt::Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ),
      itemUnderMouse_( 0 ),
      boxesPerLine_(10), // Temp value
      inDrag( false ),
@@ -122,7 +122,7 @@ KasBar::KasBar( Orientation o, KasBar *master, TQWidget *parent, const char *nam
      rootPix( 0 ),
      enableTint_( false ),
      tintAmount_( 0.1 ), 
-     tintColour_( colorGroup().mid() ),
+     tintColour_( tqcolorGroup().mid() ),
      useMask_( true ),
      res(0)
 {
@@ -130,7 +130,7 @@ KasBar::KasBar( Orientation o, KasBar *master, TQWidget *parent, const char *nam
     items.setAutoDelete( true );
     setMouseTracking( true );
     setMaxBoxes( 0 );
-    connect( master_, TQT_SIGNAL( configChanged() ), TQT_SLOT( repaint() ) );
+    connect( master_, TQT_SIGNAL( configChanged() ), TQT_SLOT( tqrepaint() ) );
 }
 
 KasBar::~KasBar()
@@ -255,7 +255,7 @@ void KasBar::setTint( bool enable )
       }
 
       emit configChanged();
-      repaint( true );
+      tqrepaint( true );
    }
 }
 
@@ -269,7 +269,7 @@ void KasBar::setTint( double amount, TQColor color )
       emit configChanged();
 
       if ( rootPix->isAvailable() )
-	rootPix->repaint( true );
+	rootPix->tqrepaint( true );
    }
 }
 
@@ -318,9 +318,9 @@ void KasBar::setDirection( Direction dir )
 	return;
 
     if ( ( dir == TQBoxLayout::LeftToRight ) || ( dir == TQBoxLayout::RightToLeft ) )
-	orient = Horizontal;
+	orient = Qt::Horizontal;
     else
-	orient = Vertical;
+	orient = Qt::Vertical;
 
     direction_ = dir;
     emit directionChanged();
@@ -332,7 +332,7 @@ void KasBar::setOrientation( Orientation o )
     if ( orient == o )
 	return;
 
-    if ( o == Horizontal )
+    if ( o == Qt::Horizontal )
 	setDirection( TQBoxLayout::LeftToRight );
     else
 	setDirection( TQBoxLayout::TopToBottom );
@@ -375,9 +375,9 @@ void KasBar::setDetached( bool detach )
     emit detachedChanged( detached );
 }
 
-TQSize KasBar::sizeHint( Orientation o,  TQSize sz )
+TQSize KasBar::tqsizeHint( Orientation o,  TQSize sz )
 {
-    if ( o == Horizontal )
+    if ( o == Qt::Horizontal )
 	setBoxesPerLine( sz.width() / itemExtent() );
     else
 	setBoxesPerLine( sz.height() / itemExtent() );
@@ -396,7 +396,7 @@ TQSize KasBar::sizeHint( Orientation o,  TQSize sz )
       ++r;
 
    TQSize s;
-   if( o == Horizontal ) {
+   if( o == Qt::Horizontal ) {
       s.setWidth( c*itemExtent() );
       s.setHeight( r*itemExtent() );
    }
@@ -434,7 +434,7 @@ void KasBar::updateLayout()
       ++r;
 
    TQSize sz;
-   if ( orient == Horizontal )
+   if ( orient == Qt::Horizontal )
        sz = TQSize( c * itemExtent(), r * itemExtent() );
    else
        sz = TQSize( r * itemExtent(), c * itemExtent() );
@@ -445,11 +445,11 @@ void KasBar::updateLayout()
 
    setUpdatesEnabled( updates );
 
-   TQWidget *top = topLevelWidget();
+   TQWidget *top = tqtopLevelWidget();
    TQRegion mask;
 
    KasItem *i;
-   if ( orient == Horizontal ) {
+   if ( orient == Qt::Horizontal ) {
        for ( i = items.first(); i; i = items.next() ) {
 	   int x = (items.at() % c) * itemExtent();
 
@@ -646,7 +646,7 @@ void KasBar::updateItem( KasItem *i )
     update( TQRect( pos, TQSize( itemExtent(), itemExtent() ) ) );
 }
 
-void KasBar::repaintItem(KasItem *i, bool erase )
+void KasBar::tqrepaintItem(KasItem *i, bool erase )
 {
     if ( !i )
 	return;
@@ -658,7 +658,7 @@ void KasBar::repaintItem(KasItem *i, bool erase )
 
     paintBackground( &p, TQRect( pos, TQSize( itemExtent(), itemExtent() ) ) );
     i->paint( &p, pos.x(), pos.y() );
-    repaint( TQRect( pos, TQSize( itemExtent(), itemExtent()  ) ), transparent_ || erase );
+    tqrepaint( TQRect( pos, TQSize( itemExtent(), itemExtent()  ) ), transparent_ || erase );
 }
 
 KasItem* KasBar::itemAt(const TQPoint &p)
@@ -670,7 +670,7 @@ KasItem* KasBar::itemAt(const TQPoint &p)
        cr.setTopLeft( i->pos() );
        cr.setSize( TQSize( itemExtent(), itemExtent() ) );
 
-       if(cr.contains(p))
+       if(cr.tqcontains(p))
 	   return i;
    }
 
diff --git a/kicker/extensions/kasbar/kasbar.h b/kicker/extensions/kasbar/kasbar.h
index 8ff745475..e1fabddae 100644
--- a/kicker/extensions/kasbar/kasbar.h
+++ b/kicker/extensions/kasbar/kasbar.h
@@ -77,7 +77,7 @@ typedef TQPtrList<KasItem> KasItemList;
 /**
  * The main view for KasBar.
  */
-class KDE_EXPORT KasBar : public QWidget
+class KDE_EXPORT KasBar : public TQWidget
 {
    Q_OBJECT
    Q_PROPERTY( int maxBoxes READ maxBoxes )
@@ -89,8 +89,8 @@ class KDE_EXPORT KasBar : public QWidget
 
    friend class KasItem;
 public:
-   KasBar( Orientation o, TQWidget *parent=0, const char *name=0, WFlags f=0 );
-   KasBar( Orientation o, KasBar *master, 
+   KasBar( Qt::Orientation o, TQWidget *parent=0, const char *name=0, WFlags f=0 );
+   KasBar( Qt::Orientation o, KasBar *master, 
 	   TQWidget* parent=0, const char* name=0, WFlags f=0 );
 
    virtual ~KasBar();
@@ -104,7 +104,7 @@ public:
    KasBar *master() const { return master_; }
 
    /** Creates a child bar of the kasbar. The child will inherit the appearance options. */
-   virtual KasBar *createChildBar( Orientation o, TQWidget *parent, const char *name=0 );
+   virtual KasBar *createChildBar( Qt::Orientation o, TQWidget *parent, const char *name=0 );
 
    /** Factory method that returns the singleton resources object. */
    virtual KasResources *resources();
@@ -121,7 +121,7 @@ public:
    void clear();
    KasItem *take( KasItem *i ) { return items.take( indexOf(i) ); }
    KasItem *itemAt( uint i ) { return items.at( i ); }
-   int indexOf( KasItem *i ) { return items.find( i ); }
+   int indexOf( KasItem *i ) { return items.tqfind( i ); }
 
    KasItemList *itemList() { return &items; }
 
@@ -141,8 +141,8 @@ public:
    int maxBoxes() const { return maxBoxes_; }
    uint boxesPerLine() const { return boxesPerLine_; }
 
-   void setOrientation( Orientation o );
-   Orientation orientation() const { return orient; }
+   void setOrientation( Qt::Orientation o );
+   Qt::Orientation orientation() const { return orient; }
 
    void setDirection( Direction dir );
    Direction direction() const { return direction_; }
@@ -152,7 +152,7 @@ public:
 
    bool isDrag() const { return inDrag; }
 
-   TQSize sizeHint( Orientation,  TQSize max );
+   TQSize tqsizeHint( Qt::Orientation,  TQSize max );
 
    //
    // Look and feel options
@@ -188,7 +188,7 @@ public:
    void updateItem( KasItem *i );
 
    /** Redraws the specified item. */
-   void repaintItem(KasItem *i, bool erase = true );
+   void tqrepaintItem(KasItem *i, bool erase = true );
 
    /** Returns the item at p or 0. */
    KasItem* itemAt(const TQPoint &p);
@@ -287,7 +287,7 @@ private:
    TQPixmap offscreen;
    KasBar *master_;
    KasItemList items;
-   Orientation orient;
+   Qt::Orientation orient;
    Direction direction_;
    KasItem *itemUnderMouse_;
    uint boxesPerLine_;
diff --git a/kicker/extensions/kasbar/kasbarapp.cpp b/kicker/extensions/kasbar/kasbarapp.cpp
index ffd1b766e..3360b95cb 100644
--- a/kicker/extensions/kasbar/kasbarapp.cpp
+++ b/kicker/extensions/kasbar/kasbarapp.cpp
@@ -83,12 +83,12 @@ int main( int argc, char **argv )
 
   kdDebug(1345) << "Kasbar starting..." << endl;
 
-  int wflags = Qt::WStyle_Customize | Qt::WX11BypassWM | Qt::WStyle_DialogBorder | Qt::WStyle_StaysOnTop;
+  int wflags = TQt::WStyle_Customize | TQt::WX11BypassWM | TQt::WStyle_DialogBorder | TQt::WStyle_StaysOnTop;
   KasBar *kasbar;
   KConfig conf( "kasbarrc" );
 
   if ( args->isSet("test") ) {
-      kasbar = new KasBar( Qt::Vertical, 0, "testkas", wflags );
+      kasbar = new KasBar( Qt::Vertical, 0, "testkas", (TQt::WFlags)wflags );
       kasbar->setItemSize( KasBar::Large );
       kasbar->append( new KasClockItem(kasbar) );
       kasbar->append( new KasItem(kasbar) );
@@ -97,7 +97,7 @@ int main( int argc, char **argv )
       kasbar->addTestItems();
   }
   else {
-      KasTasker *kastasker = new KasTasker( Qt::Vertical, 0, "testkas", wflags );
+      KasTasker *kastasker = new KasTasker( Qt::Vertical, 0, "testkas", (TQt::WFlags)wflags );
       kastasker->setConfig( &conf );
       kastasker->setStandAlone( true );
       kasbar = kastasker;
diff --git a/kicker/extensions/kasbar/kasbarextension.cpp b/kicker/extensions/kasbar/kasbarextension.cpp
index 3bc3dcd1b..c63d6e277 100644
--- a/kicker/extensions/kasbar/kasbarextension.cpp
+++ b/kicker/extensions/kasbar/kasbarextension.cpp
@@ -121,8 +121,8 @@ void KasBarExtension::setDetached( bool detach )
 
     if ( detach ) {
 
-	int wflags = Qt::WStyle_Customize | Qt::WX11BypassWM | Qt::WStyle_DialogBorder | Qt::WStyle_StaysOnTop;
-	kasbar->reparent( 0, wflags, kasbar->detachedPosition(), true );
+	int wflags = TQt::WStyle_Customize | TQt::WX11BypassWM | TQt::WStyle_DialogBorder | TQt::WStyle_StaysOnTop;
+	kasbar->reparent( 0, (WFlags)wflags, kasbar->detachedPosition(), true );
 	updateGeometry();
 	resize( detachedSize() );
     }
@@ -141,33 +141,33 @@ void KasBarExtension::showEvent( TQShowEvent */*se*/ )
 {
     updateGeometry();
     resize( kasbar->size() );
-    repaint( true );
+    tqrepaint( true );
 }
 
 TQSize KasBarExtension::detachedSize()
 {
-    if ( orientation() == Vertical )
+    if ( orientation() == Qt::Vertical )
 	return TQSize( kasbar->itemExtent()/2, 0 );
     else
 	return TQSize( 0, kasbar->itemExtent()/2 );
 
 }
 
-TQSize KasBarExtension::sizeHint(Position p, TQSize maxSize ) const
+TQSize KasBarExtension::tqsizeHint(Position p, TQSize maxSize ) const
 {
-   Orientation o = Horizontal;
+   Orientation o = Qt::Horizontal;
 
    if ( p == Left || p == Right )
-      o = Vertical;
+      o = Qt::Vertical;
 
    if ( detached_ ) {
-       if ( o == Vertical )
+       if ( o == Qt::Vertical )
 	   return TQSize( kasbar->itemExtent()/2, 0 );
        else
 	   return TQSize( 0, kasbar->itemExtent()/2 );
    }
 
-   return kasbar->sizeHint( o, maxSize );
+   return kasbar->tqsizeHint( o, maxSize );
 }
 
 void KasBarExtension::positionChange( Position /* position */)
diff --git a/kicker/extensions/kasbar/kasbarextension.h b/kicker/extensions/kasbar/kasbarextension.h
index 7fbb4fbc6..e5e3142df 100644
--- a/kicker/extensions/kasbar/kasbarextension.h
+++ b/kicker/extensions/kasbar/kasbarextension.h
@@ -76,7 +76,7 @@ public:
 
     virtual ~KasBarExtension();
 
-    TQSize sizeHint( Position, TQSize maxSize ) const;
+    TQSize tqsizeHint( Position, TQSize maxSize ) const;
     Position preferedPosition() const { return Right; }
 
     virtual void positionChange( Position position );
diff --git a/kicker/extensions/kasbar/kasclockitem.cpp b/kicker/extensions/kasbar/kasclockitem.cpp
index f025af857..518245d4b 100644
--- a/kicker/extensions/kasbar/kasclockitem.cpp
+++ b/kicker/extensions/kasbar/kasclockitem.cpp
@@ -23,7 +23,7 @@
 #include "kasclockitem.h"
 #include "kasclockitem.moc"
 
-class LCD : public QLCDNumber
+class LCD : public TQLCDNumber
 {
 public:
     LCD( TQWidget *parent, const char *name=0 )
@@ -45,7 +45,7 @@ KasClockItem::KasClockItem( KasBar *parent )
     lcd = new LCD( parent );
     lcd->hide();
 
-    lcd->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum );
+    lcd->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum );
     lcd->setBackgroundMode( NoBackground );
     lcd->setFrameStyle( TQFrame::NoFrame );
     lcd->setSegmentStyle( TQLCDNumber::Flat );
@@ -89,7 +89,7 @@ void KasClockItem::paint( TQPainter *p )
 
     p->save();
     p->translate( 3, 15 );
-    lcd->setPaletteForegroundColor( kasbar()->colorGroup().mid() );
+    lcd->setPaletteForegroundColor( kasbar()->tqcolorGroup().mid() );
     lcd->draw( p );
     p->restore();
 
diff --git a/kicker/extensions/kasbar/kasgroupitem.cpp b/kicker/extensions/kasbar/kasgroupitem.cpp
index 6e03e8e3c..12058a3c7 100644
--- a/kicker/extensions/kasbar/kasgroupitem.cpp
+++ b/kicker/extensions/kasbar/kasgroupitem.cpp
@@ -255,7 +255,7 @@ void KasGroupItem::updatePopup()
 KasPopup *KasGroupItem::createPopup()
 {
     KasPopup *pop = new KasPopup( this );
-    bar = kasbar()->createChildBar( ( kasbar()->orientation() == Horizontal ) ? Vertical : Horizontal, pop );
+    bar = kasbar()->createChildBar( ( kasbar()->orientation() == Qt::Horizontal ) ? Qt::Vertical : Qt::Horizontal, pop );
 
     connect( pop, TQT_SIGNAL(shown()), TQT_SLOT(updatePopup()) );
 
diff --git a/kicker/extensions/kasbar/kasitem.cpp b/kicker/extensions/kasbar/kasitem.cpp
index 8fd795363..3c6147b1a 100644
--- a/kicker/extensions/kasbar/kasitem.cpp
+++ b/kicker/extensions/kasbar/kasitem.cpp
@@ -179,11 +179,11 @@ void KasItem::mouseEnter()
 
 void KasItem::mouseReleaseEvent( TQMouseEvent *ev )
 {
-    if ( ev->button() == LeftButton )
+    if ( ev->button() == Qt::LeftButton )
 	emit leftButtonClicked( ev );
-    else if ( ev->button() == RightButton )
+    else if ( ev->button() == Qt::RightButton )
 	emit rightButtonClicked( ev );
-    else if ( ev->button() == MidButton )
+    else if ( ev->button() == Qt::MidButton )
 	emit middleButtonClicked( ev );
 }
 
@@ -301,7 +301,7 @@ void KasItem::paintFrame( TQPainter *p )
    if ( !frame )
        return;
 
-   qDrawShadePanel(p, 0, 0, extent(), extent(), colorGroup(), false, 2);
+   qDrawShadePanel(p, 0, 0, extent(), extent(), tqcolorGroup(), false, 2);
 
    TQPen pen;
    
@@ -547,15 +547,15 @@ void KasItem::paint( TQPainter *p, int x, int y )
     p->restore();
 }
 
-void KasItem::repaint()
+void KasItem::tqrepaint()
 {
-   repaint( true );
+   tqrepaint( true );
 }
 
-void KasItem::repaint( bool erase )
+void KasItem::tqrepaint( bool erase )
 {
    if ( kas->isVisible() )
-       kas->repaintItem( this, erase );
+       kas->tqrepaintItem( this, erase );
 }
 
 void KasItem::update()
diff --git a/kicker/extensions/kasbar/kasitem.h b/kicker/extensions/kasbar/kasitem.h
index c16a5f6d3..08f5436d4 100644
--- a/kicker/extensions/kasbar/kasitem.h
+++ b/kicker/extensions/kasbar/kasitem.h
@@ -74,7 +74,7 @@ class KasPopup;
  *
  * @author Richard Moore, rich@kde.org
  */
-class KDE_EXPORT KasItem : public QObject
+class KDE_EXPORT KasItem : public TQObject
 {
     Q_OBJECT
 
@@ -170,8 +170,8 @@ public:
     void paintModified( TQPainter *p );
 
 public slots:
-    void repaint();
-    void repaint( bool erase );
+    void tqrepaint();
+    void tqrepaint( bool erase );
     void update();
 
     void setActive( bool yes );
@@ -217,7 +217,7 @@ protected:
     TQFontMetrics fontMetrics() const { return kas->fontMetrics(); }
 
     /** Gets the color group from the parent. */
-    const TQColorGroup &colorGroup() const { return kas->colorGroup(); }
+    const TQColorGroup &tqcolorGroup() const { return kas->tqcolorGroup(); }
 
     /** Factory method that creates a popup widget for the item. */
     virtual KasPopup *createPopup();
diff --git a/kicker/extensions/kasbar/kasloaditem.cpp b/kicker/extensions/kasbar/kasloaditem.cpp
index 7b6939760..e36d2d18d 100644
--- a/kicker/extensions/kasbar/kasloaditem.cpp
+++ b/kicker/extensions/kasbar/kasloaditem.cpp
@@ -95,7 +95,7 @@ void KasLoadItem::paint( TQPainter *p )
 
     KasItem::paint( p );
 
-    TQColor light = kasbar()->colorGroup().highlight();
+    TQColor light = kasbar()->tqcolorGroup().highlight();
     TQColor dark = light.dark();
 
     KPixmap pix;
@@ -103,7 +103,7 @@ void KasLoadItem::paint( TQPainter *p )
     KPixmapEffect::gradient( pix, light, dark, KPixmapEffect::DiagonalGradient );
     p->drawPixmap( 2, extent()-2-h, pix );
 
-    p->setPen( kasbar()->colorGroup().mid() );
+    p->setPen( kasbar()->tqcolorGroup().mid() );
     for ( double pos = 0.2 ; pos < 1.0 ; pos += 0.2 ) {
 	int ypos = (int) floor((extent()-2) - (dh*maxValue*pos));
 	p->drawLine( 2, ypos, extent()-3, ypos );
diff --git a/kicker/extensions/kasbar/kaspopup.cpp b/kicker/extensions/kasbar/kaspopup.cpp
index 7538dfbb2..0edc0a77a 100644
--- a/kicker/extensions/kasbar/kaspopup.cpp
+++ b/kicker/extensions/kasbar/kaspopup.cpp
@@ -60,7 +60,7 @@
 #include "kaspopup.moc"
 
 KasPopup::KasPopup( KasItem *item, const char *name )
-    : TQHBox( 0, name, WStyle_Customize | WStyle_StaysOnTop | WStyle_Tool | WStyle_NoBorder | WX11BypassWM ),
+    : TQHBox( 0, name, (WFlags)(WStyle_Customize | WStyle_StaysOnTop | WStyle_Tool | WStyle_NoBorder | WX11BypassWM) ),
       item_( item ),
       kasbar_( item->kasbar() )
 {
@@ -95,22 +95,22 @@ TQPoint KasPopup::calcPosition( KasItem *item, int w, int h )
    int x = pos.x();
    int y = pos.y();
 
-   if ( kasbar->orientation() == Horizontal ) {
-      if ( y < ( qApp->desktop()->height() / 2 ) )
+   if ( kasbar->orientation() == Qt::Horizontal ) {
+      if ( y < ( tqApp->desktop()->height() / 2 ) )
 	 y = y + kasbar->itemExtent();
       else
 	 y = y - h;
 
-      if ( (x + w) > qApp->desktop()->width() )
+      if ( (x + w) > tqApp->desktop()->width() )
          x = x - w + kasbar->itemExtent();
    }
    else {
-      if ( x < ( qApp->desktop()->width() / 2 ) )
+      if ( x < ( tqApp->desktop()->width() / 2 ) )
 	 x = x + kasbar->itemExtent();
       else
 	 x = x - w;
 
-      if ( (y + h) > qApp->desktop()->height() )
+      if ( (y + h) > tqApp->desktop()->height() )
          y = y - h + kasbar->itemExtent();
    }
 
diff --git a/kicker/extensions/kasbar/kaspopup.h b/kicker/extensions/kasbar/kaspopup.h
index 811202b62..38abbbc28 100644
--- a/kicker/extensions/kasbar/kaspopup.h
+++ b/kicker/extensions/kasbar/kaspopup.h
@@ -69,7 +69,7 @@ class KasBar;
  *
  * @author Richard Moore, rich@kde.org
  */
-class KasPopup : public QHBox
+class KasPopup : public TQHBox
 {
    Q_OBJECT
 
diff --git a/kicker/extensions/kasbar/kasprefsdlg.cpp b/kicker/extensions/kasbar/kasprefsdlg.cpp
index e81b0aacb..6dd39517f 100644
--- a/kicker/extensions/kasbar/kasprefsdlg.cpp
+++ b/kicker/extensions/kasbar/kasprefsdlg.cpp
@@ -227,7 +227,7 @@ void KasPrefsDialog::addBackgroundPage()
    TQLabel *tintStrengthLabel = new TQLabel( i18n("Tint &strength: "), tintAmtBox );
 
    int percent = (int) (kasbar->tintAmount() * 100.0);
-   tintAmount = new TQSlider( 0, 100, 1, percent, Horizontal, tintAmtBox );
+   tintAmount = new TQSlider( 0, 100, 1, percent, Qt::Horizontal, tintAmtBox );
    tintAmount->setTracking( true );
    connect( tintAmount, TQT_SIGNAL( valueChanged( int ) ),
 	    kasbar, TQT_SLOT( setTintAmount( int ) ) );
@@ -261,7 +261,7 @@ void KasPrefsDialog::addThumbsPage()
 			  "cause performance problems." ) );
    TQLabel *thumbSizeLabel = new TQLabel( i18n("Thumbnail &size: "), thumbSizeBox );
    int percent = (int) (kasbar->thumbnailSize() * 100.0);
-   thumbSizeSlider = new TQSlider( 0, 100, 1, percent, Horizontal, thumbSizeBox );
+   thumbSizeSlider = new TQSlider( 0, 100, 1, percent, Qt::Horizontal, thumbSizeBox );
    connect( thumbSizeSlider, TQT_SIGNAL( valueChanged( int ) ),
 	    kasbar, TQT_SLOT( setThumbnailSize( int ) ) );
    thumbSizeLabel->setBuddy( thumbSizeSlider );
diff --git a/kicker/extensions/kasbar/kasresources.cpp b/kicker/extensions/kasbar/kasresources.cpp
index 78b25e8c0..3450b1549 100644
--- a/kicker/extensions/kasbar/kasresources.cpp
+++ b/kicker/extensions/kasbar/kasresources.cpp
@@ -308,7 +308,7 @@ KPixmap KasResources::activeBg()
    if ( actBg.isNull() ) {
       actBg.resize( kasbar->itemExtent(), kasbar->itemExtent() );
       KPixmapEffect::gradient( actBg,
-			       kasbar->colorGroup().light(), kasbar->colorGroup().mid(),
+			       kasbar->tqcolorGroup().light(), kasbar->tqcolorGroup().mid(),
 			       KPixmapEffect::DiagonalGradient );
    }
 
@@ -320,7 +320,7 @@ KPixmap KasResources::inactiveBg()
    if ( inactBg.isNull() ) {
       inactBg.resize( kasbar->itemExtent(), kasbar->itemExtent() );
       KPixmapEffect::gradient( inactBg,
-			       kasbar->colorGroup().mid(), kasbar->colorGroup().dark(),
+			       kasbar->tqcolorGroup().mid(), kasbar->tqcolorGroup().dark(),
 			       KPixmapEffect::DiagonalGradient );
    }
 
diff --git a/kicker/extensions/kasbar/kasresources.h b/kicker/extensions/kasbar/kasresources.h
index cda153c30..bada9786b 100644
--- a/kicker/extensions/kasbar/kasresources.h
+++ b/kicker/extensions/kasbar/kasresources.h
@@ -73,7 +73,7 @@ class KasBar;
  *
  * @author Richard Moore, rich@kde.org
  */
-class KasResources : public QObject
+class KasResources : public TQObject
 {
     Q_OBJECT
 
diff --git a/kicker/extensions/kasbar/kastasker.cpp b/kicker/extensions/kasbar/kastasker.cpp
index a087f40ff..851b7d915 100644
--- a/kicker/extensions/kasbar/kastasker.cpp
+++ b/kicker/extensions/kasbar/kastasker.cpp
@@ -152,62 +152,62 @@ KPopupMenu *KasTasker::contextMenu()
 	menu = new KPopupMenu;
 
 	showAllWindowsAction = new KToggleAction( i18n("Show &All Windows"), KShortcut(),
-						  this, "toggle_show_all_windows" );
+						  TQT_TQOBJECT(this), "toggle_show_all_windows" );
 	showAllWindowsAction->setChecked( showAllWindows() );
 	showAllWindowsAction->plug( menu );
 	connect( showAllWindowsAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowAllWindows(bool)) );
-	connect( this, TQT_SIGNAL(showAllWindowsChanged(bool)), showAllWindowsAction, TQT_SLOT(setChecked(bool)) );
+	connect( TQT_TQOBJECT(this), TQT_SIGNAL(showAllWindowsChanged(bool)), showAllWindowsAction, TQT_SLOT(setChecked(bool)) );
 
 	groupWindowsAction = new KToggleAction( i18n("&Group Windows"), KShortcut(),
-						this, "toggle_group_windows" );
+						TQT_TQOBJECT(this), "toggle_group_windows" );
 	groupWindowsAction->setChecked( groupWindows() );
 	groupWindowsAction->plug( menu );
 	connect( groupWindowsAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setGroupWindows(bool)) );
-	connect( this, TQT_SIGNAL(groupWindowsChanged(bool)), groupWindowsAction, TQT_SLOT(setChecked(bool)) );
+	connect( TQT_TQOBJECT(this), TQT_SIGNAL(groupWindowsChanged(bool)), groupWindowsAction, TQT_SLOT(setChecked(bool)) );
 
-	showClockAction = new KToggleAction( i18n("Show &Clock"), KShortcut(), this, "toggle_show_clock" );
+	showClockAction = new KToggleAction( i18n("Show &Clock"), KShortcut(), TQT_TQOBJECT(this), "toggle_show_clock" );
 	showClockAction->setChecked( showClock() );
 	showClockAction->plug( menu );
 	connect( showClockAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowClock(bool)) );
-	connect( this, TQT_SIGNAL(showClockChanged(bool)), showClockAction, TQT_SLOT(setChecked(bool)) );
+	connect( TQT_TQOBJECT(this), TQT_SIGNAL(showClockChanged(bool)), showClockAction, TQT_SLOT(setChecked(bool)) );
 
-	showLoadAction = new KToggleAction( i18n("Show &Load Meter"), KShortcut(), this, "toggle_show_load" );
+	showLoadAction = new KToggleAction( i18n("Show &Load Meter"), KShortcut(), TQT_TQOBJECT(this), "toggle_show_load" );
 	showLoadAction->setChecked( showLoad() );
 	showLoadAction->plug( menu );
 	connect( showLoadAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowLoad(bool)) );
-	connect( this, TQT_SIGNAL(showLoadChanged(bool)), showLoadAction, TQT_SLOT(setChecked(bool)) );
+	connect( TQT_TQOBJECT(this), TQT_SIGNAL(showLoadChanged(bool)), showLoadAction, TQT_SLOT(setChecked(bool)) );
 
 	menu->insertSeparator();
 
 	if ( !standalone_ ) {
-	    toggleDetachedAction = new KToggleAction( i18n("&Floating"), KShortcut(), this, "toggle_detached" );
+	    toggleDetachedAction = new KToggleAction( i18n("&Floating"), KShortcut(), TQT_TQOBJECT(this), "toggle_detached" );
 	    toggleDetachedAction->setChecked( isDetached() );
 	    toggleDetachedAction->plug( menu );
 	    connect( toggleDetachedAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setDetached(bool)) );
-	    connect( this, TQT_SIGNAL(detachedChanged(bool)), toggleDetachedAction, TQT_SLOT(setChecked(bool)) );
+	    connect( TQT_TQOBJECT(this), TQT_SIGNAL(detachedChanged(bool)), toggleDetachedAction, TQT_SLOT(setChecked(bool)) );
 	}
 
 	rotateBarAction = new KAction( i18n("R&otate Bar"), TQString("rotate"), KShortcut(),
-				       this, TQT_SLOT( toggleOrientation() ),
-				       this, "rotate_bar" );
+				       TQT_TQOBJECT(this), TQT_SLOT( toggleOrientation() ),
+				       TQT_TQOBJECT(this), "rotate_bar" );
 	rotateBarAction->plug( menu );
-	connect( this, TQT_SIGNAL(detachedChanged(bool)), rotateBarAction, TQT_SLOT(setEnabled(bool)) );
+	connect( TQT_TQOBJECT(this), TQT_SIGNAL(detachedChanged(bool)), rotateBarAction, TQT_SLOT(setEnabled(bool)) );
 	connect( rotateBarAction, TQT_SIGNAL(activated()), TQT_SLOT(writeConfigLater()) );
 
-	menu->insertItem( SmallIcon("reload"), i18n("&Refresh"), this, TQT_SLOT( refreshAll() ) );
+	menu->insertItem( SmallIcon("reload"), i18n("&Refresh"), TQT_TQOBJECT(this), TQT_SLOT( refreshAll() ) );
 
 	menu->insertSeparator();
 
-	menu->insertItem( SmallIcon("configure"), i18n("&Configure Kasbar..."), this, TQT_SLOT( showPreferences() ) );
+	menu->insertItem( SmallIcon("configure"), i18n("&Configure Kasbar..."), TQT_TQOBJECT(this), TQT_SLOT( showPreferences() ) );
 
 	// Help menu
 	KPopupMenu *help = new KPopupMenu;
-	help->insertItem( SmallIcon("about"), i18n("&About Kasbar"), this, TQT_SLOT( showAbout() ) );
+	help->insertItem( SmallIcon("about"), i18n("&About Kasbar"), TQT_TQOBJECT(this), TQT_SLOT( showAbout() ) );
 	menu->insertItem( SmallIcon("help"), i18n("&Help"), help );
 
 	if ( standalone_ ) {
 	    menu->insertSeparator();
-	    menu->insertItem( SmallIcon("exit"), i18n("&Quit"), qApp, TQT_SLOT( quit() ) );
+	    menu->insertItem( SmallIcon("exit"), i18n("&Quit"), tqApp, TQT_SLOT( quit() ) );
 	}
     }
 
@@ -587,7 +587,7 @@ void KasTasker::readConfig( KConfig *conf )
        setItemSize( conf->readNumEntry( "ItemSize", KasBar::Medium ) );
 
    setTint( conf->readBoolEntry( "EnableTint", false ) );
-   setTintColor( conf->readColorEntry( "TintColor", &Qt::black ) );
+   setTintColor( conf->readColorEntry( "TintColor", &TQt::black ) );
    setTintAmount( conf->readDoubleNumEntry( "TintAmount", 0.1 ) );
    setTransparent( conf->readBoolEntry( "Transparent", true ) );
    setPaintInactiveFrames( conf->readBoolEntry( "PaintInactiveFrames", true ) );
@@ -598,14 +598,14 @@ void KasTasker::readConfig( KConfig *conf )
    conf->setGroup("Colors");
 
    KasResources *res = resources();
-   res->setLabelPenColor( conf->readColorEntry( "LabelPenColor", &Qt::white ) );
-   res->setLabelBgColor( conf->readColorEntry( "LabelBgColor", &Qt::black ) );
-   res->setInactivePenColor( conf->readColorEntry( "InactivePenColor", &Qt::black ) );
-   res->setInactiveBgColor( conf->readColorEntry( "InactiveBgColor", &Qt::white ) );
-   res->setActivePenColor( conf->readColorEntry( "ActivePenColor", &Qt::black ) );
-   res->setActiveBgColor( conf->readColorEntry( "ActiveBgColor", &Qt::white ) );
-   res->setProgressColor( conf->readColorEntry( "ProgressColor", &Qt::green ) );
-   res->setAttentionColor( conf->readColorEntry( "AttentionColor", &Qt::red ) );
+   res->setLabelPenColor( conf->readColorEntry( "LabelPenColor", &TQt::white ) );
+   res->setLabelBgColor( conf->readColorEntry( "LabelBgColor", &TQt::black ) );
+   res->setInactivePenColor( conf->readColorEntry( "InactivePenColor", &TQt::black ) );
+   res->setInactiveBgColor( conf->readColorEntry( "InactiveBgColor", &TQt::white ) );
+   res->setActivePenColor( conf->readColorEntry( "ActivePenColor", &TQt::black ) );
+   res->setActiveBgColor( conf->readColorEntry( "ActiveBgColor", &TQt::white ) );
+   res->setProgressColor( conf->readColorEntry( "ProgressColor", &TQt::green ) );
+   res->setAttentionColor( conf->readColorEntry( "AttentionColor", &TQt::red ) );
 
    //
    // Thumbnail Settings
@@ -635,7 +635,7 @@ void KasTasker::readConfig( KConfig *conf )
    conf->setGroup("Layout");
 
    setDirection( (Direction) conf->readNumEntry( "Direction", TQBoxLayout::LeftToRight ) );
-   setOrientation( (Qt::Orientation) conf->readNumEntry( "Orientation", Horizontal ) );
+   setOrientation( (Qt::Orientation) conf->readNumEntry( "Orientation", Qt::Horizontal ) );
    setMaxBoxes( conf->readUnsignedNumEntry( "MaxBoxes", 0 ) );
 
    TQPoint pos(100, 100);
diff --git a/kicker/extensions/kasbar/kastasker.h b/kicker/extensions/kasbar/kastasker.h
index b90e4ddeb..d3491ba98 100644
--- a/kicker/extensions/kasbar/kastasker.h
+++ b/kicker/extensions/kasbar/kastasker.h
@@ -91,14 +91,14 @@ class KDE_EXPORT KasTasker : public KasBar
 
 public:
     /** Create a KasTasker widget. */
-    KasTasker( Orientation o, TQWidget* parent = 0, const char* name = 0, WFlags f = 0 );
+    KasTasker( Qt::Orientation o, TQWidget* parent = 0, const char* name = 0, WFlags f = 0 );
 
     /**
      * Create a KasTasker widget that is slaved to another KasTasker. The
      * created widget will inherit the settings of the parent, but will
      * not connect to the signals of the TaskManager.
      */
-    KasTasker( Orientation o, KasTasker *master,
+    KasTasker( Qt::Orientation o, KasTasker *master,
 	       TQWidget *parent=0, const char *name=0, WFlags f=0 );
 
     /** Cleans up. */
@@ -107,7 +107,7 @@ public:
     /** Factory method that returns the default menu for items in the bar. */
     virtual KPopupMenu *contextMenu();
 
-    virtual KasTasker *createChildBar( Orientation o, TQWidget *parent, const char *name=0 );
+    virtual KasTasker *createChildBar( Qt::Orientation o, TQWidget *parent, const char *name=0 );
 
     /**
      * Returns true if this is the top KasTasker. Note that it is possible for
diff --git a/kicker/extensions/kasbar/kastaskitem.cpp b/kicker/extensions/kasbar/kastaskitem.cpp
index c9ec7bdd0..64dda4185 100644
--- a/kicker/extensions/kasbar/kastaskitem.cpp
+++ b/kicker/extensions/kasbar/kastaskitem.cpp
@@ -135,7 +135,7 @@ TQPixmap KasTaskItem::icon()
 
 	TQPixmap thumb = task_->thumbnail();
 	TQSize sz = thumb.size();
-	sz.scale( sizes[kasbar()->itemSize()], sizes[kasbar()->itemSize()], TQSize::ScaleMin );
+	sz.tqscale( sizes[kasbar()->itemSize()], sizes[kasbar()->itemSize()], TQSize::ScaleMin );
 
 	TQImage img = thumb.convertToImage();
 	img = img.smoothScale( sz );
@@ -390,7 +390,7 @@ void KasTaskItem::showPropertiesDialog()
     tabs->addTab( createTaskProps( task_, tabs ), i18n("Task") );
 
     tabs->addTab( createTaskProps( this, tabs ), i18n("Item") );
-    tabs->addTab( createTaskProps( kasbar(), tabs, false ), i18n("Bar") );
+    tabs->addTab( createTaskProps( TQT_TQOBJECT(kasbar()), tabs, false ), i18n("Bar") );
 
 #if 0
     tabs->addTab( createNETProps( tabs ), i18n("NET") );
@@ -422,7 +422,7 @@ TQWidget *KasTaskItem::createTaskProps( TQObject *target, TQWidget *parent, bool
     taskprops->addColumn( i18n("Value") );
 
     // Create List Items
-    TQMetaObject *mo = target->metaObject();
+    TQMetaObject *mo = target->tqmetaObject();
     for ( int i = 0; i < mo->numProperties( recursive ); i++ ) {
 	const TQMetaProperty *p = mo->property(i, recursive);
 
@@ -443,9 +443,9 @@ TQString KasTaskItem::expandMacros( const TQString &format, TQObject *data )
     while ( pos >= 0 ) {
         pos = re.search( s, pos );
         if ( pos >= 0 ) {
-	    TQVariant val = data->property( re.cap(1).latin1() );
+	    TQVariant val = data->property( TQString(re.cap(1)).latin1() );
 	    TQString v = val.asString();
-	    s.replace( pos, re.matchedLength(), v );
+	    s.tqreplace( pos, re.matchedLength(), v );
             pos = pos + v.length();
         }
     }
@@ -456,7 +456,7 @@ TQString KasTaskItem::expandMacros( const TQString &format, TQObject *data )
 TQWidget *KasTaskItem::createX11Props( TQWidget *parent )
 {
     TQVBox *vb2 = new TQVBox( parent );
-    vb2->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred );
+    vb2->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred );
     vb2->setSpacing( KDialog::spacingHint() );
     vb2->setMargin( KDialog::marginHint() );
 
diff --git a/kicker/extensions/kasbar/kastaskpopup.cpp b/kicker/extensions/kasbar/kastaskpopup.cpp
index 25c096a65..9a59e1603 100644
--- a/kicker/extensions/kasbar/kastaskpopup.cpp
+++ b/kicker/extensions/kasbar/kastaskpopup.cpp
@@ -91,7 +91,7 @@ KasTaskPopup::KasTaskPopup( KasTaskItem *item, const char *name )
     }
 
     KPixmapEffect::gradient( titleBg, 
-                             Qt::black, colorGroup().mid(),
+                             Qt::black, tqcolorGroup().mid(),
                              KPixmapEffect::DiagonalGradient );
 
     connect( item->task(), TQT_SIGNAL( thumbnailChanged() ), TQT_SLOT( refresh() ) );