TQt4 port kdenetwork

This enables compilation under both Qt3 and Qt4


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

1 files changed, 11 insertions, 11 deletions

diff --git a/ksirc/colorpicker.cpp b/ksirc/colorpicker.cpp
index 9bb5f03f..ebdc9eed 100644
--- a/ksirc/colorpicker.cpp
+++ b/ksirc/colorpicker.cpp
@@ -30,8 +30,8 @@
 
 #include <klocale.h>
 
-ColorPicker::ColorPicker( TQWidget *parent, const char *name )
-    : KDialogBase( parent, name, true /*modal*/, i18n( "Pick Color" ),
+ColorPicker::ColorPicker( TQWidget *tqparent, const char *name )
+    : KDialogBase( tqparent, name, true /*modal*/, i18n( "Pick Color" ),
                    KDialogBase::Ok | KDialogBase::Cancel,
                    KDialogBase::Cancel ),
       m_foregroundColor( -1 ), m_backgroundColor( -1 )
@@ -45,9 +45,9 @@ ColorPicker::ColorPicker( TQWidget *parent, const char *name )
     sampleLayout->addWidget( preview );
 
     m_sample = new TQLineEdit( i18n( "Sample Text" ), sampleBox );
-    m_sample->setFocusPolicy( NoFocus );
-    m_sample->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum,
-                             m_sample->sizePolicy().verData() ) );
+    m_sample->setFocusPolicy( TQ_NoFocus );
+    m_sample->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum,
+                             m_sample->tqsizePolicy().verData() ) );
     sampleLayout->addWidget( m_sample );
     sampleLayout->addStretch();
 
@@ -111,7 +111,7 @@ void ColorPicker::setBackgroundColor( int col )
 
 void ColorPicker::updateSample()
 {
-    TQColorGroup cg( colorGroup() );
+    TQColorGroup cg( tqcolorGroup() );
 
     TQColor col = ksopts->textColor;
     if ( m_foregroundColor != -1 )
@@ -130,9 +130,9 @@ void ColorPicker::updateSample()
     m_sample->setPalette( TQPalette( cg, cg, cg ) );
 }
 
-ColorBar::ColorBar( const TQValueVector<TQColor> &colors, TQWidget *parent, 
+ColorBar::ColorBar( const TQValueVector<TQColor> &colors, TQWidget *tqparent, 
                       const char *name )
-    : TQFrame( parent, name, WStaticContents | WRepaintNoErase ),
+    : TQFrame( tqparent, name, WStaticContents | WRepaintNoErase ),
       m_currentCell( -1 ), m_focusedCell( - 1 ), m_colors( colors ), 
       m_cellSize( 0 )
 {
@@ -140,7 +140,7 @@ ColorBar::ColorBar( const TQValueVector<TQColor> &colors, TQWidget *parent,
 
     updateCellSize();
 
-    setFocusPolicy( StrongFocus );
+    setFocusPolicy( TQ_StrongFocus );
 }
 
 void ColorBar::drawContents( TQPainter *p )
@@ -249,7 +249,7 @@ bool ColorBar::focusNextPrevChild( bool next )
 void ColorBar::mousePressEvent( TQMouseEvent *ev )
 {
     const TQPoint &p = ev->pos();
-    if ( contentsRect().contains( p ) )
+    if ( contentsRect().tqcontains( p ) )
     {
         m_focusedCell = p.x() / m_cellSize;
         update();
@@ -270,7 +270,7 @@ void ColorBar::mouseReleaseEvent( TQMouseEvent *ev )
 
 void ColorBar::updateCellSize()
 {
-    setLineWidth( style().pixelMetric( TQStyle::PM_DefaultFrameWidth, this ) );
+    setLineWidth( tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, this ) );
 
     TQFontMetrics metrics( font() );