1 files changed, 12 insertions, 12 deletions

diff --git a/libkdepim/kfoldertree.cpp b/libkdepim/kfoldertree.cpp
index 2bf6ca1be..0098adbb2 100644
--- a/libkdepim/kfoldertree.cpp
+++ b/libkdepim/kfoldertree.cpp
@@ -12,18 +12,18 @@
 #include <tqstyle.h>
 
 //-----------------------------------------------------------------------------
-KFolderTreeItem::KFolderTreeItem( KFolderTree *parent, const TQString & label,
+KFolderTreeItem::KFolderTreeItem( KFolderTree *tqparent, const TQString & label,
 				  Protocol protocol, Type type )
-  : KListViewItem( parent, label ), mProtocol( protocol ), mType( type ),
+  : KListViewItem( tqparent, label ), mProtocol( protocol ), mType( type ),
     mUnread(-1), mTotal(0), mSize(0), mFolderIsCloseToQuota( false )
 {
 }
 
 //-----------------------------------------------------------------------------
-KFolderTreeItem::KFolderTreeItem( KFolderTreeItem *parent,
+KFolderTreeItem::KFolderTreeItem( KFolderTreeItem *tqparent,
 				  const TQString & label, Protocol protocol, Type type,
           int unread, int total )
-    : KListViewItem( parent, label ), mProtocol( protocol ), mType( type ),
+    : KListViewItem( tqparent, label ), mProtocol( protocol ), mType( type ),
       mUnread( unread ), mTotal( total ), mSize(0), mFolderIsCloseToQuota( false )
 {
 }
@@ -149,7 +149,7 @@ void KFolderTreeItem::setUnreadCount( int aUnread )
 
   mUnread = aUnread;
 
-  TQString unread = TQString::null;
+  TQString unread = TQString();
   if (mUnread == 0)
     unread = "- ";
   else {
@@ -168,7 +168,7 @@ void KFolderTreeItem::setTotalCount( int aTotal )
 
   mTotal = aTotal;
 
-  TQString total = TQString::null;
+  TQString total = TQString();
   if (mTotal == 0)
     total = "- ";
   else {
@@ -269,7 +269,7 @@ void KFolderTreeItem::paintCell( TQPainter * p, const TQColorGroup & cg,
   // deal with the folder column if the unread column is not shown
 
   /* The below is exceedingly silly, but Ingo insists that the unread
-   * count that is shown in parenthesis after the folder name must
+   * count that is shown in tqparenthesis after the folder name must
    * be configurable in color. That means that paintCell needs to do
    * two painting passes which flickers. Since that flicker is not
    * needed when there is the unread column, special case that. */
@@ -359,8 +359,8 @@ void KFolderTreeItem::setFolderIsCloseToQuota( bool v )
 //=============================================================================
 
 
-KFolderTree::KFolderTree( TQWidget *parent, const char* name )
-  : KListView( parent, name ), mUnreadIndex(-1), mTotalIndex(-1), mSizeIndex(-1)
+KFolderTree::KFolderTree( TQWidget *tqparent, const char* name )
+  : KListView( tqparent, name ), mUnreadIndex(-1), mTotalIndex(-1), mSizeIndex(-1)
 {
   // GUI-options
   setStyleDependantFrameWidth();
@@ -464,7 +464,7 @@ bool KFolderTree::acceptDrag( TQDropEvent* event ) const
 void KFolderTree::addUnreadColumn( const TQString & name, int width )
 {
   mUnreadIndex = addColumn( name, width );
-  setColumnAlignment( mUnreadIndex, tqApp->reverseLayout() ? Qt::AlignLeft : Qt::AlignRight );
+  setColumnAlignment( mUnreadIndex, tqApp->reverseLayout() ? TQt::AlignLeft : TQt::AlignRight );
   header()->adjustHeaderSize();
 }
 
@@ -472,7 +472,7 @@ void KFolderTree::addUnreadColumn( const TQString & name, int width )
 void KFolderTree::addTotalColumn( const TQString & name, int width )
 {
   mTotalIndex = addColumn( name, width );
-  setColumnAlignment( mTotalIndex, tqApp->reverseLayout() ? Qt::AlignLeft : Qt::AlignRight );
+  setColumnAlignment( mTotalIndex, tqApp->reverseLayout() ? TQt::AlignLeft : TQt::AlignRight );
   header()->adjustHeaderSize();
 }
 
@@ -507,7 +507,7 @@ void KFolderTree::removeTotalColumn()
 void KFolderTree::addSizeColumn( const TQString & name, int width )
 {
   mSizeIndex = addColumn( name, width );
-  setColumnAlignment( mSizeIndex, tqApp->reverseLayout() ? Qt::AlignLeft : Qt::AlignRight );
+  setColumnAlignment( mSizeIndex, tqApp->reverseLayout() ? TQt::AlignLeft : TQt::AlignRight );
   header()->adjustHeaderSize();
 }