summaryrefslogtreecommitdiffstats
path: root/kcontrol/input
diff options
context:
space:
mode:
Diffstat (limited to 'kcontrol/input')
-rw-r--r--kcontrol/input/core/themepage.cpp2
-rw-r--r--kcontrol/input/kmousedlg.ui26
-rw-r--r--kcontrol/input/logitechmouse.cpp2
-rw-r--r--kcontrol/input/logitechmouse_base.ui2
-rw-r--r--kcontrol/input/mouse.cpp10
-rw-r--r--kcontrol/input/xcursor/previewwidget.cpp8
-rw-r--r--kcontrol/input/xcursor/themepage.cpp2
7 files changed, 26 insertions, 26 deletions
diff --git a/kcontrol/input/core/themepage.cpp b/kcontrol/input/core/themepage.cpp
index fb108e7c6..5001ff551 100644
--- a/kcontrol/input/core/themepage.cpp
+++ b/kcontrol/input/core/themepage.cpp
@@ -31,7 +31,7 @@
#include <klistview.h>
#include <kdialog.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqdir.h>
#include <tqpixmap.h>
#include <tqimage.h>
diff --git a/kcontrol/input/kmousedlg.ui b/kcontrol/input/kmousedlg.ui
index f3e14fc53..bd559b819 100644
--- a/kcontrol/input/kmousedlg.ui
+++ b/kcontrol/input/kmousedlg.ui
@@ -57,7 +57,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -74,7 +74,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -112,7 +112,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>150</width>
<height>115</height>
@@ -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>
@@ -208,7 +208,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>60</height>
@@ -235,7 +235,7 @@
<property name="name">
<cstring>slAutoSelect</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
@@ -258,7 +258,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>230</width>
<height>20</height>
@@ -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">
@@ -301,7 +301,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
@@ -331,7 +331,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -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.cpp b/kcontrol/input/logitechmouse.cpp
index 23defa614..df50ebc75 100644
--- a/kcontrol/input/logitechmouse.cpp
+++ b/kcontrol/input/logitechmouse.cpp
@@ -25,7 +25,7 @@
#include <tqradiobutton.h>
#include <tqbuttongroup.h>
#include <tqwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqprogressbar.h>
#include <tqtimer.h>
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..f8d8b461d 100644
--- a/kcontrol/input/mouse.cpp
+++ b/kcontrol/input/mouse.cpp
@@ -47,7 +47,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <tqlayout.h>
+#include <layout.h>
#include <tqcheckbox.h>
#undef Below
#undef Above
@@ -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()));
@@ -291,7 +291,7 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name)
TQBoxLayout *vbox = new TQVBoxLayout(mouse, KDialog::marginHint(),
KDialog::spacingHint());
- TQVBoxLayout *vvbox = new TQVBoxLayout(mouse->tqlayout(), KDialog::spacingHint());
+ TQVBoxLayout *vvbox = new TQVBoxLayout(mouse->layout(), KDialog::spacingHint());
mouseKeys = new TQCheckBox(i18n("&Move pointer with keyboard (using the num pad)"), mouse);
vvbox->addWidget(mouseKeys);
@@ -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 17bf227f4..ceb399648 100644
--- a/kcontrol/input/xcursor/previewwidget.cpp
+++ b/kcontrol/input/xcursor/previewwidget.cpp
@@ -286,7 +286,7 @@ PreviewWidget::~PreviewWidget()
void PreviewWidget::setTheme( const TQString &theme )
{
- tqsetUpdatesEnabled( false );
+ setUpdatesEnabled( false );
int minHeight = previewSize + 20; // Minimum height of the preview widget
int maxHeight = height(); // Tallest cursor height
@@ -302,8 +302,8 @@ void PreviewWidget::setTheme( const TQString &theme )
current = -1;
setFixedSize( ( maxWidth + cursorSpacing ) * numCursors, kMax( maxHeight, minHeight ) );
- tqsetUpdatesEnabled( true );
- tqrepaint( false );
+ setUpdatesEnabled( true );
+ repaint( false );
}
@@ -311,7 +311,7 @@ void PreviewWidget::paintEvent( TQPaintEvent * )
{
TQPixmap buffer( size() );
TQPainter p( &buffer );
- p.fillRect( rect(), tqcolorGroup().brush( TQColorGroup::Background ) );
+ p.fillRect( rect(), colorGroup().brush( TQColorGroup::Background ) );
Picture dest;
if ( !qt_has_xft || !qt_use_xrender ) {
diff --git a/kcontrol/input/xcursor/themepage.cpp b/kcontrol/input/xcursor/themepage.cpp
index 93221df17..9eccccc91 100644
--- a/kcontrol/input/xcursor/themepage.cpp
+++ b/kcontrol/input/xcursor/themepage.cpp
@@ -33,7 +33,7 @@
#include <kio/netaccess.h>
#include <ktar.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqdir.h>
#include <tqpixmap.h>
#include <tqimage.h>