Rename old tq methods that no longer need a unique name

(cherry picked from commit 45f529de247fc4b3662f6b474abe03fe904306ec)

11 files changed, 35 insertions, 35 deletions

diff --git a/kmrml/kmrml/algorithmdialog.cpp b/kmrml/kmrml/algorithmdialog.cpp
index 68060bb3..0678fe6b 100644
--- a/kmrml/kmrml/algorithmdialog.cpp
+++ b/kmrml/kmrml/algorithmdialog.cpp
@@ -49,8 +49,8 @@ protected:
     virtual void viewportResizeEvent(TQResizeEvent* ev)
     {
       TQScrollView::viewportResizeEvent(ev);
-      m_frame->resize( kMax(m_frame->tqsizeHint().width(), ev->size().width()),
-                       kMax(m_frame->tqsizeHint().height(), ev->size().height()));
+      m_frame->resize( kMax(m_frame->sizeHint().width(), ev->size().width()),
+                       kMax(m_frame->sizeHint().height(), ev->size().height()));
     };
 
 private:
@@ -106,7 +106,7 @@ AlgorithmDialog::AlgorithmDialog( const AlgorithmList& algorithms,
     mainLayout->activate();
     algoHLayout->move( groupBox->x() + 10, groupBox->y() - 12 );
     
-    box->setMinimumWidth( algoHLayout->tqsizeHint().width() + 
+    box->setMinimumWidth( algoHLayout->sizeHint().width() + 
                           4 * KDialog::spacingHint() );
 }
 
diff --git a/kmrml/kmrml/kcontrol/indexcleaner.cpp b/kmrml/kmrml/kcontrol/indexcleaner.cpp
index 3c09b7a3..99606b43 100644
--- a/kmrml/kmrml/kcontrol/indexcleaner.cpp
+++ b/kmrml/kmrml/kcontrol/indexcleaner.cpp
@@ -78,7 +78,7 @@ void IndexCleaner::startNext()
     if ( index != -1 )
         cmd.replace( index, 2, TQUOTE( dir ) );
     else // no %d? What else can we do?
-        cmd.append( TQString::tqfromLatin1(" ") + TQUOTE( dir ) );
+        cmd.append( TQString::fromLatin1(" ") + TQUOTE( dir ) );
 
     *m_process << cmd;
 
diff --git a/kmrml/kmrml/kcontrol/kcmkmrml.cpp b/kmrml/kmrml/kcontrol/kcmkmrml.cpp
index 42aaf534..dfee10fd 100644
--- a/kmrml/kmrml/kcontrol/kcmkmrml.cpp
+++ b/kmrml/kmrml/kcontrol/kcmkmrml.cpp
@@ -86,9 +86,9 @@ void KCMKMrml::checkGiftInstallation()
         KMessageBox::error( this, errorMessage );
         m_mainPage->hide();
         TQLabel *errorLabel = new TQLabel( errorMessage, this );
-        errorLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
+        errorLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
         KURLLabel *urlLabel = new KURLLabel( "http://www.gnu.org/software/gift", TQString(), this ); 
-        urlLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+        urlLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
         connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& )), kapp, TQT_SLOT( invokeBrowser( const TQString& )) );
         TQLayout *l = tqlayout();
         l->addItem( new TQSpacerItem( 0, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding ) );
