From fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 7 Jan 2011 04:10:07 +0000 Subject: 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 --- kcontrol/input/core/themepage.cpp | 8 +++--- kcontrol/input/kmousedlg.ui | 34 +++++++++++++------------- kcontrol/input/logitechmouse.cpp | 20 +++++++-------- kcontrol/input/logitechmouse.h | 28 ++++++++++----------- kcontrol/input/logitechmouse_base.ui | 6 ++--- kcontrol/input/mouse.cpp | 10 ++++---- kcontrol/input/mouse.desktop | 2 +- kcontrol/input/mouse.h | 2 +- kcontrol/input/xcursor/previewwidget.cpp | 8 +++--- kcontrol/input/xcursor/themepage.cpp | 42 ++++++++++++++++---------------- 10 files changed, 80 insertions(+), 80 deletions(-) (limited to 'kcontrol/input') diff --git a/kcontrol/input/core/themepage.cpp b/kcontrol/input/core/themepage.cpp index 90afbbdfd..a2b5f1b86 100644 --- a/kcontrol/input/core/themepage.cpp +++ b/kcontrol/input/core/themepage.cpp @@ -52,10 +52,10 @@ namespace { ThemePage::ThemePage( TQWidget* parent, const char* name ) : TQWidget( parent, name ) { - TQBoxLayout *tqlayout = new TQVBoxLayout( this ); - tqlayout->setAutoAdd( true ); - tqlayout->setMargin( KDialog::marginHint() ); - tqlayout->setSpacing( KDialog::spacingHint() ); + TQBoxLayout *layout = new TQVBoxLayout( this ); + layout->setAutoAdd( true ); + layout->setMargin( KDialog::marginHint() ); + layout->setSpacing( KDialog::spacingHint() ); new TQLabel( i18n("Select the cursor theme you want to use:"), this ); diff --git a/kcontrol/input/kmousedlg.ui b/kcontrol/input/kmousedlg.ui index 53353c3f6..01ba9966f 100644 --- a/kcontrol/input/kmousedlg.ui +++ b/kcontrol/input/kmousedlg.ui @@ -4,7 +4,7 @@ KMouseDlg - + 0 0 @@ -57,7 +57,7 @@ Expanding - + 20 20 @@ -74,7 +74,7 @@ Expanding - + 20 20 @@ -112,7 +112,7 @@ 0 - + 150 115 @@ -181,10 +181,10 @@ - cb_pointertqshape + cb_pointershape - Cha&nge pointer tqshape over icons + Cha&nge pointer shape over icons true @@ -208,7 +208,7 @@ Fixed - + 20 60 @@ -217,7 +217,7 @@ - tqlayout7 + layout7 @@ -235,7 +235,7 @@ slAutoSelect - + 250 0 @@ -258,7 +258,7 @@ Expanding - + 230 20 @@ -283,7 +283,7 @@ Long - + AlignVCenter|AlignRight @@ -301,7 +301,7 @@ Fixed - + 20 21 @@ -331,7 +331,7 @@ Expanding - + 20 16 @@ -344,7 +344,7 @@ singleClick toggled(bool) - cb_pointertqshape + cb_pointershape setEnabled(bool) @@ -364,7 +364,7 @@ rightHanded leftHanded singleClick - cb_pointertqshape + cb_pointershape cbAutoSelect slAutoSelect doubleClick @@ -373,6 +373,6 @@ kdialog.h - - + + 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; } diff --git a/kcontrol/input/logitechmouse.h b/kcontrol/input/logitechmouse.h index 20e7400c2..4ea296725 100644 --- a/kcontrol/input/logitechmouse.h +++ b/kcontrol/input/logitechmouse.h @@ -61,36 +61,36 @@ protected slots: void stopTimerForNow(); private: - void initCordlesstqStatusReporting(); - void updateCordlesstqStatus(); + void initCordlessStatusReporting(); + void updateCordlessStatus(); void setLogitechTo400(); void setLogitechTo800(); TQString cordlessName(); - TQ_UINT8 resolution(); + Q_UINT8 resolution(); void updateResolution(); - TQ_UINT8 batteryLevel(); - TQ_UINT8 channel(); + Q_UINT8 batteryLevel(); + Q_UINT8 channel(); bool isDualChannelCapable(); TQTimer *doUpdate; struct usb_dev_handle *m_usbDeviceHandle; - bool m_connecttqStatus; // true if the CONNECT button on the mouse is pressed + bool m_connectStatus; // true if the CONNECT button on the mouse is pressed bool m_mousePowerup; // true if we are doing "just out of the box" auto-locking bool m_receiverUnlock; // true if mouse has been disconnected by a long press // of the receiver's CONNECT button bool m_waitLock; // true if receiver searching for new mouse because the // CONNECT button on the receiver was pressed - TQ_UINT8 m_batteryLevel; - TQ_UINT8 m_channel; - TQ_UINT8 m_cordlessNameIndex; // this gets convered into a TQString in cordlessName() - TQ_UINT16 m_cordlessSecurity; - TQ_UINT16 m_useSecondChannel; - TQ_UINT8 m_caseShape; - TQ_UINT8 m_numberOfButtons; - TQ_UINT8 m_resolution; + Q_UINT8 m_batteryLevel; + Q_UINT8 m_channel; + Q_UINT8 m_cordlessNameIndex; // this gets convered into a TQString in cordlessName() + Q_UINT16 m_cordlessSecurity; + Q_UINT16 m_useSecondChannel; + Q_UINT8 m_caseShape; + Q_UINT8 m_numberOfButtons; + Q_UINT8 m_resolution; bool m_twoChannelCapable; // true if the mouse supports dual channels bool m_verticalRoller; // true if the mouse has a vertical roller (wheel) bool m_horizontalRoller; // true if the mouse has a horizontal roller (wheel) diff --git a/kcontrol/input/logitechmouse_base.ui b/kcontrol/input/logitechmouse_base.ui index 3b12782dc..5c9c1cd9a 100644 --- a/kcontrol/input/logitechmouse_base.ui +++ b/kcontrol/input/logitechmouse_base.ui @@ -4,7 +4,7 @@ LogitechMouseBase - + 0 0 @@ -31,7 +31,7 @@ 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. - + WordBreak|AlignVCenter @@ -149,5 +149,5 @@ - + diff --git a/kcontrol/input/mouse.cpp b/kcontrol/input/mouse.cpp index 1b64dbb9c..68f376474 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())); @@ -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(); @@ -723,7 +723,7 @@ void MouseConfig::slotWheelScrollLinesChanged(int value) void MouseSettings::apply(bool force) { XChangePointerControl( kapp->getDisplay(), - true, true, int(tqRound(accelRate*10)), 10, thresholdMove); + true, true, int(qRound(accelRate*10)), 10, thresholdMove); // 256 might seems extreme, but X has already been known to return 32, // and we don't want to truncate things. Xlib limits the table to 256 bytes, diff --git a/kcontrol/input/mouse.desktop b/kcontrol/input/mouse.desktop index 8560e6453..fe0f30281 100644 --- a/kcontrol/input/mouse.desktop +++ b/kcontrol/input/mouse.desktop @@ -214,7 +214,7 @@ Keywords[ne]=माउस, माउस गतिवर्धन, माउस Keywords[nl]=muis,muissnelheid,muisknoppen,selectie,cursor-uiterlijk,input devices,invoerapparaten,knopindeling,klikken,iconen,pictogrammen,icons,aanwijzers,pointers,drag,verslepen,dubbelklikken,linkshandig,rechtshandig.randapparaten Keywords[nn]=mus,musakselerasjon,musterskel,musknappar,val,peikar,peikarform,inneiningar,knappar,klikk,ikon,tilbakemelding,dra,dobbeltklikk,høgrehendt,venstrehendt Keywords[nso]=Legotlo,Koketso ya legotlo,Threshold ya legotlo,Ditobetswa tsa legotlo, Kgetho,Sebopego sa Cursor,Maano a Tsenyo,Mapping Setobetswa,Tobetsa, diemedi,phetolo,Disupi,Topa,Tobetsopedi,mapping,swerwe ka lagoja,swerwe ka lanngele -Keywords[pa]=ਮਾਊਸ,ਮਾਊਸ ਪ੍ਰਵੇਸ਼,ਮਾਊਸ threshold,ਮਾਊਸ buttons,Selection,tqCursorShape,Input ਜੰਤਰ,Button Mapping,Click,icons,feedback,Pointers,Drag,DoubleClick,mapping,righthanded,left handed,ਕਲਿੱਕ,ਆਈਕਾਨ +Keywords[pa]=ਮਾਊਸ,ਮਾਊਸ ਪ੍ਰਵੇਸ਼,ਮਾਊਸ threshold,ਮਾਊਸ buttons,Selection,CursorShape,Input ਜੰਤਰ,Button Mapping,Click,icons,feedback,Pointers,Drag,DoubleClick,mapping,righthanded,left handed,ਕਲਿੱਕ,ਆਈਕਾਨ Keywords[pl]=Mysz,Akceleracja myszy,Próg myszy,Przyciski myszy,Zaznaczenie,Kształt kursora,Urządzenia wejściowe,mapowanie przycisków,kliknięcie,ikony,widoczne efekty,wskaźniki,przeciąganie,podwójne kliknięcie,mapowanie,praworęczny,leworęczny Keywords[pt]=rato,aceleração do rato,limite do rato,botões do rato,selecção,forma do cursor,dispositivos de entrada,atribuição de botões,click,ícones,feedback,cursores,arrastar,duplo 'click',atribuição,destro,esquerdino Keywords[pt_BR]=Mouse,aceleração do mouse,limiar do mouse, botões do mouse,Seleção,Formato do Cursor,Dispositivos de entrada,mapeamento de botões,clique,ícones,retorno,ponteiros,arrastar,clique duplo,mapeamento,destro,canhoto diff --git a/kcontrol/input/mouse.h b/kcontrol/input/mouse.h index 8d6bba1df..bee04d5ea 100644 --- a/kcontrol/input/mouse.h +++ b/kcontrol/input/mouse.h @@ -84,7 +84,7 @@ public: bool reverseScrollPolarity; #ifdef HAVE_LIBUSB - // TODO: In Qt4, tqreplace with a better container. + // TODO: In Qt4, replace with a better container. TQPtrList logitechMouseList; #endif }; diff --git a/kcontrol/input/xcursor/previewwidget.cpp b/kcontrol/input/xcursor/previewwidget.cpp index a7a35687c..ceb399648 100644 --- a/kcontrol/input/xcursor/previewwidget.cpp +++ b/kcontrol/input/xcursor/previewwidget.cpp @@ -68,8 +68,8 @@ namespace { "center_ptr", "circle", "dot", - "dot_box_tqmask", - "dot_box_tqmask", + "dot_box_mask", + "dot_box_mask", "double_arrow", "draped_box", "left_side", @@ -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 ); } @@ -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 38d41fff1..7caf18c3f 100644 --- a/kcontrol/input/xcursor/themepage.cpp +++ b/kcontrol/input/xcursor/themepage.cpp @@ -83,10 +83,10 @@ static TQString defaultThemeDescription( const TQString& theme ) ThemePage::ThemePage( TQWidget* parent, const char* name ) : TQWidget( parent, name ), selectedTheme( NULL ), currentTheme( NULL ) { - TQBoxLayout *tqlayout = new TQVBoxLayout( this ); - tqlayout->setAutoAdd( true ); - tqlayout->setMargin( KDialog::marginHint() ); - tqlayout->setSpacing( KDialog::spacingHint() ); + TQBoxLayout *layout = new TQVBoxLayout( this ); + layout->setAutoAdd( true ); + layout->setMargin( KDialog::marginHint() ); + layout->setSpacing( KDialog::spacingHint() ); new TQLabel( i18n("Select the cursor theme you want to use (hover preview to test cursor):"), this ); @@ -122,7 +122,7 @@ ThemePage::ThemePage( TQWidget* parent, const char* name ) ( !icons.exists() && !TQFileInfo( TQDir::homeDirPath() ).isWritable() ) ) installButton->setEnabled( false ); - if ( !themeDirs.tqcontains( path ) ) + if ( !themeDirs.contains( path ) ) installButton->setEnabled( false ); selectionChanged( listview->currentItem() ); @@ -305,17 +305,17 @@ bool ThemePage::installThemes( const TQString &file ) // Check if a theme with that name already exists if ( TQDir( destDir ).exists( *it ) ) { const TQString question = i18n( "A theme named %1 already exists in your icon " - "theme folder. Do you want tqreplace it with this one?" ).arg( *it ); + "theme folder. Do you want replace it with this one?" ).arg( *it ); int answer = KMessageBox::warningContinueCancel( this, question, i18n( "Overwrite Theme?"), i18n("Replace") ); if ( answer != KMessageBox::Continue ) continue; - // ### If the theme that's being tqreplaced is the current theme, it + // ### If the theme that's being replaced is the current theme, it // will cause cursor inconsistencies in newly started apps. } // ### Should we check if a theme with the same name exists in a global theme dir? - // If that's the case it will effectively tqreplace it, even though the global theme + // If that's the case it will effectively replace it, even though the global theme // won't be deleted. Checking for this situation is easy, since the global theme // will be in the listview. Maybe this should never be allowed since it might // result in strange side effects (from the average users point of view). OTOH @@ -395,7 +395,7 @@ const TQStringList ThemePage::getThemeBaseDirs() const TQString path = XcursorLibraryPath(); #endif // Expand all occurences of ~ to the home dir - path.tqreplace( "~/", TQDir::homeDirPath() + '/' ); + path.replace( "~/", TQDir::homeDirPath() + '/' ); return TQStringList::split( ':', path ); } @@ -414,7 +414,7 @@ bool ThemePage::isCursorTheme( const TQString &theme, const int depth ) const continue; const TQStringList subdirs( dir.entryList( TQDir::Dirs ) ); - if ( subdirs.tqcontains( theme ) ) + if ( subdirs.contains( theme ) ) { const TQString path = *it + '/' + theme; const TQString indexfile = path + "/index.theme"; @@ -453,7 +453,7 @@ bool ThemePage::isCursorTheme( const TQString &theme, const int depth ) const void ThemePage::insertThemes() { // Scan each base dir for cursor themes and add them to the listview. - // An icon theme is considered to be a cursor theme if it tqcontains + // An icon theme is considered to be a cursor theme if it contains // a cursors subdirectory or if it inherits a cursor theme. for ( TQStringList::ConstIterator it = themeDirs.begin(); it != themeDirs.end(); ++it ) { @@ -585,7 +585,7 @@ TQPixmap ThemePage::createIcon( const TQString &theme, const TQString &sample ) image.setAlphaBuffer( true ); // Clear the image - TQ_UINT32 *dst = reinterpret_cast( image.bits() ); + Q_UINT32 *dst = reinterpret_cast( image.bits() ); for ( int i = 0; i < image.width() * image.height(); i++ ) dst[i] = 0; @@ -593,26 +593,26 @@ TQPixmap ThemePage::createIcon( const TQString &theme, const TQString &sample ) TQPoint dstOffset( (image.width() - r.width()) / 2, (image.height() - r.height()) / 2 ); TQPoint srcOffset( r.topLeft() ); - dst = reinterpret_cast( image.scanLine(dstOffset.y()) ) + dstOffset.x(); - src = reinterpret_cast( xcur->pixels ) + srcOffset.y() * xcur->width + srcOffset.x(); + dst = reinterpret_cast( image.scanLine(dstOffset.y()) ) + dstOffset.x(); + src = reinterpret_cast( xcur->pixels ) + srcOffset.y() * xcur->width + srcOffset.x(); // Copy the XcursorImage into the TQImage, converting it from premultiplied // to non-premultiplied alpha and cropping it if needed. for ( int y = 0; y < r.height(); y++ ) { for ( int x = 0; x < r.width(); x++, dst++, src++ ) { - const TQ_UINT32 pixel = *src; + const Q_UINT32 pixel = *src; - const TQ_UINT8 a = tqAlpha( pixel ); - const TQ_UINT8 r = tqRed( pixel ); - const TQ_UINT8 g = tqGreen( pixel ); - const TQ_UINT8 b = tqBlue( pixel ); + const Q_UINT8 a = qAlpha( pixel ); + const Q_UINT8 r = qRed( pixel ); + const Q_UINT8 g = qGreen( pixel ); + const Q_UINT8 b = qBlue( pixel ); if ( !a || a == 255 ) { *dst = pixel; } else { float alpha = a / 255.0; - *dst = tqRgba( int(r / alpha), int(g / alpha), int(b / alpha), a ); + *dst = qRgba( int(r / alpha), int(g / alpha), int(b / alpha), a ); } } dst += ( image.width() - r.width() ); @@ -630,7 +630,7 @@ TQPixmap ThemePage::createIcon( const TQString &theme, const TQString &sample ) TQImage image( iconSize, iconSize, 32 ); image.setAlphaBuffer( true ); - TQ_UINT32 *data = reinterpret_cast< TQ_UINT32* >( image.bits() ); + Q_UINT32 *data = reinterpret_cast< Q_UINT32* >( image.bits() ); for ( int i = 0; i < image.width() * image.height(); i++ ) data[ i ] = 0; -- cgit v1.2.1