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

This reverts commit 7d739dcefd17edfd57af2072229178b456a31fbb.

14 files changed, 57 insertions, 57 deletions

diff --git a/yakuake/src/first_run_dialog_ui.ui b/yakuake/src/first_run_dialog_ui.ui
index 23d7af6..c50d852 100644
--- a/yakuake/src/first_run_dialog_ui.ui
+++ b/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="alignment">
+            <property name="tqalignment">
                 <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="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
@@ -78,7 +78,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>80</width>
                     <height>21</height>
@@ -103,7 +103,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>80</width>
                     <height>21</height>
@@ -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="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
@@ -131,7 +131,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>21</width>
                     <height>16</height>
@@ -148,7 +148,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>21</width>
                     <height>20</height>
diff --git a/yakuake/src/general_settings.cpp b/yakuake/src/general_settings.cpp
index 6ee3315..a1d1f03 100644
--- a/yakuake/src/general_settings.cpp
+++ b/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").arg(TQString::number(i)));
+        kcfg_screen->insertItem(i18n("Screen %1").tqarg(TQString::number(i)));
 
     if (TQApplication::desktop()->numScreens() > 1)
     {
diff --git a/yakuake/src/general_settings_ui.ui b/yakuake/src/general_settings_ui.ui
index 9913d89..2edc9cf 100644
--- a/yakuake/src/general_settings_ui.ui
+++ b/yakuake/src/general_settings_ui.ui
@@ -72,7 +72,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>16</width>
                             <height>20</height>
@@ -89,7 +89,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>16</width>
                             <height>20</height>
@@ -366,7 +366,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout10</cstring>
+                        <cstring>tqlayout10</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -428,7 +428,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout20</cstring>
+                        <cstring>tqlayout20</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -473,7 +473,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>210</width>
                                     <height>26</height>
@@ -494,7 +494,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>21</width>
                     <height>20</height>
diff --git a/yakuake/src/image_button.cpp b/yakuake/src/image_button.cpp
index ab364fb..c9b866d 100644
--- a/yakuake/src/image_button.cpp
+++ b/yakuake/src/image_button.cpp
@@ -55,7 +55,7 @@ void ImageButton::setToggled(bool enable)
         else
             pressed = false;
 
-        repaint();
+        tqrepaint();
     }
 }
 
@@ -98,7 +98,7 @@ void ImageButton::enterEvent(TQEvent*)
 {
     state = pressed ? 2 : 1;
 
-    repaint();
+    tqrepaint();
 }
 
 void ImageButton::leaveEvent(TQEvent*)
@@ -107,7 +107,7 @@ void ImageButton::leaveEvent(TQEvent*)
 
     if (popup_timer) popup_timer->stop();
 
-    repaint();
+    tqrepaint();
 }
 
 void ImageButton::mousePressEvent(TQMouseEvent*)
@@ -118,7 +118,7 @@ void ImageButton::mousePressEvent(TQMouseEvent*)
 
     if (popup_timer) popup_timer->stop();
 
-    repaint();
+    tqrepaint();
 
     if (popup_menu)
     {
@@ -142,7 +142,7 @@ void ImageButton::mouseReleaseEvent(TQMouseEvent*)
 
     if (popup_timer) popup_timer->stop();
 
-    repaint();
+    tqrepaint();
 
     if (toggle)
         emit toggled(pressed);
diff --git a/yakuake/src/main_window.cpp b/yakuake/src/main_window.cpp
index b301069..5253b54 100644
--- a/yakuake/src/main_window.cpp
+++ b/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").arg(i), 0, 0,
-            tab_selection_mapper, TQT_SLOT(map()), actionCollection(), TQString("go_to_tab_%1").arg(i).local8Bit());
+        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());
         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...").arg(global_key->shortcut("AccessKey").toString()));
+        showPopup(i18n("Application successfully started!\nPress %1 to use it...").tqarg(global_key->shortcut("AccessKey").toString()));
 
     // First run dialog.
     if (Settings::firstrun())
@@ -711,7 +711,7 @@ int MainWindow::getMouseScreen()
 
 TQRect MainWindow::getDesktopGeometry()
 {
-    /* Computes the desktop geometry. */
+    /* Computes the desktop tqgeometry. */
 
     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").arg(TQString::number(i)), i);
+        screen_menu->insertItem(i18n("Screen %1").tqarg(TQString::number(i)), i);
     screen_menu->setItemChecked(Settings::screen(), true);
 }
 
@@ -1232,7 +1232,7 @@ void MainWindow::slotOpenFirstRunDialog()
         connect(first_run_dialog, TQT_SIGNAL(hidden()), TQT_TQOBJECT(this), TQT_SLOT(slotDialogFinished()));
 
         FirstRunDialog* first_run_dialog_page = new FirstRunDialog(first_run_dialog);
