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

12 files changed, 38 insertions, 38 deletions

diff --git a/konq-plugins/domtreeviewer/attributeeditdialog.ui b/konq-plugins/domtreeviewer/attributeeditdialog.ui
index c0abc0e..9ecf581 100644
--- a/konq-plugins/domtreeviewer/attributeeditdialog.ui
+++ b/konq-plugins/domtreeviewer/attributeeditdialog.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout7</cstring>
+                <cstring>layout7</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -89,7 +89,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout8</cstring>
+                <cstring>layout8</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -119,7 +119,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>121</width>
                             <height>20</height>
diff --git a/konq-plugins/domtreeviewer/domlistviewitem.cpp b/konq-plugins/domtreeviewer/domlistviewitem.cpp
index 8951451..7ab20b4 100644
--- a/konq-plugins/domtreeviewer/domlistviewitem.cpp
+++ b/konq-plugins/domtreeviewer/domlistviewitem.cpp
@@ -59,14 +59,14 @@ void DOMListViewItem::init()
   clos = false;
 }
 
-void DOMListViewItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment )
+void DOMListViewItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment )
 {
   TQColorGroup _cg( cg );
   TQColor c = _cg.text();
 
   p->setFont(m_font);
   _cg.setColor( TQColorGroup::Text, m_color );
-  TQListViewItem::paintCell( p, _cg, column, width, tqalignment );
+  TQListViewItem::paintCell( p, _cg, column, width, alignment );
   _cg.setColor( TQColorGroup::Text, c );
 }
 
diff --git a/konq-plugins/domtreeviewer/domlistviewitem.h b/konq-plugins/domtreeviewer/domlistviewitem.h
index 3ba7378..f6f74f6 100644
--- a/konq-plugins/domtreeviewer/domlistviewitem.h
+++ b/konq-plugins/domtreeviewer/domlistviewitem.h
@@ -33,7 +33,7 @@ class DOMListViewItem : public TQListViewItem
    virtual ~DOMListViewItem();
  
   virtual void paintCell( TQPainter *p, const TQColorGroup &cg,
-			  int column, int width, int tqalignment );  
+			  int column, int width, int alignment );  
 
   void setColor( const TQColor &color) { m_color = color; }
 
diff --git a/konq-plugins/domtreeviewer/domtreecommands.cpp b/konq-plugins/domtreeviewer/domtreecommands.cpp
index a072409..0bbb918 100644
--- a/konq-plugins/domtreeviewer/domtreecommands.cpp
+++ b/konq-plugins/domtreeviewer/domtreecommands.cpp
@@ -53,7 +53,7 @@ static const char * const dom_error_msgs[] = {
 TQString domtreeviewer::domErrorMessage(int dom_err)
 {
   if ((unsigned)dom_err > sizeof dom_error_msgs/sizeof dom_error_msgs[0])
-    return i18n("Unknown Exception %1").tqarg(dom_err);
+    return i18n("Unknown Exception %1").arg(dom_err);
   else
     return i18n(dom_error_msgs[dom_err]);
 }
@@ -401,8 +401,8 @@ void ChangeCDataCommand::apply()
   if (!shouldReapply()) {
     oldValue = cdata.data();
     has_newlines =
-    	TQConstString(value.tqunicode(), value.length()).string().contains('\n')
-	|| TQConstString(oldValue.tqunicode(), oldValue.length()).string().contains('\n');
+    	TQConstString(value.unicode(), value.length()).string().contains('\n')
+	|| TQConstString(oldValue.unicode(), oldValue.length()).string().contains('\n');
   }
   cdata.setData(value);
   addChangedNode(cdata);
diff --git a/konq-plugins/domtreeviewer/domtreecommands.h b/konq-plugins/domtreeviewer/domtreecommands.h
index 6361fd7..eed0822 100644
--- a/konq-plugins/domtreeviewer/domtreecommands.h
+++ b/konq-plugins/domtreeviewer/domtreecommands.h
@@ -305,7 +305,7 @@ class InsertNodeCommand : public ManipulateNodeCommand
 public:
   /**
    * Prepare insertion command, inserting \c node into \c parent, just 
-   * before \c after. If \c after is 0, append it to the list of tqchildren.
+   * before \c after. If \c after is 0, append it to the list of children.
    */
   InsertNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after);
   virtual ~InsertNodeCommand();
