summaryrefslogtreecommitdiffstats
path: root/kmix/kmixapplet.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kmix/kmixapplet.cpp')
-rw-r--r--kmix/kmixapplet.cpp60
1 files changed, 30 insertions, 30 deletions
diff --git a/kmix/kmixapplet.cpp b/kmix/kmixapplet.cpp
index c0fed889..200ee035 100644
--- a/kmix/kmixapplet.cpp
+++ b/kmix/kmixapplet.cpp
@@ -66,11 +66,11 @@
extern "C"
{
- KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
+ KDE_EXPORT KPanelApplet* init(TQWidget *tqparent, const TQString& configFile)
{
KGlobal::locale()->insertCatalogue("kmix");
return new KMixApplet(configFile, KPanelApplet::Normal,
- parent, "kmixapplet");
+ tqparent, "kmixapplet");
}
}
@@ -84,10 +84,10 @@ static const TQColor mutedHighColor = "#FFFFFF";
static const TQColor mutedLowColor = "#808080";
static const TQColor mutedBackColor = "#000000";
-AppletConfigDialog::AppletConfigDialog( TQWidget * parent, const char * name )
- : KDialogBase( KDialogBase::Plain, TQString::null,
+AppletConfigDialog::AppletConfigDialog( TQWidget * tqparent, const char * name )
+ : KDialogBase( KDialogBase::Plain, TQString(),
KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel,
- KDialogBase::Ok, parent, name, false, true)
+ KDialogBase::Ok, tqparent, name, false, true)
{
setPlainCaption(i18n("Configure - Mixer Applet"));
TQFrame* page = plainPage();
@@ -150,9 +150,9 @@ bool AppletConfigDialog::useCustomColors() const
KMixApplet::KMixApplet( const TQString& configFile, Type t,
- TQWidget *parent, const char *name )
+ TQWidget *tqparent, const char *name )
- : KPanelApplet( configFile, t, KPanelApplet::Preferences | KPanelApplet::ReportBug | KPanelApplet::About, parent, name ),
+ : KPanelApplet( configFile, t, KPanelApplet::Preferences | KPanelApplet::ReportBug | KPanelApplet::About, tqparent, name ),
m_mixerWidget(0), m_errorLabel(0), m_pref(0),
m_aboutData( "kmix", I18N_NOOP("KMix Panel Applet"),
APP_VERSION, "Mini Sound Mixer Applet", KAboutData::License_GPL,
@@ -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->sizeHint().width(), m_errorLabel->sizeHint().height() );
- resize( m_errorLabel->sizeHint() );
+ m_errorLabel->setGeometry(0, 0, m_errorLabel->tqsizeHint().width(), m_errorLabel->tqsizeHint().height() );
+ resize( m_errorLabel->tqsizeHint() );
connect( m_errorLabel, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectMixer()) );
}
else {
@@ -243,13 +243,13 @@ void KMixApplet::saveConfig()
cfg->writeEntry( "ColorCustom", _customColors );
- cfg->writeEntry( "ColorHigh", _colors.high.name() );
- cfg->writeEntry( "ColorLow", _colors.low.name() );
- cfg->writeEntry( "ColorBack", _colors.back.name() );
+ cfg->writeEntry( "ColorHigh", TQString(_colors.high.name()) );
+ cfg->writeEntry( "ColorLow", TQString(_colors.low.name()) );
+ cfg->writeEntry( "ColorBack", TQString(_colors.back.name()) );
- cfg->writeEntry( "ColorMutedHigh", _colors.mutedHigh.name() );
- cfg->writeEntry( "ColorMutedLow", _colors.mutedLow.name() );
- cfg->writeEntry( "ColorMutedBack", _colors.mutedBack.name() );
+ cfg->writeEntry( "ColorMutedHigh", TQString(_colors.mutedHigh.name()) );
+ cfg->writeEntry( "ColorMutedLow", TQString(_colors.mutedLow.name()) );
+ cfg->writeEntry( "ColorMutedBack", TQString(_colors.mutedBack.name()) );
//cfg->writeEntry( "ReversedDirection", reversedDir );
@@ -266,7 +266,7 @@ void KMixApplet::loadConfig()
cfg->setGroup(0);
_mixerId = cfg->readEntry( "Mixer", "undef" );
- _mixerName = cfg->readEntry( "MixerName", TQString::null );
+ _mixerName = cfg->readEntry( "MixerName", TQString() );
_customColors = cfg->readBoolEntry( "ColorCustom", false );
@@ -325,7 +325,7 @@ void KMixApplet::selectMixer()
lst, 1, FALSE, &ok, this );
if ( ok )
{
- Mixer *mixer = Mixer::mixers().at( lst.findIndex( res ) );
+ Mixer *mixer = Mixer::mixers().at( lst.tqfindIndex( res ) );
if (!mixer)
KMessageBox::sorry( this, i18n("Invalid mixer entered.") );
else
@@ -375,7 +375,7 @@ void KMixApplet::positionChange(Position pos) {
loadConfig();
setColors();
- const TQSize panelAppletConstrainedSize = sizeHint();
+ const TQSize panelAppletConstrainedSize = tqsizeHint();
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 sizeHint(), because we must take the new PanelSize in account.
+ // resizing changes our own tqsizeHint(), because we must take the new PanelSize in account.
// So updateGeometry() is amust for us.
//kdDebug(67100) << "KMixApplet::resizeEvent(). UPDATE GEOMETRY" << endl;
updateGeometry();
@@ -414,35 +414,35 @@ void KMixApplet::updateGeometrySlot() {
}
-TQSize KMixApplet::sizeHint() const {
- //kdDebug(67100) << "KMixApplet::sizeHint()\n";
+TQSize KMixApplet::tqsizeHint() const {
+ //kdDebug(67100) << "KMixApplet::tqsizeHint()\n";
TQSize qsz;
if ( m_errorLabel !=0 ) {
- qsz = m_errorLabel->sizeHint();
+ qsz = m_errorLabel->tqsizeHint();
}
else if ( m_mixerWidget != 0) {
- qsz = m_mixerWidget->sizeHint();
+ qsz = m_mixerWidget->tqsizeHint();
}
else {
// During construction of m_mixerWidget or if something goes wrong:
- // Return something that should resemble our former sizeHint().
+ // Return something that should resemble our former tqsizeHint().
qsz = size();
}
- //kdDebug(67100) << "KMixApplet::sizeHint() leftright =" << qsz << "\n";
+ //kdDebug(67100) << "KMixApplet::tqsizeHint() leftright =" << qsz << "\n";
return qsz;
}
/**
- We need widthForHeight() and heigthForWidth() only because KPanelApplet::updateLayout does relayouts
+ We need widthForHeight() and heigthForWidth() only because KPanelApplet::updateLayout does retqlayouts
using this method. Actually we ignore the passed paramater and just return our preferred size.
*/
int KMixApplet::widthForHeight(int) const {
- //kdDebug(67100) << "KMixApplet::widthForHeight() = " << sizeHint().width() << endl;
- return sizeHint().width();
+ //kdDebug(67100) << "KMixApplet::widthForHeight() = " << tqsizeHint().width() << endl;
+ return tqsizeHint().width();
}
int KMixApplet::heightForWidth(int) const {
- //kdDebug(67100) << "KMixApplet::heightForWidth() = " << sizeHint().height() << endl;
- return sizeHint().height();
+ //kdDebug(67100) << "KMixApplet::heightForWidth() = " << tqsizeHint().height() << endl;
+ return tqsizeHint().height();
}