From f59dfa08651a47f21d004e8e4cb5020b8035287e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:59:25 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 83fbc82a101309e171089f0d5ed080f82a367345. --- kmix/mdwslider.cpp | 104 ++++++++++++++++++++++++++--------------------------- 1 file changed, 52 insertions(+), 52 deletions(-) (limited to 'kmix/mdwslider.cpp') diff --git a/kmix/mdwslider.cpp b/kmix/mdwslider.cpp index 9e6fe11e..8d363c5e 100644 --- a/kmix/mdwslider.cpp +++ b/kmix/mdwslider.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include @@ -81,11 +81,11 @@ MDWSlider::MDWSlider(Mixer *mixer, MixDevice* md, // create widgets createWidgets( showMuteLED, showRecordLED ); - m_keys->insert( "Increase volume", i18n( "Increase Volume of '%1'" ).arg(m_mixdevice->name().utf8().data()), TQString(), + m_keys->insert( "Increase volume", i18n( "Increase Volume of '%1'" ).tqarg(m_mixdevice->name().utf8().data()), TQString(), KShortcut(), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( increaseVolume() ) ); - m_keys->insert( "Decrease volume", i18n( "Decrease Volume of '%1'" ).arg(m_mixdevice->name().utf8().data()), TQString(), + m_keys->insert( "Decrease volume", i18n( "Decrease Volume of '%1'" ).tqarg(m_mixdevice->name().utf8().data()), TQString(), KShortcut(), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( decreaseVolume() ) ); - m_keys->insert( "Toggle mute", i18n( "Toggle Mute of '%1'" ).arg(m_mixdevice->name().utf8().data()), TQString(), + m_keys->insert( "Toggle mute", i18n( "Toggle Mute of '%1'" ).tqarg(m_mixdevice->name().utf8().data()), TQString(), KShortcut(), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( toggleMuted() ) ); installEventFilter( this ); // filter for popup @@ -115,25 +115,25 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) { if ( _orientation == Qt::Vertical ) { _layout = new TQVBoxLayout( this ); - _layout->setAlignment(TQt::AlignCenter); + _layout->tqsetAlignment(TQt::AlignCenter); } else { _layout = new TQHBoxLayout( this ); - _layout->setAlignment(TQt::AlignCenter); + _layout->tqsetAlignment(TQt::AlignCenter); } // -- MAIN SLIDERS LAYOUT --- TQBoxLayout *slidersLayout; if ( _orientation == Qt::Vertical ) { slidersLayout = new TQHBoxLayout( _layout ); - slidersLayout->setAlignment(TQt::AlignVCenter); + slidersLayout->tqsetAlignment(TQt::AlignVCenter); } else { slidersLayout = new TQVBoxLayout( _layout ); - slidersLayout->setAlignment(TQt::AlignHCenter); + slidersLayout->tqsetAlignment(TQt::AlignHCenter); } - /* cesken: This is inconsistent. Why should vertical and horizontal layout differ? + /* cesken: This is inconsistent. Why should vertical and horizontal tqlayout differ? * Also it eats too much space - especially when you don't show sliders at all. * Even more on the vertical panel applet (see Bug #97667) if ( _orientation == Qt::Horizontal ) @@ -145,11 +145,11 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) TQBoxLayout *labelLayout; if ( _orientation == Qt::Vertical ) { labelLayout = new TQVBoxLayout( slidersLayout ); - labelLayout->setAlignment(TQt::AlignHCenter); + labelLayout->tqsetAlignment(TQt::AlignHCenter); } else { labelLayout = new TQHBoxLayout( slidersLayout ); - labelLayout->setAlignment(TQt::AlignVCenter); + labelLayout->tqsetAlignment(TQt::AlignVCenter); } if ( _orientation == Qt::Vertical ) { m_label = new VerticalText( this, m_mixdevice->name().utf8().data() ); @@ -183,22 +183,22 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) TQBoxLayout *sliLayout; if ( _orientation == Qt::Vertical ) { sliLayout = new TQVBoxLayout( slidersLayout ); - sliLayout->setAlignment(TQt::AlignHCenter); + sliLayout->tqsetAlignment(TQt::AlignHCenter); } else { sliLayout = new TQHBoxLayout( slidersLayout ); - sliLayout->setAlignment(TQt::AlignVCenter); + sliLayout->tqsetAlignment(TQt::AlignVCenter); } // --- ICON ---------------------------- TQBoxLayout *iconLayout; if ( _orientation == Qt::Vertical ) { iconLayout = new TQHBoxLayout( sliLayout ); - iconLayout->setAlignment(TQt::AlignVCenter); + iconLayout->tqsetAlignment(TQt::AlignVCenter); } else { iconLayout = new TQVBoxLayout( sliLayout ); - iconLayout->setAlignment(TQt::AlignHCenter); + iconLayout->tqsetAlignment(TQt::AlignHCenter); } m_iconLabel = 0L; @@ -213,36 +213,36 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) // --- MUTE LED if ( showMuteLED ) { - TQBoxLayout *ledlayout; + TQBoxLayout *ledtqlayout; if ( _orientation == Qt::Vertical ) { - ledlayout = new TQHBoxLayout( sliLayout ); - ledlayout->setAlignment(TQt::AlignVCenter); + ledtqlayout = new TQHBoxLayout( sliLayout ); + ledtqlayout->tqsetAlignment(TQt::AlignVCenter); } else { - ledlayout = new TQVBoxLayout( sliLayout ); - ledlayout->setAlignment(TQt::AlignHCenter); + ledtqlayout = new TQVBoxLayout( sliLayout ); + ledtqlayout->tqsetAlignment(TQt::AlignHCenter); } if( m_mixdevice->hasMute() ) { - ledlayout->addStretch(); + ledtqlayout->addStretch(); // create mute LED m_muteLED = new KLedButton( TQt::green, KLed::On, KLed::Sunken, KLed::Circular, this, "MuteLED" ); m_muteLED->setFixedSize( TQSize(16, 16) ); m_muteLED->resize( TQSize(16, 16) ); - ledlayout->addWidget( m_muteLED ); + ledtqlayout->addWidget( m_muteLED ); TQToolTip::add( m_muteLED, i18n( "Mute" ) ); connect( m_muteLED, TQT_SIGNAL(stateChanged(bool)), this, TQT_SLOT(toggleMuted()) ); m_muteLED->installEventFilter( this ); - ledlayout->addStretch(); + ledtqlayout->addStretch(); } // has Mute LED else { // we don't have a MUTE LED. We create a dummy widget // !! possibly not neccesary any more (we are layouted) TQWidget *qw = new TQWidget(this, "Spacer"); qw->setFixedSize( TQSize(16, 16) ); - ledlayout->addWidget(qw); + ledtqlayout->addWidget(qw); qw->installEventFilter( this ); } // has no Mute LED @@ -253,11 +253,11 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) TQBoxLayout *volLayout; if ( _orientation == Qt::Vertical ) { volLayout = new TQHBoxLayout( sliLayout ); - volLayout->setAlignment(TQt::AlignVCenter); + volLayout->tqsetAlignment(TQt::AlignVCenter); } else { volLayout = new TQVBoxLayout( sliLayout ); - volLayout->setAlignment(TQt::AlignHCenter); + volLayout->tqsetAlignment(TQt::AlignHCenter); } // Sliders and volume number indication @@ -273,11 +273,11 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) if ( _orientation == Qt::Vertical ) { slinumLayout = new TQVBoxLayout( volLayout ); - slinumLayout->setAlignment(TQt::AlignHCenter); + slinumLayout->tqsetAlignment(TQt::AlignHCenter); } else { slinumLayout = new TQHBoxLayout( volLayout ); - slinumLayout->setAlignment(TQt::AlignVCenter); + slinumLayout->tqsetAlignment(TQt::AlignVCenter); } // create labels to hold volume values (taken from qamix/kamix) @@ -285,7 +285,7 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) slinumLayout->addWidget( number ); number->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); number->setLineWidth( 2 ); - number->setMinimumWidth( number->sizeHint().width() ); + number->setMinimumWidth( number->tqsizeHint().width() ); number->setPaletteBackgroundColor( TQColor(190, 250, 190) ); // don't show the value by default number->hide(); @@ -302,7 +302,7 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) slider = new TQSlider( 0, maxvol, maxvol/10, maxvol - m_mixdevice->getVolume( chid ), _orientation, this, m_mixdevice->name().ascii() ); - slider->setMinimumSize( slider->sizeHint() ); + slider->setMinimumSize( slider->tqsizeHint() ); } slider->setBackgroundOrigin(AncestorOrigin); @@ -314,7 +314,7 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) slider->hide(); number->hide(); } - slinumLayout->addWidget( slider ); // add to layout + slinumLayout->addWidget( slider ); // add to tqlayout m_sliders.append ( slider ); // add to list _slidersChids.append(chid); // Remember slider-chid association connect( slider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(volumeChange(int)) ); @@ -327,27 +327,27 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) sliLayout->addSpacing( 5 ); // --- LED LAYOUT TO CENTER --- - TQBoxLayout *reclayout; + TQBoxLayout *rectqlayout; if ( _orientation == Qt::Vertical ) { - reclayout = new TQHBoxLayout( sliLayout ); - reclayout->setAlignment(TQt::AlignVCenter); + rectqlayout = new TQHBoxLayout( sliLayout ); + rectqlayout->tqsetAlignment(TQt::AlignVCenter); } else { - reclayout = new TQVBoxLayout( sliLayout ); - reclayout->setAlignment(TQt::AlignHCenter); + rectqlayout = new TQVBoxLayout( sliLayout ); + rectqlayout->tqsetAlignment(TQt::AlignHCenter); } if( m_mixdevice->isRecordable() ) { - reclayout->addStretch(); + rectqlayout->addStretch(); m_recordLED = new KLedButton( TQt::red, m_mixdevice->isRecSource()?KLed::On:KLed::Off, KLed::Sunken, KLed::Circular, this, "RecordLED" ); m_recordLED->setFixedSize( TQSize(16, 16) ); - reclayout->addWidget( m_recordLED ); + rectqlayout->addWidget( m_recordLED ); connect(m_recordLED, TQT_SIGNAL(stateChanged(bool)), this, TQT_SLOT(setRecsrc(bool))); m_recordLED->installEventFilter( this ); TQToolTip::add( m_recordLED, i18n( "Record" ) ); - reclayout->addStretch(); + rectqlayout->addStretch(); } else { @@ -355,12 +355,12 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) // !! possibly not neccesary any more (we are layouted) TQWidget *qw = new TQWidget(this, "Spacer"); qw->setFixedSize( TQSize(16, 16) ); - reclayout->addWidget(qw); + rectqlayout->addWidget(qw); qw->installEventFilter( this ); } // has no Record LED } // showRecordLED - layout()->activate(); + tqlayout()->activate(); } @@ -432,13 +432,13 @@ MDWSlider::setIcon( int icontype ) m_iconLabel->resize( 10, 10 ); } else m_iconLabel->setPixmap( miniDevPM ); - m_iconLabel->setAlignment( TQt::AlignCenter ); + m_iconLabel->tqsetAlignment( TQt::AlignCenter ); } else { kdError(67100) << "Pixmap missing." << endl; } - layout()->activate(); + tqlayout()->activate(); } bool @@ -514,7 +514,7 @@ MDWSlider::setStereoLinked(bool value) if( slider && static_cast(slider)->tickmarks() ) setTicks( true ); - layout()->activate(); + tqlayout()->activate(); } @@ -529,7 +529,7 @@ MDWSlider::setLabeled(bool value) else m_label->hide(); - layout()->activate(); + tqlayout()->activate(); } void @@ -558,7 +558,7 @@ MDWSlider::setTicks( bool ticks ) } } - layout()->activate(); + tqlayout()->activate(); } void @@ -579,7 +579,7 @@ MDWSlider::setValueStyle( ValueStyle valueStyle ) } } } - layout()->activate(); + tqlayout()->activate(); } void @@ -592,7 +592,7 @@ MDWSlider::setIcons(bool value) else m_iconLabel->hide(); - layout()->activate(); + tqlayout()->activate(); } } // if it has an icon } @@ -934,13 +934,13 @@ void MDWSlider::showContextMenu() menu->popup( pos ); } -TQSize MDWSlider::sizeHint() const { +TQSize MDWSlider::tqsizeHint() const { if ( _layout != 0 ) { - return _layout->sizeHint(); + return _layout->tqsizeHint(); } else { - // layout not (yet) created - return TQWidget::sizeHint(); + // tqlayout not (yet) created + return TQWidget::tqsizeHint(); } } -- cgit v1.2.1