diff --git a/kmrml/kmrml/kcontrol/mainpage.cpp b/kmrml/kmrml/kcontrol/mainpage.cpp
index c44f1b0e..ea922913 100644
--- a/kmrml/kmrml/kcontrol/mainpage.cpp
+++ b/kmrml/kmrml/kcontrol/mainpage.cpp
@@ -186,7 +186,7 @@ TQStringList MainPage::difference( const TQStringList& oldIndexDirs,
 {
     TQStringList result;
 
-    TQString slash = TQString::tqfromLatin1("/");
+    TQString slash = TQString::fromLatin1("/");
     TQStringList::ConstIterator oldIt = oldIndexDirs.begin();
     TQString oldDir, newDir;
 
diff --git a/kmrml/kmrml/kcontrol/serverconfigwidget.ui b/kmrml/kmrml/kcontrol/serverconfigwidget.ui
index e577b221..5f3a34cd 100644
--- a/kmrml/kmrml/kcontrol/serverconfigwidget.ui
+++ b/kmrml/kmrml/kcontrol/serverconfigwidget.ui
@@ -135,7 +135,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>200</width>
                                     <height>0</height>
@@ -200,7 +200,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>16</width>
                             <height>16</height>
diff --git a/kmrml/kmrml/lib/kmrml_config.cpp b/kmrml/kmrml/lib/kmrml_config.cpp
index 2167448b..023a93d9 100644
--- a/kmrml/kmrml/lib/kmrml_config.cpp
+++ b/kmrml/kmrml/lib/kmrml_config.cpp
@@ -104,7 +104,7 @@ bool Config::sync()
 void Config::setDefaultHost( const TQString& host )
 {
     m_defaultHost = host.isEmpty() ?
-                    TQString::tqfromLatin1(DEFAULT_HOST) : host;
+                    TQString::fromLatin1(DEFAULT_HOST) : host;
 
     m_config->setGroup( CONFIG_GROUP );
     m_config->writeEntry( "Default Host", m_defaultHost );
diff --git a/kmrml/kmrml/lib/kmrml_config.h b/kmrml/kmrml/lib/kmrml_config.h
index 4e39d3bf..2208030a 100644
--- a/kmrml/kmrml/lib/kmrml_config.h
+++ b/kmrml/kmrml/lib/kmrml_config.h
@@ -108,7 +108,7 @@ namespace KMrml
 
         TQString settingsGroup( const TQString& host ) const
         {
-            return TQString::tqfromLatin1( "SettingsFor: " ).append( host );
+            return TQString::fromLatin1( "SettingsFor: " ).append( host );
         }
 
         bool m_serverStartedIndividually;
diff --git a/kmrml/kmrml/mrml_part.cpp b/kmrml/kmrml/mrml_part.cpp
index c35e6607..b2b4b78e 100644
--- a/kmrml/kmrml/mrml_part.cpp
+++ b/kmrml/kmrml/mrml_part.cpp
@@ -153,13 +153,13 @@ MrmlPart::MrmlPart( TQWidget *parentWidget, const char * /* widgetName */,
 
     m_algoButton = new TQPushButton( TQString(), m_panel );
     m_algoButton->setPixmap( SmallIcon("configure") );
-    m_algoButton->setFixedSize( m_algoButton->tqsizeHint() );
+    m_algoButton->setFixedSize( m_algoButton->sizeHint() );
     connect( m_algoButton, TQT_SIGNAL( clicked() ),
              TQT_SLOT( slotConfigureAlgorithm() ));
     TQToolTip::add( m_algoButton, i18n("Configure algorithm") );
 
     TQWidget *spacer = new TQWidget( m_panel );
-    spacer->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
+    spacer->setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
                                         TQSizePolicy::Minimum ) );
 
     int resultSize = config->readNumEntry( "Result-size", 20 );
@@ -172,7 +172,7 @@ MrmlPart::MrmlPart( TQWidget *parentWidget, const char * /* widgetName */,
 
     m_startButton = new TQPushButton( TQString(), tmp );
     connect( m_startButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotStartClicked() ));
-    settqStatus( NeedCollection );
+    setStatus( NeedCollection );
 
     setWidget( box );
 
@@ -206,7 +206,7 @@ void MrmlPart::initCollections( const TQDomElement& elem )
         KMessageBox::information( widget(),
                                i18n("There is no image collection available\n"
                                     "at %1.\n"), i18n("No Image Collection"));
-        settqStatus( NeedCollection );
+        setStatus( NeedCollection );
     }
     else
         m_collectionCombo->updateGeometry(); // adjust the entire grid
@@ -229,7 +229,7 @@ bool MrmlPart::openURL( const KURL& url )
 
     m_url = url;
     TQString host = url.host().isEmpty() ?
-                   TQString::tqfromLatin1("localhost") : url.host();
+                   TQString::fromLatin1("localhost") : url.host();
 
     m_hostCombo->setCurrentItem( host );
 
@@ -285,8 +285,8 @@ bool MrmlPart::openURL( const KURL& url )
                  == KMessageBox::Yes )
             {
                 KApplication::kdeinitExec( "kcmshell",
-                                           TQString::tqfromLatin1("kcmkmrml"));
-                settqStatus( NeedCollection );
+                                           TQString::fromLatin1("kcmkmrml"));
+                setStatus( NeedCollection );
                 return false;
             }
         }
