1 files changed, 23 insertions, 23 deletions

diff --git a/parts/classview/classtreebase.cpp b/parts/classview/classtreebase.cpp
index c6d2770e..00a5a87a 100644
--- a/parts/classview/classtreebase.cpp
+++ b/parts/classview/classtreebase.cpp
@@ -95,7 +95,7 @@ TQString ClassTreeItem::scopedText() const
     if (m_item)
         return m_item->path();
 
-    return TQString::null;
+    return TQString();
 }
 
 
@@ -121,7 +121,7 @@ TQString ClassTreeItem::text( int ) const
 {
     if (m_item)
         return m_item->asString();
-    return TQString::null;
+    return TQString();
 }
 
 
@@ -149,7 +149,7 @@ void ClassTreeScopeItem::init()
 TQString ClassTreeScopeItem::text( int col ) const
 {
     if (!m_item)
-        return TQString::null;
+        return TQString();
     if (m_item->name().isEmpty())
         return i18n("Global");
     return ClassTreeItem::text( col );
@@ -272,9 +272,9 @@ void ClassTreeClassItem::setOpen(bool o)
     ClassTreeItem::setOpen(o);
 }
 
-ClassTreeMethodItem::ClassTreeMethodItem(ClassTreeItem *parent, ClassTreeItem *lastSibling,
+ClassTreeMethodItem::ClassTreeMethodItem(ClassTreeItem *tqparent, ClassTreeItem *lastSibling,
                                          ParsedMethod *parsedMethod)
-    : ClassTreeItem(parent, lastSibling, parsedMethod)
+    : ClassTreeItem(tqparent, lastSibling, parsedMethod)
 {
     TQString icon;
 
@@ -310,7 +310,7 @@ TQString ClassTreeMethodItem::text( int ) const
     TQString str;
 
     if ( !m_item )
-        return TQString::null;
+        return TQString();
  
     ParsedMethod* method = static_cast<ParsedMethod*>(m_item);
 
@@ -336,9 +336,9 @@ TQString ClassTreeMethodItem::text( int ) const
 }
 
 
-ClassTreeAttrItem::ClassTreeAttrItem(ClassTreeItem *parent, ClassTreeItem *lastSibling,
+ClassTreeAttrItem::ClassTreeAttrItem(ClassTreeItem *tqparent, ClassTreeItem *lastSibling,
                                      ParsedAttribute *parsedAttr)
-    : ClassTreeItem(parent, lastSibling, parsedAttr)
+    : ClassTreeItem(tqparent, lastSibling, parsedAttr)
 {
     TQString icon;
     
@@ -363,13 +363,13 @@ ClassTreeAttrItem::ClassTreeAttrItem(ClassTreeItem *parent, ClassTreeItem *lastS
 TQString ClassTreeAttrItem::text( int ) const
 {
     if ( !m_item )
-        return TQString::null;
+        return TQString();
     return m_item->name();
 }
 
-ClassTreeScriptItem::ClassTreeScriptItem(ClassTreeItem *parent, ClassTreeItem *lastSibling,
+ClassTreeScriptItem::ClassTreeScriptItem(ClassTreeItem *tqparent, ClassTreeItem *lastSibling,
                                      ParsedScript *parsedScript)
-    : ClassTreeItem(parent, lastSibling, parsedScript)
+    : ClassTreeItem(tqparent, lastSibling, parsedScript)
 {
     TQString icon;
 
@@ -387,7 +387,7 @@ ClassTreeScriptItem::ClassTreeScriptItem(ClassTreeItem *parent, ClassTreeItem *l
 TQString ClassTreeScriptItem::text( int ) const
 {
     if ( !m_item )
-        return TQString::null;
+        return TQString();
     return m_item->name();
 }
 
@@ -419,11 +419,11 @@ void ClassTreeScriptItem::setOpen(bool o)
 }
 
 
-class ClassToolTip : public QToolTip
+class ClassToolTip : public TQToolTip
 {
 public:
-    ClassToolTip( TQWidget *parent )
-        : TQToolTip(parent)
+    ClassToolTip( TQWidget *tqparent )
+        : TQToolTip(tqparent)
         {}
 
 protected:
@@ -433,10 +433,10 @@ protected:
 
 void ClassToolTip::maybeTip(const TQPoint &p)
 {
-    ClassTreeBase *ctw = static_cast<ClassTreeBase*>(parentWidget());
+    ClassTreeBase *ctw = static_cast<ClassTreeBase*>(tqparentWidget());
 
     TQListViewItem *item = ctw->itemAt(p);
-    TQRect r = ctw->itemRect(item);
+    TQRect r = ctw->tqitemRect(item);
 
     if (item && r.isValid()) {
         ClassTreeItem *ctitem = static_cast<ClassTreeItem*>(item);
@@ -447,15 +447,15 @@ void ClassToolTip::maybeTip(const TQPoint &p)
 }
 
 
-ClassTreeBase::ClassTreeBase(ClassViewPart *part, TQWidget *parent, const char *name)
-    : KListView(parent, name)
+ClassTreeBase::ClassTreeBase(ClassViewPart *part, TQWidget *tqparent, const char *name)
+    : KListView(tqparent, name)
 {
     setFocusPolicy(ClickFocus);
     setRootIsDecorated(true);
     setResizeMode(TQListView::LastColumn);
     setSorting(-1);
     header()->hide();
-    addColumn(TQString::null);
+    addColumn(TQString());
 
     (void) new ClassToolTip(this);
     
@@ -488,7 +488,7 @@ ClassTreeBase::TreeState ClassTreeBase::treeState() const
             TQListViewItem *item = it.current();
             while (item) {
                 path.prepend(item->text(0));
-                item = item->parent();
+                item = item->tqparent();
             }
             state.append(path);
         }
@@ -507,7 +507,7 @@ void ClassTreeBase::setTreeState(TreeState state)
             TQListViewItem *item = it.current();
             while (item) {
                 path.prepend(item->text(0));
-                item = item->parent();
+                item = item->tqparent();
             }
             if (*tsit == path) {
                 it.current()->setOpen(true);
@@ -525,7 +525,7 @@ void ClassTreeBase::slotItemExecuted( TQListViewItem* item )
     if (!item)
         return;
 
-    // toggle open state for parents
+    // toggle open state for tqparents
     if (item->childCount() > 0)
         setOpen(item, !isOpen(item));