Rename old tq methods that no longer need a unique name

13 files changed, 40 insertions, 40 deletions

diff --git a/libkonq/knewmenu.cc b/libkonq/knewmenu.cc
index 35f528318..3a8dcd817 100644
--- a/libkonq/knewmenu.cc
+++ b/libkonq/knewmenu.cc
@@ -545,7 +545,7 @@ void KURLDesktopFileDlg::initDialog( const TQString& textFileName, const TQStrin
 
     TQLabel * label = new TQLabel( textFileName, fileNameBox );
     m_leFileName = new KLineEdit( fileNameBox, 0L );
-    m_leFileName->setMinimumWidth(m_leFileName->tqsizeHint().width() * 3);
+    m_leFileName->setMinimumWidth(m_leFileName->sizeHint().width() * 3);
     label->setBuddy(m_leFileName);  // please "scheck" style
     m_leFileName->setText( defaultName );
     m_leFileName->setSelection(0, m_leFileName->text().length()); // autoselect
@@ -559,7 +559,7 @@ void KURLDesktopFileDlg::initDialog( const TQString& textFileName, const TQStrin
     m_urlRequester = new KURLRequester( defaultUrl, urlBox, "urlRequester" );
     m_urlRequester->setMode( KFile::File | KFile::Directory );
 
-    m_urlRequester->setMinimumWidth( m_urlRequester->tqsizeHint().width() * 3 );
+    m_urlRequester->setMinimumWidth( m_urlRequester->sizeHint().width() * 3 );
     connect( m_urlRequester->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)),
              TQT_SLOT(slotURLTextChanged(const TQString&)) );
     label->setBuddy(m_urlRequester);  // please "scheck" style
