Rename old tq methods that no longer need a unique name

6 files changed, 19 insertions, 19 deletions

diff --git a/yakuake/src/first_run_dialog_ui.ui b/yakuake/src/first_run_dialog_ui.ui
index c50d852..551a030 100644
--- a/yakuake/src/first_run_dialog_ui.ui
+++ b/yakuake/src/first_run_dialog_ui.ui
@@ -78,7 +78,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>80</width>
                     <height>21</height>
@@ -103,7 +103,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>80</width>
                     <height>21</height>
@@ -131,7 +131,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>21</width>
                     <height>16</height>
@@ -148,7 +148,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>21</width>
                     <height>20</height>
diff --git a/yakuake/src/general_settings_ui.ui b/yakuake/src/general_settings_ui.ui
index 2edc9cf..7239ded 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="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>16</width>
                             <height>20</height>
@@ -89,7 +89,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>16</width>
                             <height>20</height>
@@ -473,7 +473,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>210</width>
                                     <height>26</height>
@@ -494,7 +494,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>21</width>
                     <height>20</height>
diff --git a/yakuake/src/main_window.cpp b/yakuake/src/main_window.cpp
index 5253b54..5d25a3b 100644
--- a/yakuake/src/main_window.cpp
+++ b/yakuake/src/main_window.cpp
@@ -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->tqsizeHint());
+        first_run_dialog_page->setMinimumSize(first_run_dialog_page->sizeHint());
         first_run_dialog_page->setShortcut(global_key->shortcut("AccessKey"));
 
         first_run_dialog->setMainWidget(first_run_dialog_page);
diff --git a/yakuake/src/session.cpp b/yakuake/src/session.cpp
index eb3c294..23d2c91 100644
--- a/yakuake/src/session.cpp
+++ b/yakuake/src/session.cpp
@@ -56,10 +56,10 @@ void Session::slotFocusChanged()
 {
     if (checkFocusWidget())
     {
-        base_widget->setFocusProxy(base_widget->tqfocusWidget());
-        active_terminal = base_widget->tqfocusWidget();
-        int terminal_id = terminal_ids[base_widget->tqfocusWidget()];
-        slotTitleChange(base_widget->tqfocusWidget(),
+        base_widget->setFocusProxy(base_widget->focusWidget());
+        active_terminal = base_widget->focusWidget();
+        int terminal_id = terminal_ids[base_widget->focusWidget()];
+        slotTitleChange(base_widget->focusWidget(),
             terminals[terminal_id]->title());
     }
 }
@@ -67,7 +67,7 @@ void Session::slotFocusChanged()
 int Session::activeTerminalId()
 {
     if (checkFocusWidget())
-        return terminal_ids[base_widget->tqfocusWidget()];
+        return terminal_ids[base_widget->focusWidget()];
     else
         return -1;
 }
@@ -403,7 +403,7 @@ void Session::slotLastTerminalClosed()
 
 void Session::slotTitleChange(TQWidget* w, const TQString& title)
 {
-    if (w == base_widget->tqfocusWidget())
+    if (w == base_widget->focusWidget())
     {
         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->tqfocusWidget()
-        && base_widget->tqfocusWidget()->isA(TQCString("TEWidget")))
+    if (base_widget->focusWidget()
+        && base_widget->focusWidget()->isA(TQCString("TEWidget")))
     {
         return true;
     }
diff --git a/yakuake/src/skin_settings_ui.ui b/yakuake/src/skin_settings_ui.ui
index 6df3c4c..5c3b4d6 100644
--- a/yakuake/src/skin_settings_ui.ui
+++ b/yakuake/src/skin_settings_ui.ui
@@ -86,7 +86,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>290</width>
                             <height>0</height>
diff --git a/yakuake/src/tabbed_widget.cpp b/yakuake/src/tabbed_widget.cpp
index 7ac982f..e36bdc3 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->tqsetAlignment(TQt::AlignHCenter);
+        inline_edit->setAlignment(TQt::AlignHCenter);
         inline_edit->setFrame(false);
         inline_edit->selectAll();
         inline_edit->setFocus();