Remove additional unneeded tq method conversions

(cherry picked from commit 64321895ea)

yakuake/src/first_run_dialog_ui.ui

@@ -42,7 +42,7 @@
             <property name="text">
                 <string>&lt;b&gt;Welcome to Yakuake&lt;/b&gt;</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignVCenter</set>
             </property>
         </widget>
@@ -64,7 +64,7 @@
             <property name="text">
                 <string>You can change the shortcut later at any time via the menu.</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
@@ -117,7 +117,7 @@
             <property name="text">
                 <string>Before using the application, you might want to change the keyboard shortcut used to open and close the Yakuake window:</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>

yakuake/src/general_settings.cpp

@@ -32,7 +32,7 @@ GeneralSettings::GeneralSettings(TQWidget* parent, const char* name)
     steps_spinbox->setSuffix("ms");
 
     for (int i = 2; i <= TQApplication::desktop()->numScreens(); i++)
-        kcfg_screen->insertItem(i18n("Screen %1").tqarg(TQString::number(i)));
+        kcfg_screen->insertItem(i18n("Screen %1").arg(TQString::number(i)));
 
     if (TQApplication::desktop()->numScreens() > 1)
     {

yakuake/src/image_button.cpp

@@ -55,7 +55,7 @@ void ImageButton::setToggled(bool enable)
         else
             pressed = false;
 
-        tqrepaint();
+        repaint();
     }
 }
 
@@ -98,7 +98,7 @@ void ImageButton::enterEvent(TQEvent*)
 {
     state = pressed ? 2 : 1;
 
-    tqrepaint();
+    repaint();
 }
 
 void ImageButton::leaveEvent(TQEvent*)
@@ -107,7 +107,7 @@ void ImageButton::leaveEvent(TQEvent*)
 
     if (popup_timer) popup_timer->stop();
 
-    tqrepaint();
+    repaint();
 }
 
 void ImageButton::mousePressEvent(TQMouseEvent*)
@@ -118,7 +118,7 @@ void ImageButton::mousePressEvent(TQMouseEvent*)
 
     if (popup_timer) popup_timer->stop();
 
