summaryrefslogtreecommitdiffstats
path: root/kmix
diff options
context:
space:
mode:
Diffstat (limited to 'kmix')
-rw-r--r--kmix/colorwidget.ui2
-rw-r--r--kmix/dialogselectmaster.cpp6
-rw-r--r--kmix/dialogviewconfiguration.cpp8
-rw-r--r--kmix/dialogviewconfiguration.h2
-rw-r--r--kmix/kledbutton.cpp2
-rw-r--r--kmix/kledbutton.h2
-rw-r--r--kmix/kmix.cpp6
-rw-r--r--kmix/kmixapplet.cpp28
-rw-r--r--kmix/kmixapplet.h2
-rw-r--r--kmix/kmixerwidget.cpp6
-rw-r--r--kmix/ksmallslider.cpp6
-rw-r--r--kmix/ksmallslider.h4
-rw-r--r--kmix/mdwenum.cpp16
-rw-r--r--kmix/mdwenum.h2
-rw-r--r--kmix/mdwslider.cpp48
-rw-r--r--kmix/mdwslider.h2
-rw-r--r--kmix/mdwswitch.cpp10
-rw-r--r--kmix/mdwswitch.h2
-rw-r--r--kmix/verticaltext.cpp2
-rw-r--r--kmix/verticaltext.h2
-rw-r--r--kmix/viewapplet.cpp12
-rw-r--r--kmix/viewapplet.h2
-rw-r--r--kmix/viewdockareapopup.cpp10
-rw-r--r--kmix/viewdockareapopup.h2
-rw-r--r--kmix/viewgrid.cpp20
-rw-r--r--kmix/viewgrid.h4
-rw-r--r--kmix/viewsliders.cpp6
-rw-r--r--kmix/viewsliders.h2
-rw-r--r--kmix/viewsurround.cpp6
-rw-r--r--kmix/viewsurround.h2
-rw-r--r--kmix/viewswitches.cpp8
-rw-r--r--kmix/viewswitches.h2
32 files changed, 117 insertions, 117 deletions
diff --git a/kmix/colorwidget.ui b/kmix/colorwidget.ui
index d91d9ea9..27739653 100644
--- a/kmix/colorwidget.ui
+++ b/kmix/colorwidget.ui
@@ -236,7 +236,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kmix/dialogselectmaster.cpp b/kmix/dialogselectmaster.cpp
index b70c2b6c..08c8f760 100644
--- a/kmix/dialogselectmaster.cpp
+++ b/kmix/dialogselectmaster.cpp
@@ -67,15 +67,15 @@ void DialogSelectMaster::createWidgets(Mixer *ptr_mixer)
TQHBoxLayout* mixerNameLayout = new TQHBoxLayout( _layout );
//widgetsLayout->setStretchFactor( mixerNameLayout, 0 );
//TQSizePolicy qsp( TQSizePolicy::Ignored, TQSizePolicy::Maximum);
- //mixerNameLayout->tqsetSizePolicy(qsp);
+ //mixerNameLayout->setSizePolicy(qsp);
mixerNameLayout->setSpacing(KDialog::spacingHint());
TQLabel *qlbl = new TQLabel( i18n("Current Mixer"), m_mainFrame );
mixerNameLayout->addWidget(qlbl);
- qlbl->setFixedHeight(qlbl->tqsizeHint().height());
+ qlbl->setFixedHeight(qlbl->sizeHint().height());
m_cMixer = new KComboBox( FALSE, m_mainFrame, "mixerCombo" );
- m_cMixer->setFixedHeight(m_cMixer->tqsizeHint().height());
+ m_cMixer->setFixedHeight(m_cMixer->sizeHint().height());
connect( m_cMixer, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( createPageByID( int ) ) );
//int id=1;
diff --git a/kmix/dialogviewconfiguration.cpp b/kmix/dialogviewconfiguration.cpp
index 28cf3c3f..09e88d23 100644
--- a/kmix/dialogviewconfiguration.cpp
+++ b/kmix/dialogviewconfiguration.cpp
@@ -58,7 +58,7 @@ DialogViewConfiguration::DialogViewConfiguration( TQWidget*, ViewBase& view)
}
}
_layout->activate();
- resize(_layout->tqsizeHint() );
+ resize(_layout->sizeHint() );
connect( this, TQT_SIGNAL(okClicked()) , this, TQT_SLOT(apply()) );
}
@@ -93,9 +93,9 @@ void DialogViewConfiguration::apply()
_view.configurationUpdate();
}
-TQSize DialogViewConfiguration::tqsizeHint() const {
- // kdDebug(67100) << "DialogViewConfiguration::tqsizeHint() is (100,500)\n";
- return _layout->tqsizeHint();
+TQSize DialogViewConfiguration::sizeHint() const {
+ // kdDebug(67100) << "DialogViewConfiguration::sizeHint() is (100,500)\n";
+ return _layout->sizeHint();
}
#include "dialogviewconfiguration.moc"
diff --git a/kmix/dialogviewconfiguration.h b/kmix/dialogviewconfiguration.h
index c0a80bae..8d64bd27 100644
--- a/kmix/dialogviewconfiguration.h
+++ b/kmix/dialogviewconfiguration.h
@@ -18,7 +18,7 @@ class DialogViewConfiguration : public KDialogBase
DialogViewConfiguration(TQWidget* parent, ViewBase& view);
~DialogViewConfiguration();
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
public slots:
void apply();
diff --git a/kmix/kledbutton.cpp b/kmix/kledbutton.cpp
index 7e9fbe02..6c134d2b 100644
--- a/kmix/kledbutton.cpp
+++ b/kmix/kledbutton.cpp
@@ -66,7 +66,7 @@ bool KLedButton::eventFilter( TQObject* /*obj*/ , TQEvent* /*ev*/ ) {
}
-TQSize KLedButton::tqsizeHint() const
+TQSize KLedButton::sizeHint() const
{
return size();
}
diff --git a/kmix/kledbutton.h b/kmix/kledbutton.h
index da07d492..8e22cb9b 100644
--- a/kmix/kledbutton.h
+++ b/kmix/kledbutton.h
@@ -39,7 +39,7 @@ class KLedButton : public KLed {
TQWidget *parent=0, const char *name=0);
~KLedButton();
- TQSize tqsizeHint () const;
+ TQSize sizeHint () const;
TQSizePolicy sizePolicy () const;
signals:
void stateChanged( bool newState );
diff --git a/kmix/kmix.cpp b/kmix/kmix.cpp
index 3db2ec09..bc9a7124 100644
--- a/kmix/kmix.cpp
+++ b/kmix/kmix.cpp
@@ -157,12 +157,12 @@ KMixWindow::initWidgets()
mixerNameLayout = new TQHBox( centralWidget(), "mixerNameLayout" );
widgetsLayout->setStretchFactor( mixerNameLayout, 0 );
TQSizePolicy qsp( TQSizePolicy::Ignored, TQSizePolicy::Maximum);
- mixerNameLayout->tqsetSizePolicy(qsp);
+ mixerNameLayout->setSizePolicy(qsp);
mixerNameLayout->setSpacing(KDialog::spacingHint());
TQLabel *qlbl = new TQLabel( i18n("Current mixer:"), mixerNameLayout );
- qlbl->setFixedHeight(qlbl->tqsizeHint().height());
+ qlbl->setFixedHeight(qlbl->sizeHint().height());
m_cMixer = new KComboBox( FALSE, mixerNameLayout, "mixerCombo" );
- m_cMixer->setFixedHeight(m_cMixer->tqsizeHint().height());
+ m_cMixer->setFixedHeight(m_cMixer->sizeHint().height());
connect( m_cMixer, TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( showSelectedMixer( int ) ) );
TQToolTip::add( m_cMixer, i18n("Current mixer" ) );
diff --git a/kmix/kmixapplet.cpp b/kmix/kmixapplet.cpp
index 741cbd0e..3d5fec6d 100644
--- a/kmix/kmixapplet.cpp
+++ b/kmix/kmixapplet.cpp
@@ -205,8 +205,8 @@ KMixApplet::KMixApplet( const TQString& configFile, Type t,
// No mixer set by user (kmixappletrc_*) and more than one to choose
// We do NOT know which mixer to use => ask the User
m_errorLabel = new TQPushButton( i18n("Select Mixer"), this );
- m_errorLabel->setGeometry(0, 0, m_errorLabel->tqsizeHint().width(), m_errorLabel->tqsizeHint().height() );
- resize( m_errorLabel->tqsizeHint() );
+ m_errorLabel->setGeometry(0, 0, m_errorLabel->sizeHint().width(), m_errorLabel->sizeHint().height() );
+ resize( m_errorLabel->sizeHint() );
connect( m_errorLabel, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectMixer()) );
}
else {
@@ -375,7 +375,7 @@ void KMixApplet::positionChange(Position pos) {
loadConfig();
setColors();
- const TQSize panelAppletConstrainedSize = tqsizeHint();
+ const TQSize panelAppletConstrainedSize = sizeHint();
m_mixerWidget->setGeometry( 0, 0, panelAppletConstrainedSize.width(), panelAppletConstrainedSize.height() );
resize( panelAppletConstrainedSize.width(), panelAppletConstrainedSize.height() );
//setFixedSize(panelAppletConstrainedSize.width(), panelAppletConstrainedSize.height() );
@@ -401,7 +401,7 @@ void KMixApplet::resizeEvent(TQResizeEvent *e)
}
- // resizing changes our own tqsizeHint(), because we must take the new PanelSize in account.
+ // resizing changes our own sizeHint(), because we must take the new PanelSize in account.
// So updateGeometry() is amust for us.
//kdDebug(67100) << "KMixApplet::resizeEvent(). UPDATE GEOMETRY" << endl;
updateGeometry();
@@ -414,21 +414,21 @@ void KMixApplet::updateGeometrySlot() {
}
-TQSize KMixApplet::tqsizeHint() const {
- //kdDebug(67100) << "KMixApplet::tqsizeHint()\n";
+TQSize KMixApplet::sizeHint() const {
+ //kdDebug(67100) << "KMixApplet::sizeHint()\n";
TQSize qsz;
if ( m_errorLabel !=0 ) {
- qsz = m_errorLabel->tqsizeHint();
+ qsz = m_errorLabel->sizeHint();
}
else if ( m_mixerWidget != 0) {
- qsz = m_mixerWidget->tqsizeHint();
+ qsz = m_mixerWidget->sizeHint();
}
else {
// During construction of m_mixerWidget or if something goes wrong:
- // Return something that should resemble our former tqsizeHint().
+ // Return something that should resemble our former sizeHint().
qsz = size();
}
- //kdDebug(67100) << "KMixApplet::tqsizeHint() leftright =" << qsz << "\n";
+ //kdDebug(67100) << "KMixApplet::sizeHint() leftright =" << qsz << "\n";
return qsz;
}
@@ -437,12 +437,12 @@ TQSize KMixApplet::tqsizeHint() const {
using this method. Actually we ignore the passed paramater and just return our preferred size.
*/
int KMixApplet::widthForHeight(int) const {
- //kdDebug(67100) << "KMixApplet::widthForHeight() = " << tqsizeHint().width() << endl;
- return tqsizeHint().width();
+ //kdDebug(67100) << "KMixApplet::widthForHeight() = " << sizeHint().width() << endl;
+ return sizeHint().width();
}
int KMixApplet::heightForWidth(int) const {
- //kdDebug(67100) << "KMixApplet::heightForWidth() = " << tqsizeHint().height() << endl;
- return tqsizeHint().height();
+ //kdDebug(67100) << "KMixApplet::heightForWidth() = " << sizeHint().height() << endl;
+ return sizeHint().height();
}
diff --git a/kmix/kmixapplet.h b/kmix/kmixapplet.h
index 5f7136ad..2147b421 100644
--- a/kmix/kmixapplet.h
+++ b/kmix/kmixapplet.h
@@ -88,7 +88,7 @@ public:
void reportBug();
void paletteChange ( const TQPalette & oldPalette );
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
TQSizePolicy sizePolicy() const;
int widthForHeight(int) const;
int heightForWidth(int) const;
diff --git a/kmix/kmixerwidget.cpp b/kmix/kmixerwidget.cpp
index 56c90d03..20153449 100644
--- a/kmix/kmixerwidget.cpp
+++ b/kmix/kmixerwidget.cpp
@@ -81,7 +81,7 @@ KMixerWidget::KMixerWidget( int _id, Mixer *mixer, const TQString &mixerName,
if ( !mixerName.isEmpty() )
s.append(" \"").append(mixerName).append("\"");
TQLabel *errorLabel = new TQLabel( s, this );
- errorLabel->tqsetAlignment( TQLabel::AlignCenter | TQLabel::WordBreak );
+ errorLabel->setAlignment( TQLabel::AlignCenter | TQLabel::WordBreak );
tqlayout->addWidget( errorLabel );
}
}
@@ -136,8 +136,8 @@ void KMixerWidget::createLayout(ViewBase::ViewFlags vflags)
m_balanceSlider = new TQSlider( -100, 100, 25, 0, Qt::Horizontal, this, "RightLeft" );
m_balanceSlider->setTickmarks( TQSlider::Below );
m_balanceSlider->setTickInterval( 25 );
- m_balanceSlider->setMinimumSize( m_balanceSlider->tqsizeHint() );
- m_balanceSlider->setFixedHeight( m_balanceSlider->tqsizeHint().height() );
+ m_balanceSlider->setMinimumSize( m_balanceSlider->sizeHint() );
+ m_balanceSlider->setFixedHeight( m_balanceSlider->sizeHint().height() );
TQLabel *mixerName = new TQLabel(this, "mixerName");
mixerName->setText( _mixer->mixerName() );
diff --git a/kmix/ksmallslider.cpp b/kmix/ksmallslider.cpp
index fea113b5..ef3382c5 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() ), tqcolorGroup(), TRUE );
+ tqstyle().tqdrawPrimitive ( TQStyle::PE_Panel, &p, TQRect( 0, 0, width(), height() ), colorGroup(), TRUE );
// ------------------------ draw lower/left part ----------------------------------------
@@ -396,7 +396,7 @@ int KSmallSlider::goodPart( const TQPoint &p ) const
}
/***************** SIZE STUFF START ***************/
-TQSize KSmallSlider::tqsizeHint() const
+TQSize KSmallSlider::sizeHint() const
{
//constPolish();
const int length = 25;
@@ -409,7 +409,7 @@ TQSize KSmallSlider::tqsizeHint() const
}
-TQSize KSmallSlider::tqminimumSizeHint() const
+TQSize KSmallSlider::minimumSizeHint() const
{
TQSize s(10,10);
return s;
diff --git a/kmix/ksmallslider.h b/kmix/ksmallslider.h
index 7b672720..2ed0f6e6 100644
--- a/kmix/ksmallslider.h
+++ b/kmix/ksmallslider.h
@@ -42,9 +42,9 @@ class KSmallSlider : public TQWidget, public TQRangeControl
//virtual void setTracking( bool enable );
//bool tracking() const;
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
TQSizePolicy sizePolicy() const;
- TQSize tqminimumSizeHint() const;
+ TQSize minimumSizeHint() const;
int minValue() const;
int maxValue() const;
diff --git a/kmix/mdwenum.cpp b/kmix/mdwenum.cpp
index 90ac1350..8ec363ba 100644
--- a/kmix/mdwenum.cpp
+++ b/kmix/mdwenum.cpp
@@ -75,21 +75,21 @@ void MDWEnum::createWidgets()
{
if ( _orientation == Qt::Vertical ) {
_layout = new TQVBoxLayout( this );
- _layout->tqsetAlignment(TQt::AlignHCenter);
+ _layout->setAlignment(TQt::AlignHCenter);
}
else {
_layout = new TQHBoxLayout( this );
- _layout->tqsetAlignment(TQt::AlignVCenter);
+ _layout->setAlignment(TQt::AlignVCenter);
}
TQToolTip::add( this, m_mixdevice->name() );
//this->setStretchFactor( _layout, 0 );
//TQSizePolicy qsp( TQSizePolicy::Ignored, TQSizePolicy::Maximum);
- //_layout->tqsetSizePolicy(qsp);
+ //_layout->setSizePolicy(qsp);
//_layout->setSpacing(KDialog::spacingHint());
_label = new TQLabel( m_mixdevice->name(), this);
_layout->addWidget(_label);
- _label->setFixedHeight(_label->tqsizeHint().height());
+ _label->setFixedHeight(_label->sizeHint().height());
_enumCombo = new KComboBox( FALSE, this, "mixerCombo" );
// ------------ fill ComboBox start ------------
int maxEnumId= m_mixdevice->enumValues().count();
@@ -98,7 +98,7 @@ void MDWEnum::createWidgets()
}
// ------------ fill ComboBox end --------------
_layout->addWidget(_enumCombo);
- _enumCombo->setFixedHeight(_enumCombo->tqsizeHint().height());
+ _enumCombo->setFixedHeight(_enumCombo->sizeHint().height());
connect( _enumCombo, TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( setEnumId( int ) ) );
TQToolTip::add( _enumCombo, m_mixdevice->name() );
@@ -127,13 +127,13 @@ void MDWEnum::showContextMenu()
menu->popup( pos );
}
-TQSize MDWEnum::tqsizeHint() const {
+TQSize MDWEnum::sizeHint() const {
if ( _layout != 0 ) {
- return _layout->tqsizeHint();
+ return _layout->sizeHint();
}
else {
// tqlayout not (yet) created
- return TQWidget::tqsizeHint();
+ return TQWidget::sizeHint();
}
}
diff --git a/kmix/mdwenum.h b/kmix/mdwenum.h
index 0a77506f..398afa93 100644
--- a/kmix/mdwenum.h
+++ b/kmix/mdwenum.h
@@ -51,7 +51,7 @@ public:
~MDWEnum();
void addActionToPopup( KAction *action );
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
bool eventFilter( TQObject* obj, TQEvent* e );
public slots:
diff --git a/kmix/mdwslider.cpp b/kmix/mdwslider.cpp
index 8d363c5e..18037f69 100644
--- a/kmix/mdwslider.cpp
+++ b/kmix/mdwslider.cpp
@@ -115,22 +115,22 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED )
{
if ( _orientation == Qt::Vertical ) {
_layout = new TQVBoxLayout( this );
- _layout->tqsetAlignment(TQt::AlignCenter);
+ _layout->setAlignment(TQt::AlignCenter);
}
else {
_layout = new TQHBoxLayout( this );
- _layout->tqsetAlignment(TQt::AlignCenter);
+ _layout->setAlignment(TQt::AlignCenter);
}
// -- MAIN SLIDERS LAYOUT ---
TQBoxLayout *slidersLayout;
if ( _orientation == Qt::Vertical ) {
slidersLayout = new TQHBoxLayout( _layout );
- slidersLayout->tqsetAlignment(TQt::AlignVCenter);
+ slidersLayout->setAlignment(TQt::AlignVCenter);
}
else {
slidersLayout = new TQVBoxLayout( _layout );
- slidersLayout->tqsetAlignment(TQt::AlignHCenter);
+ slidersLayout->setAlignment(TQt::AlignHCenter);
}
/* cesken: This is inconsistent. Why should vertical and horizontal tqlayout differ?
@@ -145,11 +145,11 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED )
TQBoxLayout *labelLayout;
if ( _orientation == Qt::Vertical ) {
labelLayout = new TQVBoxLayout( slidersLayout );
- labelLayout->tqsetAlignment(TQt::AlignHCenter);
+ labelLayout->setAlignment(TQt::AlignHCenter);
}
else {
labelLayout = new TQHBoxLayout( slidersLayout );
- labelLayout->tqsetAlignment(TQt::AlignVCenter);
+ labelLayout->setAlignment(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->tqsetAlignment(TQt::AlignHCenter);
+ sliLayout->setAlignment(TQt::AlignHCenter);
}
else {
sliLayout = new TQHBoxLayout( slidersLayout );
- sliLayout->tqsetAlignment(TQt::AlignVCenter);
+ sliLayout->setAlignment(TQt::AlignVCenter);
}
// --- ICON ----------------------------
TQBoxLayout *iconLayout;
if ( _orientation == Qt::Vertical ) {
iconLayout = new TQHBoxLayout( sliLayout );
- iconLayout->tqsetAlignment(TQt::AlignVCenter);
+ iconLayout->setAlignment(TQt::AlignVCenter);
}
else {
iconLayout = new TQVBoxLayout( sliLayout );
- iconLayout->tqsetAlignment(TQt::AlignHCenter);
+ iconLayout->setAlignment(TQt::AlignHCenter);
}
m_iconLabel = 0L;
@@ -216,11 +216,11 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED )
TQBoxLayout *ledtqlayout;
if ( _orientation == Qt::Vertical ) {
ledtqlayout = new TQHBoxLayout( sliLayout );
- ledtqlayout->tqsetAlignment(TQt::AlignVCenter);
+ ledtqlayout->setAlignment(TQt::AlignVCenter);
}
else {
ledtqlayout = new TQVBoxLayout( sliLayout );
- ledtqlayout->tqsetAlignment(TQt::AlignHCenter);
+ ledtqlayout->setAlignment(TQt::AlignHCenter);
}
if( m_mixdevice->hasMute() )
@@ -253,11 +253,11 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED )
TQBoxLayout *volLayout;
if ( _orientation == Qt::Vertical ) {
volLayout = new TQHBoxLayout( sliLayout );
- volLayout->tqsetAlignment(TQt::AlignVCenter);
+ volLayout->setAlignment(TQt::AlignVCenter);
}
else {
volLayout = new TQVBoxLayout( sliLayout );
- volLayout->tqsetAlignment(TQt::AlignHCenter);
+ volLayout->setAlignment(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->tqsetAlignment(TQt::AlignHCenter);
+ slinumLayout->setAlignment(TQt::AlignHCenter);
}
else {
slinumLayout = new TQHBoxLayout( volLayout );
- slinumLayout->tqsetAlignment(TQt::AlignVCenter);
+ slinumLayout->setAlignment(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->tqsizeHint().width() );
+ number->setMinimumWidth( number->sizeHint().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->tqsizeHint() );
+ slider->setMinimumSize( slider->sizeHint() );
}
slider->setBackgroundOrigin(AncestorOrigin);
@@ -330,11 +330,11 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED )
TQBoxLayout *rectqlayout;
if ( _orientation == Qt::Vertical ) {
rectqlayout = new TQHBoxLayout( sliLayout );
- rectqlayout->tqsetAlignment(TQt::AlignVCenter);
+ rectqlayout->setAlignment(TQt::AlignVCenter);
}
else {
rectqlayout = new TQVBoxLayout( sliLayout );
- rectqlayout->tqsetAlignment(TQt::AlignHCenter);
+ rectqlayout->setAlignment(TQt::AlignHCenter);
}
if( m_mixdevice->isRecordable() ) {
@@ -432,7 +432,7 @@ MDWSlider::setIcon( int icontype )
m_iconLabel->resize( 10, 10 );
} else
m_iconLabel->setPixmap( miniDevPM );
- m_iconLabel->tqsetAlignment( TQt::AlignCenter );
+ m_iconLabel->setAlignment( TQt::AlignCenter );
} else
{
kdError(67100) << "Pixmap missing." << endl;
@@ -934,13 +934,13 @@ void MDWSlider::showContextMenu()
menu->popup( pos );
}
-TQSize MDWSlider::tqsizeHint() const {
+TQSize MDWSlider::sizeHint() const {
if ( _layout != 0 ) {
- return _layout->tqsizeHint();
+ return _layout->sizeHint();
}
else {
// tqlayout not (yet) created
- return TQWidget::tqsizeHint();
+ return TQWidget::sizeHint();
}
}
diff --git a/kmix/mdwslider.h b/kmix/mdwslider.h
index 61a95c96..49b3d700 100644
--- a/kmix/mdwslider.h
+++ b/kmix/mdwslider.h
@@ -77,7 +77,7 @@ public:
void setValueStyle( ValueStyle valueStyle );
void setColors( TQColor high, TQColor low, TQColor back );
void setMutedColors( TQColor high, TQColor low, TQColor back );
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
bool eventFilter( TQObject* obj, TQEvent* e );
TQSizePolicy sizePolicy() const;
diff --git a/kmix/mdwswitch.cpp b/kmix/mdwswitch.cpp
index 056bca57..d16be452 100644
--- a/kmix/mdwswitch.cpp
+++ b/kmix/mdwswitch.cpp
@@ -79,11 +79,11 @@ void MDWSwitch::createWidgets()
{
if ( _orientation == Qt::Vertical ) {
_layout = new TQVBoxLayout( this );
- _layout->tqsetAlignment(TQt::AlignHCenter);
+ _layout->setAlignment(TQt::AlignHCenter);
}
else {
_layout = new TQHBoxLayout( this );
- _layout->tqsetAlignment(TQt::AlignVCenter);
+ _layout->setAlignment(TQt::AlignVCenter);
}
TQToolTip::add( this, m_mixdevice->name() );
@@ -164,13 +164,13 @@ void MDWSwitch::showContextMenu()
menu->popup( pos );
}
-TQSize MDWSwitch::tqsizeHint() const {
+TQSize MDWSwitch::sizeHint() const {
if ( _layout != 0 ) {
- return _layout->tqsizeHint();
+ return _layout->sizeHint();
}
else {
// tqlayout not (yet) created
- return TQWidget::tqsizeHint();
+ return TQWidget::sizeHint();
}
}
diff --git a/kmix/mdwswitch.h b/kmix/mdwswitch.h
index 6c6f3bbf..5b4b15e0 100644
--- a/kmix/mdwswitch.h
+++ b/kmix/mdwswitch.h
@@ -61,7 +61,7 @@ public:
~MDWSwitch();
void addActionToPopup( KAction *action );
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
void setBackgroundMode(BackgroundMode m);
bool eventFilter( TQObject* obj, TQEvent* e );
diff --git a/kmix/verticaltext.cpp b/kmix/verticaltext.cpp
index aabe8a23..77bda1af 100644
--- a/kmix/verticaltext.cpp
+++ b/kmix/verticaltext.cpp
@@ -46,7 +46,7 @@ void VerticalText::paintEvent ( TQPaintEvent * /*event*/ ) {
paint.drawText( -height()+2, width(), TQString::fromUtf8(name()) );
}
-TQSize VerticalText::tqsizeHint() const {
+TQSize VerticalText::sizeHint() const {
return TQSize(20,100); // !! UGLY. Should be reworked
}
diff --git a/kmix/verticaltext.h b/kmix/verticaltext.h
index 1e621e83..c378bafc 100644
--- a/kmix/verticaltext.h
+++ b/kmix/verticaltext.h
@@ -9,7 +9,7 @@ public:
VerticalText(TQWidget * parent, const char * name, WFlags f = 0);
~VerticalText();
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
TQSizePolicy sizePolicy () const;
protected:
diff --git a/kmix/viewapplet.cpp b/kmix/viewapplet.cpp
index 6b25dde0..cf2b15b6 100644
--- a/kmix/viewapplet.cpp
+++ b/kmix/viewapplet.cpp
@@ -56,11 +56,11 @@ ViewApplet::ViewApplet(TQWidget* parent, const char* name, Mixer* mixer, ViewBas
if ( _viewOrientation == Qt::Horizontal ) {
_layoutMDW = new TQHBoxLayout( this );
- tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred);
+ setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred);
}
else {
_layoutMDW = new TQVBoxLayout( this );
- tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
+ setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
}
@@ -139,10 +139,10 @@ void ViewApplet::constructionFinished() {
}
-TQSize ViewApplet::tqsizeHint() const {
+TQSize ViewApplet::sizeHint() const {
// Basically out main tqlayout knows very good what the sizes should be
- TQSize qsz = _layoutMDW->tqsizeHint();
- //kdDebug(67100) << "ViewApplet::tqsizeHint(): NewSize is " << qsz << "\n";
+ TQSize qsz = _layoutMDW->sizeHint();
+ //kdDebug(67100) << "ViewApplet::sizeHint(): NewSize is " << qsz << "\n";
return qsz;
}
@@ -196,7 +196,7 @@ void ViewApplet::resizeEvent(TQResizeEvent *qre)
// kdDebug(67100) << "ViewApplet::resizeEvent(). SHOULD resize _layoutMDW to " << qre->size() << endl;
//TQWidget::resizeEvent(qre);
- // resizing changes our own tqsizeHint(), because we must take the new PanelSize in account.
+ // resizing changes our own sizeHint(), because we must take the new PanelSize in account.
// So updateGeometry() is amust for us.
updateGeometry();
}
diff --git a/kmix/viewapplet.h b/kmix/viewapplet.h
index 38d21465..400e45f5 100644
--- a/kmix/viewapplet.h
+++ b/kmix/viewapplet.h
@@ -25,7 +25,7 @@ public:
virtual void constructionFinished();
virtual void configurationUpdate();
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
TQSizePolicy sizePolicy() const;
virtual void resizeEvent(TQResizeEvent*);
diff --git a/kmix/viewdockareapopup.cpp b/kmix/viewdockareapopup.cpp
index 859993bb..ec9a3cd6 100644
--- a/kmix/viewdockareapopup.cpp
+++ b/kmix/viewdockareapopup.cpp
@@ -163,9 +163,9 @@ int ViewDockAreaPopup::advice() {
}
}
-TQSize ViewDockAreaPopup::tqsizeHint() const {
- // kdDebug(67100) << "ViewDockAreaPopup::tqsizeHint(): NewSize is " << _mdw->tqsizeHint() << "\n";
- return( _mdw->tqsizeHint() );
+TQSize ViewDockAreaPopup::sizeHint() const {
+ // kdDebug(67100) << "ViewDockAreaPopup::sizeHint(): NewSize is " << _mdw->sizeHint() << "\n";
+ return( _mdw->sizeHint() );
}
void ViewDockAreaPopup::constructionFinished() {
@@ -173,8 +173,8 @@ void ViewDockAreaPopup::constructionFinished() {
_mdw->move(0,0);
_mdw->show();
- _mdw->resize(_mdw->tqsizeHint() );
- resize(tqsizeHint());
+ _mdw->resize(_mdw->sizeHint() );
+ resize(sizeHint());
}
diff --git a/kmix/viewdockareapopup.h b/kmix/viewdockareapopup.h
index a31afa4b..7a30a1a0 100644
--- a/kmix/viewdockareapopup.h
+++ b/kmix/viewdockareapopup.h
@@ -32,7 +32,7 @@ public:
virtual void refreshVolumeLevels();
virtual void showContextMenu();
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
bool justHidden();
protected:
diff --git a/kmix/viewgrid.cpp b/kmix/viewgrid.cpp
index 1aba7fcf..588f9c5e 100644
--- a/kmix/viewgrid.cpp
+++ b/kmix/viewgrid.cpp
@@ -126,9 +126,9 @@ TQWidget* ViewGrid::add(MixDevice *md)
return mdw;
}
-TQSize ViewGrid::tqsizeHint() const {
- // kdDebug(67100) << "ViewGrid::tqsizeHint(): NewSize is " << _layoutMDW->tqsizeHint() << "\n";
- return( m_tqsizeHint);
+TQSize ViewGrid::sizeHint() const {
+ // kdDebug(67100) << "ViewGrid::sizeHint(): NewSize is " << _layoutMDW->sizeHint() << "\n";
+ return( m_sizeHint);
}
void ViewGrid::constructionFinished() {
@@ -141,8 +141,8 @@ void ViewGrid::constructionFinished() {
void ViewGrid::refreshVolumeLevels() {
// kdDebug(67100) << "ViewGrid::refreshVolumeLevels()\n";
- m_tqsizeHint.setWidth (0);
- m_tqsizeHint.setHeight(0);
+ m_sizeHint.setWidth (0);
+ m_sizeHint.setHeight(0);
m_testingX = 0;
m_testingY = 0;
@@ -182,8 +182,8 @@ void ViewGrid::refreshVolumeLevels() {
after hiding/showing channels.
*/
void ViewGrid::configurationUpdate() {
- m_tqsizeHint.setWidth (0);
- m_tqsizeHint.setHeight(0);
+ m_sizeHint.setWidth (0);
+ m_sizeHint.setHeight(0);
m_testingX = 0;
m_testingY = 0;
@@ -195,9 +195,9 @@ void ViewGrid::configurationUpdate() {
int xPos = m_testingX * m_spacingHorizontal;
int yPos = m_testingY * m_spacingVertical ;
mdw->move( xPos, yPos );
- mdw->resize( mdw->tqsizeHint() );
- int xMax = xPos + mdw->width() ; if ( xMax > m_tqsizeHint.width() ) m_tqsizeHint.setWidth(xMax);
- int yMax = yPos + mdw->height(); if ( yMax > m_tqsizeHint.height() ) m_tqsizeHint.setHeight(yMax);
+ mdw->resize( mdw->sizeHint() );
+ int xMax = xPos + mdw->width() ; if ( xMax > m_sizeHint.width() ) m_sizeHint.setWidth(xMax);
+ int yMax = yPos + mdw->height(); if ( yMax > m_sizeHint.height() ) m_sizeHint.setHeight(yMax);
m_testingX += 5;
if ( m_testingX > 50 ) {
diff --git a/kmix/viewgrid.h b/kmix/viewgrid.h
index 5fd1a183..48592a55 100644
--- a/kmix/viewgrid.h
+++ b/kmix/viewgrid.h
@@ -23,7 +23,7 @@ public:
virtual void configurationUpdate();
virtual void constructionFinished();
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
public slots:
virtual void refreshVolumeLevels();
@@ -33,7 +33,7 @@ private:
unsigned int m_spacingVertical;
// m_maxX and m_maxY are the highest coordiantes encountered
- TQSize m_tqsizeHint;
+ TQSize m_sizeHint;
unsigned int m_testingX;
unsigned int m_testingY;
diff --git a/kmix/viewsliders.cpp b/kmix/viewsliders.cpp
index 3cab3c6d..ea97e2aa 100644
--- a/kmix/viewsliders.cpp
+++ b/kmix/viewsliders.cpp
@@ -102,9 +102,9 @@ TQWidget* ViewSliders::add(MixDevice *md)
return mdw;
}
-TQSize ViewSliders::tqsizeHint() const {
- // kdDebug(67100) << "ViewSliders::tqsizeHint(): NewSize is " << _layoutMDW->tqsizeHint() << "\n";
- return( _layoutMDW->tqsizeHint() );
+TQSize ViewSliders::sizeHint() const {
+ // kdDebug(67100) << "ViewSliders::sizeHint(): NewSize is " << _layoutMDW->sizeHint() << "\n";
+ return( _layoutMDW->sizeHint() );
}
void ViewSliders::constructionFinished() {
diff --git a/kmix/viewsliders.h b/kmix/viewsliders.h
index 168a425c..31e3fda9 100644
--- a/kmix/viewsliders.h
+++ b/kmix/viewsliders.h
@@ -21,7 +21,7 @@ public:
virtual TQWidget* add(MixDevice *mdw);
virtual void constructionFinished();
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
public slots:
virtual void refreshVolumeLevels();
diff --git a/kmix/viewsurround.cpp b/kmix/viewsurround.cpp
index 5b2ac99f..81f84f64 100644
--- a/kmix/viewsurround.cpp
+++ b/kmix/viewsurround.cpp
@@ -162,9 +162,9 @@ TQWidget* ViewSurround::add(MixDevice *md)
return mdw;
}
-TQSize ViewSurround::tqsizeHint() const {
- // kdDebug(67100) << "ViewSurround::tqsizeHint(): NewSize is " << _layoutMDW->tqsizeHint() << "\n";
- return( _layoutMDW->tqsizeHint() );
+TQSize ViewSurround::sizeHint() const {
+ // kdDebug(67100) << "ViewSurround::sizeHint(): NewSize is " << _layoutMDW->sizeHint() << "\n";
+ return( _layoutMDW->sizeHint() );
}
void ViewSurround::constructionFinished() {
diff --git a/kmix/viewsurround.h b/kmix/viewsurround.h
index de469292..4ba3c5cc 100644
--- a/kmix/viewsurround.h
+++ b/kmix/viewsurround.h
@@ -24,7 +24,7 @@ public:
virtual TQWidget* add(MixDevice *mdw);
virtual void constructionFinished();
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
public slots:
virtual void refreshVolumeLevels();
diff --git a/kmix/viewswitches.cpp b/kmix/viewswitches.cpp
index 3d3166bb..3c414815 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 tqsizeHint() or some other subtle tqlayout issue.
+ // the _layoutEnum, so it might be a sizeHint() or some other subtle tqlayout issue.
_layoutEnum = new TQVBoxLayout(_layoutMDW);
}
init();
@@ -118,9 +118,9 @@ TQWidget* ViewSwitches::add(MixDevice *md)
return mdw;
}
-TQSize ViewSwitches::tqsizeHint() const {
- //kdDebug(67100) << "ViewSwitches::tqsizeHint(): NewSize is " << _layoutMDW->tqsizeHint() << "\n";
- return( _layoutMDW->tqsizeHint() );
+TQSize ViewSwitches::sizeHint() const {
+ //kdDebug(67100) << "ViewSwitches::sizeHint(): NewSize is " << _layoutMDW->sizeHint() << "\n";
+ return( _layoutMDW->sizeHint() );
}
void ViewSwitches::constructionFinished() {
diff --git a/kmix/viewswitches.h b/kmix/viewswitches.h
index 9e591514..3ddb288f 100644
--- a/kmix/viewswitches.h
+++ b/kmix/viewswitches.h
@@ -22,7 +22,7 @@ public:
virtual void constructionFinished();
virtual void configurationUpdate();
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
public slots:
virtual void refreshVolumeLevels();