rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

22 files changed, 71 insertions, 71 deletions

diff --git a/parts/fileview/addfilegroupdlg.cpp b/parts/fileview/addfilegroupdlg.cpp
index 112eec4a..9e45d1ae 100644
--- a/parts/fileview/addfilegroupdlg.cpp
+++ b/parts/fileview/addfilegroupdlg.cpp
@@ -20,8 +20,8 @@
 #include "addfilegroupdlg.h"
 
 
-AddFileGroupDialog::AddFileGroupDialog(const TQString& old_title, const TQString& old_pattern, TQWidget *tqparent, const char *name)
-    : TQDialog(tqparent, name, true)
+AddFileGroupDialog::AddFileGroupDialog(const TQString& old_title, const TQString& old_pattern, TQWidget *parent, const char *name)
+    : TQDialog(parent, name, true)
 {
     TQLabel *title_label = new TQLabel(i18n("&Title:"), this);
     title_edit = new KLineEdit(old_title, this);
diff --git a/parts/fileview/addfilegroupdlg.h b/parts/fileview/addfilegroupdlg.h
index 20c54d37..f531d1a3 100644
--- a/parts/fileview/addfilegroupdlg.h
+++ b/parts/fileview/addfilegroupdlg.h
@@ -22,7 +22,7 @@ class AddFileGroupDialog : public TQDialog
   TQ_OBJECT
 
 public:
-    AddFileGroupDialog( const TQString& old_title="", const TQString& old_pattern="", TQWidget *tqparent=0, const char *name=0 );
+    AddFileGroupDialog( const TQString& old_title="", const TQString& old_pattern="", TQWidget *parent=0, const char *name=0 );
     ~AddFileGroupDialog();
 
     TQString title() const
diff --git a/parts/fileview/filegroupsconfigwidget.cpp b/parts/fileview/filegroupsconfigwidget.cpp
index 277bab4e..c1a4f5bc 100644
--- a/parts/fileview/filegroupsconfigwidget.cpp
+++ b/parts/fileview/filegroupsconfigwidget.cpp
@@ -21,8 +21,8 @@
 
 
 FileGroupsConfigWidget::FileGroupsConfigWidget(FileGroupsPart *part,
-                                               TQWidget *tqparent, const char *name)
-    : FileGroupsConfigWidgetBase(tqparent, name)
+                                               TQWidget *parent, const char *name)
+    : FileGroupsConfigWidgetBase(parent, name)
 {
     m_part = part;
 
diff --git a/parts/fileview/filegroupsconfigwidget.h b/parts/fileview/filegroupsconfigwidget.h
index c236aa43..f3f530ad 100644
--- a/parts/fileview/filegroupsconfigwidget.h
+++ b/parts/fileview/filegroupsconfigwidget.h
@@ -23,7 +23,7 @@ class FileGroupsConfigWidget : public FileGroupsConfigWidgetBase
   TQ_OBJECT
 
 public:
-    FileGroupsConfigWidget( FileGroupsPart *widget, TQWidget *tqparent, const char *name=0 );
+    FileGroupsConfigWidget( FileGroupsPart *widget, TQWidget *parent, const char *name=0 );
     ~FileGroupsConfigWidget();
 
 public slots:
diff --git a/parts/fileview/filegroupspart.cpp b/parts/fileview/filegroupspart.cpp
index 29dccd55..4451ff2a 100644
--- a/parts/fileview/filegroupspart.cpp
+++ b/parts/fileview/filegroupspart.cpp
@@ -36,8 +36,8 @@ typedef KDevGenericFactory<FileGroupsPart> FileGroupsFactory;
 static const KDevPluginInfo data("kdevfilegroups");
 K_EXPORT_COMPONENT_FACTORY( libkdevfilegroups, FileGroupsFactory( data ) )
 
-FileGroupsPart::FileGroupsPart(TQObject *tqparent, const char *name, const TQStringList &)
-    : KDevPlugin(&data, tqparent, name ? name : "FileGroupsPart")
+FileGroupsPart::FileGroupsPart(TQObject *parent, const char *name, const TQStringList &)
+    : KDevPlugin(&data, parent, name ? name : "FileGroupsPart")
 {
     deleteRequested = false;
     setInstance(FileGroupsFactory::instance());
diff --git a/parts/fileview/filegroupspart.h b/parts/fileview/filegroupspart.h
index 85f83164..3a1207ec 100644
--- a/parts/fileview/filegroupspart.h
+++ b/parts/fileview/filegroupspart.h
@@ -26,7 +26,7 @@ class FileGroupsPart : public KDevPlugin
   TQ_OBJECT
 
 public:
-    FileGroupsPart( TQObject *tqparent, const char *name, const TQStringList & );
+    FileGroupsPart( TQObject *parent, const char *name, const TQStringList & );
     ~FileGroupsPart();
 
 public slots:
diff --git a/parts/fileview/filegroupswidget.cpp b/parts/fileview/filegroupswidget.cpp
index 40c2b752..0c498e98 100644
--- a/parts/fileview/filegroupswidget.cpp
+++ b/parts/fileview/filegroupswidget.cpp
@@ -77,7 +77,7 @@ private:
 class FileViewFolderItem : public TQListViewItem
 {
 public:
-    FileViewFolderItem(TQListView *tqparent, const TQString &name, const TQString &pattern);
+    FileViewFolderItem(TQListView *parent, const TQString &name, const TQString &pattern);
     bool matches(const TQString &fileName);
 
 private:
@@ -85,8 +85,8 @@ private:
 };
 
 
-FileViewFolderItem::FileViewFolderItem(TQListView *tqparent, const TQString &name, const TQString &pattern)
-    : TQListViewItem(tqparent, name)
+FileViewFolderItem::FileViewFolderItem(TQListView *parent, const TQString &name, const TQString &pattern)
+    : TQListViewItem(parent, name)
 {
     setPixmap(0, SmallIcon("folder"));
     m_patterns.setAutoDelete(true);
@@ -133,7 +133,7 @@ bool FileViewFolderItem::matches(const TQString &fileName)
 class FileGroupsFileItem : public TQListViewItem
 {
 public:
-    FileGroupsFileItem(TQListViewItem *tqparent, const TQString &fileName);
+    FileGroupsFileItem(TQListViewItem *parent, const TQString &fileName);
     TQString fileName() const
     { return fullname; }
 
@@ -142,8 +142,8 @@ private:
 };
 
 
-FileGroupsFileItem::FileGroupsFileItem(TQListViewItem *tqparent, const TQString &fileName)
-    : TQListViewItem(tqparent), fullname(fileName)
+FileGroupsFileItem::FileGroupsFileItem(TQListViewItem *parent, const TQString &fileName)
+    : TQListViewItem(parent), fullname(fileName)
 {
     setPixmap(0, SmallIcon("document"));
     TQFileInfo fi(fileName);
@@ -214,7 +214,7 @@ void FileGroupsWidget::slotItemExecuted(TQListViewItem *item)
         setOpen(item, !isOpen(item));
 
     // Is it a group item?
-    if (!item->tqparent())
+    if (!item->parent())
         return;
 
     FileGroupsFileItem *fgfitem = static_cast<FileGroupsFileItem*>(item);
@@ -230,7 +230,7 @@ void FileGroupsWidget::slotContextMenu(KListView *, TQListViewItem *item, const
     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."));
     if (item) {
-    if (item->tqparent()) {
+    if (item->parent()) {
         // Not for group items
         FileGroupsFileItem *fvfitem = static_cast<FileGroupsFileItem*>(item);
         TQString pathName = m_part->project()->projectDirectory() + TQDir::separator() + fvfitem->fileName();
diff --git a/parts/fileview/fileitemfactory.h b/parts/fileview/fileitemfactory.h
index fcb606fc..bd484edd 100644
--- a/parts/fileview/fileitemfactory.h
+++ b/parts/fileview/fileitemfactory.h
@@ -28,13 +28,13 @@ namespace filetreeview
     {
         friend class FileTreeBranchItem;
     protected:
-        FileTreeViewItem( KFileTreeViewItem* tqparent, KFileItem* item, KFileTreeBranch* branch, bool pf )
-        : KFileTreeViewItem( tqparent, item, branch ), m_isProjectFile( pf ), m_isActiveDir( false )
+        FileTreeViewItem( KFileTreeViewItem* parent, KFileItem* item, KFileTreeBranch* branch, bool pf )
+        : KFileTreeViewItem( parent, item, branch ), m_isProjectFile( pf ), m_isActiveDir( false )
         {
             hideOrShow();
         }
-        FileTreeViewItem( KFileTreeView* tqparent, KFileItem* item, KFileTreeBranch* branch )
-        : KFileTreeViewItem( tqparent, item, branch ), m_isProjectFile( false )
+        FileTreeViewItem( KFileTreeView* parent, KFileItem* item, KFileTreeBranch* branch )
+        : KFileTreeViewItem( parent, item, branch ), m_isProjectFile( false )
         {
             hideOrShow();
         }
diff --git a/parts/fileview/filetreeviewwidgetimpl.cpp b/parts/fileview/filetreeviewwidgetimpl.cpp
index a35d1a6d..7ca52b17 100644
--- a/parts/fileview/filetreeviewwidgetimpl.cpp
+++ b/parts/fileview/filetreeviewwidgetimpl.cpp
@@ -30,9 +30,9 @@ using namespace filetreeview;
 // class FileTreeViewWidgetImpl
 ///////////////////////////////////////////////////////////////////////////////
 
-FileTreeViewWidgetImpl::FileTreeViewWidgetImpl( FileTreeWidget *tqparent, const char *name )
-    : TQObject( tqparent, name ), m_branchItemFactory( 0 ),
-    m_part( tqparent->part() ), m_isReloadingTree( false )
+FileTreeViewWidgetImpl::FileTreeViewWidgetImpl( FileTreeWidget *parent, const char *name )
+    : TQObject( parent, name ), m_branchItemFactory( 0 ),
+    m_part( parent->part() ), m_isReloadingTree( false )
 {
     kdDebug(9017) << "FileTreeViewWidgetImpl::FileTreeViewWidgetImpl()" << endl;
 
@@ -63,7 +63,7 @@ FileTreeViewWidgetImpl::~FileTreeViewWidgetImpl()
 
 FileTreeWidget *FileTreeViewWidgetImpl::fileTree() const
 {
-    return static_cast<FileTreeWidget *>( TQT_TQWIDGET(tqparent()) );
+    return static_cast<FileTreeWidget *>( TQT_TQWIDGET(parent()) );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/parts/fileview/filetreeviewwidgetimpl.h b/parts/fileview/filetreeviewwidgetimpl.h
index 34f19ca3..7df81e0e 100644
--- a/parts/fileview/filetreeviewwidgetimpl.h
+++ b/parts/fileview/filetreeviewwidgetimpl.h
@@ -41,7 +41,7 @@ class FileTreeViewWidgetImpl : public TQObject
     Q_OBJECT
   TQ_OBJECT
 public:
-    FileTreeViewWidgetImpl( FileTreeWidget *tqparent, const char *name );
+    FileTreeViewWidgetImpl( FileTreeWidget *parent, const char *name );
     virtual ~FileTreeViewWidgetImpl();
 
     //! return a list containing the filenames of the currently selected items.
diff --git a/parts/fileview/filetreewidget.cpp b/parts/fileview/filetreewidget.cpp
index 958e756e..f5aa0ff4 100644
--- a/parts/fileview/filetreewidget.cpp
+++ b/parts/fileview/filetreewidget.cpp
@@ -51,8 +51,8 @@ using namespace filetreeview;
 // class FileTreeWidget
 ///////////////////////////////////////////////////////////////////////////////
 
-FileTreeWidget::FileTreeWidget( FileViewPart *part, TQWidget *tqparent, KDevVCSFileInfoProvider *infoProvider )
-    : KFileTreeView( tqparent, "filetreewidget" ), m_part( part ), m_rootBranch( 0 )
+FileTreeWidget::FileTreeWidget( FileViewPart *part, TQWidget *parent, KDevVCSFileInfoProvider *infoProvider )
+    : KFileTreeView( parent, "filetreewidget" ), m_part( part ), m_rootBranch( 0 )
 {
     kdDebug(9017) << "Requested FileTree for: " << projectDirectory() << endl;
     if (versionControl() && infoProvider)
@@ -265,7 +265,7 @@ void FileTreeWidget::addProjectFiles( TQStringList const & fileList, bool constr
         if ( !m_projectFiles.contains( file ) )
         {
             // We got a new file to add to this project.
-            // Ensure all the tqparent directories are part of the project set, too.
+            // Ensure all the parent directories are part of the project set, too.
             TQStringList paths = TQStringList::split( "/", *it);
             paths.pop_back();
             while( !paths.isEmpty() )
@@ -273,7 +273,7 @@ void FileTreeWidget::addProjectFiles( TQStringList const & fileList, bool constr
                 // We are adding the directories from longest (the one containing our file),
                 // to the shortest, measured from root directory of our project.
                 // Whenever we find out that a directory is already recorded as part of our project,
-                // we may stop adding, because its tqparent directories were already added -
+                // we may stop adding, because its parent directories were already added -
                 // in some previous addition.
                 TQString joinedPaths = paths.join("/");
                 if( m_projectFiles.contains( joinedPaths ) )
diff --git a/parts/fileview/filetreewidget.h b/parts/fileview/filetreewidget.h
index f7a7ac51..84d45e6d 100644
--- a/parts/fileview/filetreewidget.h
+++ b/parts/fileview/filetreewidget.h
@@ -49,7 +49,7 @@ class FileTreeWidget : public KFileTreeView
     Q_OBJECT
   TQ_OBJECT
 public:
-    FileTreeWidget( FileViewPart *part, TQWidget *tqparent, KDevVCSFileInfoProvider *infoProvider );
+    FileTreeWidget( FileViewPart *part, TQWidget *parent, KDevVCSFileInfoProvider *infoProvider );
     virtual ~FileTreeWidget();
 
     void openDirectory(const TQString &dirName);
diff --git a/parts/fileview/fileviewpart.cpp b/parts/fileview/fileviewpart.cpp
index c5d0655a..0e3758c9 100644
--- a/parts/fileview/fileviewpart.cpp
+++ b/parts/fileview/fileviewpart.cpp
@@ -57,8 +57,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdevfileview, FileViewFactory( data ) )
 // class FileTreeWidget
 ///////////////////////////////////////////////////////////////////////////////
 
-FileViewPart::FileViewPart(TQObject *tqparent, const char *name, const TQStringList &)
-	: KDevPlugin(&data, tqparent, name ? name : "FileViewPart"),
+FileViewPart::FileViewPart(TQObject *parent, const char *name, const TQStringList &)
+	: KDevPlugin(&data, parent, name ? name : "FileViewPart"),
     m_widget( 0 )
 {
     setInstance( FileViewFactory::instance() );
diff --git a/parts/fileview/fileviewpart.h b/parts/fileview/fileviewpart.h
index 985d15ed..0dfd4796 100644
--- a/parts/fileview/fileviewpart.h
+++ b/parts/fileview/fileviewpart.h
@@ -27,7 +27,7 @@ class FileViewPart : public KDevPlugin
   TQ_OBJECT
 
 public:
-    FileViewPart( TQObject *tqparent, const char *name, const TQStringList & );
+    FileViewPart( TQObject *parent, const char *name, const TQStringList & );
     virtual ~FileViewPart();
 
     //! Colors to use for VCS visual feed-back
diff --git a/parts/fileview/partwidget.cpp b/parts/fileview/partwidget.cpp
index 040f6312..6b06647c 100644
--- a/parts/fileview/partwidget.cpp
+++ b/parts/fileview/partwidget.cpp
@@ -34,11 +34,11 @@
 // class PartWidget
 ///////////////////////////////////////////////////////////////////////////////
 
-PartWidget::PartWidget( FileViewPart *part, TQWidget *tqparent )
-    : TQVBox( tqparent, "fileviewpartwidget" ), m_filetree( 0 ),
+PartWidget::PartWidget( FileViewPart *part, TQWidget *parent )
+    : TQVBox( parent, "fileviewpartwidget" ), m_filetree( 0 ),
     m_filter( 0 ), m_btnFilter( 0 ), m_part( part )
 {
-    Q_ASSERT( part && tqparent );
+    Q_ASSERT( part && parent );
 
     KDevVCSFileInfoProvider *infoProvider = 0;
     if (part && part->versionControl() && part->versionControl()->fileInfoProvider())
diff --git a/parts/fileview/partwidget.h b/parts/fileview/partwidget.h
index 66c57228..3dfa18a6 100644
--- a/parts/fileview/partwidget.h
+++ b/parts/fileview/partwidget.h
@@ -21,7 +21,7 @@ class PartWidget : public TQVBox
     Q_OBJECT
   TQ_OBJECT
 public:
-    PartWidget( FileViewPart *part, TQWidget *tqparent = 0 );
+    PartWidget( FileViewPart *part, TQWidget *parent = 0 );
     virtual ~PartWidget();
 
     class FileTreeWidget *m_filetree;
diff --git a/parts/fileview/stdfiletreewidgetimpl.cpp b/parts/fileview/stdfiletreewidgetimpl.cpp
index 943f8850..3766973d 100644
--- a/parts/fileview/stdfiletreewidgetimpl.cpp
+++ b/parts/fileview/stdfiletreewidgetimpl.cpp
@@ -23,10 +23,10 @@
 class StdFileTreeViewItem : public filetreeview::FileTreeViewItem
 {
 public:
-    StdFileTreeViewItem( KFileTreeViewItem* tqparent, KFileItem* item, KFileTreeBranch* branch, bool pf )
-        : FileTreeViewItem( tqparent, item, branch, pf ) {}
-    StdFileTreeViewItem( KFileTreeView* tqparent, KFileItem* item, KFileTreeBranch* branch )
-        : FileTreeViewItem( tqparent, item, branch ) {}
+    StdFileTreeViewItem( KFileTreeViewItem* parent, KFileItem* item, KFileTreeBranch* branch, bool pf )
+        : FileTreeViewItem( parent, item, branch, pf ) {}
+    StdFileTreeViewItem( KFileTreeView* parent, KFileItem* item, KFileTreeBranch* branch )
+        : FileTreeViewItem( parent, item, branch ) {}
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -39,22 +39,22 @@ public:
     StdFileTreeBranchItem( KFileTreeView* view, const KURL& url, const TQString& name, const TQPixmap& pix )
         : FileTreeBranchItem( view, url, name, pix ) {}
     virtual ~StdFileTreeBranchItem() {}
-    virtual KFileTreeViewItem* createTreeViewItem( KFileTreeViewItem* tqparent, KFileItem* fileItem );
+    virtual KFileTreeViewItem* createTreeViewItem( KFileTreeViewItem* parent, KFileItem* fileItem );
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
-KFileTreeViewItem* StdFileTreeBranchItem::createTreeViewItem( KFileTreeViewItem* tqparent, KFileItem* fileItem )
+KFileTreeViewItem* StdFileTreeBranchItem::createTreeViewItem( KFileTreeViewItem* parent, KFileItem* fileItem )
 {
-    if (!tqparent || !fileItem)
+    if (!parent || !fileItem)
         return 0;
 
-    FileTreeWidget *lv = static_cast<StdFileTreeViewItem*>( tqparent )->listView();
+    FileTreeWidget *lv = static_cast<StdFileTreeViewItem*>( parent )->listView();
     const KURL fileURL = fileItem->url();
 
     const bool isDirectory = lv->isInProject( fileURL.path() );
 
-    return new StdFileTreeViewItem( tqparent, fileItem, this, isDirectory );
+    return new StdFileTreeViewItem( parent, fileItem, this, isDirectory );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -74,14 +74,14 @@ public:
 // class StdFileTreeWidgetImpl
 ///////////////////////////////////////////////////////////////////////////////
 
-StdFileTreeWidgetImpl::StdFileTreeWidgetImpl( FileTreeWidget *tqparent )
-    : FileTreeViewWidgetImpl( tqparent, "stdfiletreewidgetimpl" )
+StdFileTreeWidgetImpl::StdFileTreeWidgetImpl( FileTreeWidget *parent )
+    : FileTreeViewWidgetImpl( parent, "stdfiletreewidgetimpl" )
 {
     kdDebug(9017) << "StdFileTreeWidgetImpl::StdFileTreeWidgetImpl()" << endl;
 
     setBranchItemFactory( new StdBranchItemFactory );
 
-    tqparent->addColumn( TQString() );
+    parent->addColumn( TQString() );
     header()->hide();
 }
 
diff --git a/parts/fileview/stdfiletreewidgetimpl.h b/parts/fileview/stdfiletreewidgetimpl.h
index 260d2372..4d15beff 100644
--- a/parts/fileview/stdfiletreewidgetimpl.h
+++ b/parts/fileview/stdfiletreewidgetimpl.h
@@ -25,7 +25,7 @@ class StdFileTreeWidgetImpl : public FileTreeViewWidgetImpl
     Q_OBJECT
   TQ_OBJECT
 public:
-    StdFileTreeWidgetImpl( FileTreeWidget *tqparent );
+    StdFileTreeWidgetImpl( FileTreeWidget *parent );
     virtual ~StdFileTreeWidgetImpl();
 
     /*
diff --git a/parts/fileview/vcscolorsconfigwidget.cpp b/parts/fileview/vcscolorsconfigwidget.cpp
index 117955d5..63067c04 100644
--- a/parts/fileview/vcscolorsconfigwidget.cpp
+++ b/parts/fileview/vcscolorsconfigwidget.cpp
@@ -51,8 +51,8 @@ VCSColors &VCSColors::operator=( const VCSColors &others )
 ///////////////////////////////////////////////////////////////////////////////
 
 VCSColorsConfigWidget::VCSColorsConfigWidget(FileViewPart *part, const VCSColors &vcsColors,
-    TQWidget* tqparent, const char* name, WFlags fl)
-    : VCSColorsConfigWidgetBase( tqparent, name, fl ), m_part( part )
+    TQWidget* parent, const char* name, WFlags fl)
+    : VCSColorsConfigWidgetBase( parent, name, fl ), m_part( part )
 {
     setColors( vcsColors );
 }
diff --git a/parts/fileview/vcscolorsconfigwidget.h b/parts/fileview/vcscolorsconfigwidget.h
index 61d1b0e7..6a9a606b 100644
--- a/parts/fileview/vcscolorsconfigwidget.h
+++ b/parts/fileview/vcscolorsconfigwidget.h
@@ -41,7 +41,7 @@ class VCSColorsConfigWidget : public VCSColorsConfigWidgetBase
 
 public:
   VCSColorsConfigWidget( FileViewPart *part, const VCSColors &vcsColors,
-      TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+      TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
   virtual ~VCSColorsConfigWidget();
   /*$PUBLIC_FUNCTIONS$*/
 
diff --git a/parts/fileview/vcsfiletreewidgetimpl.cpp b/parts/fileview/vcsfiletreewidgetimpl.cpp
index 6aebce29..eb3d2c4a 100644
--- a/parts/fileview/vcsfiletreewidgetimpl.cpp
+++ b/parts/fileview/vcsfiletreewidgetimpl.cpp
@@ -42,10 +42,10 @@ using namespace filetreeview;
 class VCSFileTreeViewItem : public filetreeview::FileTreeViewItem
 {
 public:
-    VCSFileTreeViewItem( KFileTreeViewItem* tqparent, KFileItem* item, KFileTreeBranch* branch, bool pf )
-        : FileTreeViewItem( tqparent, item, branch, pf ), m_statusColor( &FileViewPart::vcsColors.unknown ) {}
-    VCSFileTreeViewItem( KFileTreeView* tqparent, KFileItem* item, KFileTreeBranch* branch )
-        : FileTreeViewItem( tqparent, item, branch ), m_statusColor( &FileViewPart::vcsColors.unknown ) {}
+    VCSFileTreeViewItem( KFileTreeViewItem* parent, KFileItem* item, KFileTreeBranch* branch, bool pf )
+        : 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 )
     {
         // paint cell in a different color depending on VCS state
@@ -130,7 +130,7 @@ public:
         KDevVCSFileInfoProvider *vcsInfoProvider )
         : FileTreeBranchItem( view, url, name, pix ), m_vcsInfoProvider( vcsInfoProvider ) {}
 //    virtual ~VCSFileTreeBranchItem() {}
-    virtual KFileTreeViewItem* createTreeViewItem( KFileTreeViewItem* tqparent, KFileItem* fileItem );
+    virtual KFileTreeViewItem* createTreeViewItem( KFileTreeViewItem* parent, KFileItem* fileItem );
 
 private:
     KDevVCSFileInfoProvider *m_vcsInfoProvider;
@@ -138,17 +138,17 @@ private:
 
 ///////////////////////////////////////////////////////////////////////////////
 
-KFileTreeViewItem* VCSFileTreeBranchItem::createTreeViewItem( KFileTreeViewItem* tqparent, KFileItem* fileItem )
+KFileTreeViewItem* VCSFileTreeBranchItem::createTreeViewItem( KFileTreeViewItem* parent, KFileItem* fileItem )
 {
 //  kdDebug(9017) << "MyFileTreeBranch::createTreeViewItem(): " + fileItem->url().path() << endl;
-    if (!tqparent || !fileItem)
+    if (!parent || !fileItem)
         return 0;
 
-    FileTreeWidget *lv = static_cast<filetreeview::FileTreeViewItem*>( tqparent )->listView();
+    FileTreeWidget *lv = static_cast<filetreeview::FileTreeViewItem*>( parent )->listView();
     const KURL fileURL = fileItem->url();
     const bool isDirectory = lv->isInProject( fileURL.path() );
 
-    VCSFileTreeViewItem *newItem = new VCSFileTreeViewItem( tqparent, fileItem, this, isDirectory );
+    VCSFileTreeViewItem *newItem = new VCSFileTreeViewItem( parent, fileItem, this, isDirectory );
 
 //     TQString fileName = fileURL.fileName();
 //     TQString dirName = URLUtil::extractPathNameRelative( lv->projectDirectory(), fileURL.directory() );
@@ -182,8 +182,8 @@ private:
 // class VCSFileTreeWidgetImpl
 ///////////////////////////////////////////////////////////////////////////////
 
-VCSFileTreeWidgetImpl::VCSFileTreeWidgetImpl( FileTreeWidget *tqparent, KDevVCSFileInfoProvider *infoProvider )
-    : FileTreeViewWidgetImpl( tqparent, "vcsfiletreewidgetimpl" ),
+VCSFileTreeWidgetImpl::VCSFileTreeWidgetImpl( FileTreeWidget *parent, KDevVCSFileInfoProvider *infoProvider )
+    : FileTreeViewWidgetImpl( parent, "vcsfiletreewidgetimpl" ),
     m_actionToggleShowVCSFields( 0 ), m_actionSyncWithRepository( 0 ), m_vcsInfoProvider( infoProvider ),
     m_isSyncingWithRepository( false ), m_vcsStatusRequestedItem( 0 )
 {
@@ -193,10 +193,10 @@ VCSFileTreeWidgetImpl::VCSFileTreeWidgetImpl( FileTreeWidget *tqparent, KDevVCSF
     setBranchItemFactory( new VCSBranchItemFactory( m_vcsInfoProvider ) );
 
     // Update the #define order on top if you change this order!
-    tqparent->addColumn( "Filename" );
-    tqparent->addColumn( "tqStatus" );
-    tqparent->addColumn( "Work" );
-    tqparent->addColumn( "Repo" );
+    parent->addColumn( "Filename" );
+    parent->addColumn( "tqStatus" );
+    parent->addColumn( "Work" );
+    parent->addColumn( "Repo" );
 
     connect( m_vcsInfoProvider, TQT_SIGNAL(statusReady(const VCSFileInfoMap&, void *)),
         this, TQT_SLOT(vcsDirStatusReady(const VCSFileInfoMap&, void*)) );
@@ -218,7 +218,7 @@ VCSFileTreeWidgetImpl::VCSFileTreeWidgetImpl( FileTreeWidget *tqparent, KDevVCSF
     TQDomDocument &dom = projectDom();
     m_actionToggleShowVCSFields->setChecked( DomUtil::readBoolEntry(dom, "/kdevfileview/tree/showvcsfields") );
     slotToggleShowVCSFields( showVCSFields() ); // show or hide fields depending on read settings
-    connect( tqparent, TQT_SIGNAL(expanded(TQListViewItem*)), this, TQT_SLOT(slotDirectoryExpanded(TQListViewItem*)));
+    connect( parent, TQT_SIGNAL(expanded(TQListViewItem*)), this, TQT_SLOT(slotDirectoryExpanded(TQListViewItem*)));
 }
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/parts/fileview/vcsfiletreewidgetimpl.h b/parts/fileview/vcsfiletreewidgetimpl.h
index b88766a5..ad9ccfab 100644
--- a/parts/fileview/vcsfiletreewidgetimpl.h
+++ b/parts/fileview/vcsfiletreewidgetimpl.h
@@ -27,7 +27,7 @@ class VCSFileTreeWidgetImpl : public FileTreeViewWidgetImpl
     Q_OBJECT
   TQ_OBJECT
 public:
-    VCSFileTreeWidgetImpl( FileTreeWidget *tqparent, KDevVCSFileInfoProvider *infoProvider );
+    VCSFileTreeWidgetImpl( FileTreeWidget *parent, KDevVCSFileInfoProvider *infoProvider );
     virtual ~VCSFileTreeWidgetImpl();
 
     /*