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

8 files changed, 28 insertions, 28 deletions

diff --git a/parts/fileview/addfilegroupdlg.cpp b/parts/fileview/addfilegroupdlg.cpp
index 98eec46d..701bc9c1 100644
--- a/parts/fileview/addfilegroupdlg.cpp
+++ b/parts/fileview/addfilegroupdlg.cpp
@@ -10,7 +10,7 @@
  ***************************************************************************/
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <kbuttonbox.h>
 #include <klocale.h>
@@ -35,10 +35,10 @@ AddFileGroupDialog::AddFileGroupDialog(const TQString& old_title, const TQString
     TQFontMetrics fm(pattern_edit->fontMetrics());
     pattern_edit->setMinimumWidth(fm.width('X')*35);
     connect( pattern_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotTextChanged() ) );
-    TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 10);
+    TQVBoxLayout *layout = new TQVBoxLayout(this, 10);
 
     TQGridLayout *grid = new TQGridLayout(2, 2);
-    tqlayout->addLayout(grid);
+    layout->addLayout(grid);
     grid->addWidget(title_label, 0, 0);
     grid->addWidget(title_edit, 0, 1);
     grid->addWidget(pattern_label, 1, 0);
@@ -46,7 +46,7 @@ AddFileGroupDialog::AddFileGroupDialog(const TQString& old_title, const TQString
 
     TQFrame *frame = new TQFrame(this);
     frame->setFrameStyle(TQFrame::HLine | TQFrame::Sunken);
-    tqlayout->addWidget(frame, 0);
+    layout->addWidget(frame, 0);
 
     KButtonBox *buttonbox = new KButtonBox(this);
     buttonbox->addStretch();
@@ -56,8 +56,8 @@ AddFileGroupDialog::AddFileGroupDialog(const TQString& old_title, const TQString
     m_pOk->setDefault(true);
     connect( m_pOk, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) );
     connect( cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) );
-    buttonbox->tqlayout();
-    tqlayout->addWidget(buttonbox, 0);
+    buttonbox->layout();
+    layout->addWidget(buttonbox, 0);
     slotTextChanged();
 }
 
diff --git a/parts/fileview/filegroupsconfigwidgetbase.ui b/parts/fileview/filegroupsconfigwidgetbase.ui
index 00687a21..01574b69 100644
--- a/parts/fileview/filegroupsconfigwidgetbase.ui
+++ b/parts/fileview/filegroupsconfigwidgetbase.ui
@@ -97,7 +97,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -138,7 +138,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -171,7 +171,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/parts/fileview/filegroupswidget.cpp b/parts/fileview/filegroupswidget.cpp
index 7efefd96..e0222eb5 100644
--- a/parts/fileview/filegroupswidget.cpp
+++ b/parts/fileview/filegroupswidget.cpp
@@ -228,7 +228,7 @@ void FileGroupsWidget::slotContextMenu(KListView *, TQListViewItem *item, const
     popup.insertTitle(i18n("File Groups"));
     /// @todo Add, remove groups
     int customizeId = popup.insertItem(i18n("Customize..."));
-    popup.tqsetWhatsThis(customizeId, i18n("<b>Customize</b><p>Opens <b>Customize File Groups</b> dialog where the groups can be managed."));
+    popup.setWhatsThis(customizeId, i18n("<b>Customize</b><p>Opens <b>Customize File Groups</b> dialog where the groups can be managed."));
     if (item) {
     if (item->parent()) {
         // Not for group items
diff --git a/parts/fileview/fileitemfactory.cpp b/parts/fileview/fileitemfactory.cpp
index 5f4478bc..3ccf5921 100644
--- a/parts/fileview/fileitemfactory.cpp
+++ b/parts/fileview/fileitemfactory.cpp
@@ -50,7 +50,7 @@ bool FileTreeViewItem::changeActiveDir( const TQString& olddir, const TQString&
         m_isActiveDir = false;
         setVisible( listView()->shouldBeShown( this ) );
         foundolddir = true;
-        tqrepaint();
+        repaint();
     }
 
     if ( this->path() == newdir && isDir() && !m_isActiveDir )
@@ -58,7 +58,7 @@ bool FileTreeViewItem::changeActiveDir( const TQString& olddir, const TQString&
         m_isActiveDir = true;
         setVisible( listView()->shouldBeShown( this ) );
         foundnewdir = true;
-        tqrepaint();
+        repaint();
     }
 
     if( foundnewdir && foundolddir )
@@ -85,7 +85,7 @@ bool FileTreeViewItem::setProjectFile( TQString const & path, bool pf )
         kdDebug( 9017 ) << "FileTreeViewItem::setProjectFile(): " + path << " projectfile: " << pf << endl;
         m_isProjectFile = pf;
         setVisible( listView()->shouldBeShown( this ) );
-        tqrepaint();
+        repaint();
         return true;
     }
 
@@ -103,7 +103,7 @@ bool FileTreeViewItem::setProjectFile( TQString const & path, bool pf )
 ///////////////////////////////////////////////////////////////////////////////
 
 void FileTreeViewItem::paintCell(TQPainter *p, const TQColorGroup &cg,
-    int column, int width, int tqalignment)
+    int column, int width, int alignment)
 {
     if ( listView()->showNonProjectFiles() && isProjectFile() )
     {
@@ -119,7 +119,7 @@ void FileTreeViewItem::paintCell(TQPainter *p, const TQColorGroup &cg,
         p->setFont( font );
     }
 
-    TQListViewItem::paintCell( p, cg, column, width, tqalignment );
+    TQListViewItem::paintCell( p, cg, column, width, alignment );
 }
 
 
diff --git a/parts/fileview/fileitemfactory.h b/parts/fileview/fileitemfactory.h
index bd484edd..065591d7 100644
--- a/parts/fileview/fileitemfactory.h
+++ b/parts/fileview/fileitemfactory.h
@@ -41,7 +41,7 @@ namespace filetreeview
         virtual ~FileTreeViewItem() {}
 
     public:
-        virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment );
+        virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment );
         FileTreeWidget* listView() const;
         void hideOrShow();
         bool isProjectFile() const { return m_isProjectFile; }