@@ -308,7 +308,7 @@ void MrmlPart::contactServer( const KURL& url )
     m_job->addMetaData( MrmlShared::kio_task(), MrmlShared::kio_initialize() );
 
     TQString host = url.host().isEmpty() ?
-                   TQString::tqfromLatin1("localhost") : url.host();
+                   TQString::fromLatin1("localhost") : url.host();
 
     slotSetStatusBar( i18n("Connecting to indexing server at %1...").tqarg( host ));
 }
@@ -376,7 +376,7 @@ bool MrmlPart::closeURL()
         m_job = 0L;
     }
 
-    settqStatus( NeedCollection );
+    setStatus( NeedCollection );
 
     return true;
 }
@@ -400,7 +400,7 @@ KIO::TransferJob * MrmlPart::transferJob( const KURL& url )
 
     emit started( job );
     emit setWindowCaption( url.prettyURL() );
-    settqStatus( InProgress );
+    setStatus( InProgress );
 
     return job;
 }
@@ -423,7 +423,7 @@ void MrmlPart::slotResult( KIO::Job *job )
     bool auto_random = m_view->isEmpty() && m_queryList.isEmpty();
     m_random->setChecked( auto_random );
     m_random->setEnabled( !auto_random );
-    settqStatus( job->error() ? NeedCollection : CanSearch );
+    setStatus( job->error() ? NeedCollection : CanSearch );
 
     if ( !job->error() && !m_queryList.isEmpty() ) {
         // we have a connection and we got a list of relevant URLs to query for
@@ -776,7 +776,7 @@ void MrmlPart::slotHostComboActivated( const TQString& host )
     openURL( settings.getUrl() );
 }
 
