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

7 files changed, 39 insertions, 39 deletions

diff --git a/parts/classview/classtooldlg.cpp b/parts/classview/classtooldlg.cpp
index a30e0e11..43ccfa18 100644
--- a/parts/classview/classtooldlg.cpp
+++ b/parts/classview/classtooldlg.cpp
@@ -41,37 +41,37 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part )
     parents_button = new TQToolButton(this);
     parents_button->setPixmap( UserIcon("CTparents", KIcon::DefaultState, ClassViewFactory::instance()) );
     parents_button->setToggleButton(true);
-    parents_button->setFixedSize(parents_button->tqsizeHint());
+    parents_button->setFixedSize(parents_button->sizeHint());
     TQToolTip::add(parents_button, i18n("Show parents"));
 
-    tqchildren_button = new TQToolButton(this);
-    tqchildren_button->setPixmap( UserIcon("CTtqchildren", KIcon::DefaultState, ClassViewFactory::instance()) );
-    tqchildren_button->setToggleButton(true);
-    tqchildren_button->setFixedSize(tqchildren_button->tqsizeHint());
-    TQToolTip::add(tqchildren_button, i18n("Show tqchildren"));
+    children_button = new TQToolButton(this);
+    children_button->setPixmap( UserIcon("CTchildren", KIcon::DefaultState, ClassViewFactory::instance()) );
+    children_button->setToggleButton(true);
+    children_button->setFixedSize(children_button->sizeHint());
+    TQToolTip::add(children_button, i18n("Show children"));
 
     clients_button = new TQToolButton(this);
     clients_button->setPixmap( UserIcon("CTclients", KIcon::DefaultState, ClassViewFactory::instance()) );
     clients_button->setToggleButton(true);
-    clients_button->setFixedSize(clients_button->tqsizeHint());
+    clients_button->setFixedSize(clients_button->sizeHint());
     TQToolTip::add(clients_button, i18n("Show clients"));
 
     suppliers_button = new TQToolButton(this);
     suppliers_button->setPixmap( UserIcon("CTsuppliers", KIcon::DefaultState, ClassViewFactory::instance()) );
     suppliers_button->setToggleButton(true);
-    suppliers_button->setFixedSize(suppliers_button->tqsizeHint());
+    suppliers_button->setFixedSize(suppliers_button->sizeHint());
     TQToolTip::add(suppliers_button, i18n("Show suppliers"));
 
     methods_button = new TQToolButton(this);
     methods_button->setPixmap( UserIcon("CVpublic_meth", KIcon::DefaultState, ClassViewFactory::instance()) );
     methods_button->setToggleButton(true);
-    methods_button->setFixedSize(methods_button->tqsizeHint());
+    methods_button->setFixedSize(methods_button->sizeHint());
     TQToolTip::add(methods_button, i18n("Show methods"));
 
     attributes_button = new TQToolButton(this);
     attributes_button->setPixmap( UserIcon("CVpublic_var", KIcon::DefaultState, ClassViewFactory::instance()) );
     attributes_button->setToggleButton(true);
-    attributes_button->setFixedSize(attributes_button->tqsizeHint());
+    attributes_button->setFixedSize(attributes_button->sizeHint());
     TQToolTip::add(attributes_button, i18n("Show attributes"));
 
     access_combo = new TQComboBox(false, this, "access combo");
@@ -86,17 +86,17 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part )
     class_tree = new ClassToolWidget(part, this);
     //    classTree->setMinimumSize( 500, 400 );
 
-    TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
     TQHBoxLayout *firstrowLayout = new TQHBoxLayout();
     TQHBoxLayout *secondrowLayout = new TQHBoxLayout();
-    tqlayout->addLayout(firstrowLayout);
-    tqlayout->addLayout(secondrowLayout);
+    layout->addLayout(firstrowLayout);
+    layout->addLayout(secondrowLayout);
 
     firstrowLayout->addWidget(class_combo, 1);
     firstrowLayout->addWidget(close_button, 0);
 
     secondrowLayout->addWidget(parents_button);
-    secondrowLayout->addWidget(tqchildren_button);
+    secondrowLayout->addWidget(children_button);
     secondrowLayout->addWidget(clients_button);
     secondrowLayout->addWidget(suppliers_button);
     secondrowLayout->addStretch();
@@ -104,7 +104,7 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part )
     secondrowLayout->addWidget(attributes_button);
     secondrowLayout->addWidget(access_combo);
 
-    tqlayout->addWidget(class_tree, 10);
+    layout->addWidget(class_tree, 10);
 
     connect( class_combo, TQT_SIGNAL(activated(const TQString&)),
              this, TQT_SLOT(slotClassComboChoice(const TQString&)) );