diff --git a/parts/fileview/filetreeviewwidgetimpl.cpp b/parts/fileview/filetreeviewwidgetimpl.cpp
index 2793a52b..f1b557f2 100644
--- a/parts/fileview/filetreeviewwidgetimpl.cpp
+++ b/parts/fileview/filetreeviewwidgetimpl.cpp
@@ -97,7 +97,7 @@ void FileTreeViewWidgetImpl::fillPopupMenu( TQPopupMenu *popupMenu, TQListViewIt
     if (item == fileTree()->firstChild() && canReloadTree())
     {
         int id = popupMenu->insertItem( i18n( "Reload Tree"), this, TQT_SLOT( slotReloadTree() ) );
-        popupMenu->tqsetWhatsThis( id, i18n("<b>Reload tree</b><p>Reloads the project files tree.") );
+        popupMenu->setWhatsThis( id, i18n("<b>Reload tree</b><p>Reloads the project files tree.") );
     }
 
     m_actionToggleShowNonProjectFiles->plug( popupMenu );
diff --git a/parts/fileview/partwidget.cpp b/parts/fileview/partwidget.cpp
index 39177191..11bd6f56 100644
--- a/parts/fileview/partwidget.cpp
+++ b/parts/fileview/partwidget.cpp
@@ -12,7 +12,7 @@
 
 #include <tqwhatsthis.h>
 #include <tqvbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtoolbutton.h>
 #include <tqdom.h>
 #include <kxmlguiclient.h>
@@ -50,14 +50,14 @@ PartWidget::PartWidget( FileViewPart *part, TQWidget *parent )
     m_filetree->setIcon(SmallIcon("folder"));
     TQWhatsThis::add(m_filetree, i18n("<b>File tree</b><p>"
                                     "The file viewer shows all files of the project "
-                                    "in a tree tqlayout."));
+                                    "in a tree layout."));
 
     TQHBox* filterBox = new TQHBox( this );
     m_btnFilter = new TQToolButton( filterBox );
     m_btnFilter->setIconSet( SmallIconSet("filter" ) );
     m_btnFilter->setToggleButton( true );
     m_filter = new KHistoryCombo( true, filterBox, "filter");
-    m_filter->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
+    m_filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
     filterBox->setStretchFactor(m_filter, 2);
 
     connect( m_btnFilter, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotBtnFilterClick() ) );
