From 63a986d8c5f5e98aec58902f69b9fd2e83238638 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sat, 9 Jul 2011 02:23:29 +0000
Subject: [PATCH] Remove the tq in front of these incorrectly TQt4-converted
 methods/data members: tqrepaint[...] tqinvalidate[...] tqparent[...]
 tqmask[...] tqlayout[...] tqalignment[...]

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/yakuake@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 yakuake/src/first_run_dialog_ui.ui |  4 ++--
 yakuake/src/general_settings_ui.ui |  4 ++--
 yakuake/src/main_window.cpp        | 16 ++++++++--------
 yakuake/src/main_window.h          |  2 +-
 yakuake/src/session.cpp            |  2 +-
 yakuake/src/skin_settings_ui.ui    |  4 ++--
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/yakuake/src/first_run_dialog_ui.ui b/yakuake/src/first_run_dialog_ui.ui
index 853b7dc..c50d852 100644
--- a/yakuake/src/first_run_dialog_ui.ui
+++ b/yakuake/src/first_run_dialog_ui.ui
@@ -157,8 +157,8 @@
         </spacer>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kseparator.h</includehint>
     <includehint>kkeybutton.h</includehint>
diff --git a/yakuake/src/general_settings_ui.ui b/yakuake/src/general_settings_ui.ui
index 98bc216..2edc9cf 100644
--- a/yakuake/src/general_settings_ui.ui
+++ b/yakuake/src/general_settings_ui.ui
@@ -536,8 +536,8 @@
     <tabstop>kcfg_location</tabstop>
     <tabstop>kcfg_screen</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/yakuake/src/main_window.cpp b/yakuake/src/main_window.cpp
index 10e128e..b284dec 100644
--- a/yakuake/src/main_window.cpp
+++ b/yakuake/src/main_window.cpp
@@ -314,8 +314,8 @@ void MainWindow::updateWindowMask()
 {
     TQRegion tqmask = title_bar->getWidgetMask();
 
-    tqmask.translate(0, tqmask_height);
-    tqmask += TQRegion(0, 0, width(), tqmask_height);
+    tqmask.translate(0, mask_height);
+    tqmask += TQRegion(0, 0, width(), mask_height);
 
     setMask(tqmask);
 }
@@ -951,7 +951,7 @@ void MainWindow::slotIncreaseHeight()
 
     int steps = (Settings::steps() == 0) ? 1 : Settings::steps();
 
-    tqmask_height = (step++ * max_height) / steps;
+    mask_height = (step++ * max_height) / steps;
 
     if (step >= steps)
     {
@@ -959,7 +959,7 @@ void MainWindow::slotIncreaseHeight()
         timer.stop();
         disconnect(&timer, TQT_SIGNAL(timeout()), 0, 0);
 
-        tqmask_height = max_height;
+        mask_height = max_height;
 
         if (background_changed)
         {
@@ -971,7 +971,7 @@ void MainWindow::slotIncreaseHeight()
     }
 
     updateWindowMask();
-    title_bar->move(0, tqmask_height);
+    title_bar->move(0, mask_height);
 }
 
 void MainWindow::slotDecreaseHeight()
@@ -980,7 +980,7 @@ void MainWindow::slotDecreaseHeight()
 
     int steps = (Settings::steps() == 0) ? 1 : Settings::steps();
 
-    tqmask_height = (--step * max_height) / steps;
+    mask_height = (--step * max_height) / steps;
 
     if (step <= 0)
     {
@@ -995,7 +995,7 @@ void MainWindow::slotDecreaseHeight()
     }
 
     updateWindowMask();
-    title_bar->move(0, tqmask_height);
+    title_bar->move(0, mask_height);
 }
 
 void MainWindow::slotInitSkin()
@@ -1048,7 +1048,7 @@ void MainWindow::slotUpdateSize(int new_width, int new_height, int new_location)
     back_widget->setGeometry(0, 0, width(), height());
 
     // Update the window tqmask.
-    tqmask_height = (isVisible()) ? max_height : 0;
+    mask_height = (isVisible()) ? max_height : 0;
     updateWindowMask();
 }
 
diff --git a/yakuake/src/main_window.h b/yakuake/src/main_window.h
index 225fc0e..5483f5b 100644
--- a/yakuake/src/main_window.h
+++ b/yakuake/src/main_window.h
@@ -167,7 +167,7 @@ class MainWindow : public KMainWindow, virtual public DCOPInterface
 
         /* Maximum height value. */
         int max_height;
-        int tqmask_height;
+        int mask_height;
 
         /* Application border. */
         int margin;
diff --git a/yakuake/src/session.cpp b/yakuake/src/session.cpp
index 977fa54..2a2bb23 100644
--- a/yakuake/src/session.cpp
+++ b/yakuake/src/session.cpp
@@ -302,7 +302,7 @@ void Session::createInitialSplits(SessionType type)
 
 void Session::split(TQWidget* active_terminal, Qt::Orientation o)
 {
-    TerminalSplitter* splitter = static_cast<TerminalSplitter*>(active_terminal->tqparentWidget());
+    TerminalSplitter* splitter = static_cast<TerminalSplitter*>(active_terminal->parentWidget());
     if (!splitter) return;
 
     // If the tqparent splitter of this terminal has only this one child,
diff --git a/yakuake/src/skin_settings_ui.ui b/yakuake/src/skin_settings_ui.ui
index a75f46b..6df3c4c 100644
--- a/yakuake/src/skin_settings_ui.ui
+++ b/yakuake/src/skin_settings_ui.ui
@@ -115,8 +115,8 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>kcolorbutton.h</includehint>