Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.

1 files changed, 28 insertions, 28 deletions

diff --git a/libtdepim/progressdialog.cpp b/libtdepim/progressdialog.cpp
index 81baa3735..bd5b594c6 100644
--- a/libtdepim/progressdialog.cpp
+++ b/libtdepim/progressdialog.cpp
@@ -34,7 +34,7 @@
 #endif
 
 #include <tqapplication.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqprogressbar.h>
 #include <tqtimer.h>
 #include <tqheader.h>
@@ -84,14 +84,14 @@ void TransactionItemView::resizeContents( int w, int h )
   // (handling of TQEvent::LayoutHint in TQScrollView calls this method)
   //kdDebug(5300) << k_funcinfo << w << "," << h << endl;
   TQScrollView::resizeContents( w, h );
-  // Tell the layout in the parent (progressdialog) that our size changed
+  // Tell the tqlayout in the parent (progressdialog) that our size changed
   updateGeometry();
   // Resize the parent (progressdialog) - this works but resize horizontally too often
   //parentWidget()->adjustSize();
 
   TQApplication::sendPostedEvents( 0, TQEvent::ChildInserted );
   TQApplication::sendPostedEvents( 0, TQEvent::LayoutHint );
-  TQSize sz = parentWidget()->sizeHint();
+  TQSize sz = parentWidget()->tqsizeHint();
   int currentWidth = parentWidget()->width();
   // Don't resize to sz.width() every time when it only reduces a little bit
   if ( currentWidth < sz.width() || currentWidth > sz.width() + 100 )
@@ -99,19 +99,19 @@ void TransactionItemView::resizeContents( int w, int h )
   parentWidget()->resize( currentWidth, sz.height() );
 }
 
-TQSize TransactionItemView::sizeHint() const
+TQSize TransactionItemView::tqsizeHint() const
 {
-  return minimumSizeHint();
+  return tqminimumSizeHint();
 }
 
-TQSize TransactionItemView::minimumSizeHint() const
+TQSize TransactionItemView::tqminimumSizeHint() const
 {
   int f = 2 * frameWidth();
   // Make room for a vertical scrollbar in all cases, to avoid a horizontal one
-  int vsbExt = verticalScrollBar()->sizeHint().width();
-  int minw = topLevelWidget()->width() / 3;
-  int maxh = topLevelWidget()->height() / 2;
-  TQSize sz( mBigBox->minimumSizeHint() );
+  int vsbExt = verticalScrollBar()->tqsizeHint().width();
+  int minw = tqtopLevelWidget()->width() / 3;
+  int maxh = tqtopLevelWidget()->height() / 2;
+  TQSize sz( mBigBox->tqminimumSizeHint() );
   sz.setWidth( TQMAX( sz.width(), minw ) + f + vsbExt );
   sz.setHeight( TQMIN( sz.height(), maxh ) + f );
   return sz;
@@ -146,7 +146,7 @@ TransactionItem::TransactionItem( TQWidget* parent,
 {
   setSpacing( 2 );
   setMargin( 2 );
-  setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
+  tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
 
   mFrame = new TQFrame( this );
   mFrame->setFrameShape( TQFrame::HLine );
@@ -160,8 +160,8 @@ TransactionItem::TransactionItem( TQWidget* parent,
   mItemLabel = new TQLabel( item->label(), h );
   // always interpret the label text as RichText, but disable word wrapping
   mItemLabel->setTextFormat( TQt::RichText );
-  mItemLabel->setAlignment( TQt::AlignAuto | TQt::AlignVCenter | TQt::SingleLine );
-  h->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
+  mItemLabel->tqsetAlignment( TQt::AlignAuto | TQt::AlignVCenter | TQt::SingleLine );
+  h->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
 
   mProgress = new TQProgressBar( 100, h );
   mProgress->setProgress( item->progress() );
@@ -175,17 +175,17 @@ TransactionItem::TransactionItem( TQWidget* parent,
 
   h = new TQHBox( this );
   h->setSpacing( 5 );
-  h->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
+  h->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
   mSSLLabel = new SSLLabel( h );
-  mSSLLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
-  mItemStatus = new TQLabel( item->status(), h );
+  mSSLLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+  mItemtqStatus = new TQLabel( item->status(), h );
   // always interpret the status text as RichText, but disable word wrapping
-  mItemStatus->setTextFormat( TQt::RichText );
-  mItemStatus->setAlignment( TQt::AlignAuto | TQt::AlignVCenter | TQt::SingleLine );
-  // richtext leads to sizeHint acting as if wrapping was enabled though,
+  mItemtqStatus->setTextFormat( TQt::RichText );
+  mItemtqStatus->tqsetAlignment( TQt::AlignAuto | TQt::AlignVCenter | TQt::SingleLine );
+  // richtext leads to tqsizeHint acting as if wrapping was enabled though,
   // so make sure we only ever have the height of one line.
-  mItemStatus->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored ) );
-  mItemStatus->setFixedHeight( mItemLabel->sizeHint().height() );
+  mItemtqStatus->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored ) );
+  mItemtqStatus->setFixedHeight( mItemLabel->tqsizeHint().height() );
   setCrypto( item->usesCrypto() );
   if( first ) hideHLine();
 }
