Rename obsolete tq methods to standard names

18 files changed, 42 insertions, 42 deletions

diff --git a/konq-plugins/domtreeviewer/attributeeditdialog.ui b/konq-plugins/domtreeviewer/attributeeditdialog.ui
index 1a1eafa..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">
diff --git a/konq-plugins/domtreeviewer/domtreecommands.cpp b/konq-plugins/domtreeviewer/domtreecommands.cpp
index 5837239..0bbb918 100644
--- a/konq-plugins/domtreeviewer/domtreecommands.cpp
+++ b/konq-plugins/domtreeviewer/domtreecommands.cpp
@@ -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/domtreeview.cpp b/konq-plugins/domtreeviewer/domtreeview.cpp
index 4a15a2b..d196f40 100644
--- a/konq-plugins/domtreeviewer/domtreeview.cpp
+++ b/konq-plugins/domtreeviewer/domtreeview.cpp
@@ -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";
diff --git a/konq-plugins/domtreeviewer/domtreeviewbase.ui b/konq-plugins/domtreeviewer/domtreeviewbase.ui
index 9d1c575..4b79c2d 100644
--- a/konq-plugins/domtreeviewer/domtreeviewbase.ui
+++ b/konq-plugins/domtreeviewer/domtreeviewbase.ui
@@ -135,7 +135,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout7</cstring>
+                <cstring>layout7</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -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">
diff --git a/konq-plugins/domtreeviewer/domtreewindow.cpp b/konq-plugins/domtreeviewer/domtreewindow.cpp
index 5fc3b87..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
diff --git a/konq-plugins/domtreeviewer/elementeditdialog.ui b/konq-plugins/domtreeviewer/elementeditdialog.ui
index be8eaaf..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">
diff --git a/konq-plugins/domtreeviewer/messagedialog.ui b/konq-plugins/domtreeviewer/messagedialog.ui
index 35a7b38..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">
diff --git a/konq-plugins/domtreeviewer/texteditdialog.ui b/konq-plugins/domtreeviewer/texteditdialog.ui
index 250df1b..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">
diff --git a/konq-plugins/fsview/fsview_part.cpp b/konq-plugins/fsview/fsview_part.cpp
index afbf675..3995a47 100644
--- a/konq-plugins/fsview/fsview_part.cpp
+++ b/konq-plugins/fsview/fsview_part.cpp
@@ -344,7 +344,7 @@ void FSViewBrowserExtension::trash()
 void FSViewBrowserExtension::copySelection( bool move )
 {
   KonqDrag *urlData = KonqDrag::newDrag( _view->selectedUrls(), move );
-  TQApplication::tqclipboard()->setData( urlData );
+  TQApplication::clipboard()->setData( urlData );
 }
 
 void FSViewBrowserExtension::editMimeType()
diff --git a/konq-plugins/fsview/treemap.cpp b/konq-plugins/fsview/treemap.cpp
index cab9809..32c52f1 100644
--- a/konq-plugins/fsview/treemap.cpp
+++ b/konq-plugins/fsview/treemap.cpp
@@ -2152,7 +2152,7 @@ void TreeMapWidget::drawTreeMap()
 
   if (hasFocus()) {
     TQPainter p(this);
-    tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p,
+    style().tqdrawPrimitive( TQStyle::PE_FocusRect, &p,
                            TQRect(0, 0, TQWidget::width(), TQWidget::height()),
                            colorGroup() );
   }
diff --git a/konq-plugins/fsview/treemap.h b/konq-plugins/fsview/treemap.h
index 31ac9d3..9bacedc 100644
--- a/konq-plugins/fsview/treemap.h
+++ b/konq-plugins/fsview/treemap.h
@@ -372,7 +372,7 @@ private:
   int _sortTextNo;
   bool _sortAscending;
 
-  // temporary tqlayout
+  // temporary layout
   TQRect _rect;
   TQPtrList<TQRect>* _freeRects;
   int _depth;
