summaryrefslogtreecommitdiffstats
path: root/kcontrol/input/logitechmouse.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-03 20:16:47 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-03 20:16:47 +0000
commit495d08bc2db58ee7fc4ea55a7158f2f61b82fc56 (patch)
treedaabcb652c07b9a17cad88ca50b63a2d91ead4a3 /kcontrol/input/logitechmouse.cpp
parent50001f1757f97510e80cb1990e2f2d5b00144c2a (diff)
downloadtdebase-495d08bc2db58ee7fc4ea55a7158f2f61b82fc56.tar.gz
tdebase-495d08bc2db58ee7fc4ea55a7158f2f61b82fc56.zip
Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1211357 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kcontrol/input/logitechmouse.cpp')
-rw-r--r--kcontrol/input/logitechmouse.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/kcontrol/input/logitechmouse.cpp b/kcontrol/input/logitechmouse.cpp
index 9fc8daf32..ee0c31b06 100644
--- a/kcontrol/input/logitechmouse.cpp
+++ b/kcontrol/input/logitechmouse.cpp
@@ -86,7 +86,7 @@ LogitechMouse::LogitechMouse( struct usb_device *usbDev, int mouseCapabilityFlag
if ( mouseCapabilityFlags & HAS_CSR ) {
- initCordlessStatusReporting();
+ initCordlesstqStatusReporting();
// Do a name
cordlessNameLabel->setText( i18n("Mouse type: %1").arg( cordlessName() ) );
@@ -118,15 +118,15 @@ LogitechMouse::~LogitechMouse()
usb_close( m_usbDeviceHandle );
}
-void LogitechMouse::initCordlessStatusReporting()
+void LogitechMouse::initCordlesstqStatusReporting()
{
- updateCordlessStatus();
+ updateCordlesstqStatus();
doUpdate = new TQTimer( this ); // will be automatically deleted
connect( doUpdate, TQT_SIGNAL( timeout() ), this, TQT_SLOT( updateGUI() ) );
doUpdate->start( 20000 );
}
-void LogitechMouse::updateCordlessStatus()
+void LogitechMouse::updateCordlesstqStatus()
{
TQByteArray status(8);
@@ -147,7 +147,7 @@ void LogitechMouse::updateCordlessStatus()
} else {
// kdDebug() << "P6 (connect status): " << (status[0] & 0xFF) << endl;
if ( status[0] & 0x20 ) { // mouse is talking
- m_connectStatus = ( status[0] & 0x80 );
+ m_connecttqStatus = ( status[0] & 0x80 );
m_mousePowerup = ( status[0] & 0x40 );
m_receiverUnlock = ( status[0] & 0x10 );
m_waitLock = ( status[0] & 0x08 );
@@ -188,7 +188,7 @@ void LogitechMouse::updateCordlessStatus()
void LogitechMouse::updateGUI()
{
- updateCordlessStatus();
+ updateCordlesstqStatus();
batteryBar->setProgress( batteryLevel() );
@@ -229,7 +229,7 @@ void LogitechMouse::applyChanges()
KMessageBox::information(this, i18n("RF channel 2 has been set. Please press Connect button on mouse to re-establish link"), i18n("Press Connect Button") );
}
- initCordlessStatusReporting();
+ initCordlesstqStatusReporting();
}
}
@@ -238,7 +238,7 @@ void LogitechMouse::save(KConfig * /*config*/)
kdDebug() << "Logitech mouse settings not saved - not implemented yet" << endl;
}
-Q_UINT8 LogitechMouse::resolution()
+TQ_UINT8 LogitechMouse::resolution()
{
// kdDebug() << "resolution: " << m_resolution << endl;
if ( 0 == m_resolution ) {
@@ -299,13 +299,13 @@ void LogitechMouse::setLogitechTo400()
}
}
-Q_UINT8 LogitechMouse::batteryLevel()
+TQ_UINT8 LogitechMouse::batteryLevel()
{
return m_batteryLevel;
}
-Q_UINT8 LogitechMouse::channel()
+TQ_UINT8 LogitechMouse::channel()
{
return m_channel;
}