@@ -101,7 +101,7 @@ void PartWidget::slotFilterChange( const TQString & nf )
     if ( empty )
     {
         m_filter->lineEdit()->setText( TQString() );
-        TQToolTip::add( m_btnFilter, i18n("Apply last filter (\"%1\")").tqarg( m_lastFilter ) );
+        TQToolTip::add( m_btnFilter, i18n("Apply last filter (\"%1\")").arg( m_lastFilter ) );
     }
     else
     {
diff --git a/parts/fileview/vcsfiletreewidgetimpl.cpp b/parts/fileview/vcsfiletreewidgetimpl.cpp
index 0e102cd9..780ccf9f 100644
--- a/parts/fileview/vcsfiletreewidgetimpl.cpp
+++ b/parts/fileview/vcsfiletreewidgetimpl.cpp
@@ -46,12 +46,12 @@ public:
         : FileTreeViewItem( parent, item, branch, pf ), m_statusColor( &FileViewPart::vcsColors.unknown ) {}
     VCSFileTreeViewItem( KFileTreeView* parent, KFileItem* item, KFileTreeBranch* branch )
         : FileTreeViewItem( parent, item, branch ), m_statusColor( &FileViewPart::vcsColors.unknown ) {}
-    virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment )
+    virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment )
     {
         // paint cell in a different color depending on VCS state
         TQColorGroup mycg( cg );
         mycg.setColor( TQColorGroup::Base, *m_statusColor );
-        FileTreeViewItem::paintCell( p, mycg, column, width, tqalignment );
+        FileTreeViewItem::paintCell( p, mycg, column, width, alignment );
     }
     void setVCSInfo( const VCSFileInfo &info );
 
@@ -62,7 +62,7 @@ public:
     void setFileName( const TQString &p ) { setText( FILENAME_COLUMN, p ); }
     void setWorkingRev( const TQString &p ) { setText( WORKREVISION_COLUMN, p ); }
     void setRepositoryRev( const TQString &p ) { setText( REPOREVISION_COLUMN, p ); }
-    void settqStatus( const VCSFileInfo::FileState status );
+    void setStatus( const VCSFileInfo::FileState status );
 
 private:
     TQColor *m_statusColor; // cached
@@ -75,12 +75,12 @@ void VCSFileTreeViewItem::setVCSInfo( const VCSFileInfo &info )
     //setFileName( info.fileName );
     setRepositoryRev( info.repoRevision );
     setWorkingRev( info.workRevision );
-    settqStatus( info.state );
+    setStatus( info.state );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void VCSFileTreeViewItem::settqStatus( const VCSFileInfo::FileState status )
+void VCSFileTreeViewItem::setStatus( const VCSFileInfo::FileState status )
 {
     setText( STATUS_COLUMN, VCSFileInfo::state2String( status ) );
     // Update color too
@@ -331,7 +331,7 @@ void VCSFileTreeWidgetImpl::slotSyncWithRepository()
     const VCSFileTreeViewItem *myFileItem = static_cast<VCSFileTreeViewItem *>( m_vcsStatusRequestedItem );
     const TQString relDirPath = URLUtil::extractPathNameRelative( projectDirectory(), myFileItem->fileItem()->url().path() );
     kdDebug(9017) << "VCS Info requested for: " << relDirPath << endl;
-    m_vcsInfoProvider->requesttqStatus( relDirPath, m_vcsStatusRequestedItem );
+    m_vcsInfoProvider->requestStatus( relDirPath, m_vcsStatusRequestedItem );
     m_isSyncingWithRepository = true;
 }
 
@@ -344,7 +344,7 @@ void VCSFileTreeWidgetImpl::slotDirectoryExpanded( TQListViewItem* aItem )
 
     const TQString relDirPath = URLUtil::extractPathNameRelative( projectDirectory(), item->fileItem()->url().path() );
     kdDebug(9017) << "ASync VCS Info requested for: " << relDirPath << endl;
-    m_vcsInfoProvider->requesttqStatus( relDirPath, item, false, false );
+    m_vcsInfoProvider->requestStatus( relDirPath, item, false, false );
 
 //     m_isSyncingWithRepository = true;