@@ -331,7 +331,7 @@ class RemoveNodeCommand : public ManipulateNodeCommand
 public:
   /**
    * Prepare insertion command, inserting \c node into \c parent, just 
-   * before \c after. If \c after is 0, append it to the list of tqchildren.
+   * before \c after. If \c after is 0, append it to the list of children.
    */
   RemoveNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after);
   virtual ~RemoveNodeCommand();
diff --git a/konq-plugins/domtreeviewer/domtreeview.cpp b/konq-plugins/domtreeviewer/domtreeview.cpp
index 615f056..4089c22 100644
--- a/konq-plugins/domtreeviewer/domtreeview.cpp
+++ b/konq-plugins/domtreeviewer/domtreeview.cpp
@@ -36,9 +36,9 @@
 #include <tqfont.h>
 #include <tqfile.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpopupmenu.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqtimer.h>
 #include <tqwidgetstack.h>
 
@@ -124,7 +124,7 @@ void DOMTreeView::setHtmlPart(KHTMLPart *_part)
     // nothing here yet
   }
 
-  parentWidget()->setCaption( part ? i18n( "DOM Tree for %1" ).tqarg(part->url().prettyURL()) : i18n("DOM Tree") );
+  parentWidget()->setCaption( part ? i18n( "DOM Tree for %1" ).arg(part->url().prettyURL()) : i18n("DOM Tree") );
 
   TQTimer::singleShot(0, this, TQT_SLOT(slotSetHtmlPartDelayed()));
 }
@@ -343,7 +343,7 @@ void DOMTreeView::highlightHTML(DOMListViewItem *cur_item, const TQString &nodeN
    * think it's worth it.
    */
 
-  TQColor namedColor(tqpalette().active().text());
+  TQColor namedColor(palette().active().text());
   TQString tagName = nodeName.upper();
   if ( tagName == "HTML" ) {
     namedColor = "#0000ff";
@@ -530,7 +530,7 @@ void DOMTreeView::slotSaveClicked()
 
     if (file.exists()) {
       const TQString title = i18n( "File Exists" );
-      const TQString text = i18n( "Do you really want to overwrite: \n%1?" ).tqarg(url.url());
+      const TQString text = i18n( "Do you really want to overwrite: \n%1?" ).arg(url.url());
       if (KMessageBox::Continue != KMessageBox::warningContinueCancel(this, text, title, i18n("Overwrite") ) ) {
 	return;
       }
@@ -545,12 +545,12 @@ void DOMTreeView::slotSaveClicked()
       delete m_textStream;
     } else {
       const TQString title = i18n( "Unable to Open File" );
-      const TQString text = i18n( "Unable to open \n %1 \n for writing" ).tqarg(url.path());
+      const TQString text = i18n( "Unable to open \n %1 \n for writing" ).arg(url.path());
       KMessageBox::sorry( this, text, title );
     }
   } else {
     const TQString title = i18n( "Invalid URL" );
-    const TQString text = i18n( "This URL \n %1 \n is not valid." ).tqarg(url.url());
+    const TQString text = i18n( "This URL \n %1 \n is not valid." ).arg(url.url());
     KMessageBox::sorry( this, text, title );
   }
 }