@@ -209,9 +209,9 @@ void TransactionItem::setLabel( const TQString& label )
   mItemLabel->setText( label );
 }
 
-void TransactionItem::seStatus( const TQString& status )
+void TransactionItem::setqStatus( const TQString& status )
 {
-  mItemStatus->setText( status );
+  mItemtqStatus->setText( status );
 }
 
 void TransactionItem::setCrypto( bool on )
@@ -258,7 +258,7 @@ ProgressDialog::ProgressDialog( TQWidget* alignWidget, TQWidget* parent, const c
     TQVBox* rightBox = new TQVBox( this );
     TQToolButton* pbClose = new TQToolButton( rightBox );
     pbClose->setAutoRaise(true);
-    pbClose->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+    pbClose->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
     pbClose->setFixedSize( 16, 16 );
     pbClose->setIconSet( KGlobal::iconLoader()->loadIconSet( "fileclose", KIcon::Small, 14 ) );
     TQToolTip::add( pbClose, i18n( "Hide detailed progress window" ) );
@@ -278,8 +278,8 @@ ProgressDialog::ProgressDialog( TQWidget* alignWidget, TQWidget* parent, const c
               this, TQT_SLOT( slotTransactionCompleted( KPIM::ProgressItem* ) ) );
     connect ( pm, TQT_SIGNAL( progressItemProgress( KPIM::ProgressItem*, unsigned int ) ),
               this, TQT_SLOT( slotTransactionProgress( KPIM::ProgressItem*, unsigned int ) ) );
-    connect ( pm, TQT_SIGNAL( progressItemStatus( KPIM::ProgressItem*, const TQString& ) ),
-              this, TQT_SLOT( slotTransactionStatus( KPIM::ProgressItem*, const TQString& ) ) );
+    connect ( pm, TQT_SIGNAL( progressItemtqStatus( KPIM::ProgressItem*, const TQString& ) ),
+              this, TQT_SLOT( slotTransactiontqStatus( KPIM::ProgressItem*, const TQString& ) ) );
     connect ( pm, TQT_SIGNAL( progressItemLabel( KPIM::ProgressItem*, const TQString& ) ),
               this, TQT_SLOT( slotTransactionLabel( KPIM::ProgressItem*, const TQString& ) ) );
     connect ( pm, TQT_SIGNAL( progressItemUsesCrypto(KPIM::ProgressItem*, bool) ),
@@ -353,12 +353,12 @@ void ProgressDialog::slotTransactionProgress( ProgressItem *item,
    }
 }
 
-void ProgressDialog::slotTransactionStatus( ProgressItem *item,
+void ProgressDialog::slotTransactiontqStatus( ProgressItem *item,
                                             const TQString& status )
 {
    if ( mTransactionsToListviewItems.contains( item ) ) {
      TransactionItem *ti = mTransactionsToListviewItems[ item ];
-     ti->seStatus( status );
+     ti->setqStatus( status );
    }
 }