diff --git a/konq-plugins/imagerotation/exif.py b/konq-plugins/imagerotation/exif.py
index 1f71387..60fce74 100755
--- a/konq-plugins/imagerotation/exif.py
+++ b/konq-plugins/imagerotation/exif.py
@@ -811,7 +811,7 @@ class EXIF_header:
                                       repr(self.tags[ifd_name+' '+tag_name]))
 
     # extract uncompressed TIFF thumbnail (like pulling teeth)
-    # we take advantage of the pre-existing tqlayout in the thumbnail IFD as
+    # we take advantage of the pre-existing layout in the thumbnail IFD as
     # much as possible
     def extract_TIFF_thumbnail(self, thumb_ifd):
         entries=self.s2n(thumb_ifd, 2)
diff --git a/konq-plugins/searchbar/searchbar.cpp b/konq-plugins/searchbar/searchbar.cpp
index 4da4d30..c31de51 100644
--- a/konq-plugins/searchbar/searchbar.cpp
+++ b/konq-plugins/searchbar/searchbar.cpp
@@ -363,7 +363,7 @@ void SearchBarPlugin::setIcon()
 	TQPainter p( &arrowmap );
 	p.drawPixmap(0, 2, m_searchIcon);
 	TQStyle::SFlags arrowFlags = TQStyle::Style_Default;
