Rename old tq methods that no longer need a unique name

11 files changed, 22 insertions, 22 deletions

diff --git a/src/rip/base_k3baudiorippingoptionwidget.ui b/src/rip/base_k3baudiorippingoptionwidget.ui
index 5a7a15b..820b04f 100644
--- a/src/rip/base_k3baudiorippingoptionwidget.ui
+++ b/src/rip/base_k3baudiorippingoptionwidget.ui
@@ -99,7 +99,7 @@ which can be used with programs like xmms or noatun.
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>16</height>
@@ -164,7 +164,7 @@ file will contain all tracks one after the other.
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>16</height>
diff --git a/src/rip/base_k3bcddbpatternwidget.ui b/src/rip/base_k3bcddbpatternwidget.ui
index feff67a..351ee9e 100644
--- a/src/rip/base_k3bcddbpatternwidget.ui
+++ b/src/rip/base_k3bcddbpatternwidget.ui
@@ -123,7 +123,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>31</width>
                             <height>2</height>
diff --git a/src/rip/k3baudiocdview.cpp b/src/rip/k3baudiocdview.cpp
index 807e462..07cdf5e 100644
--- a/src/rip/k3baudiocdview.cpp
+++ b/src/rip/k3baudiocdview.cpp
@@ -111,7 +111,7 @@ K3bAudioCdView::K3bAudioCdView( TQWidget* parent, const char *name )
   TQSpacerItem* spacer = new TQSpacerItem( 10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
   toolBoxLayout->addItem( spacer );
   m_labelLength = new TQLabel( mainWidget() );
-  m_labelLength->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+  m_labelLength->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
   toolBoxLayout->addWidget( m_labelLength );
 
 
@@ -359,7 +359,7 @@ void K3bAudioCdView::slotEditTrackCddb()
     grid->setRowStretch( 4, 1 );
 
     d.setMainWidget(w);
-    d.resize( TQMAX( TQMAX(d.tqsizeHint().height(), d.tqsizeHint().width()), 300), d.tqsizeHint().height() );
+    d.resize( TQMAX( TQMAX(d.sizeHint().height(), d.sizeHint().width()), 300), d.sizeHint().height() );
 
     if( d.exec() == TQDialog::Accepted ) {
       m_cddbInfo.titles[a->trackNumber-1] = editTitle->text();
@@ -415,7 +415,7 @@ void K3bAudioCdView::slotEditAlbumCddb()
   grid->setRowStretch( 7, 1 );
 
   d.setMainWidget(w);
-  d.resize( TQMAX( TQMAX(d.tqsizeHint().height(), d.tqsizeHint().width()), 300), d.tqsizeHint().height() );
+  d.resize( TQMAX( TQMAX(d.sizeHint().height(), d.sizeHint().width()), 300), d.sizeHint().height() );
 
   if( d.exec() == TQDialog::Accepted ) {
     m_cddbInfo.cdTitle = editTitle->text();
@@ -584,7 +584,7 @@ void K3bAudioCdView::showBusyLabel( bool b )
     // the themed label is a cut label, thus its size hint is
     // based on the cut text, we force it to be full
     m_busyInfoLabel->resize( width(), height() );
-    m_busyInfoLabel->resize( m_busyInfoLabel->tqsizeHint() );
+    m_busyInfoLabel->resize( m_busyInfoLabel->sizeHint() );
     int x = (width() - m_busyInfoLabel->width())/2;
     int y = (height() - m_busyInfoLabel->height())/2;
     TQRect r( TQPoint( x, y ), m_busyInfoLabel->size() );
diff --git a/src/rip/k3bpatternparser.cpp b/src/rip/k3bpatternparser.cpp
index d83fe49..9cec693 100644
--- a/src/rip/k3bpatternparser.cpp
+++ b/src/rip/k3bpatternparser.cpp
@@ -171,7 +171,7 @@ TQString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry,
             dir.append( s ); // I think it makes more sense to allow empty comments
             break;
           case DATE:
-            dir.append( KGlobal::locale()->formatDate( TQDate::tqcurrentDate() ) );
+            dir.append( KGlobal::locale()->formatDate( TQDate::currentDate() ) );
             break;
           default:
             dir.append( pattern.mid(i, len) );
@@ -247,7 +247,7 @@ TQString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry,
         s = entry.cdExtInfo;
         break;
       case DATE:
-        s = KGlobal::locale()->formatDate( TQDate::tqcurrentDate() );
+        s = KGlobal::locale()->formatDate( TQDate::currentDate() );
         break;
       default: // we must never get here,
         break; // all choices should be covered
diff --git a/src/rip/k3bvideocdrippingdialog.cpp b/src/rip/k3bvideocdrippingdialog.cpp
index 9283f00..f0ab309 100644
--- a/src/rip/k3bvideocdrippingdialog.cpp
+++ b/src/rip/k3bvideocdrippingdialog.cpp
@@ -77,7 +77,7 @@ void K3bVideoCdRippingDialog::setupGui()
     groupDirectory->tqlayout() ->setMargin( KDialog::marginHint() );
 
     TQGridLayout* groupDirectoryLayout = new TQGridLayout( groupDirectory->tqlayout() );
-    groupDirectoryLayout->tqsetAlignment( TQt::AlignTop );
+    groupDirectoryLayout->setAlignment( TQt::AlignTop );
 
     TQLabel* rippathLabel = new TQLabel( i18n( "Rip files to:" ), groupDirectory );
     m_editDirectory = new KURLRequester( groupDirectory, "m_editDirectory" );
@@ -90,13 +90,13 @@ void K3bVideoCdRippingDialog::setupGui()
     freeSpaceBox->setSpacing( KDialog::spacingHint() );
     ( void ) new TQLabel( i18n( "Free space in directory:" ), freeSpaceBox, "FreeSpaceLabel" );
     m_labelFreeSpace = new TQLabel( "                       ", freeSpaceBox, "m_labelFreeSpace" );
-    m_labelFreeSpace->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+    m_labelFreeSpace->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
 
     TQHBox* necessarySizeBox = new TQHBox( groupDirectory );
     necessarySizeBox->setSpacing( KDialog::spacingHint() );
     ( void ) new TQLabel( i18n( "Necessary storage size:" ), necessarySizeBox, "StorSize" );
     m_labelNecessarySize = new TQLabel( "                        ", necessarySizeBox, "m_labelNecessarySize" );
-    m_labelNecessarySize->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+    m_labelNecessarySize->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
 
 
     groupDirectoryLayout->addWidget( rippathLabel, 0, 0 );
diff --git a/src/rip/k3bvideocdview.cpp b/src/rip/k3bvideocdview.cpp
index 7fbe3b2..9a60482 100644
--- a/src/rip/k3bvideocdview.cpp
+++ b/src/rip/k3bvideocdview.cpp
@@ -153,7 +153,7 @@ K3bVideoCdView::K3bVideoCdView( TQWidget* parent, const char *name )
     TQSpacerItem* spacer = new TQSpacerItem( 10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
     toolBoxLayout->addItem( spacer );
     m_labelLength = new TQLabel( mainWidget() );
-    m_labelLength->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+    m_labelLength->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
     toolBoxLayout->addWidget( m_labelLength );
 
     // the track view
diff --git a/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui b/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui
index 864b798..3ea6c03 100644
--- a/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui
+++ b/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui
@@ -372,7 +372,7 @@
                                             <property name="sizeType">
                                                 <enum>Expanding</enum>
                                             </property>
-                                            <property name="tqsizeHint">
+                                            <property name="sizeHint">
                                                 <size>
                                                     <width>20</width>
                                                     <height>0</height>
@@ -560,7 +560,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>5</width>
                                 <height>1</height>
@@ -663,7 +663,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>1</height>
diff --git a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
index bcdb0f6..2ce8ae4 100644
--- a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
@@ -233,7 +233,7 @@ void K3bVideoDVDRippingDialog::populateTitleView( const TQValueList<int>& titles
 
       if( m_dvd[*it-1].audioStream(i).format() == K3bVideoDVD::AUDIO_FORMAT_DTS ) {
 	// width of the radio button from TQCheckListItem::paintCell
-	int buttonSize = tqstyle().tqpixelMetric( TQStyle::PM_CheckListButtonSize, m_w->m_titleView ) + 4;
+	int buttonSize = tqstyle().pixelMetric( TQStyle::PM_CheckListButtonSize, m_w->m_titleView ) + 4;
 	int spaceWidth = fontMetrics().width( ' ' );
 	int numSpaces = buttonSize/spaceWidth;
 	asI = new TQListViewItem( titleItem, asI, TQString().fill( ' ', numSpaces ) + text + " (" + i18n("not supported") + ")" );
@@ -471,7 +471,7 @@ TQString K3bVideoDVDRippingDialog::createFilename( const K3bVideoDVDRippingJob::
 	  f.append( "16:9" );
 	break;
       case PATTERN_CURRENT_DATE:
-	f.append( KGlobal::locale()->formatDate( TQDate::tqcurrentDate() ) );
+	f.append( KGlobal::locale()->formatDate( TQDate::currentDate() ) );
 	break;
       default:
 	f.append( pattern[i-1] );
diff --git a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp
index 5811750..8c3e592 100644
--- a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp
@@ -300,7 +300,7 @@ public:
       return;
     int col = m_view->header()->sectionAt( contentsPos.x() );
 
-    TQRect r = m_view->tqitemRect( item );
+    TQRect r = m_view->itemRect( item );
     int headerPos = m_view->header()->sectionPos( col );
     r.setLeft( headerPos );
     r.setRight( headerPos + m_view->header()->sectionSize( col ) );
diff --git a/src/rip/videodvd/k3bvideodvdrippingview.cpp b/src/rip/videodvd/k3bvideodvdrippingview.cpp
index 101d965..56ecf0c 100644
--- a/src/rip/videodvd/k3bvideodvdrippingview.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingview.cpp
@@ -54,7 +54,7 @@ K3bVideoDVDRippingView::K3bVideoDVDRippingView( TQWidget* parent, const char * n
   TQSpacerItem* spacer = new TQSpacerItem( 10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
   toolBoxLayout->addItem( spacer );
   m_labelLength = new TQLabel( mainWidget() );
-  m_labelLength->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+  m_labelLength->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
   toolBoxLayout->addWidget( m_labelLength );
 
 
diff --git a/src/rip/videodvd/k3bvideodvdrippingwidget.cpp b/src/rip/videodvd/k3bvideodvdrippingwidget.cpp
index d05f915..cdbb932 100644
--- a/src/rip/videodvd/k3bvideodvdrippingwidget.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingwidget.cpp
@@ -351,8 +351,8 @@ void K3bVideoDVDRippingWidget::slotCustomPictureSize()
   spinHeight->setSpecialValueText( i18n("Auto") );
   TQLabel* labelW = new TQLabel( spinWidth, i18n("Width") + ':', dlg.plainPage() );
   TQLabel* labelH = new TQLabel( spinHeight, i18n("Height") + ':', dlg.plainPage() );
-  labelW->tqsetAlignment( TQt::AlignRight|TQt::AlignVCenter );
-  labelH->tqsetAlignment( TQt::AlignRight|TQt::AlignVCenter );
+  labelW->setAlignment( TQt::AlignRight|TQt::AlignVCenter );
+  labelH->setAlignment( TQt::AlignRight|TQt::AlignVCenter );
 
   TQGridLayout* grid = new TQGridLayout( dlg.plainPage() );
   grid->setMargin( 0 );