@@ -113,7 +113,7 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part )
     connect( access_combo, TQT_SIGNAL(activated(const TQString&)),
              this, TQT_SLOT(slotAccessComboChoice(const TQString&)) );
     connect( parents_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewParents()));
-    connect( tqchildren_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewChildren()));
+    connect( children_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewChildren()));
     connect( clients_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewClients()));
     connect( suppliers_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewSuppliers()));
     connect( methods_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewMethods()));
@@ -178,7 +178,7 @@ void ClassToolDialog::viewParents()
 }
 
 
-/** View the tqchildren of the current class. */
+/** View the children of the current class. */
 void ClassToolDialog::viewChildren()
 {
     currentOperation = ViewChildren;
@@ -287,7 +287,7 @@ void ClassToolDialog::updateCaptionAndButtons()
             caption = i18n("Parents");
             break;
         case ViewChildren:
-            button = tqchildren_button;
+            button = children_button;
             caption = i18n("Children");
             break;
         case ViewClients:
@@ -300,11 +300,11 @@ void ClassToolDialog::updateCaptionAndButtons()
             break;
         case ViewMethods:
             button = methods_button;
-            caption = i18n("%1 Methods").tqarg(access_combo->currentText());
+            caption = i18n("%1 Methods").arg(access_combo->currentText());
             break;
         case ViewAttributes:
             button = attributes_button;
-            caption = i18n("%1 Attributes").tqarg(access_combo->currentText());
+            caption = i18n("%1 Attributes").arg(access_combo->currentText());
             break;
         default:
             button = 0;
@@ -313,7 +313,7 @@ void ClassToolDialog::updateCaptionAndButtons()
         }
 
     parents_button->setOn(false);
-    tqchildren_button->setOn(false);
+    children_button->setOn(false);
     clients_button->setOn(false);
     suppliers_button->setOn(false);
     methods_button->setOn(false);
@@ -321,7 +321,7 @@ void ClassToolDialog::updateCaptionAndButtons()
 
     if (button) {
         button->setOn(true);
-        setCaption(i18n("%1 of Class %2").tqarg(caption).tqarg(currentClass->name()));
+        setCaption(i18n("%1 of Class %2").arg(caption).arg(currentClass->name()));
     } else
         setCaption(caption);
 }
diff --git a/parts/classview/classtooldlg.h b/parts/classview/classtooldlg.h
index 9b722346..54d1d1cd 100644
--- a/parts/classview/classtooldlg.h
+++ b/parts/classview/classtooldlg.h
@@ -18,7 +18,7 @@
 #include <tqlabel.h>
 #include <tqtoolbutton.h>
 #include <tqcombobox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include "classtoolwidget.h"
 #include "parseditem.h"
 
@@ -47,7 +47,7 @@ public slots:
     void viewNone();
     /** View the parents of the current class. */
     void viewParents();
-    /** View the tqchildren of the current class. */
+    /** View the children of the current class. */
     void viewChildren();
     /** View all classes that has this class as an attribute. */
     void viewClients();
@@ -76,7 +76,7 @@ private:
     TQComboBox *class_combo;
     
     TQToolButton *parents_button;
-    TQToolButton *tqchildren_button;
+    TQToolButton *children_button;
     TQToolButton *clients_button;
     TQToolButton *suppliers_button;
     TQToolButton *methods_button;
diff --git a/parts/classview/classtreebase.cpp b/parts/classview/classtreebase.cpp
index d057f6e0..a541251b 100644
--- a/parts/classview/classtreebase.cpp
+++ b/parts/classview/classtreebase.cpp
@@ -436,7 +436,7 @@ void ClassToolTip::maybeTip(const TQPoint &p)
     ClassTreeBase *ctw = static_cast<ClassTreeBase*>(parentWidget());
 
     TQListViewItem *item = ctw->itemAt(p);