diff --git a/libkonq/konq_bgnddlg.cc b/libkonq/konq_bgnddlg.cc
index b025f3d4d..042cafb99 100644
--- a/libkonq/konq_bgnddlg.cc
+++ b/libkonq/konq_bgnddlg.cc
@@ -51,7 +51,7 @@ KonqBgndDialog::KonqBgndDialog( TQWidget* parent,
     m_buttonGroup->tqlayout()->setMargin( KDialog::marginHint() );
     m_buttonGroup->tqlayout()->setSpacing( KDialog::spacingHint() );
     TQGridLayout* groupLayout = new TQGridLayout( m_buttonGroup->tqlayout() );
-    groupLayout->tqsetAlignment( Qt::AlignTop );
+    groupLayout->setAlignment( Qt::AlignTop );
     mainLayout->addWidget( m_buttonGroup );
 
     connect( m_buttonGroup, TQT_SIGNAL( clicked(int) ),
@@ -61,7 +61,7 @@ KonqBgndDialog::KonqBgndDialog( TQWidget* parent,
     m_radioColor = new TQRadioButton( i18n("Co&lor:"), m_buttonGroup );
     groupLayout->addWidget( m_radioColor, 0, 0 );
     m_buttonColor = new KColorButton( theColor, defaultColor, m_buttonGroup );
-    m_buttonColor->tqsetSizePolicy( TQSizePolicy::Preferred,
+    m_buttonColor->setSizePolicy( TQSizePolicy::Preferred,
                                 TQSizePolicy::Minimum );
     groupLayout->addWidget( m_buttonColor, 0, 1 );
 
@@ -90,14 +90,14 @@ KonqBgndDialog::KonqBgndDialog( TQWidget* parent,
     TQLabel* lbl = new TQLabel( i18n("Preview"), page );
     hlay->addWidget( lbl );
     TQFrame* frame = new TQFrame( page );
-    frame->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum );
+    frame->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum );
     frame->setFrameShape( TQFrame::HLine );
     frame->setFrameShadow( TQFrame::Sunken );
     hlay->addWidget( frame );
 
     // preview frame
     m_preview = new TQFrame( page );
-    m_preview->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
+    m_preview->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
     m_preview->setMinimumSize( 370, 180 );
     m_preview->setFrameShape( TQFrame::Panel );
     m_preview->setFrameShadow( TQFrame::Raised );
diff --git a/libkonq/konq_drag.cc b/libkonq/konq_drag.cc
index 4b97456f6..1e5271123 100644
--- a/libkonq/konq_drag.cc
+++ b/libkonq/konq_drag.cc
@@ -47,12 +47,12 @@ const char* KonqIconDrag::format( int i ) const
     else return 0;
 }
 
-TQByteArray KonqIconDrag::tqencodedData( const char* mime ) const
+TQByteArray KonqIconDrag::encodedData( const char* mime ) const
 {
     TQByteArray a;
     TQCString mimetype( mime );
     if ( mimetype == "application/x-qiconlist" )
-        a = TQIconDrag::tqencodedData( mime );
+        a = TQIconDrag::encodedData( mime );
     else if ( mimetype == "text/uri-list" ) {
         TQCString s = urls.join( "\r\n" ).latin1();
         if( urls.count() > 0 )
@@ -145,7 +145,7 @@ const char* KonqIconDrag2::format( int i ) const
     return KonqIconDrag::format( i );
 }
 
-TQByteArray KonqIconDrag2::tqencodedData( const char* mime ) const
+TQByteArray KonqIconDrag2::encodedData( const char* mime ) const
 {
     TQCString mimetype( mime );
     if ( mimetype == "application/x-kde-urilist" )
@@ -164,7 +164,7 @@ TQByteArray KonqIconDrag2::tqencodedData( const char* mime ) const
         a[c] = 0;
         return a;
     }
-    return KonqIconDrag::tqencodedData( mime );
+    return KonqIconDrag::encodedData( mime );
 }
 
 //
@@ -223,7 +223,7 @@ const char* KonqDrag::format( int i ) const
     else return 0;
 }
 
-TQByteArray KonqDrag::tqencodedData( const char* mime ) const
+TQByteArray KonqDrag::encodedData( const char* mime ) const
 {
     TQByteArray a;
     TQCString mimetype( mime );
@@ -243,7 +243,7 @@ TQByteArray KonqDrag::tqencodedData( const char* mime ) const
     }
     else if ( mimetype == "application/x-kde-urilist" )
     {
-        return TQUriDrag::tqencodedData( "text/uri-list" );
+        return TQUriDrag::encodedData( "text/uri-list" );
     }
     else if ( mimetype == "application/x-kde-cutselection" )
     {
@@ -271,7 +271,7 @@ TQByteArray KonqDrag::tqencodedData( const char* mime ) const
 
 bool KonqDrag::decodeIsCutSelection( const TQMimeSource *e )
 {
-  TQByteArray a = e->tqencodedData( "application/x-kde-cutselection" );
+  TQByteArray a = e->encodedData( "application/x-kde-cutselection" );
   if ( a.isEmpty() )
     return false;
   else
diff --git a/libkonq/konq_drag.h b/libkonq/konq_drag.h
index 65a156021..c30bbe49b 100644
--- a/libkonq/konq_drag.h
+++ b/libkonq/konq_drag.h
@@ -44,7 +44,7 @@ public:
     virtual ~KonqIconDrag() {}
 
     const char* format( int i ) const;
-    TQByteArray tqencodedData( const char* mime ) const;
+    TQByteArray encodedData( const char* mime ) const;
 
     void append( const TQIconDragItem &item, const TQRect &pr,
                  const TQRect &tr, const TQString &url );
@@ -72,7 +72,7 @@ public:
     virtual ~KonqIconDrag2() {}
 
     virtual const char* format( int i ) const;
-    virtual TQByteArray tqencodedData( const char* mime ) const;
+    virtual TQByteArray encodedData( const char* mime ) const;
 
     void append( const TQIconDragItem &item, const TQRect &pr,
                  const TQRect &tr, const TQString &url, const KURL &mostLocalURL );
@@ -107,7 +107,7 @@ public:
     virtual ~KonqDrag() {}
 
     virtual const char* format( int i ) const;
-    virtual TQByteArray tqencodedData( const char* mime ) const;
+    virtual TQByteArray encodedData( const char* mime ) const;
 
     void setMoveSelection( bool move ) { m_bCutSelection = move; }
 
diff --git a/libkonq/konq_filetip.cc b/libkonq/konq_filetip.cc
index c7ef40c56..03f7d64bf 100644
--- a/libkonq/konq_filetip.cc
+++ b/libkonq/konq_filetip.cc
@@ -49,7 +49,7 @@ KonqFileTip::KonqFileTip( TQScrollView* parent )
 {
     m_iconLabel = new TQLabel(this);
     m_textLabel = new TQLabel(this);
-    m_textLabel->tqsetAlignment(TQt::AlignAuto | TQt::AlignTop);
+    m_textLabel->setAlignment(TQt::AlignAuto | TQt::AlignTop);
 
     TQGridLayout* layout = new TQGridLayout(this, 1, 2, 8, 0);
     layout->addWidget(m_iconLabel, 0, 0);
@@ -189,7 +189,7 @@ void KonqFileTip::drawContents( TQPainter *p )
     }
 
     if ( m_corners[m_corner].isNull())
-        m_corners[m_corner].load( locate( "data", TQString::tqfromLatin1( "konqueror/pics/%1.png" ).arg( names[m_corner] ) ) );
+        m_corners[m_corner].load( locate( "data", TQString::fromLatin1( "konqueror/pics/%1.png" ).arg( names[m_corner] ) ) );
 
     TQPixmap &pix = m_corners[m_corner];
 
diff --git a/libkonq/konq_historymgr.cc b/libkonq/konq_historymgr.cc
index 9ac069cc5..451b61ecf 100644
--- a/libkonq/konq_historymgr.cc
+++ b/libkonq/konq_historymgr.cc
@@ -48,7 +48,7 @@ KonqHistoryManager::KonqHistoryManager( TQObject *parent, const char *name )
 
     m_history.setAutoDelete( true );
     m_filename = locateLocal( "data",
-			      TQString::tqfromLatin1("konqueror/konq_history" ));
+			      TQString::fromLatin1("konqueror/konq_history" ));
 
     if ( !kapp->dcopClient()->isAttached() )
 	kapp->dcopClient()->attach();
@@ -295,7 +295,7 @@ void KonqHistoryManager::addToHistory( bool pending, const KURL& _url,
     // konqueror's window caption).
     if ( !pending && u != title )
 	entry.title = title;
-    entry.firstVisited = TQDateTime::tqcurrentDateTime();
+    entry.firstVisited = TQDateTime::currentDateTime();
     entry.lastVisited = entry.firstVisited;
 
     // always remove from pending if available, otherwise the else branch leaks
@@ -342,7 +342,7 @@ void KonqHistoryManager::insert( const TQString& url )
     // Local URL -> add to history
     KonqHistoryEntry entry;
     entry.url = u;
-    entry.firstVisited = TQDateTime::tqcurrentDateTime();
+    entry.firstVisited = TQDateTime::currentDateTime();
     entry.lastVisited = entry.firstVisited;
     emitAddToHistory( entry );
 }
@@ -589,7 +589,7 @@ void KonqHistoryManager::notifyRemove( KURL::List urls, TQCString )
 // compatibility fallback, try to load the old completion history
 bool KonqHistoryManager::loadFallback()
 {
-    TQString file = locateLocal( "config", TQString::tqfromLatin1("konq_history"));
+    TQString file = locateLocal( "config", TQString::fromLatin1("konq_history"));
     if ( file.isEmpty() )
 	return false;
 
@@ -646,7 +646,7 @@ KonqHistoryEntry * KonqHistoryManager::createFallbackEntry(const TQString& item)
 	entry->url = u;
 	entry->numberOfTimesVisited = weight;
 	// to make it not expire immediately...
-	entry->lastVisited = TQDateTime::tqcurrentDateTime();
+	entry->lastVisited = TQDateTime::currentDateTime();
     }
 
     return entry;
diff --git a/libkonq/konq_iconviewwidget.cc b/libkonq/konq_iconviewwidget.cc
index d881b6012..a4414db52 100644
--- a/libkonq/konq_iconviewwidget.cc
+++ b/libkonq/konq_iconviewwidget.cc
@@ -151,7 +151,7 @@ KonqIconViewWidget::KonqIconViewWidget( TQWidget * parent, const char * name, WF
     m_LineupMode = LineupBoth;
     // emit our signals
     slotSelectionChanged();
-    m_iconPositionGroupPrefix = TQString::tqfromLatin1( "IconPosition::" );
+    m_iconPositionGroupPrefix = TQString::fromLatin1( "IconPosition::" );
     KonqUndoManager::incRef();
 }
 
@@ -308,7 +308,7 @@ void KonqIconViewWidget::slotOnItem( TQIconViewItem *_item )
                         if (!hasPixmap && backgroundMode() != NoBackground)
                            d->m_movie->setBackgroundColor( viewport()->backgroundColor() );
                         d->m_movie->connectUpdate( this, TQT_SLOT( slotMovieUpdate(const TQRect &) ) );
-                        d->m_movie->connectqStatus( TQT_TQOBJECT(this), TQT_SLOT( slotMovieStatus(int) ) );
+                        d->m_movie->connecStatus( TQT_TQOBJECT(this), TQT_SLOT( slotMovieStatus(int) ) );
                         d->movieFileName = d->pActiveItem->mouseOverAnimation();
                         d->pActiveItem->setAnimated( true );
                     }
@@ -349,7 +349,7 @@ void KonqIconViewWidget::slotOnItem( TQIconViewItem *_item )
         d->pSoundPlayer->mimeTypes().contains(
             item->item()->mimetype())
         && KGlobalSettings::showFilePreview(item->item()->url())
-        && tqtopLevelWidget() == kapp->activeWindow())
+        && topLevelWidget() == kapp->activeWindow())
     {
         d->pSoundItem = item;
         d->bSoundItemClicked = false;
@@ -653,7 +653,7 @@ void KonqIconViewWidget::setIcons( int size, const TQStringList& stopImagePrevie
     // or bottom icons exceed the size of the viewport.. here we prevent the tqrepaint
     // event that will be triggered in that case.
     bool prevUpdatesState = viewport()->isUpdatesEnabled();
-    viewport()->tqsetUpdatesEnabled( false );
+    viewport()->setUpdatesEnabled( false );
 
     // Do this even if size didn't change, since this is used by refreshMimeTypes...
     for ( TQIconViewItem *it = firstItem(); it; it = it->nextItem() ) {
@@ -673,7 +673,7 @@ void KonqIconViewWidget::setIcons( int size, const TQStringList& stopImagePrevie
     }
 
     // Restore viewport update to previous state
-    viewport()->tqsetUpdatesEnabled( prevUpdatesState );
+    viewport()->setUpdatesEnabled( prevUpdatesState );
 
     if ( ( sizeChanged || previewSizeChanged || oldGridX != gridX() ||
          !stopImagePreviewFor.isEmpty() ) && autoArrange() )
@@ -995,7 +995,7 @@ void KonqIconViewWidget::contentsDragEnterEvent( TQDragEnterEvent *e )
 {
     if ( e->provides( "text/uri-list" ) )
     {
-        TQByteArray payload = e->tqencodedData( "text/uri-list" );
+        TQByteArray payload = e->encodedData( "text/uri-list" );
         if ( !payload.size() )
             kdError() << "Empty data !" << endl;
         // Cache the URLs, since we need them every time we move over a file
@@ -1221,7 +1221,7 @@ void KonqIconViewWidget::contentsMouseMoveEvent( TQMouseEvent *e )
         // The following call is SO expensive (the ::widgetAt call eats up to 80%
         // of the mouse move cpucycles!), so it's mandatory to place that function
         // under strict checks, such as d->pSoundPlayer->isPlaying()
-        if ( TQApplication::widgetAt( TQCursor::pos() ) != tqtopLevelWidget() )
+        if ( TQApplication::widgetAt( TQCursor::pos() ) != topLevelWidget() )
         {
             if (d->pSoundPlayer)
                 d->pSoundPlayer->stop();
diff --git a/libkonq/konq_operations.cc b/libkonq/konq_operations.cc
index fb803a9a9..0e0416f70 100644
--- a/libkonq/konq_operations.cc
+++ b/libkonq/konq_operations.cc
@@ -76,7 +76,7 @@ KonqOperations::~KonqOperations()
 
 void KonqOperations::editMimeType( const TQString & mimeType )
 {
-  TQString keditfiletype = TQString::tqfromLatin1("keditfiletype");
+  TQString keditfiletype = TQString::fromLatin1("keditfiletype");
   KRun::runCommand( keditfiletype + " " + KProcess::quote(mimeType),
                     keditfiletype, keditfiletype /*unused*/);
 }
diff --git a/libkonq/konq_popupmenu.cc b/libkonq/konq_popupmenu.cc
index a7608c7f8..b878b0ae5 100644
--- a/libkonq/konq_popupmenu.cc
+++ b/libkonq/konq_popupmenu.cc
@@ -355,7 +355,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
     m_pluginList.setAutoDelete( true );
     m_ownActions.setHighlightingEnabled( true );
 
-    attrName = TQString::tqfromLatin1( "name" );
+    attrName = TQString::fromLatin1( "name" );
 
     prepareXMLGUIStuff();
     m_builder = new KonqPopupMenuGUIBuilder( this );
@@ -1157,7 +1157,7 @@ void KonqPopupMenu::addPlugins()
     //search for a plugin with the right protocol
     KTrader::OfferList plugin_offers;
     unsigned int pluginCount = 0;
-    plugin_offers = KTrader::self()->query( m_sMimeType.isNull() ? TQString::tqfromLatin1( "all/all" ) : m_sMimeType, "'KonqPopupMenu/Plugin' in ServiceTypes");
+    plugin_offers = KTrader::self()->query( m_sMimeType.isNull() ? TQString::fromLatin1( "all/all" ) : m_sMimeType, "'KonqPopupMenu/Plugin' in ServiceTypes");
     if ( plugin_offers.isEmpty() )
         return; // no plugins installed do not bother about it
 
@@ -1176,7 +1176,7 @@ void KonqPopupMenu::addPlugins()
         if ( !plugin )
             continue;
         // This make the kuick plugin insert its stuff above "Properties"
-        TQString pluginClientName = TQString::tqfromLatin1( "Plugin%1" ).arg( pluginCount );
+        TQString pluginClientName = TQString::fromLatin1( "Plugin%1" ).arg( pluginCount );
         addMerge( pluginClientName );
         plugin->domDocument().documentElement().setAttribute( "name", pluginClientName );
         m_pluginList.append( plugin );
diff --git a/libkonq/konq_propsview.cc b/libkonq/konq_propsview.cc
index b860183c6..303fe044f 100644
--- a/libkonq/konq_propsview.cc
+++ b/libkonq/konq_propsview.cc
@@ -474,7 +474,7 @@ void KonqPropsView::setBgColor( const TQColor & color )
 const TQColor & KonqPropsView::bgColor( TQWidget * widget ) const
 {
     if ( !m_bgColor.isValid() )
-        return widget->tqcolorGroup().base();
+        return widget->colorGroup().base();
     else
         return m_bgColor;
 }
@@ -501,7 +501,7 @@ void KonqPropsView::setTextColor( const TQColor & color )
 const TQColor & KonqPropsView::textColor( TQWidget * widget ) const
 {
     if ( !m_textColor.isValid() )
-        return widget->tqcolorGroup().text();
+        return widget->colorGroup().text();
     else
         return m_textColor;
 }
diff --git a/libkonq/konq_propsview.h b/libkonq/konq_propsview.h
index c17f58a68..c69b97966 100644
--- a/libkonq/konq_propsview.h
+++ b/libkonq/konq_propsview.h
@@ -133,7 +133,7 @@ protected:
 
   TQString currentGroup() const {
       return isDefaultProperties() ? 
-          TQString::tqfromLatin1("Settings") : TQString::tqfromLatin1("URL properties");
+          TQString::fromLatin1("Settings") : TQString::fromLatin1("URL properties");
   }
 
 private:
diff --git a/libkonq/konq_settings.cc b/libkonq/konq_settings.cc
index b9cf41503..d48c7af10 100644
--- a/libkonq/konq_settings.cc
+++ b/libkonq/konq_settings.cc
@@ -146,10 +146,10 @@ bool KonqFMSettings::shouldEmbed( const TQString & serviceType ) const
     kdDebug(1203) << "KonqFMSettings::shouldEmbed : serviceTypeGroup=" << serviceTypeGroup << endl;
     if ( serviceTypeGroup == "inode" || serviceTypeGroup == "Browser" || serviceTypeGroup == "Konqueror" )
         return true; //always embed mimetype inode/*, Browser/* and Konqueror/*
-    TQMap<TQString, TQString>::ConstIterator it = m_embedMap.find( TQString::tqfromLatin1("embed-")+serviceTypeGroup );
+    TQMap<TQString, TQString>::ConstIterator it = m_embedMap.find( TQString::fromLatin1("embed-")+serviceTypeGroup );
     if ( it != m_embedMap.end() ) {
         kdDebug(1203) << "KonqFMSettings::shouldEmbed: " << it.data() << endl;
-        return it.data() == TQString::tqfromLatin1("true");
+        return it.data() == TQString::fromLatin1("true");
     }
     // 3 - if no config found, use default.
     // Note: if you change those defaults, also change kcontrol/filetypes/typeslistitem.cpp !
diff --git a/libkonq/konqbookmarkmanager.h b/libkonq/konqbookmarkmanager.h
index a45878562..9774d92e9 100644
--- a/libkonq/konqbookmarkmanager.h
+++ b/libkonq/konqbookmarkmanager.h
@@ -11,7 +11,7 @@ public:
     static KBookmarkManager * self() {
         if ( !s_bookmarkManager )
         {
-            TQString bookmarksFile = locateLocal("data", TQString::tqfromLatin1("konqueror/bookmarks.xml"));
+            TQString bookmarksFile = locateLocal("data", TQString::fromLatin1("konqueror/bookmarks.xml"));
             s_bookmarkManager = KBookmarkManager::managerForFile( bookmarksFile );
         }
         return s_bookmarkManager;