From a5b44fbe44e58478ad74d819c5f4c36926d31872 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Mon, 19 Dec 2011 11:53:50 -0600
Subject: Remove additional unneeded tq method conversions (cherry picked from
 commit f64397c82fa94371ab4a64af28c4d0029f4cd93f)

---
 kcontrol/input/kmousedlg.ui              | 10 +++++-----
 kcontrol/input/logitechmouse_base.ui     |  2 +-
 kcontrol/input/mouse.cpp                 |  6 +++---
 kcontrol/input/xcursor/previewwidget.cpp |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'kcontrol/input')

diff --git a/kcontrol/input/kmousedlg.ui b/kcontrol/input/kmousedlg.ui
index 5dfcedb46..bd559b819 100644
--- a/kcontrol/input/kmousedlg.ui
+++ b/kcontrol/input/kmousedlg.ui
@@ -181,10 +181,10 @@
                 </widget>
                 <widget class="TQCheckBox" row="2" column="1" rowspan="1" colspan="2">
                     <property name="name">
-                        <cstring>cb_pointertqshape</cstring>
+                        <cstring>cb_pointershape</cstring>
                     </property>
                     <property name="text">
-                        <string>Cha&amp;nge pointer tqshape over icons</string>
+                        <string>Cha&amp;nge pointer shape over icons</string>
                     </property>
                     <property name="checked">
                         <bool>true</bool>
@@ -283,7 +283,7 @@
                             <property name="text">
                                 <string>Long</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="hAlign" stdset="0">
@@ -344,7 +344,7 @@
     <connection>
         <sender>singleClick</sender>
         <signal>toggled(bool)</signal>
-        <receiver>cb_pointertqshape</receiver>
+        <receiver>cb_pointershape</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
@@ -364,7 +364,7 @@
     <tabstop>rightHanded</tabstop>
     <tabstop>leftHanded</tabstop>
     <tabstop>singleClick</tabstop>
-    <tabstop>cb_pointertqshape</tabstop>
+    <tabstop>cb_pointershape</tabstop>
     <tabstop>cbAutoSelect</tabstop>
     <tabstop>slAutoSelect</tabstop>
     <tabstop>doubleClick</tabstop>
diff --git a/kcontrol/input/logitechmouse_base.ui b/kcontrol/input/logitechmouse_base.ui
index acee892a0..8d8a6cf65 100644
--- a/kcontrol/input/logitechmouse_base.ui
+++ b/kcontrol/input/logitechmouse_base.ui
@@ -31,7 +31,7 @@
             <property name="text">
                 <string>You have a Logitech Mouse connected, and libusb was found at compile time, but it was not possible to access this mouse. This is probably caused by a permissions problem - you should consult the manual on how to fix this.</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
diff --git a/kcontrol/input/mouse.cpp b/kcontrol/input/mouse.cpp
index 1b64dbb9c..ccd4a0536 100644
--- a/kcontrol/input/mouse.cpp
+++ b/kcontrol/input/mouse.cpp
@@ -150,7 +150,7 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name)
     connect(tab1->slAutoSelect, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
     connect(tab1->cbVisualActivate, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
 
-    connect(tab1->cb_pointertqshape, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+    connect(tab1->cb_pointershape, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
 
     connect(tab1->singleClick, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
     connect(tab1->singleClick, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClick()));
@@ -506,7 +506,7 @@ void MouseConfig::load( bool useDefaults )
 
   tab1->singleClick->setChecked( settings->singleClick );
   tab1->doubleClick->setChecked(!settings->singleClick);
-  tab1->cb_pointertqshape->setChecked(settings->changeCursor);
+  tab1->cb_pointershape->setChecked(settings->changeCursor);
   tab1->cbAutoSelect->setChecked( settings->autoSelectDelay >= 0 );
   if ( settings->autoSelectDelay < 0 )
      tab1->slAutoSelect->setValue( 0 );
@@ -564,7 +564,7 @@ void MouseConfig::save()
   settings->autoSelectDelay = tab1->cbAutoSelect->isChecked()? tab1->slAutoSelect->value():-1;
   settings->visualActivate = tab1->cbVisualActivate->isChecked();
 //  settings->changeCursor = tab1->singleClick->isChecked();
-  settings->changeCursor = tab1->cb_pointertqshape->isChecked();
+  settings->changeCursor = tab1->cb_pointershape->isChecked();
   settings->reverseScrollPolarity = tab1->cbScrollPolarity->isChecked();
 
   settings->apply();
diff --git a/kcontrol/input/xcursor/previewwidget.cpp b/kcontrol/input/xcursor/previewwidget.cpp
index c4b1ec6b0..ceb399648 100644
--- a/kcontrol/input/xcursor/previewwidget.cpp
+++ b/kcontrol/input/xcursor/previewwidget.cpp
@@ -303,7 +303,7 @@ void PreviewWidget::setTheme( const TQString &theme )
 	current = -1;
 	setFixedSize( ( maxWidth + cursorSpacing ) * numCursors, kMax( maxHeight, minHeight ) );
 	setUpdatesEnabled( true );
-	tqrepaint( false );
+	repaint( false );
 }
 
 
-- 
cgit v1.2.1