-    tqrepaint();
+    repaint();
 
     if (popup_menu)
     {
@@ -142,7 +142,7 @@ void ImageButton::mouseReleaseEvent(TQMouseEvent*)
 
     if (popup_timer) popup_timer->stop();
 
-    tqrepaint();
+    repaint();
 
     if (toggle)
         emit toggled(pressed);

yakuake/src/main_window.cpp

@@ -192,8 +192,8 @@ MainWindow::MainWindow(TQWidget * parent, const char * name) :
 
     for (uint i = 1; i <= 12; ++i)
     {
-        KAction* tab_selection_action = new KAction(i18n("Switch to Session %1").tqarg(i), 0, 0,
-            tab_selection_mapper, TQT_SLOT(map()), actionCollection(), TQString("go_to_tab_%1").tqarg(i).local8Bit());
+        KAction* tab_selection_action = new KAction(i18n("Switch to Session %1").arg(i), 0, 0,
+            tab_selection_mapper, TQT_SLOT(map()), actionCollection(), TQString("go_to_tab_%1").arg(i).local8Bit());
         tab_selection_mapper->setMapping(tab_selection_action, i-1);
     }
 
@@ -220,7 +220,7 @@ MainWindow::MainWindow(TQWidget * parent, const char * name) :
 
     // Startup notification popup.
     if (Settings::popup() && !Settings::firstrun())
-        showPopup(i18n("Application successfully started!\nPress %1 to use it...").tqarg(global_key->shortcut("AccessKey").toString()));
+        showPopup(i18n("Application successfully started!\nPress %1 to use it...").arg(global_key->shortcut("AccessKey").toString()));
 
     // First run dialog.
     if (Settings::firstrun())
@@ -711,7 +711,7 @@ int MainWindow::getMouseScreen()
 
 TQRect MainWindow::getDesktopGeometry()
 {
-    /* Computes the desktop tqgeometry. */
+    /* Computes the desktop geometry. */
 
     if (full_screen)
     {
@@ -822,7 +822,7 @@ void MainWindow::updateScreenMenu()
     screen_menu->insertItem(i18n("At mouse location"), 0);
     screen_menu->insertSeparator();
     for (int i = 1; i <= TQApplication::desktop()->numScreens(); i++)
-        screen_menu->insertItem(i18n("Screen %1").tqarg(TQString::number(i)), i);
+        screen_menu->insertItem(i18n("Screen %1").arg(TQString::number(i)), i);
     screen_menu->setItemChecked(Settings::screen(), true);
 }
 

yakuake/src/session.cpp

@@ -323,7 +323,7 @@ void Session::split(TQWidget* active_terminal, Qt::Orientation o)
 
         terminal->widget()->show();
     }
-    // If the parent splitter of this terminal already has two tqchildren,
+    // If the parent splitter of this terminal already has two children,
     // add a new splitter to it and reparent the terminal to the new
     // splitter.
     else

yakuake/src/skin_list_item.cpp

@@ -30,8 +30,8 @@ SkinListItem::SkinListItem(KListView* parent, const TQString& fancy_name,
     setAuthor(author);
     setDir(dir);
 
-    TQString fancy_author = i18n("by %1").tqarg(author);
-    TQString text = TQString("<qt><b>%1</b><br>%2</qt>").tqarg(fancy_name).tqarg(fancy_author);
+    TQString fancy_author = i18n("by %1").arg(author);
+    TQString text = TQString("<qt><b>%1</b><br>%2</qt>").arg(fancy_name).arg(fancy_author);
 
     item_text = new TQSimpleRichText(text, listView()->font());
     item_text->adjustSize();

yakuake/src/skin_settings.cpp

@@ -52,7 +52,7 @@ SkinSettings::SkinSettings(TQWidget* parent, const char* name, bool translucency
     kcfg_skinbgcolor->setHidden(translucency);
 
     skinbgtqlayout->setEnabled(!translucency);
-    skinbgtqlayout->tqinvalidate();
+    skinbgtqlayout->invalidate();
 
     skins_list->header()->hide();
     skins_list->setSelectionModeExt(KListView::Single);
@@ -239,7 +239,7 @@ void SkinSettings::slotValidateSkinArchive(KIO::Job* job)
             failInstall(i18n("Unable to locate required files in the skin archive.\n\n The archive appears to be invalid."));
     }
     else
-        failInstall(i18n("Unable to list the skin archive contents.") + TQString("\n\n %1").tqarg(job->errorString()));
+        failInstall(i18n("Unable to list the skin archive contents.") + TQString("\n\n %1").arg(job->errorString()));
 }
 
 void SkinSettings::checkForExistingSkin()
@@ -347,7 +347,7 @@ void SkinSettings::slotRemoveSkin()
     if (!selected_item) return;
 
     int remove = KMessageBox::warningContinueCancel(0L,
-        i18n("Do you want to remove \"%1\" by %2?").tqarg(selected_item->text(0)).tqarg(selected_item->author()),
+        i18n("Do you want to remove \"%1\" by %2?").arg(selected_item->text(0)).arg(selected_item->author()),
         i18n("Remove Skin"),
         KStdGuiItem::del());
 

yakuake/src/tab_bar.cpp

@@ -180,10 +180,10 @@ void TabBar::reloadSkin(const TQString& skin)
     tabs_widget->move(tabs_position.x(), tabs_position.y());
     tabs_widget->resize(width() - 2 * tabs_position.x(), tabs_widget->height());
 
-    minus_button->tqrepaint();
-    plus_button->tqrepaint();
+    minus_button->repaint();
+    plus_button->repaint();
     tabs_widget->refreshBuffer();
-    tqrepaint();
+    repaint();
 }
 
 void TabBar::setPixmaps(const TQString& skin)

yakuake/src/tabbed_widget.cpp

@@ -381,7 +381,7 @@ void TabbedWidget::setBackgroundPixmap(const TQString & path)
     background_image.load(path);
     resize(width(), background_image.height());
 
-    tqrepaint();
+    repaint();
 }
 
 void TabbedWidget::setSeparatorPixmap(const TQString & path)
@@ -551,7 +551,7 @@ void TabbedWidget::refreshBuffer()
 
     painter.end();
 
-    tqrepaint();
+    repaint();
 }
 
 const int TabbedWidget::drawButton(int position, TQPainter& painter)

yakuake/src/title_bar.cpp

@@ -48,7 +48,7 @@ void TitleBar::setTitleText(const TQString& title)
         return;
 
     title_text = title;
-    tqrepaint();
+    repaint();
 }
 
 void TitleBar::setFocusButtonEnabled(bool enable)
@@ -122,7 +122,7 @@ void TitleBar::reloadSkin(const TQString& skin)
 
     updateWidgetMask();
 
-    tqrepaint();
+    repaint();
 }
 
 void TitleBar::setPixmaps(const TQString& skin)

yakuake/src/translucent_widget.cpp

@@ -40,5 +40,5 @@ void TranslucentWidget::slotUpdateBackground()
     // This is wired up to KApplication::backgroundChanged and needed
     // to kick KRootPixmap into updating the background again, which
     // it likes to forget after having been moved off-screen.
-    if (root_pixmap) root_pixmap->tqrepaint(true);
+    if (root_pixmap) root_pixmap->repaint(true);
 }