@@ -973,7 +973,7 @@ public:
 
 protected:
   virtual void paintCell( TQPainter *p, const TQColorGroup &cg,
-			  int column, int width, int tqalignment )
+			  int column, int width, int alignment )
   {
     bool updates_enabled = listView()->isUpdatesEnabled();
     listView()->setUpdatesEnabled(false);
@@ -993,7 +993,7 @@ protected:
 
     TQColorGroup _cg( cg );
     _cg.setColor( TQColorGroup::Text, c );
-    super::paintCell( p, _cg, column, width, tqalignment );
+    super::paintCell( p, _cg, column, width, alignment );
 
     if (text_changed) setText(column, oldText);
     listView()->setUpdatesEnabled(updates_enabled);
diff --git a/konq-plugins/domtreeviewer/domtreeview.h b/konq-plugins/domtreeviewer/domtreeview.h
index 6ff1634..43c389c 100644
--- a/konq-plugins/domtreeviewer/domtreeview.h
+++ b/konq-plugins/domtreeviewer/domtreeview.h
@@ -169,7 +169,7 @@ class DOMTreeView : public DOMTreeViewBase
     // == DOM Node Info panel ======================================
 
     public:
-        // Keep in sync with the widget stack tqchildren
+        // Keep in sync with the widget stack children
         enum InfoPanel { ElementPanel, CDataPanel, EmptyPanel };
     
     public slots:
diff --git a/konq-plugins/domtreeviewer/domtreeviewbase.ui b/konq-plugins/domtreeviewer/domtreeviewbase.ui
index 0d3a204..4b79c2d 100644
--- a/konq-plugins/domtreeviewer/domtreeviewbase.ui
+++ b/konq-plugins/domtreeviewer/domtreeviewbase.ui
@@ -12,7 +12,7 @@
             <height>508</height>
         </rect>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>600</width>
             <height>380</height>
@@ -108,7 +108,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>10</width>
                             <height>20</height>
@@ -135,7 +135,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout7</cstring>
+                <cstring>layout7</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -173,7 +173,7 @@
                     <property name="name">
                         <cstring>groupBox1</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>300</width>
                             <height>400</height>
@@ -188,7 +188,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout4</cstring>
+                                <cstring>layout4</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -400,7 +400,7 @@
                                     </widget>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>tqlayout3</cstring>
+                                            <cstring>layout3</cstring>
                                         </property>
                                         <hbox>
                                             <property name="name">
@@ -424,7 +424,7 @@
                                                 <property name="sizeType">
                                                     <enum>Expanding</enum>
                                                 </property>
-                                                <property name="tqsizeHint">
+                                                <property name="sizeHint">
                                                     <size>
                                                         <width>81</width>
                                                         <height>20</height>
diff --git a/konq-plugins/domtreeviewer/domtreewindow.cpp b/konq-plugins/domtreeviewer/domtreewindow.cpp
index 11b6a1d..a13e288 100644
--- a/konq-plugins/domtreeviewer/domtreewindow.cpp
+++ b/konq-plugins/domtreeviewer/domtreewindow.cpp
@@ -72,7 +72,7 @@ DOMTreeWindow::DOMTreeWindow(PluginDomtreeviewer *plugin)
 
     // message window dialog
     msgdlg = new MessageDialog(0, "MessageDialog");
-    msgdlg->messagePane->setPaletteBackgroundColor(tqpalette().active().base());
+    msgdlg->messagePane->setPaletteBackgroundColor(palette().active().base());
 // msgdlg->show();
 
     // then, setup our actions
@@ -248,7 +248,7 @@ void DOMTreeWindow::dropEvent(TQDropEvent *event)
 
 void DOMTreeWindow::addMessage(int msg_id, const TQString &msg)
 {
-  TQDateTime t(TQDateTime::tqcurrentDateTime());
+  TQDateTime t(TQDateTime::currentDateTime());
   TQString fullmsg = t.toString();
   fullmsg += ":";
 
diff --git a/konq-plugins/domtreeviewer/elementeditdialog.ui b/konq-plugins/domtreeviewer/elementeditdialog.ui
index d703eeb..cd2829b 100644
--- a/konq-plugins/domtreeviewer/elementeditdialog.ui
+++ b/konq-plugins/domtreeviewer/elementeditdialog.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout7</cstring>
+                <cstring>layout7</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -47,7 +47,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -104,7 +104,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout6</cstring>
+                <cstring>layout6</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -145,7 +145,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>60</width>
                             <height>20</height>
diff --git a/konq-plugins/domtreeviewer/messagedialog.ui b/konq-plugins/domtreeviewer/messagedialog.ui
index c6d20bc..830b1cd 100644
--- a/konq-plugins/domtreeviewer/messagedialog.ui
+++ b/konq-plugins/domtreeviewer/messagedialog.ui
@@ -41,7 +41,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -68,7 +68,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>300</width>
                             <height>20</height>
diff --git a/konq-plugins/domtreeviewer/texteditdialog.ui b/konq-plugins/domtreeviewer/texteditdialog.ui
index b68a31e..767f505 100644
--- a/konq-plugins/domtreeviewer/texteditdialog.ui
+++ b/konq-plugins/domtreeviewer/texteditdialog.ui
@@ -60,7 +60,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout6</cstring>
+                <cstring>layout6</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -101,7 +101,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>60</width>
                             <height>20</height>