-void MrmlPart::settqStatus( tqStatus status )
+void MrmlPart::setStatus( Status status )
 {
     switch ( status )
     {
diff --git a/kmrml/kmrml/mrml_part.h b/kmrml/kmrml/mrml_part.h
index 1451b833..0bfec704 100644
--- a/kmrml/kmrml/mrml_part.h
+++ b/kmrml/kmrml/mrml_part.h
@@ -57,7 +57,7 @@ class MrmlPart : public KParts::ReadOnlyPart
   TQ_OBJECT
 
 public:
-    enum tqStatus { NeedCollection, CanSearch, InProgress };
+    enum Status { NeedCollection, CanSearch, InProgress };
 
     MrmlPart( TQWidget *parentWidget, const char *widgetName,
               TQObject *parent, const char *name, const TQStringList& args );
@@ -116,7 +116,7 @@ private:
     void initHostCombo();
     void enableServerDependentWidgets( bool enable );
 
-    void settqStatus( tqStatus status );
+    void setStatus( Status status );
 
     void contactServer( const KURL& url );
     void downloadReferenceFiles( const KURL::List& downloadList );
@@ -143,7 +143,7 @@ private:
     CollectionList m_collections;
     AlgorithmList m_algorithms;
 
-    tqStatus m_status;
+    Status m_status;
     static uint s_sessionId;
 
 };
diff --git a/kmrml/kmrml/mrml_view.cpp b/kmrml/kmrml/mrml_view.cpp
index d5b26117..fa70124b 100644
--- a/kmrml/kmrml/mrml_view.cpp
+++ b/kmrml/kmrml/mrml_view.cpp
@@ -57,7 +57,7 @@ MrmlView::MrmlView( TQWidget *parent, const char *name )
     // query result image
     TQLabel l( i18n( "No thumbnail available" ), 0L );
     l.setFixedSize( 80, 80 );
-    l.tqsetAlignment( WordBreak | AlignCenter );
+    l.setAlignment( WordBreak | AlignCenter );
 //     l.setFrameStyle( TQLabel::Box | TQLabel::Plain );
 //     l.setLineWidth( 1 );
     l.setPaletteBackgroundColor( TQt::white );
@@ -176,7 +176,7 @@ void MrmlView::slotLayout()
     TQPtrListIterator<MrmlViewItem> it( m_items );
 
     for ( ; it.current(); ++it ) {
-        itemWidth = TQMAX( itemWidth, it.current()->tqsizeHint().width() );
+        itemWidth = TQMAX( itemWidth, it.current()->sizeHint().width() );
     }
 
     if ( itemWidth == 0 )
@@ -202,7 +202,7 @@ void MrmlView::slotLayout()
         if ( item == 0 )
             rowIt = it;
 
-        rowHeight = TQMAX( rowHeight, it.current()->tqsizeHint().height() );
+        rowHeight = TQMAX( rowHeight, it.current()->sizeHint().height() );
         addChild( it.current(), margin + item * itemWidth, y );
         it.current()->show();
 
@@ -306,11 +306,11 @@ MrmlViewItem::MrmlViewItem( const KURL& url, const KURL& thumbURL,
 
     /*
     if ( similarity > -1 )
-        TQToolTip::add( this, TQString::tqfromLatin1("<qt>%1<br>%1</qt>")
+        TQToolTip::add( this, TQString::fromLatin1("<qt>%1<br>%1</qt>")
                        .tqarg( url )
                        .tqarg(i18n("Similarity: %1").tqarg( TQString::number(similarity))));
     else
-        TQToolTip::add( this, TQString::tqfromLatin1("<qt>%1</qt>").tqarg( url ) );
+        TQToolTip::add( this, TQString::fromLatin1("<qt>%1</qt>").tqarg( url ) );
     */
 
     setMinimumSize( 130, 130 ); // ###
@@ -342,14 +342,14 @@ void MrmlViewItem::paintEvent( TQPaintEvent *e )
 
     if ( m_similarity >= 0 ) {
         TQPainter p( this );
-        TQPen pen( tqcolorGroup().highlight(), 1, TQPen::SolidLine );
+        TQPen pen( colorGroup().highlight(), 1, TQPen::SolidLine );
         p.setPen( pen );
         int x = margin;
         int y = m_combo->y() - similarityHeight - 2;
         int w = (int) (similarityFullWidth * m_similarity);
         int h = similarityHeight;
         p.drawRect( x, y, similarityFullWidth, h );
-        p.fillRect( x, y, w, h, tqcolorGroup().highlight() );
+        p.fillRect( x, y, w, h, colorGroup().highlight() );
     }
 }
 
@@ -361,7 +361,7 @@ void MrmlViewItem::resizeEvent( TQResizeEvent *e )
     m_combo->move( width()/2 - m_combo->width()/2, y );
 }
 
-TQSize MrmlViewItem::tqsizeHint() const
+TQSize MrmlViewItem::sizeHint() const
 {
     int w = TQMAX( TQMAX(minimumHeight(), m_combo->width()), m_pixmap.width() );
     w += 2 * margin;
diff --git a/kmrml/kmrml/mrml_view.h b/kmrml/kmrml/mrml_view.h
index a9f1aad1..f73634a8 100644
--- a/kmrml/kmrml/mrml_view.h
+++ b/kmrml/kmrml/mrml_view.h
@@ -126,7 +126,7 @@ public:
 
     void setSimilarity( double value );
 
-    virtual TQSize tqsizeHint() const;
+    virtual TQSize sizeHint() const;
 
     const KURL& url() const { return m_url; }
     const KURL& thumbURL() const { return m_thumbURL; }