diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 04:10:07 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 04:10:07 +0000 |
commit | fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf (patch) | |
tree | 9eda848e56fcb862fdfdf479adeccd95b6fe387a /kcontrol/input/logitechmouse.cpp | |
parent | 02f67d0e1355b79b1806746efb0f2f640e57f13d (diff) | |
download | tdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.tar.gz tdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.zip |
Revert automated changes
Sorry guys, they are just not ready for prime time
Work will continue as always
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kcontrol/input/logitechmouse.cpp')
-rw-r--r-- | kcontrol/input/logitechmouse.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/kcontrol/input/logitechmouse.cpp b/kcontrol/input/logitechmouse.cpp index ee0c31b06..9fc8daf32 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 ) { - initCordlesstqStatusReporting(); + initCordlessStatusReporting(); // Do a name cordlessNameLabel->setText( i18n("Mouse type: %1").arg( cordlessName() ) ); @@ -118,15 +118,15 @@ LogitechMouse::~LogitechMouse() usb_close( m_usbDeviceHandle ); } -void LogitechMouse::initCordlesstqStatusReporting() +void LogitechMouse::initCordlessStatusReporting() { - updateCordlesstqStatus(); + updateCordlessStatus(); doUpdate = new TQTimer( this ); // will be automatically deleted connect( doUpdate, TQT_SIGNAL( timeout() ), this, TQT_SLOT( updateGUI() ) ); doUpdate->start( 20000 ); } -void LogitechMouse::updateCordlesstqStatus() +void LogitechMouse::updateCordlessStatus() { TQByteArray status(8); @@ -147,7 +147,7 @@ void LogitechMouse::updateCordlesstqStatus() } else { // kdDebug() << "P6 (connect status): " << (status[0] & 0xFF) << endl; if ( status[0] & 0x20 ) { // mouse is talking - m_connecttqStatus = ( status[0] & 0x80 ); + m_connectStatus = ( status[0] & 0x80 ); m_mousePowerup = ( status[0] & 0x40 ); m_receiverUnlock = ( status[0] & 0x10 ); m_waitLock = ( status[0] & 0x08 ); @@ -188,7 +188,7 @@ void LogitechMouse::updateCordlesstqStatus() void LogitechMouse::updateGUI() { - updateCordlesstqStatus(); + updateCordlessStatus(); 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") ); } - initCordlesstqStatusReporting(); + initCordlessStatusReporting(); } } @@ -238,7 +238,7 @@ void LogitechMouse::save(KConfig * /*config*/) kdDebug() << "Logitech mouse settings not saved - not implemented yet" << endl; } -TQ_UINT8 LogitechMouse::resolution() +Q_UINT8 LogitechMouse::resolution() { // kdDebug() << "resolution: " << m_resolution << endl; if ( 0 == m_resolution ) { @@ -299,13 +299,13 @@ void LogitechMouse::setLogitechTo400() } } -TQ_UINT8 LogitechMouse::batteryLevel() +Q_UINT8 LogitechMouse::batteryLevel() { return m_batteryLevel; } -TQ_UINT8 LogitechMouse::channel() +Q_UINT8 LogitechMouse::channel() { return m_channel; } |