-    TQRect r = ctw->tqitemRect(item);
+    TQRect r = ctw->itemRect(item);
 
     if (item && r.isValid()) {
         ClassTreeItem *ctitem = static_cast<ClassTreeItem*>(item);
diff --git a/parts/classview/classviewwidget.cpp b/parts/classview/classviewwidget.cpp
index 20c8e8b1..0908af61 100644
--- a/parts/classview/classviewwidget.cpp
+++ b/parts/classview/classviewwidget.cpp
@@ -43,7 +43,7 @@
 
 #include <tqheader.h>
 #include <tqdir.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
 #include <tqstringlist.h>
 
 // namespace ?!?
@@ -1259,7 +1259,7 @@ void ClassViewWidget::maybeTip( TQPoint const & p )
         
 	kdDebug(0) << tooltip << endl;
 	
-	TQRect r = tqitemRect( item );
+	TQRect r = itemRect( item );
 
 	if ( item && r.isValid() && !tooltip.isEmpty() )
 	{
diff --git a/parts/classview/digraphview.cpp b/parts/classview/digraphview.cpp
index ba09e463..49d3b259 100644
--- a/parts/classview/digraphview.cpp
+++ b/parts/classview/digraphview.cpp
@@ -16,7 +16,7 @@
 #include <tqapplication.h>
 #include <tqpainter.h>
 #include <tqpaintdevicemetrics.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kmessagebox.h>
@@ -235,7 +235,7 @@ void DigraphView::process( const TQString& file, const TQString& ext )
     TQTextStream &is = *ifile.textStream();
     is << "digraph G {" << endl;
     is << "rankdir=LR;" << endl;
-    is << "node [tqshape=box,fontname=Helvetica,fontsize=12];" << endl;
+    is << "node [shape=box,fontname=Helvetica,fontsize=12];" << endl;
     TQStringList::Iterator it;
     for (it = inputs.begin(); it != inputs.end(); ++it)
         is << (*it) << endl;
@@ -313,7 +313,7 @@ void DigraphView::drawContents(TQPainter* p, int clipx, int clipy, int clipw, in
         triangle[0] = p2 + TQPoint((int)(d11+d21),(int)(d12+d22));
         triangle[1] = p2 + TQPoint((int)(d11-d21),(int)(d12-d22));
         triangle[2] = p2;
-        p->tqdrawPolygon(triangle, true);
+        p->drawPolygon(triangle, true);
     }
 }
 
@@ -338,7 +338,7 @@ void DigraphView::contentsMousePressEvent(TQMouseEvent *e)
 }
 
 
-TQSize DigraphView::tqsizeHint() const
+TQSize DigraphView::sizeHint() const
 {
     if (width == -1)
         return TQSize(100, 100); // arbitrary
diff --git a/parts/classview/digraphview.h b/parts/classview/digraphview.h
index 9130be75..cd25e279 100644
--- a/parts/classview/digraphview.h
+++ b/parts/classview/digraphview.h
@@ -42,7 +42,7 @@ signals:
 protected:
     virtual void drawContents(TQPainter* p, int clipx, int clipy, int clipw, int cliph);
     virtual void contentsMousePressEvent(TQMouseEvent *e);
-    virtual TQSize tqsizeHint() const;
+    virtual TQSize sizeHint() const;
 
 private:
     int toXPixel(double x);
diff --git a/parts/classview/hierarchydlg.cpp b/parts/classview/hierarchydlg.cpp
index 0929c5cd..428692fa 100644
--- a/parts/classview/hierarchydlg.cpp
+++ b/parts/classview/hierarchydlg.cpp
@@ -22,7 +22,7 @@
 #include <kmessagebox.h>
 #include <kdebug.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqfileinfo.h>
 #include <tqlistview.h>
 #include <tqapplication.h>
@@ -41,10 +41,10 @@ HierarchyDialog::HierarchyDialog( ClassViewPart *part )
     : TQDialog(0, "hierarchy dialog", false)
 {
     class_combo = new KComboView(true, 150, this);
-    class_combo->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred );
+    class_combo->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred );
 //    class_combo->setMinimumWidth(150);
     namespace_combo = new KComboView(true, 150, this);
-    namespace_combo->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred );
+    namespace_combo->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred );
 //    namespace_combo->setMinimumWidth(150);
 
     TQPushButton *close_button = new KPushButton(KStdGuiItem::close(), this);
@@ -55,16 +55,16 @@ HierarchyDialog::HierarchyDialog( ClassViewPart *part )
     digraph = new DigraphView(splitter, "digraph view");
 //    member_tree = new ClassToolWidget(part, splitter);
 
-    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
     TQBoxLayout *combo_layout = new TQHBoxLayout();
-    tqlayout->addLayout(combo_layout);
+    layout->addLayout(combo_layout);
     combo_layout->addWidget(namespace_combo);
     combo_layout->addWidget(class_combo);
     combo_layout->addSpacing(60);
     combo_layout->addWidget(refresh_button);
     combo_layout->addWidget(save_button);
     combo_layout->addWidget(close_button);
-    tqlayout->addWidget(splitter);
+    layout->addWidget(splitter);
 
     connect( namespace_combo, TQT_SIGNAL(activated(TQListViewItem*)),
              this, TQT_SLOT(slotNamespaceComboChoice(TQListViewItem*)) );