-	m_searchCombo->tqstyle().tqdrawPrimitive(TQStyle::PE_ArrowDown, &p, TQRect(arrowmap.width()-6, 
+	m_searchCombo->style().tqdrawPrimitive(TQStyle::PE_ArrowDown, &p, TQRect(arrowmap.width()-6, 
 	    arrowmap.height()-6, 6, 5), m_searchCombo->colorGroup(), arrowFlags, TQStyleOption() );
 	p.end();
 	m_searchIcon = arrowmap;
@@ -590,7 +590,7 @@ int SearchBarCombo::findHistoryItem(const TQString &searchText)
 
 void SearchBarCombo::mousePressEvent(TQMouseEvent *e)
 {
-	int x0 = TQStyle::visualRect( tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ), this ).x();
+	int x0 = TQStyle::visualRect( style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ), this ).x();
 
 	if(e->x() > x0 + 2 && e->x() < lineEdit()->x())
 	{
diff --git a/konq-plugins/sidebar/metabar/src/configdialog.cpp b/konq-plugins/sidebar/metabar/src/configdialog.cpp
index 63a62a6..d2cd8c0 100644
--- a/konq-plugins/sidebar/metabar/src/configdialog.cpp
+++ b/konq-plugins/sidebar/metabar/src/configdialog.cpp
@@ -161,7 +161,7 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent
   tab->addTab(actionPage, i18n("Actions"));
   tab->addTab(links, i18n("Links"));
   
-  //tqlayout  
+  //layout  
   TQGridLayout *general_layout = new TQGridLayout(general, 2, 2, 5, 5);
   general_layout->addWidget(entries_group, 0, 0);
   general_layout->addWidget(appearance_group, 0, 1);
@@ -330,15 +330,15 @@ void ConfigDialog::createLink()
   bottom_layout->addWidget(ok);
   bottom_layout->addWidget(cancel);
   
-  TQGridLayout *tqlayout = new TQGridLayout(0, 2, 3, 0, 5);
-  tqlayout->addMultiCellWidget(icon, 0, 1, 0, 0);
-  tqlayout->addWidget(new TQLabel(i18n("Name:"), main), 0, 1);
-  tqlayout->addWidget(name, 0, 2);
-  tqlayout->addWidget(new TQLabel(i18n("URL:"), main), 1, 1);
-  tqlayout->addWidget(url, 1, 2);
+  TQGridLayout *layout = new TQGridLayout(0, 2, 3, 0, 5);
+  layout->addMultiCellWidget(icon, 0, 1, 0, 0);
+  layout->addWidget(new TQLabel(i18n("Name:"), main), 0, 1);
+  layout->addWidget(name, 0, 2);
+  layout->addWidget(new TQLabel(i18n("URL:"), main), 1, 1);
+  layout->addWidget(url, 1, 2);
 
   TQVBoxLayout *main_layout = new TQVBoxLayout(main, 5, 5);
-  main_layout->addLayout(tqlayout);
+  main_layout->addLayout(layout);
   main_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
   main_layout->addLayout(bottom_layout);
   
@@ -413,15 +413,15 @@ void ConfigDialog::editLink(TQListViewItem *item)
     bottom_layout->addWidget(ok);
     bottom_layout->addWidget(cancel);
     
-    TQGridLayout *tqlayout = new TQGridLayout(0, 2, 3, 0, 5);
-    tqlayout->addMultiCellWidget(icon, 0, 1, 0, 0);
-    tqlayout->addWidget(new TQLabel(i18n("Name:"), main), 0, 1);
-    tqlayout->addWidget(name, 0, 2);
-    tqlayout->addWidget(new TQLabel(i18n("URL:"), main), 1, 1);
-    tqlayout->addWidget(url, 1, 2);
+    TQGridLayout *layout = new TQGridLayout(0, 2, 3, 0, 5);
+    layout->addMultiCellWidget(icon, 0, 1, 0, 0);
+    layout->addWidget(new TQLabel(i18n("Name:"), main), 0, 1);
+    layout->addWidget(name, 0, 2);
+    layout->addWidget(new TQLabel(i18n("URL:"), main), 1, 1);
+    layout->addWidget(url, 1, 2);
     
     TQVBoxLayout *main_layout = new TQVBoxLayout(main, 5, 5);
-    main_layout->addLayout(tqlayout);
+    main_layout->addLayout(layout);
     main_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
     main_layout->addLayout(bottom_layout);
     
diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
index 05ce39a..eeaf53c 100644
--- a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
@@ -114,8 +114,8 @@ MetabarWidget::MetabarWidget(TQWidget *parent, const char *name) : TQWidget(pare
   plugins.insert("http", httpPlugin);
   plugins.insert("https", httpPlugin);
   
-  TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
-  tqlayout->addWidget(html->view());
+  TQVBoxLayout *layout = new TQVBoxLayout(this);
+  layout->addWidget(html->view());
   
   popup = new KPopupMenu(0);
   KAction *configAction = new KAction(i18n("Configure %1...").arg("Metabar"), "configure", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotShowConfig()), html->actionCollection(), "configure");
diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
index 59e0e0d..edaa1f4 100644
--- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
+++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
@@ -53,7 +53,7 @@ namespace KSB_News {
   NSStackTabWidget::NSStackTabWidget(TQWidget *parent, const char *name,
                                      TQPixmap appIcon) : TQWidget(parent, name) {
     currentPage = 0;
-    tqlayout = new TQVBoxLayout(this);
+    layout = new TQVBoxLayout(this);
 
     pagesheader.setAutoDelete(TRUE);
     pages.setAutoDelete(TRUE);
@@ -132,8 +132,8 @@ namespace KSB_News {
     pagesheader.insert(nsp, button);
     pages.insert(nsp, sv);
 
-    tqlayout->addWidget(button);
-    tqlayout->addWidget(sv);
+    layout->addWidget(button);
+    layout->addWidget(sv);
     button->show();
     if (pages.count() == 1) {
       currentPage = sv;
diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.h b/konq-plugins/sidebar/newsticker/nsstacktabwidget.h
index 08f0f22..e6ab6a7 100644
--- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.h
+++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.h
@@ -74,7 +74,7 @@ namespace KSB_News {
   private:
     TQPtrDict<TQWidget> pages;
     TQPtrDict<TQWidget> pagesheader;
-    TQVBoxLayout *tqlayout;
+    TQVBoxLayout *layout;
     TQWidget *currentPage;
     KPopupMenu *popup, *helpmenu;
     KAboutData *m_aboutdata;
diff --git a/konq-plugins/webarchiver/archiveviewbase.ui b/konq-plugins/webarchiver/archiveviewbase.ui
index 571b39d..743c591 100644
--- a/konq-plugins/webarchiver/archiveviewbase.ui
+++ b/konq-plugins/webarchiver/archiveviewbase.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <grid>
                 <property name="name">