summaryrefslogtreecommitdiffstats
path: root/kmix
diff options
context:
space:
mode:
Diffstat (limited to 'kmix')
-rw-r--r--kmix/kmix.cpp10
-rw-r--r--kmix/kmixerwidget.cpp6
-rw-r--r--kmix/kmixprefdlg.cpp24
-rw-r--r--kmix/ksmallslider.cpp2
-rw-r--r--kmix/mdwenum.cpp2
-rw-r--r--kmix/mdwslider.cpp56
-rw-r--r--kmix/mdwswitch.cpp2
-rw-r--r--kmix/viewapplet.cpp2
-rw-r--r--kmix/viewdockareapopup.cpp4
-rw-r--r--kmix/viewgrid.cpp2
-rw-r--r--kmix/viewsurround.cpp2
-rw-r--r--kmix/viewswitches.cpp2
12 files changed, 57 insertions, 57 deletions
diff --git a/kmix/kmix.cpp b/kmix/kmix.cpp
index 8ee4701e..462d655b 100644
--- a/kmix/kmix.cpp
+++ b/kmix/kmix.cpp
@@ -145,10 +145,10 @@ KMixWindow::initPrefDlg()
void
KMixWindow::initWidgets()
{
- // Main widget and tqlayout
+ // Main widget and layout
setCentralWidget( new TQWidget( this, "qt_central_widget" ) );
- // Widgets tqlayout
+ // Widgets layout
widgetsLayout = new TQVBoxLayout( centralWidget(), 0, 0, "widgetsLayout" );
widgetsLayout->setResizeMode(TQLayout::Minimum); // works fine
@@ -166,7 +166,7 @@ KMixWindow::initWidgets()
connect( m_cMixer, TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( showSelectedMixer( int ) ) );
TQToolTip::add( m_cMixer, i18n("Current mixer" ) );
- // Add first tqlayout to widgets
+ // Add first layout to widgets
widgetsLayout->addWidget( mixerNameLayout );
m_wsMixers = new TQWidgetStack( centralWidget(), "MixerWidgetStack" );
@@ -522,11 +522,11 @@ KMixWindow::applyPrefs( KMixPrefDlg *prefDlg )
}
if ( prefDlg->_rbVertical->isChecked() ) {
//TQString "For a change of language to take place, quit and restart KDiff3.";
- //kdDebug(67100) << "KMix should change toQt::Vertical tqlayout\n";
+ //kdDebug(67100) << "KMix should change toQt::Vertical layout\n";
m_toplevelOrientation = Qt::Vertical;
}
else if ( prefDlg->_rbHorizontal->isChecked() ) {
- //kdDebug(67100) << "KMix should change toQt::Horizontal tqlayout\n";
+ //kdDebug(67100) << "KMix should change toQt::Horizontal layout\n";
m_toplevelOrientation = Qt::Horizontal;
}
m_autoStart = prefDlg->m_autoStartChk->isChecked();
diff --git a/kmix/kmixerwidget.cpp b/kmix/kmixerwidget.cpp
index 20153449..adf1b88d 100644
--- a/kmix/kmixerwidget.cpp
+++ b/kmix/kmixerwidget.cpp
@@ -76,13 +76,13 @@ KMixerWidget::KMixerWidget( int _id, Mixer *mixer, const TQString &mixerName,
{
// No mixer found
// !! Fix this: This is actually never shown!
- TQBoxLayout *tqlayout = new TQHBoxLayout( this );
+ TQBoxLayout *layout = new TQHBoxLayout( this );
TQString s = i18n("Invalid mixer");
if ( !mixerName.isEmpty() )
s.append(" \"").append(mixerName).append("\"");
TQLabel *errorLabel = new TQLabel( s, this );
errorLabel->setAlignment( TQLabel::AlignCenter | TQLabel::WordBreak );
- tqlayout->addWidget( errorLabel );
+ layout->addWidget( errorLabel );
}
}
@@ -103,7 +103,7 @@ void KMixerWidget::createLayout(ViewBase::ViewFlags vflags)
delete m_topLayout;
}
- // create main tqlayout
+ // create main layout
m_topLayout = new TQVBoxLayout( this, 0, 3, "m_topLayout" );
// Create tabs of input + output + [...]
diff --git a/kmix/kmixprefdlg.cpp b/kmix/kmixprefdlg.cpp
index 3cfa42e5..2185cb47 100644
--- a/kmix/kmixprefdlg.cpp
+++ b/kmix/kmixprefdlg.cpp
@@ -43,36 +43,36 @@ KMixPrefDlg::KMixPrefDlg( TQWidget *parent )
// general buttons
m_generalTab = plainPage( /* i18n("&General") */ );
- TQBoxLayout *tqlayout = new TQVBoxLayout( m_generalTab );
- tqlayout->setSpacing( KDialog::spacingHint() );
+ TQBoxLayout *layout = new TQVBoxLayout( m_generalTab );
+ layout->setSpacing( KDialog::spacingHint() );
m_dockingChk = new TQCheckBox( i18n("&Dock into panel"), m_generalTab );
- tqlayout->addWidget( m_dockingChk );
+ layout->addWidget( m_dockingChk );
TQWhatsThis::add(m_dockingChk, i18n("Docks the mixer into the KDE panel"));
m_volumeChk = new TQCheckBox(i18n("Enable system tray &volume control"),
m_generalTab);
- tqlayout->addWidget(m_volumeChk);
+ layout->addWidget(m_volumeChk);
m_showTicks = new TQCheckBox( i18n("Show &tickmarks"), m_generalTab );
- tqlayout->addWidget( m_showTicks );
+ layout->addWidget( m_showTicks );
TQWhatsThis::add(m_showTicks,
i18n("Enable/disable tickmark scales on the sliders"));
m_showLabels = new TQCheckBox( i18n("Show &labels"), m_generalTab );
- tqlayout->addWidget( m_showLabels );
+ layout->addWidget( m_showLabels );
TQWhatsThis::add(m_showLabels,
i18n("Enables/disables description labels above the sliders"));
m_onLogin = new TQCheckBox( i18n("Restore volumes on login"), m_generalTab );
- tqlayout->addWidget( m_onLogin );
+ layout->addWidget( m_onLogin );
m_dockIconMuting = new TQCheckBox(
i18n("Middle click on system tray icon toggles muting"), m_generalTab );
- tqlayout->addWidget( m_dockIconMuting );
+ layout->addWidget( m_dockIconMuting );
- TQBoxLayout *numbersLayout = new TQHBoxLayout( tqlayout );
+ TQBoxLayout *numbersLayout = new TQHBoxLayout( layout );
TQButtonGroup *numbersGroup = new TQButtonGroup( 3, Qt::Horizontal, i18n("Numbers"), m_generalTab );
numbersGroup->setRadioButtonExclusive(true);
TQLabel* qlbl = new TQLabel( i18n("Volume Values: "), m_generalTab );
@@ -91,10 +91,10 @@ KMixPrefDlg::KMixPrefDlg( TQWidget *parent )
numbersLayout->addStretch();
m_autoStartChk = new TQCheckBox( i18n("&Autostart"), m_generalTab );
- tqlayout->addWidget( m_autoStartChk );
+ layout->addWidget( m_autoStartChk );
TQWhatsThis::add(m_autoStartChk, i18n("Automatically start mixer when you login"));
- TQBoxLayout *orientationLayout = new TQHBoxLayout( tqlayout );
+ TQBoxLayout *orientationLayout = new TQHBoxLayout( layout );
TQButtonGroup* orientationGroup = new TQButtonGroup( 2, Qt::Horizontal, i18n("Orientation"), m_generalTab );
//orientationLayout->add(orientationGroup);
orientationGroup->setRadioButtonExclusive(true);
@@ -112,7 +112,7 @@ KMixPrefDlg::KMixPrefDlg( TQWidget *parent )
orientationLayout->add(_rbVertical);
orientationLayout->addStretch();
- tqlayout->addStretch();
+ layout->addStretch();
enableButtonSeparator(true);
connect( this, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(apply()) );
diff --git a/kmix/ksmallslider.cpp b/kmix/ksmallslider.cpp
index c47dfe93..8a69676f 100644
--- a/kmix/ksmallslider.cpp
+++ b/kmix/ksmallslider.cpp
@@ -225,7 +225,7 @@ void KSmallSlider::paintEvent( TQPaintEvent * )
int sliderPos = positionFromValue( TQRangeControl::value() );
// ------------------------ draw 3d border ---------------------------------------------
- tqstyle().tqdrawPrimitive ( TQStyle::PE_Panel, &p, TQRect( 0, 0, width(), height() ), colorGroup(), TRUE );
+ style().tqdrawPrimitive ( TQStyle::PE_Panel, &p, TQRect( 0, 0, width(), height() ), colorGroup(), TRUE );
// ------------------------ draw lower/left part ----------------------------------------
diff --git a/kmix/mdwenum.cpp b/kmix/mdwenum.cpp
index 8ec363ba..e5504534 100644
--- a/kmix/mdwenum.cpp
+++ b/kmix/mdwenum.cpp
@@ -132,7 +132,7 @@ TQSize MDWEnum::sizeHint() const {
return _layout->sizeHint();
}
else {
- // tqlayout not (yet) created
+ // layout not (yet) created
return TQWidget::sizeHint();
}
}
diff --git a/kmix/mdwslider.cpp b/kmix/mdwslider.cpp
index a4fa0bcc..f2ff1b1f 100644
--- a/kmix/mdwslider.cpp
+++ b/kmix/mdwslider.cpp
@@ -133,7 +133,7 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED )
slidersLayout->setAlignment(TQt::AlignHCenter);
}
- /* cesken: This is inconsistent. Why should vertical and horizontal tqlayout differ?
+ /* cesken: This is inconsistent. Why should vertical and horizontal layout 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 )
@@ -213,36 +213,36 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED )
// --- MUTE LED
if ( showMuteLED ) {
- TQBoxLayout *ledtqlayout;
+ TQBoxLayout *ledlayout;
if ( _orientation == Qt::Vertical ) {
- ledtqlayout = new TQHBoxLayout( sliLayout );
- ledtqlayout->setAlignment(TQt::AlignVCenter);
+ ledlayout = new TQHBoxLayout( sliLayout );
+ ledlayout->setAlignment(TQt::AlignVCenter);
}
else {
- ledtqlayout = new TQVBoxLayout( sliLayout );
- ledtqlayout->setAlignment(TQt::AlignHCenter);
+ ledlayout = new TQVBoxLayout( sliLayout );
+ ledlayout->setAlignment(TQt::AlignHCenter);
}
if( m_mixdevice->hasMute() )
{
- ledtqlayout->addStretch();
+ ledlayout->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) );
- ledtqlayout->addWidget( m_muteLED );
+ ledlayout->addWidget( m_muteLED );
TQToolTip::add( m_muteLED, i18n( "Mute" ) );
connect( m_muteLED, TQT_SIGNAL(stateChanged(bool)), this, TQT_SLOT(toggleMuted()) );
m_muteLED->installEventFilter( this );
- ledtqlayout->addStretch();
+ ledlayout->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) );
- ledtqlayout->addWidget(qw);
+ ledlayout->addWidget(qw);
qw->installEventFilter( this );
} // has no Mute LED
@@ -314,7 +314,7 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED )
slider->hide();
number->hide();
}
- slinumLayout->addWidget( slider ); // add to tqlayout
+ slinumLayout->addWidget( slider ); // add to layout
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 *rectqlayout;
+ TQBoxLayout *reclayout;
if ( _orientation == Qt::Vertical ) {
- rectqlayout = new TQHBoxLayout( sliLayout );
- rectqlayout->setAlignment(TQt::AlignVCenter);
+ reclayout = new TQHBoxLayout( sliLayout );
+ reclayout->setAlignment(TQt::AlignVCenter);
}
else {
- rectqlayout = new TQVBoxLayout( sliLayout );
- rectqlayout->setAlignment(TQt::AlignHCenter);
+ reclayout = new TQVBoxLayout( sliLayout );
+ reclayout->setAlignment(TQt::AlignHCenter);
}
if( m_mixdevice->isRecordable() ) {
- rectqlayout->addStretch();
+ reclayout->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) );
- rectqlayout->addWidget( m_recordLED );
+ reclayout->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" ) );
- rectqlayout->addStretch();
+ reclayout->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) );
- rectqlayout->addWidget(qw);
+ reclayout->addWidget(qw);
qw->installEventFilter( this );
} // has no Record LED
} // showRecordLED
- tqlayout()->activate();
+ layout()->activate();
}
@@ -438,7 +438,7 @@ MDWSlider::setIcon( int icontype )
kdError(67100) << "Pixmap missing." << endl;
}
- tqlayout()->activate();
+ layout()->activate();
}
bool
@@ -514,7 +514,7 @@ MDWSlider::setStereoLinked(bool value)
if( slider && static_cast<TQSlider *>(slider)->tickmarks() )
setTicks( true );
- tqlayout()->activate();
+ layout()->activate();
}
@@ -529,7 +529,7 @@ MDWSlider::setLabeled(bool value)
else
m_label->hide();
- tqlayout()->activate();
+ layout()->activate();
}
void
@@ -558,7 +558,7 @@ MDWSlider::setTicks( bool ticks )
}
}
- tqlayout()->activate();
+ layout()->activate();
}
void
@@ -579,7 +579,7 @@ MDWSlider::setValueStyle( ValueStyle valueStyle )
}
}
}
- tqlayout()->activate();
+ layout()->activate();
}
void
@@ -592,7 +592,7 @@ MDWSlider::setIcons(bool value)
else
m_iconLabel->hide();
- tqlayout()->activate();
+ layout()->activate();
}
} // if it has an icon
}
@@ -939,7 +939,7 @@ TQSize MDWSlider::sizeHint() const {
return _layout->sizeHint();
}
else {
- // tqlayout not (yet) created
+ // layout not (yet) created
return TQWidget::sizeHint();
}
}
diff --git a/kmix/mdwswitch.cpp b/kmix/mdwswitch.cpp
index d16be452..6fe1aeb4 100644
--- a/kmix/mdwswitch.cpp
+++ b/kmix/mdwswitch.cpp
@@ -169,7 +169,7 @@ TQSize MDWSwitch::sizeHint() const {
return _layout->sizeHint();
}
else {
- // tqlayout not (yet) created
+ // layout not (yet) created
return TQWidget::sizeHint();
}
}
diff --git a/kmix/viewapplet.cpp b/kmix/viewapplet.cpp
index cf2b15b6..b81a27f1 100644
--- a/kmix/viewapplet.cpp
+++ b/kmix/viewapplet.cpp
@@ -140,7 +140,7 @@ void ViewApplet::constructionFinished() {
TQSize ViewApplet::sizeHint() const {
- // Basically out main tqlayout knows very good what the sizes should be
+ // Basically out main layout knows very good what the sizes should be
TQSize qsz = _layoutMDW->sizeHint();
//kdDebug(67100) << "ViewApplet::sizeHint(): NewSize is " << qsz << "\n";
return qsz;
diff --git a/kmix/viewdockareapopup.cpp b/kmix/viewdockareapopup.cpp
index ec9a3cd6..4fac6d81 100644
--- a/kmix/viewdockareapopup.cpp
+++ b/kmix/viewdockareapopup.cpp
@@ -46,9 +46,9 @@
ViewDockAreaPopup::ViewDockAreaPopup(TQWidget* parent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KMixDockWidget *dockW )
: ViewBase(parent, name, TQString(), mixer, WStyle_Customize | WType_Popup | TQt::WStyle_DialogBorder, vflags), _mdw(0), _dock(dockW)
{
- TQBoxLayout *tqlayout = new TQHBoxLayout( this );
+ TQBoxLayout *layout = new TQHBoxLayout( this );
_frame = new TQFrame( this );
- tqlayout->addWidget( _frame );
+ layout->addWidget( _frame );
_frame->setFrameStyle( TQFrame::PopupPanel | TQFrame::Raised );
_frame->setLineWidth( 1 );
diff --git a/kmix/viewgrid.cpp b/kmix/viewgrid.cpp
index a52973c4..72bae125 100644
--- a/kmix/viewgrid.cpp
+++ b/kmix/viewgrid.cpp
@@ -134,7 +134,7 @@ TQSize ViewGrid::sizeHint() const {
void ViewGrid::constructionFinished() {
//_layoutMDW->activate();
- // do a manual tqlayout
+ // do a manual layout
configurationUpdate();
}
diff --git a/kmix/viewsurround.cpp b/kmix/viewsurround.cpp
index 81f84f64..8e0b6df5 100644
--- a/kmix/viewsurround.cpp
+++ b/kmix/viewsurround.cpp
@@ -154,7 +154,7 @@ TQWidget* ViewSurround::add(MixDevice *md)
case MixDevice::SURROUND:
case MixDevice::AC97:
default:
- // Add as slider to the tqlayout on the left side
+ // Add as slider to the layout on the left side
_layoutSliders->add(mdw);
break;
} // switch(type)
diff --git a/kmix/viewswitches.cpp b/kmix/viewswitches.cpp
index 3c414815..f2277ebf 100644
--- a/kmix/viewswitches.cpp
+++ b/kmix/viewswitches.cpp
@@ -46,7 +46,7 @@ ViewSwitches::ViewSwitches(TQWidget* parent, const char* name, const TQString &
// Place enums right from the switches: This is done, so that there will be no
// ugly space on the left side, when no Switch is shown.
// Actually it is not really clear yet, why there is empty space at all: There are 0 items in
- // the _layoutEnum, so it might be a sizeHint() or some other subtle tqlayout issue.
+ // the _layoutEnum, so it might be a sizeHint() or some other subtle layout issue.
_layoutEnum = new TQVBoxLayout(_layoutMDW);
}
init();
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-19 11:41:30 +0000