-        first_run_dialog_page->setMinimumSize(first_run_dialog_page->sizeHint());
+        first_run_dialog_page->setMinimumSize(first_run_dialog_page->tqsizeHint());
         first_run_dialog_page->setShortcut(global_key->shortcut("AccessKey"));
 
         first_run_dialog->setMainWidget(first_run_dialog_page);
diff --git a/yakuake/src/main_window.h b/yakuake/src/main_window.h
index c2d02f3..4674347 100644
--- a/yakuake/src/main_window.h
+++ b/yakuake/src/main_window.h
@@ -23,7 +23,7 @@
 #include <tqmap.h>
 #include <tqcolor.h>
 #include <tqtimer.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqwidget.h>
 #include <tqapplication.h>
 #include <tqwidgetstack.h>
diff --git a/yakuake/src/session.cpp b/yakuake/src/session.cpp
index 4c70882..eb3c294 100644
--- a/yakuake/src/session.cpp
+++ b/yakuake/src/session.cpp
@@ -17,7 +17,7 @@
 #include "terminal_focus_watcher.h"
 
 #include <tqobjectlist.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqtimer.h>
 
 
@@ -56,10 +56,10 @@ void Session::slotFocusChanged()
 {
     if (checkFocusWidget())
     {
-        base_widget->setFocusProxy(base_widget->focusWidget());
-        active_terminal = base_widget->focusWidget();
-        int terminal_id = terminal_ids[base_widget->focusWidget()];
-        slotTitleChange(base_widget->focusWidget(),
+        base_widget->setFocusProxy(base_widget->tqfocusWidget());
+        active_terminal = base_widget->tqfocusWidget();
+        int terminal_id = terminal_ids[base_widget->tqfocusWidget()];
+        slotTitleChange(base_widget->tqfocusWidget(),
             terminals[terminal_id]->title());
     }
 }
@@ -67,7 +67,7 @@ void Session::slotFocusChanged()
 int Session::activeTerminalId()
 {
     if (checkFocusWidget())
-        return terminal_ids[base_widget->focusWidget()];
+        return terminal_ids[base_widget->tqfocusWidget()];
     else
         return -1;
 }
@@ -123,7 +123,7 @@ void Session::pasteClipboard()
 void Session::pasteClipboard(int terminal_id)
 {
     if (terminal_parts[terminal_id])
-        terminal_parts[terminal_id]->sendInput(TQApplication::clipboard()->text(TQClipboard::Clipboard));
+        terminal_parts[terminal_id]->sendInput(TQApplication::tqclipboard()->text(TQClipboard::Clipboard));
 }
 
 void Session::pasteSelection()
@@ -138,7 +138,7 @@ void Session::pasteSelection()
 void Session::pasteSelection(int terminal_id)
 {
     if (terminal_parts[terminal_id])
-        terminal_parts[terminal_id]->sendInput(TQApplication::clipboard()->text(TQClipboard::Selection));
+        terminal_parts[terminal_id]->sendInput(TQApplication::tqclipboard()->text(TQClipboard::Selection));
 }
 
 void Session::runCommand(const TQString& command)
@@ -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 children,
+    // If the parent splitter of this terminal already has two tqchildren,
     // add a new splitter to it and reparent the terminal to the new
     // splitter.
     else
@@ -403,7 +403,7 @@ void Session::slotLastTerminalClosed()
 
 void Session::slotTitleChange(TQWidget* w, const TQString& title)
 {
-    if (w == base_widget->focusWidget())
+    if (w == base_widget->tqfocusWidget())
     {
         session_title = title;
         emit titleChanged( session_title);
@@ -412,8 +412,8 @@ void Session::slotTitleChange(TQWidget* w, const TQString& title)
 
 bool Session::checkFocusWidget()
 {
-    if (base_widget->focusWidget()
-        && base_widget->focusWidget()->isA(TQCString("TEWidget")))
+    if (base_widget->tqfocusWidget()
+        && base_widget->tqfocusWidget()->isA(TQCString("TEWidget")))
     {
         return true;
     }
diff --git a/yakuake/src/skin_list_item.cpp b/yakuake/src/skin_list_item.cpp
index 7fadf5f..d6359dd 100644
--- a/yakuake/src/skin_list_item.cpp
+++ b/yakuake/src/skin_list_item.cpp
@@ -16,7 +16,7 @@
 #include <tqrect.h>
 #include <tqpainter.h>
 #include <tqpixmap.h>
-#include <palette.h>
+#include <tqpalette.h>
 
 #include <kglobalsettings.h>
 #include <klocale.h>
@@ -30,8 +30,8 @@ SkinListItem::SkinListItem(KListView* parent, const TQString& fancy_name,
     setAuthor(author);
     setDir(dir);
 
-    TQString fancy_author = i18n("by %1").arg(author);
-    TQString text = TQString("<qt><b>%1</b><br>%2</qt>").arg(fancy_name).arg(fancy_author);
+    TQString fancy_author = i18n("by %1").tqarg(author);
+    TQString text = TQString("<qt><b>%1</b><br>%2</qt>").tqarg(fancy_name).tqarg(fancy_author);
 
     item_text = new TQSimpleRichText(text, listView()->font());
     item_text->adjustSize();
diff --git a/yakuake/src/skin_settings.cpp b/yakuake/src/skin_settings.cpp
index 3296d6d..8bdb79d 100644
--- a/yakuake/src/skin_settings.cpp
+++ b/yakuake/src/skin_settings.cpp
@@ -18,7 +18,7 @@
 #include <tqurl.h>
 #include <tqheader.h>
 #include <tqpixmap.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqlabel.h>
 #include <tqfile.h>
@@ -51,8 +51,8 @@ SkinSettings::SkinSettings(TQWidget* parent, const char* name, bool translucency
     kcfg_skinbgcolor->setEnabled(!translucency);
     kcfg_skinbgcolor->setHidden(translucency);
 
-    skinbglayout->setEnabled(!translucency);
-    skinbglayout->invalidate();
+    skinbgtqlayout->setEnabled(!translucency);
+    skinbgtqlayout->tqinvalidate();
 
     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").arg(job->errorString()));
+        failInstall(i18n("Unable to list the skin archive contents.") + TQString("\n\n %1").tqarg(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?").arg(selected_item->text(0)).arg(selected_item->author()),
+        i18n("Do you want to remove \"%1\" by %2?").tqarg(selected_item->text(0)).tqarg(selected_item->author()),
         i18n("Remove Skin"),
         KStdGuiItem::del());
 
diff --git a/yakuake/src/skin_settings_ui.ui b/yakuake/src/skin_settings_ui.ui
index 3f29641..6df3c4c 100644
--- a/yakuake/src/skin_settings_ui.ui
+++ b/yakuake/src/skin_settings_ui.ui
@@ -45,7 +45,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>skinbglayout</cstring>
+                <cstring>skinbgtqlayout</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -86,7 +86,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>290</width>
                             <height>0</height>
diff --git a/yakuake/src/tab_bar.cpp b/yakuake/src/tab_bar.cpp
index bc31be4..6a2965f 100644
--- a/yakuake/src/tab_bar.cpp
+++ b/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->repaint();
-    plus_button->repaint();
+    minus_button->tqrepaint();
+    plus_button->tqrepaint();
     tabs_widget->refreshBuffer();
-    repaint();
+    tqrepaint();
 }
 
 void TabBar::setPixmaps(const TQString& skin)
diff --git a/yakuake/src/tabbed_widget.cpp b/yakuake/src/tabbed_widget.cpp
index c5c9b98..7ac982f 100644
--- a/yakuake/src/tabbed_widget.cpp
+++ b/yakuake/src/tabbed_widget.cpp
@@ -210,7 +210,7 @@ void TabbedWidget::interactiveRename(int position)
 
         inline_edit->setText(captions[position]);
         inline_edit->setGeometry(width, 0, areas[position], height());
-        inline_edit->setAlignment(TQt::AlignHCenter);
+        inline_edit->tqsetAlignment(TQt::AlignHCenter);
         inline_edit->setFrame(false);
         inline_edit->selectAll();
         inline_edit->setFocus();
@@ -381,7 +381,7 @@ void TabbedWidget::setBackgroundPixmap(const TQString & path)
     background_image.load(path);
     resize(width(), background_image.height());
 
-    repaint();
+    tqrepaint();
 }
 
 void TabbedWidget::setSeparatorPixmap(const TQString & path)
@@ -551,7 +551,7 @@ void TabbedWidget::refreshBuffer()
 
     painter.end();
 
-    repaint();
+    tqrepaint();
 }
 
 const int TabbedWidget::drawButton(int position, TQPainter& painter)
diff --git a/yakuake/src/title_bar.cpp b/yakuake/src/title_bar.cpp
index 35caed0..954f994 100644
--- a/yakuake/src/title_bar.cpp
+++ b/yakuake/src/title_bar.cpp
@@ -48,7 +48,7 @@ void TitleBar::setTitleText(const TQString& title)
         return;
 
     title_text = title;
-    repaint();
+    tqrepaint();
 }
 
 void TitleBar::setFocusButtonEnabled(bool enable)
@@ -122,7 +122,7 @@ void TitleBar::reloadSkin(const TQString& skin)
 
     updateWidgetMask();
 
-    repaint();
+    tqrepaint();
 }
 
 void TitleBar::setPixmaps(const TQString& skin)
diff --git a/yakuake/src/translucent_widget.cpp b/yakuake/src/translucent_widget.cpp
index 5a1f59a..3201e37 100644
--- a/yakuake/src/translucent_widget.cpp
+++ b/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->repaint(true);
+    if (root_pixmap) root_pixmap->tqrepaint(true);
 }