summaryrefslogtreecommitdiffstats
path: root/kmix
diff options
context:
space:
mode:
Diffstat (limited to 'kmix')
-rw-r--r--kmix/KMixApp.h1
-rw-r--r--kmix/colorwidget.ui26
-rw-r--r--kmix/dialogselectmaster.cpp14
-rw-r--r--kmix/dialogselectmaster.h1
-rw-r--r--kmix/dialogviewconfiguration.cpp10
-rw-r--r--kmix/dialogviewconfiguration.h5
-rw-r--r--kmix/kledbutton.cpp20
-rw-r--r--kmix/kledbutton.h9
-rw-r--r--kmix/kmix.cpp52
-rw-r--r--kmix/kmix.h3
-rw-r--r--kmix/kmixapplet.cpp60
-rw-r--r--kmix/kmixapplet.h10
-rw-r--r--kmix/kmixdockwidget.cpp30
-rw-r--r--kmix/kmixdockwidget.h3
-rw-r--r--kmix/kmixerwidget.cpp24
-rw-r--r--kmix/kmixerwidget.h3
-rw-r--r--kmix/kmixprefdlg.cpp32
-rw-r--r--kmix/kmixprefdlg.h3
-rw-r--r--kmix/ksmallslider.cpp34
-rw-r--r--kmix/ksmallslider.h15
-rw-r--r--kmix/mdwenum.cpp36
-rw-r--r--kmix/mdwenum.h5
-rw-r--r--kmix/mdwslider.cpp136
-rw-r--r--kmix/mdwslider.h5
-rw-r--r--kmix/mdwswitch.cpp36
-rw-r--r--kmix/mdwswitch.h5
-rw-r--r--kmix/mixdevice.cpp4
-rw-r--r--kmix/mixdevice.h5
-rw-r--r--kmix/mixdevicewidget.cpp8
-rw-r--r--kmix/mixdevicewidget.h5
-rw-r--r--kmix/mixer.cpp4
-rw-r--r--kmix/mixer.h3
-rw-r--r--kmix/mixer_alsa9.cpp26
-rw-r--r--kmix/mixer_hpux.cpp20
-rw-r--r--kmix/mixer_hpux.h2
-rw-r--r--kmix/mixer_irix.cpp4
-rw-r--r--kmix/mixer_oss.cpp18
-rw-r--r--kmix/mixer_oss4.cpp12
-rw-r--r--kmix/mixer_sun.cpp4
-rw-r--r--kmix/mixertoolbox.cpp16
-rw-r--r--kmix/verticaltext.cpp8
-rw-r--r--kmix/verticaltext.h6
-rw-r--r--kmix/viewapplet.cpp28
-rw-r--r--kmix/viewapplet.h7
-rw-r--r--kmix/viewbase.cpp10
-rw-r--r--kmix/viewbase.h5
-rw-r--r--kmix/viewdockareapopup.cpp26
-rw-r--r--kmix/viewdockareapopup.h5
-rw-r--r--kmix/viewgrid.cpp42
-rw-r--r--kmix/viewgrid.h7
-rw-r--r--kmix/viewinput.cpp4
-rw-r--r--kmix/viewinput.h3
-rw-r--r--kmix/viewoutput.cpp4
-rw-r--r--kmix/viewoutput.h3
-rw-r--r--kmix/viewsliders.cpp16
-rw-r--r--kmix/viewsliders.h5
-rw-r--r--kmix/viewsurround.cpp42
-rw-r--r--kmix/viewsurround.h5
-rw-r--r--kmix/viewswitches.cpp20
-rw-r--r--kmix/viewswitches.h5
-rw-r--r--kmix/volume.cpp40
-rw-r--r--kmix/volume.h14
62 files changed, 520 insertions, 494 deletions
diff --git a/kmix/KMixApp.h b/kmix/KMixApp.h
index 79e4fc4e..4b5b1122 100644
--- a/kmix/KMixApp.h
+++ b/kmix/KMixApp.h
@@ -8,6 +8,7 @@ class KMixWindow;
class KMixApp : public KUniqueApplication
{
Q_OBJECT
+ TQ_OBJECT
public:
KMixApp();
~KMixApp();
diff --git a/kmix/colorwidget.ui b/kmix/colorwidget.ui
index 56f1d60e..35d2a0f8 100644
--- a/kmix/colorwidget.ui
+++ b/kmix/colorwidget.ui
@@ -1,11 +1,11 @@
<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
<class>ColorWidget</class>
<author>Stefan Schimanski &lt;1Stein@gmx.de&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>ColorWidget</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -20,7 +20,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>customColors</cstring>
</property>
@@ -28,7 +28,7 @@
<string>&amp;Use custom colors</string>
</property>
</widget>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>activeColors</cstring>
</property>
@@ -53,7 +53,7 @@
<string></string>
</property>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>TextLabel3</cstring>
</property>
@@ -97,7 +97,7 @@
<string></string>
</property>
</widget>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>labelLoad</cstring>
</property>
@@ -111,7 +111,7 @@
<cstring>activeHigh</cstring>
</property>
</widget>
- <widget class="QLabel" row="2" column="0">
+ <widget class="TQLabel" row="2" column="0">
<property name="name">
<cstring>TextLabel4</cstring>
</property>
@@ -127,7 +127,7 @@
</widget>
</grid>
</widget>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>mutedColors</cstring>
</property>
@@ -141,7 +141,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>TextLabel6</cstring>
</property>
@@ -155,7 +155,7 @@
<cstring>mutedHigh</cstring>
</property>
</widget>
- <widget class="QLabel" row="2" column="0">
+ <widget class="TQLabel" row="2" column="0">
<property name="name">
<cstring>TextLabel8</cstring>
</property>
@@ -169,7 +169,7 @@
<cstring>mutedBack</cstring>
</property>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>TextLabel7</cstring>
</property>
@@ -236,7 +236,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -272,5 +272,5 @@
<include location="global" impldecl="in declaration">klocale.h</include>
<include location="global" impldecl="in declaration">kseparator.h</include>
</includes>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/kmix/dialogselectmaster.cpp b/kmix/dialogselectmaster.cpp
index a201f33a..d206429e 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->setSizePolicy(qsp);
+ //mixerNameLayout->tqsetSizePolicy(qsp);
mixerNameLayout->setSpacing(KDialog::spacingHint());
TQLabel *qlbl = new TQLabel( i18n("Current Mixer"), m_mainFrame );
mixerNameLayout->addWidget(qlbl);
- qlbl->setFixedHeight(qlbl->sizeHint().height());
+ qlbl->setFixedHeight(qlbl->tqsizeHint().height());
m_cMixer = new KComboBox( FALSE, m_mainFrame, "mixerCombo" );
- m_cMixer->setFixedHeight(m_cMixer->sizeHint().height());
+ m_cMixer->setFixedHeight(m_cMixer->tqsizeHint().height());
connect( m_cMixer, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( createPageByID( int ) ) );
//int id=1;
@@ -97,10 +97,10 @@ void DialogSelectMaster::createWidgets(Mixer *ptr_mixer)
_layout->addWidget(qlbl);
m_scrollableChannelSelector = new TQScrollView(m_mainFrame, "scrollableChannelSelector");
- m_scrollableChannelSelector->viewport()->setBackgroundMode(Qt::PaletteBackground);
+ m_scrollableChannelSelector->viewport()->setBackgroundMode(TQt::PaletteBackground);
_layout->add(m_scrollableChannelSelector);
- m_buttonGroupForScrollView = new TQButtonGroup(this); // invisible QButtonGroup
+ m_buttonGroupForScrollView = new TQButtonGroup(this); // invisible TQButtonGroup
m_buttonGroupForScrollView->hide();
createPage(ptr_mixer);
@@ -133,7 +133,7 @@ void DialogSelectMaster::createPage(Mixer* mixer)
* In case the user selected a new Mixer via m_cMixer, we need
* to remove the stuff created on the last call.
*/
- // delete the VBox. This should automatically remove all contained QRadioButton's.
+ // delete the VBox. This should automatically remove all contained TQRadioButton's.
delete m_vboxForScrollView;
m_mixerPKs.clear();
/** Reset page end -------------------------------------------------- */
@@ -153,7 +153,7 @@ void DialogSelectMaster::createPage(Mixer* mixer)
if ( ! md->isEnum() && ! md->isSwitch() ) {
//kdDebug(67100) << "DialogSelectMaster::createPage() mset append qrb" << endl;
TQString mdName = md->name();
- mdName.replace('&', "&&"); // Quoting the '&' needed, to prevent TQRadioButton creating an accelerator
+ mdName.tqreplace('&', "&&"); // Quoting the '&' needed, to prevent TQRadioButton creating an accelerator
TQRadioButton* qrb = new TQRadioButton( mdName, m_vboxForScrollView);
m_buttonGroupForScrollView->insert(qrb); //(qrb, md->num());
//_qEnabledCB.append(qrb);
diff --git a/kmix/dialogselectmaster.h b/kmix/dialogselectmaster.h
index c454a3fe..5a3a57b2 100644
--- a/kmix/dialogselectmaster.h
+++ b/kmix/dialogselectmaster.h
@@ -16,6 +16,7 @@ class Mixer;
class DialogSelectMaster : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
DialogSelectMaster(Mixer *);
~DialogSelectMaster();
diff --git a/kmix/dialogviewconfiguration.cpp b/kmix/dialogviewconfiguration.cpp
index 09e88d23..948df8fe 100644
--- a/kmix/dialogviewconfiguration.cpp
+++ b/kmix/dialogviewconfiguration.cpp
@@ -50,7 +50,7 @@ DialogViewConfiguration::DialogViewConfiguration( TQWidget*, ViewBase& view)
if ( qw->inherits("MixDeviceWidget") ) {
MixDeviceWidget *mdw = static_cast<MixDeviceWidget*>(qw);
TQString mdName = mdw->mixDevice()->name();
- mdName.replace('&', "&&"); // Quoting the '&' needed, to prevent TQCheckBox creating an accelerator
+ mdName.tqreplace('&', "&&"); // Quoting the '&' needed, to prevent TQCheckBox creating an accelerator
TQCheckBox* cb = new TQCheckBox( mdName, plainPage() );
_qEnabledCB.append(cb);
cb->setChecked( !mdw->isDisabled() ); //mdw->isVisible() );
@@ -58,7 +58,7 @@ DialogViewConfiguration::DialogViewConfiguration( TQWidget*, ViewBase& view)
}
}
_layout->activate();
- resize(_layout->sizeHint() );
+ resize(_layout->tqsizeHint() );
connect( this, TQT_SIGNAL(okClicked()) , this, TQT_SLOT(apply()) );
}
@@ -93,9 +93,9 @@ void DialogViewConfiguration::apply()
_view.configurationUpdate();
}
-TQSize DialogViewConfiguration::sizeHint() const {
- // kdDebug(67100) << "DialogViewConfiguration::sizeHint() is (100,500)\n";
- return _layout->sizeHint();
+TQSize DialogViewConfiguration::tqsizeHint() const {
+ // kdDebug(67100) << "DialogViewConfiguration::tqsizeHint() is (100,500)\n";
+ return _layout->tqsizeHint();
}
#include "dialogviewconfiguration.moc"
diff --git a/kmix/dialogviewconfiguration.h b/kmix/dialogviewconfiguration.h
index 6ee8c83f..4b90a168 100644
--- a/kmix/dialogviewconfiguration.h
+++ b/kmix/dialogviewconfiguration.h
@@ -13,11 +13,12 @@ class TQVBoxLayout;
class DialogViewConfiguration : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- DialogViewConfiguration(TQWidget* parent, ViewBase& view);
+ DialogViewConfiguration(TQWidget* tqparent, ViewBase& view);
~DialogViewConfiguration();
- TQSize sizeHint() const;
+ TQSize tqsizeHint() const;
public slots:
void apply();
diff --git a/kmix/kledbutton.cpp b/kmix/kledbutton.cpp
index e0a7bff1..0145d4c4 100644
--- a/kmix/kledbutton.cpp
+++ b/kmix/kledbutton.cpp
@@ -24,17 +24,17 @@
#include "kledbutton.h"
-KLedButton::KLedButton(const TQColor &col, TQWidget *parent, const char *name)
- : KLed( col, parent, name )
+KLedButton::KLedButton(const TQColor &col, TQWidget *tqparent, const char *name)
+ : KLed( col, tqparent, name )
{
- // KLed and thus KLedButtung does not do proper positioning in QLayout's.
+ // KLed and thus KLedButtung does not do proper positioning in TQLayout's.
// Thus I will do a dirty trick here
- installEventFilter(parent);
+ installEventFilter(tqparent);
}
KLedButton::KLedButton(const TQColor& col, KLed::State st, KLed::Look look,
- KLed::Shape shape, TQWidget *parent, const char *name)
- : KLed( col, st, look, shape, parent, name )
+ KLed::Shape tqshape, TQWidget *tqparent, const char *name)
+ : KLed( col, st, look, tqshape, tqparent, name )
{
}
@@ -44,7 +44,7 @@ KLedButton::~KLedButton()
void KLedButton::mousePressEvent( TQMouseEvent *e )
{
- if (e->button() == LeftButton)
+ if (e->button() == Qt::LeftButton)
{
toggle();
emit stateChanged( state() );
@@ -52,8 +52,8 @@ void KLedButton::mousePressEvent( TQMouseEvent *e )
}
bool KLedButton::eventFilter( TQObject* /*obj*/ , TQEvent* /*ev*/ ) {
- // KLed and thus KLedButtung does not do proper positioning in QLayout's.
- // Thus I listen to my parents resize events and do it here ... OUCH, that's ugly
+ // KLed and thus KLedButtung does not do proper positioning in TQLayout's.
+ // Thus I listen to my tqparents resize events and do it here ... OUCH, that's ugly
/* No, this cannot work !
if ( ev->type() == TQEvent::Resize ) {
TQResizeEvent* qre = (TQResizeEvent*)ev;
@@ -66,7 +66,7 @@ bool KLedButton::eventFilter( TQObject* /*obj*/ , TQEvent* /*ev*/ ) {
}
-TQSize KLedButton::sizeHint() const
+TQSize KLedButton::tqsizeHint() const
{
return size();
}
diff --git a/kmix/kledbutton.h b/kmix/kledbutton.h
index e8d562af..ed7f529b 100644
--- a/kmix/kledbutton.h
+++ b/kmix/kledbutton.h
@@ -32,13 +32,14 @@
class KLedButton : public KLed {
Q_OBJECT
+ TQ_OBJECT
public:
- KLedButton(const TQColor &col=Qt::green, TQWidget *parent=0, const char *name=0);
- KLedButton(const TQColor& col, KLed::State st, KLed::Look look, KLed::Shape shape,
- TQWidget *parent=0, const char *name=0);
+ KLedButton(const TQColor &col=TQt::green, TQWidget *tqparent=0, const char *name=0);
+ KLedButton(const TQColor& col, KLed::State st, KLed::Look look, KLed::Shape tqshape,
+ TQWidget *tqparent=0, const char *name=0);
~KLedButton();
- TQSize sizeHint () const;
+ TQSize tqsizeHint () const;
TQSizePolicy sizePolicy () const;
signals:
void stateChanged( bool newState );
diff --git a/kmix/kmix.cpp b/kmix/kmix.cpp
index ce4ab910..f0a2e4db 100644
--- a/kmix/kmix.cpp
+++ b/kmix/kmix.cpp
@@ -107,25 +107,25 @@ void
KMixWindow::initActions()
{
// file menu
- KStdAction::quit( this, TQT_SLOT(quit()), actionCollection());
+ KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(quit()), actionCollection());
// settings menu
- KStdAction::showMenubar( this, TQT_SLOT(toggleMenuBar()), actionCollection());
- KStdAction::preferences( this, TQT_SLOT(showSettings()), actionCollection());
- new KAction( i18n( "Configure &Global Shortcuts..." ), "configure_shortcuts", 0, this,
+ KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT(toggleMenuBar()), actionCollection());
+ KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(showSettings()), actionCollection());
+ new KAction( i18n( "Configure &Global Shortcuts..." ), "configure_shortcuts", 0, TQT_TQOBJECT(this),
TQT_SLOT( configureGlobalShortcuts() ), actionCollection(), "settings_global" );
KStdAction::keyBindings( guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection());
- (void) new KAction( i18n( "Hardware &Information" ), 0, this, TQT_SLOT( slotHWInfo() ), actionCollection(), "hwinfo" );
- (void) new KAction( i18n( "Hide Mixer Window" ), Key_Escape, this, TQT_SLOT(hide()), actionCollection(), "hide_kmixwindow" );
+ (void) new KAction( i18n( "Hardware &Information" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotHWInfo() ), actionCollection(), "hwinfo" );
+ (void) new KAction( i18n( "Hide Mixer Window" ), Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(hide()), actionCollection(), "hide_kmixwindow" );
- m_globalAccel = new KGlobalAccel( this );
- m_globalAccel->insert( "Increase volume", i18n( "Increase Volume of Master Channel"), TQString::null,
- KShortcut(), KShortcut(), this, TQT_SLOT( increaseVolume() ) );
- m_globalAccel->insert( "Decrease volume", i18n( "Decrease Volume of Master Channel"), TQString::null,
- KShortcut(), KShortcut(), this, TQT_SLOT( decreaseVolume() ) );
- m_globalAccel->insert( "Toggle mute", i18n( "Toggle Mute of Master Channel"), TQString::null,
- KShortcut(), KShortcut(), this, TQT_SLOT( toggleMuted() ) );
+ m_globalAccel = new KGlobalAccel( TQT_TQOBJECT(this) );
+ m_globalAccel->insert( "Increase volume", i18n( "Increase Volume of Master Channel"), TQString(),
+ KShortcut(), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( increaseVolume() ) );
+ m_globalAccel->insert( "Decrease volume", i18n( "Decrease Volume of Master Channel"), TQString(),
+ KShortcut(), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( decreaseVolume() ) );
+ m_globalAccel->insert( "Toggle mute", i18n( "Toggle Mute of Master Channel"), TQString(),
+ KShortcut(), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( toggleMuted() ) );
m_globalAccel->readSettings();
m_globalAccel->updateConnections();
@@ -145,10 +145,10 @@ KMixWindow::initPrefDlg()
void
KMixWindow::initWidgets()
{
- // Main widget and layout
+ // Main widget and tqlayout
setCentralWidget( new TQWidget( this, "qt_central_widget" ) );
- // Widgets layout
+ // Widgets tqlayout
widgetsLayout = new TQVBoxLayout( centralWidget(), 0, 0, "widgetsLayout" );
widgetsLayout->setResizeMode(TQLayout::Minimum); // works fine
@@ -157,16 +157,16 @@ KMixWindow::initWidgets()
mixerNameLayout = new TQHBox( centralWidget(), "mixerNameLayout" );
widgetsLayout->setStretchFactor( mixerNameLayout, 0 );
TQSizePolicy qsp( TQSizePolicy::Ignored, TQSizePolicy::Maximum);
- mixerNameLayout->setSizePolicy(qsp);
+ mixerNameLayout->tqsetSizePolicy(qsp);
mixerNameLayout->setSpacing(KDialog::spacingHint());
TQLabel *qlbl = new TQLabel( i18n("Current mixer:"), mixerNameLayout );
- qlbl->setFixedHeight(qlbl->sizeHint().height());
+ qlbl->setFixedHeight(qlbl->tqsizeHint().height());
m_cMixer = new KComboBox( FALSE, mixerNameLayout, "mixerCombo" );
- m_cMixer->setFixedHeight(m_cMixer->sizeHint().height());
- connect( m_cMixer, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( showSelectedMixer( int ) ) );
+ m_cMixer->setFixedHeight(m_cMixer->tqsizeHint().height());
+ connect( m_cMixer, TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( showSelectedMixer( int ) ) );
TQToolTip::add( m_cMixer, i18n("Current mixer" ) );
- // Add first layout to widgets
+ // Add first tqlayout to widgets
widgetsLayout->addWidget( mixerNameLayout );
m_wsMixers = new TQWidgetStack( centralWidget(), "MixerWidgetStack" );
@@ -267,9 +267,9 @@ KMixWindow::saveConfig()
config->writeEntry( "ValueStyle", "None" );
if ( m_toplevelOrientation == Qt::Vertical )
- config->writeEntry( "Orientation","Vertical" );
+ config->writeEntry( "Qt::Orientation","Vertical" );
else
- config->writeEntry( "Orientation","Horizontal" );
+ config->writeEntry( "Qt::Orientation","Horizontal" );
config->writeEntry( "Autostart", m_autoStart );
// save mixer widgets
@@ -305,7 +305,7 @@ KMixWindow::loadConfig()
m_multiDriverMode = config->readBoolEntry("MultiDriver", false);
m_surroundView = config->readBoolEntry("Experimental-ViewSurround", false );
m_gridView = config->readBoolEntry("Experimental-ViewGrid", false );
- const TQString& orientationString = config->readEntry("Orientation", "Horizontal");
+ const TQString& orientationString = config->readEntry("Qt::Orientation", "Horizontal");
TQString mixerMasterCard = config->readEntry( "MasterMixer", "" );
Mixer::setMasterCard(mixerMasterCard);
TQString masterDev = config->readEntry( "MasterMixerDevice", "" );
@@ -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 to Vertical layout\n";
+ //kdDebug(67100) << "KMix should change toQt::Vertical tqlayout\n";
m_toplevelOrientation = Qt::Vertical;
}
else if ( prefDlg->_rbHorizontal->isChecked() ) {
- //kdDebug(67100) << "KMix should change to Horizontal layout\n";
+ //kdDebug(67100) << "KMix should change toQt::Horizontal tqlayout\n";
m_toplevelOrientation = Qt::Horizontal;
}
m_autoStart = prefDlg->m_autoStartChk->isChecked();
@@ -551,7 +551,7 @@ KMixWindow::applyPrefs( KMixPrefDlg *prefDlg )
show();
}
- this->repaint(); // make KMix look fast (saveConfig() often uses several seconds)
+ this->tqrepaint(); // make KMix look fast (saveConfig() often uses several seconds)
kapp->processEvents();
saveConfig();
}
diff --git a/kmix/kmix.h b/kmix/kmix.h
index 398c88d8..09e4cb15 100644
--- a/kmix/kmix.h
+++ b/kmix/kmix.h
@@ -27,7 +27,7 @@
#include <config.h>
#endif
-// include files for Qt
+// include files for TQt
#include <tqstring.h>
#include <tqmap.h>
@@ -55,6 +55,7 @@ class
KMixWindow : public KMainWindow
{
Q_OBJECT
+ TQ_OBJECT
public:
KMixWindow();
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();
}
diff --git a/kmix/kmixapplet.h b/kmix/kmixapplet.h
index 561a596f..1b997a5b 100644
--- a/kmix/kmixapplet.h
+++ b/kmix/kmixapplet.h
@@ -22,7 +22,7 @@
#ifndef KMIXAPPLET_H
#define KMIXAPPLET_H
-// Qt
+// TQt
#include <tqlayout.h>
#include <tqptrlist.h>
#include <tqwidget.h>
@@ -43,8 +43,9 @@ class KMixApplet;
class AppletConfigDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- AppletConfigDialog( TQWidget * parent=0, const char * name=0 );
+ AppletConfigDialog( TQWidget * tqparent=0, const char * name=0 );
virtual ~AppletConfigDialog() {};
void setActiveColors(const TQColor& high, const TQColor& low, const TQColor& back);
@@ -70,10 +71,11 @@ class AppletConfigDialog : public KDialogBase
class KMixApplet : public KPanelApplet
{
Q_OBJECT
+ TQ_OBJECT
public:
KMixApplet( const TQString& configFile, Type t = Normal,
- TQWidget *parent = 0, const char *name = 0 );
+ TQWidget *tqparent = 0, const char *name = 0 );
virtual ~KMixApplet();
struct Colors {
@@ -86,7 +88,7 @@ public:
void reportBug();
void paletteChange ( const TQPalette & oldPalette );
- TQSize sizeHint() const;
+ TQSize tqsizeHint() const;
TQSizePolicy sizePolicy() const;
int widthForHeight(int) const;
int heightForWidth(int) const;
diff --git a/kmix/kmixdockwidget.cpp b/kmix/kmixdockwidget.cpp
index 32372cb3..1a0763d5 100644
--- a/kmix/kmixdockwidget.cpp
+++ b/kmix/kmixdockwidget.cpp
@@ -48,8 +48,8 @@
#include "kwin.h"
#include "viewdockareapopup.h"
-KMixDockWidget::KMixDockWidget( Mixer *mixer, TQWidget *parent, const char *name, bool volumePopup, bool dockIconMuting )
- : KSystemTray( parent, name ),
+KMixDockWidget::KMixDockWidget( Mixer *mixer, TQWidget *tqparent, const char *name, bool volumePopup, bool dockIconMuting )
+ : KSystemTray( tqparent, name ),
m_mixer(mixer),
_dockAreaPopup(0L),
_audioPlayer(0L),
@@ -81,7 +81,7 @@ KMixDockWidget::~KMixDockWidget()
void KMixDockWidget::createActions()
{
// Put "Mute" selector in context menu
- (void)new KToggleAction( i18n( "M&ute" ), 0, this, TQT_SLOT( dockMute() ),
+ (void)new KToggleAction( i18n( "M&ute" ), 0, TQT_TQOBJECT(this), TQT_SLOT( dockMute() ),
actionCollection(), "dock_mute" );
KAction *a = actionCollection()->action( "dock_mute" );
KPopupMenu *popupMenu = contextMenu();
@@ -89,7 +89,7 @@ void KMixDockWidget::createActions()
// Put "Select Master Channel" dialog in context menu
if ( m_mixer != 0 ) {
- (void)new KAction( i18n("Select Master Channel..."), 0, this, TQT_SLOT(selectMaster()),
+ (void)new KAction( i18n("Select Master Channel..."), 0, TQT_TQOBJECT(this), TQT_SLOT(selectMaster()),
actionCollection(), "select_master");
KAction *a2 = actionCollection()->action( "select_master" );
if (a2) a2->plug( popupMenu );
@@ -123,7 +123,7 @@ KMixDockWidget::createMasterVolWidget()
m_mixer->readSetFromHWforceUpdate(); // after changing the master device, make sure to re-read (otherwise no "changed()" signals might get sent by the Mixer
/* With the recently introduced TQSocketNotifier stuff, we can't rely on regular timer updates
any longer. Also the readSetFromHWforceUpdate() won't be enough. As a workaround, we trigger
- all "repaints" manually here.
+ all "tqrepaints" manually here.
The call to m_mixer->readSetFromHWforceUpdate() is most likely superfluous, even if we don't use TQSocketNotifier (e.g. in backends OSS, Solaris, ...)
*/
setVolumeTip();
@@ -135,8 +135,8 @@ KMixDockWidget::createMasterVolWidget()
*
*/
// connect( m_mixer, TQT_SIGNAL(newVolumeLevels()), _dockAreaPopup, TQT_SLOT(refreshVolumeLevels()) );
- connect( m_mixer, TQT_SIGNAL(newVolumeLevels()), this, TQT_SLOT(setVolumeTip() ) );
- connect( m_mixer, TQT_SIGNAL(newVolumeLevels()), this, TQT_SLOT(slotUpdatePixmap() ) );
+ connect( m_mixer, TQT_SIGNAL(newVolumeLevels()), TQT_TQOBJECT(this), TQT_SLOT(setVolumeTip() ) );
+ connect( m_mixer, TQT_SIGNAL(newVolumeLevels()), TQT_TQOBJECT(this), TQT_SLOT(slotUpdatePixmap() ) );
}
void KMixDockWidget::slotUpdatePixmap()
@@ -191,7 +191,7 @@ KMixDockWidget::setVolumeTip()
}
newToolTipValue = val + 10000*md->isMuted();
if ( _oldToolTipValue != newToolTipValue ) {
- tip = i18n( "Volume at %1%" ).arg( val );
+ tip = i18n( "Volume at %1%" ).tqarg( val );
if ( md->isMuted() ) {
tip += i18n( " (Muted)" );
}
@@ -267,7 +267,7 @@ KMixDockWidget::mousePressEvent(TQMouseEvent *me)
// esken: Due to overwhelming request, LeftButton shows the ViewDockAreaPopup, if configured
// to do so. Otherwise the main window will be shown.
- if ( me->button() == LeftButton )
+ if ( me->button() == Qt::LeftButton )
{
if ( ! _volumePopup ) {
// Case 1: User wants to show main window => This is the KSystemTray default action
@@ -311,7 +311,7 @@ KMixDockWidget::mousePressEvent(TQMouseEvent *me)
TQWidget::mousePressEvent(me); // KSystemTray's shouldn't do the default action for this
return;
} // LeftMouseButton pressed
- else if ( me->button() == MidButton ) {
+ else if ( me->button() == Qt::MidButton ) {
if ( ! _dockIconMuting ) {
toggleActive();
} else {
@@ -357,10 +357,10 @@ KMixDockWidget::wheelEvent(TQWheelEvent *e)
}
md->getVolume().setVolume(vol);
m_mixer->commitVolumeChange(md);
- // refresh the toolTip (Qt removes it on a MouseWheel event)
- // Mhhh, it doesn't work. Qt does not show it again.
+ // refresh the toolTip (TQt removes it on a MouseWheel event)
+ // Mhhh, it doesn't work. TQt does not show it again.
setVolumeTip();
- // Simulate a mouse move to make Qt show the tooltip again
+ // Simulate a mouse move to make TQt show the tooltip again
TQApplication::postEvent( this, new TQMouseEvent( TQEvent::MouseMove, TQCursor::pos(), Qt::NoButton, Qt::NoButton ) );
}
@@ -384,9 +384,9 @@ void
KMixDockWidget::contextMenuAboutToShow( KPopupMenu* /* menu */ )
{
KAction* showAction = actionCollection()->action("minimizeRestore");
- if ( parentWidget() && showAction )
+ if ( tqparentWidget() && showAction )
{
- if ( parentWidget()->isVisible() )
+ if ( tqparentWidget()->isVisible() )
{
showAction->setText( i18n("Hide Mixer Window") );
}
diff --git a/kmix/kmixdockwidget.h b/kmix/kmixdockwidget.h
index e536be4b..9efaefb6 100644
--- a/kmix/kmixdockwidget.h
+++ b/kmix/kmixdockwidget.h
@@ -39,11 +39,12 @@ class Volume;
class KMixDockWidget : public KSystemTray {
Q_OBJECT
+ TQ_OBJECT
friend class KMixWindow;
public:
- KMixDockWidget(Mixer *, TQWidget *parent=0, const char *name=0, bool volumePopup=true, bool dockIconMuting=false);
+ KMixDockWidget(Mixer *, TQWidget *tqparent=0, const char *name=0, bool volumePopup=true, bool dockIconMuting=false);
~KMixDockWidget();
void setErrorPixmap();
diff --git a/kmix/kmixerwidget.cpp b/kmix/kmixerwidget.cpp
index 45fbbf31..322f2160 100644
--- a/kmix/kmixerwidget.cpp
+++ b/kmix/kmixerwidget.cpp
@@ -19,7 +19,7 @@
*/
-// Qt
+// TQt
#include <tqlabel.h>
#include <tqlayout.h>
#include <tqslider.h>
@@ -49,7 +49,7 @@
/**
This widget is embedded in the KMix Main window. Each Hardware Mixer is visualized by one KMixerWidget.
- KMixerWidget contains
+ KMixerWidget tqcontains
(a) a headline where you can change Mixer's (if you got more than one Mixer)
(b) a Tab with 2-4 Tabs (containing View's with sliders, switches and other GUI elements visualizing the Mixer)
(c) A balancing slider
@@ -57,8 +57,8 @@
*/
KMixerWidget::KMixerWidget( int _id, Mixer *mixer, const TQString &mixerName,
MixDevice::DeviceCategory categoryMask,
- TQWidget * parent, const char * name, ViewBase::ViewFlags vflags )
- : TQWidget( parent, name ), _mixer(mixer), m_balanceSlider(0),
+ TQWidget * tqparent, const char * name, ViewBase::ViewFlags vflags )
+ : TQWidget( tqparent, name ), _mixer(mixer), m_balanceSlider(0),
m_topLayout(0),
m_id( _id ),
_iconsEnabled( true ), _labelsEnabled( false ), _ticksEnabled( false ),
@@ -76,13 +76,13 @@ KMixerWidget::KMixerWidget( int _id, Mixer *mixer, const TQString &mixerName,
{
// No mixer found
// !! Fix this: This is actually never shown!
- TQBoxLayout *layout = new TQHBoxLayout( this );
+ TQBoxLayout *tqlayout = 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 );
- layout->addWidget( errorLabel );
+ errorLabel->tqsetAlignment( TQLabel::AlignCenter | TQLabel::WordBreak );
+ tqlayout->addWidget( errorLabel );
}
}
@@ -103,7 +103,7 @@ void KMixerWidget::createLayout(ViewBase::ViewFlags vflags)
delete m_topLayout;
}
- // create main layout
+ // create main tqlayout
m_topLayout = new TQVBoxLayout( this, 0, 3, "m_topLayout" );
// Create tabs of input + output + [...]
@@ -133,11 +133,11 @@ void KMixerWidget::createLayout(ViewBase::ViewFlags vflags)
// *** Lower part: Slider and Mixer Name ************************************************
TQHBoxLayout *balanceAndDetail = new TQHBoxLayout( m_topLayout, 8, "balanceAndDetail");
// Create the left-right-slider
- m_balanceSlider = new TQSlider( -100, 100, 25, 0, TQSlider::Horizontal, this, "RightLeft" );
+ 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->sizeHint() );
- m_balanceSlider->setFixedHeight( m_balanceSlider->sizeHint().height() );
+ m_balanceSlider->setMinimumSize( m_balanceSlider->tqsizeHint() );
+ m_balanceSlider->setFixedHeight( m_balanceSlider->tqsizeHint().height() );
TQLabel *mixerName = new TQLabel(this, "mixerName");
mixerName->setText( _mixer->mixerName() );
@@ -167,7 +167,7 @@ void KMixerWidget::possiblyAddView(ViewBase* vbase)
_views.push_back(vbase);
vbase ->createDeviceWidgets();
m_ioTab->addTab( vbase , vbase->caption() );
- connect( vbase, TQT_SIGNAL(toggleMenuBar()), parentWidget(), TQT_SLOT(toggleMenuBar()) );
+ connect( vbase, TQT_SIGNAL(toggleMenuBar()), tqparentWidget(), TQT_SLOT(toggleMenuBar()) );
}
}
diff --git a/kmix/kmixerwidget.h b/kmix/kmixerwidget.h
index 6e793ca6..06ea6745 100644
--- a/kmix/kmixerwidget.h
+++ b/kmix/kmixerwidget.h
@@ -59,11 +59,12 @@ class ViewSurround;
class KMixerWidget : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
KMixerWidget( int _id, Mixer *mixer, const TQString &mixerName,
MixDevice::DeviceCategory categoryMask = MixDevice::ALL ,
- TQWidget *parent=0, const char *name=0, ViewBase::ViewFlags vflags=0 );
+ TQWidget *tqparent=0, const char *name=0, ViewBase::ViewFlags vflags=0 );
~KMixerWidget();
enum KMixerWidgetIO { OUTPUT=0, INPUT };
diff --git a/kmix/kmixprefdlg.cpp b/kmix/kmixprefdlg.cpp
index dbf2ae93..2a2793e4 100644
--- a/kmix/kmixprefdlg.cpp
+++ b/kmix/kmixprefdlg.cpp
@@ -36,43 +36,43 @@
#include "kmixerwidget.h"
-KMixPrefDlg::KMixPrefDlg( TQWidget *parent )
+KMixPrefDlg::KMixPrefDlg( TQWidget *tqparent )
: KDialogBase( Plain, i18n( "Configure" ),
- Ok|Cancel|Apply, Ok, parent )
+ Ok|Cancel|Apply, Ok, tqparent )
{
// general buttons
m_generalTab = plainPage( /* i18n("&General") */ );
- TQBoxLayout *layout = new TQVBoxLayout( m_generalTab );
- layout->setSpacing( KDialog::spacingHint() );
+ TQBoxLayout *tqlayout = new TQVBoxLayout( m_generalTab );
+ tqlayout->setSpacing( KDialog::spacingHint() );
m_dockingChk = new TQCheckBox( i18n("&Dock into panel"), m_generalTab );
- layout->addWidget( m_dockingChk );
+ tqlayout->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);
- layout->addWidget(m_volumeChk);
+ tqlayout->addWidget(m_volumeChk);
m_showTicks = new TQCheckBox( i18n("Show &tickmarks"), m_generalTab );
- layout->addWidget( m_showTicks );
+ tqlayout->addWidget( m_showTicks );
TQWhatsThis::add(m_showTicks,
i18n("Enable/disable tickmark scales on the sliders"));
m_showLabels = new TQCheckBox( i18n("Show &labels"), m_generalTab );
- layout->addWidget( m_showLabels );
+ tqlayout->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 );
- layout->addWidget( m_onLogin );
+ tqlayout->addWidget( m_onLogin );
m_dockIconMuting = new TQCheckBox(
i18n("Middle click on system tray icon toggles muting"), m_generalTab );
- layout->addWidget( m_dockIconMuting );
+ tqlayout->addWidget( m_dockIconMuting );
- TQBoxLayout *numbersLayout = new TQHBoxLayout( layout );
+ TQBoxLayout *numbersLayout = new TQHBoxLayout( tqlayout );
TQButtonGroup *numbersGroup = new TQButtonGroup( 3, Qt::Horizontal, i18n("Numbers"), m_generalTab );
numbersGroup->setRadioButtonExclusive(true);
TQLabel* qlbl = new TQLabel( i18n("Volume Values: "), m_generalTab );
@@ -91,14 +91,14 @@ KMixPrefDlg::KMixPrefDlg( TQWidget *parent )
numbersLayout->addStretch();
m_autoStartChk = new TQCheckBox( i18n("&Autostart"), m_generalTab );
- layout->addWidget( m_autoStartChk );
+ tqlayout->addWidget( m_autoStartChk );
TQWhatsThis::add(m_autoStartChk, i18n("Automatically start mixer when you login"));
- TQBoxLayout *orientationLayout = new TQHBoxLayout( layout );
- TQButtonGroup* orientationGroup = new TQButtonGroup( 2, Qt::Horizontal, i18n("Orientation"), m_generalTab );
+ TQBoxLayout *orientationLayout = new TQHBoxLayout( tqlayout );
+ TQButtonGroup* orientationGroup = new TQButtonGroup( 2, Qt::Horizontal, i18n("Qt::Orientation"), m_generalTab );
//orientationLayout->add(orientationGroup);
orientationGroup->setRadioButtonExclusive(true);
- TQLabel* qlb = new TQLabel( i18n("Slider Orientation: "), m_generalTab );
+ TQLabel* qlb = new TQLabel( i18n("Slider Qt::Orientation: "), m_generalTab );
_rbHorizontal = new TQRadioButton(i18n("&Horizontal"), m_generalTab );
_rbVertical = new TQRadioButton(i18n("&Vertical" ), m_generalTab );
orientationGroup->insert(_rbHorizontal);
@@ -112,7 +112,7 @@ KMixPrefDlg::KMixPrefDlg( TQWidget *parent )
orientationLayout->add(_rbVertical);
orientationLayout->addStretch();
- layout->addStretch();
+ tqlayout->addStretch();
enableButtonSeparator(true);
connect( this, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(apply()) );
diff --git a/kmix/kmixprefdlg.h b/kmix/kmixprefdlg.h
index 2c299515..0840e05e 100644
--- a/kmix/kmixprefdlg.h
+++ b/kmix/kmixprefdlg.h
@@ -33,11 +33,12 @@ class
KMixPrefDlg : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
friend class KMixWindow;
public:
- KMixPrefDlg( TQWidget *parent );
+ KMixPrefDlg( TQWidget *tqparent );
~KMixPrefDlg();
signals:
diff --git a/kmix/ksmallslider.cpp b/kmix/ksmallslider.cpp
index e10c46c8..eb03cfc7 100644
--- a/kmix/ksmallslider.cpp
+++ b/kmix/ksmallslider.cpp
@@ -36,22 +36,22 @@ static const TQColor mutedLowColor2 = "#808080";
static const TQColor backColor2 = "#000000";
*/
-KSmallSlider::KSmallSlider( TQWidget *parent, const char *name )
- : TQWidget( parent, name ), _orientation( Qt::Vertical )
+KSmallSlider::KSmallSlider( TQWidget *tqparent, const char *name )
+ : TQWidget( tqparent, name ), _orientation( Qt::Vertical )
{
init();
}
-KSmallSlider::KSmallSlider( Qt::Orientation orientation, TQWidget *parent, const char *name )
- : TQWidget( parent, name ), _orientation( orientation )
+KSmallSlider::KSmallSlider( Qt::Orientation orientation, TQWidget *tqparent, const char *name )
+ : TQWidget( tqparent, name ), _orientation( orientation )
{
init();
}
KSmallSlider::KSmallSlider( int minValue, int maxValue, int pageStep,
int value, Qt::Orientation orientation,
- TQWidget *parent, const char *name )
- : TQWidget( parent, name ),
+ TQWidget *tqparent, const char *name )
+ : TQWidget( tqparent, name ),
TQRangeControl( minValue, maxValue, 1, pageStep, value ), _orientation( orientation)
{
init();
@@ -68,7 +68,7 @@ void KSmallSlider::init()
//track = TRUE;
//setMouseTracking(true);
grayed = false;
- setFocusPolicy( TabFocus );
+ setFocusPolicy( TQ_TabFocus );
colHigh = TQColor(0,255,0);
colLow = TQColor(255,0,0);
@@ -98,7 +98,7 @@ int KSmallSlider::valueFromPosition( int p ) const
return TQRangeControl::valueFromPosition( avail - p, avail );
}
else {
- // Horizontal everything is fine. Slider values match with Coordinate System
+ //Qt::Horizontal everything is fine. Slider values match with Coordinate System
return TQRangeControl::valueFromPosition( p, available() );
}
}
@@ -225,7 +225,7 @@ void KSmallSlider::paintEvent( TQPaintEvent * )
int sliderPos = positionFromValue( TQRangeControl::value() );
// ------------------------ draw 3d border ---------------------------------------------
- style().drawPrimitive ( TQStyle::PE_Panel, &p, TQRect( 0, 0, width(), height() ), colorGroup(), TRUE );
+ tqstyle().tqdrawPrimitive ( TQStyle::PE_Panel, &p, TQRect( 0, 0, width(), height() ), tqcolorGroup(), TRUE );
// ------------------------ draw lower/left part ----------------------------------------
@@ -286,7 +286,7 @@ void KSmallSlider::mousePressEvent( TQMouseEvent *e )
{
//resetState();
- if ( e->button() == RightButton ) {
+ if ( e->button() == Qt::RightButton ) {
return;
}
@@ -326,7 +326,7 @@ void KSmallSlider::wheelEvent( TQWheelEvent * e)
}
e->accept(); // Accept the event
- // Hint: Qt autmatically triggers a valueChange() when we do setValue()
+ // Hint: TQt autmatically triggers a valueChange() when we do setValue()
}
void KSmallSlider::mouseReleaseEvent( TQMouseEvent * )
@@ -340,7 +340,7 @@ void KSmallSlider::mouseReleaseEvent( TQMouseEvent * )
void KSmallSlider::moveSlider( int pos )
{
int a = available();
- int newPos = QMIN( a, QMAX( 0, pos ) ); // keep it inside the available bounds of the slider
+ int newPos = TQMIN( a, TQMAX( 0, pos ) ); // keep it inside the available bounds of the slider
int newVal = valueFromPosition( newPos );
if ( newVal != TQRangeControl::value() ) {
@@ -396,7 +396,7 @@ int KSmallSlider::goodPart( const TQPoint &p ) const
}
/***************** SIZE STUFF START ***************/
-TQSize KSmallSlider::sizeHint() const
+TQSize KSmallSlider::tqsizeHint() const
{
//constPolish();
const int length = 25;
@@ -409,7 +409,7 @@ TQSize KSmallSlider::sizeHint() const
}
-TQSize KSmallSlider::minimumSizeHint() const
+TQSize KSmallSlider::tqminimumSizeHint() const
{
TQSize s(10,10);
return s;
@@ -486,7 +486,7 @@ void KSmallSlider::setGray( bool value )
{
grayed = value;
update();
- //repaint();
+ //tqrepaint();
}
}
@@ -501,7 +501,7 @@ void KSmallSlider::setColors( TQColor high, TQColor low, TQColor back )
colLow = low;
colBack = back;
update();
- //repaint();
+ //tqrepaint();
}
void KSmallSlider::setGrayColors( TQColor high, TQColor low, TQColor back )
@@ -510,7 +510,7 @@ void KSmallSlider::setGrayColors( TQColor high, TQColor low, TQColor back )
grayLow = low;
grayBack = back;
update();
- //repaint();
+ //tqrepaint();
}
#include "ksmallslider.moc"
diff --git a/kmix/ksmallslider.h b/kmix/ksmallslider.h
index 62849f7b..23a84695 100644
--- a/kmix/ksmallslider.h
+++ b/kmix/ksmallslider.h
@@ -29,21 +29,22 @@
#include <tqpixmap.h>
#include <tqrangecontrol.h>
-class KSmallSlider : public TQWidget, public QRangeControl
+class KSmallSlider : public TQWidget, public TQRangeControl
{
Q_OBJECT
+ TQ_OBJECT
public:
- KSmallSlider( TQWidget *parent, const char *name=0 );
- KSmallSlider( Qt::Orientation, TQWidget *parent, const char *name=0 );
+ KSmallSlider( TQWidget *tqparent, const char *name=0 );
+ KSmallSlider( Qt::Orientation, TQWidget *tqparent, const char *name=0 );
KSmallSlider( int minValue, int maxValue, int pageStep, int value,
- Qt::Orientation, TQWidget *parent, const char *name=0 );
+ Qt::Orientation, TQWidget *tqparent, const char *name=0 );
//virtual void setTracking( bool enable );
//bool tracking() const;
- TQSize sizeHint() const;
+ TQSize tqsizeHint() const;
TQSizePolicy sizePolicy() const;
- TQSize minimumSizeHint() const;
+ TQSize tqminimumSizeHint() const;
int minValue() const;
int maxValue() const;
@@ -99,7 +100,7 @@ public slots:
int goodPart( const TQPoint& ) const;
//void initTicks();
- //QCOORD sliderPos;
+ //TQCOORD sliderPos;
//int sliderVal;
//State state;
//bool track;
diff --git a/kmix/mdwenum.cpp b/kmix/mdwenum.cpp
index 35ec4de8..17a5887d 100644
--- a/kmix/mdwenum.cpp
+++ b/kmix/mdwenum.cpp
@@ -46,22 +46,22 @@
*/
MDWEnum::MDWEnum(Mixer *mixer, MixDevice* md,
Qt::Orientation orientation,
- TQWidget* parent, ViewBase* mw, const char* name) :
- MixDeviceWidget(mixer,md,false,orientation,parent,mw,name),
+ TQWidget* tqparent, ViewBase* mw, const char* name) :
+ MixDeviceWidget(mixer,md,false,orientation,tqparent,mw,name),
_label(0), _enumCombo(0), _layout(0)
{
// create actions (on _mdwActions, see MixDeviceWidget)
// KStdAction::showMenubar() is in MixDeviceWidget now
- new KToggleAction( i18n("&Hide"), 0, this, TQT_SLOT(setDisabled()), _mdwActions, "hide" );
- new KAction( i18n("C&onfigure Shortcuts..."), 0, this, TQT_SLOT(defineKeys()), _mdwActions, "keys" );
+ new KToggleAction( i18n("&Hide"), 0, TQT_TQOBJECT(this), TQT_SLOT(setDisabled()), _mdwActions, "hide" );
+ new KAction( i18n("C&onfigure Shortcuts..."), 0, TQT_TQOBJECT(this), TQT_SLOT(defineKeys()), _mdwActions, "keys" );
// create widgets
createWidgets();
/* !!! remove this for production version */
- m_keys->insert( "Next Value", i18n( "Next Value" ), TQString::null,
- KShortcut(), KShortcut(), this, TQT_SLOT( nextEnumId() ) );
+ m_keys->insert( "Next Value", i18n( "Next Value" ), TQString(),
+ KShortcut(), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( nextEnumId() ) );
installEventFilter( this ); // filter for popup
}
@@ -75,21 +75,21 @@ void MDWEnum::createWidgets()
{
if ( _orientation == Qt::Vertical ) {
_layout = new TQVBoxLayout( this );
- _layout->setAlignment(Qt::AlignHCenter);
+ _layout->tqsetAlignment(TQt::AlignHCenter);
}
else {
_layout = new TQHBoxLayout( this );
- _layout->setAlignment(Qt::AlignVCenter);
+ _layout->tqsetAlignment(TQt::AlignVCenter);
}
TQToolTip::add( this, m_mixdevice->name() );
//this->setStretchFactor( _layout, 0 );
//TQSizePolicy qsp( TQSizePolicy::Ignored, TQSizePolicy::Maximum);
- //_layout->setSizePolicy(qsp);
+ //_layout->tqsetSizePolicy(qsp);
//_layout->setSpacing(KDialog::spacingHint());
_label = new TQLabel( m_mixdevice->name(), this);
_layout->addWidget(_label);
- _label->setFixedHeight(_label->sizeHint().height());
+ _label->setFixedHeight(_label->tqsizeHint().height());
_enumCombo = new KComboBox( FALSE, this, "mixerCombo" );
// ------------ fill ComboBox start ------------
int maxEnumId= m_mixdevice->enumValues().count();
@@ -98,8 +98,8 @@ void MDWEnum::createWidgets()
}
// ------------ fill ComboBox end --------------
_layout->addWidget(_enumCombo);
- _enumCombo->setFixedHeight(_enumCombo->sizeHint().height());
- connect( _enumCombo, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( setEnumId( int ) ) );
+ _enumCombo->setFixedHeight(_enumCombo->tqsizeHint().height());
+ connect( _enumCombo, TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( setEnumId( int ) ) );
TQToolTip::add( _enumCombo, m_mixdevice->name() );
//_layout->addSpacing( 4 );
@@ -127,13 +127,13 @@ void MDWEnum::showContextMenu()
menu->popup( pos );
}
-TQSize MDWEnum::sizeHint() const {
+TQSize MDWEnum::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();
}
}
@@ -188,13 +188,13 @@ void MDWEnum::setDisabled( bool value ) {
}
/**
- * An event filter for the various QWidgets. We watch for Mouse press Events, so
+ * An event filter for the various TQWidgets. We watch for Mouse press Events, so
* that we can popup the context menu.
*/
bool MDWEnum::eventFilter( TQObject* obj, TQEvent* e )
{
if (e->type() == TQEvent::MouseButtonPress) {
- TQMouseEvent *qme = static_cast<TQMouseEvent*>(e);
+ TQMouseEvent *qme = TQT_TQMOUSEEVENT(e);
if (qme->button() == Qt::RightButton) {
showContextMenu();
return true;
diff --git a/kmix/mdwenum.h b/kmix/mdwenum.h
index a541f155..d0ec1bec 100644
--- a/kmix/mdwenum.h
+++ b/kmix/mdwenum.h
@@ -42,15 +42,16 @@ class ViewBase;
class MDWEnum : public MixDeviceWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
MDWEnum( Mixer *mixer, MixDevice* md,
Qt::Orientation orientation,
- TQWidget* parent = 0, ViewBase* mw = 0, const char* name = 0);
+ TQWidget* tqparent = 0, ViewBase* mw = 0, const char* name = 0);
~MDWEnum();
void addActionToPopup( KAction *action );
- TQSize sizeHint() const;
+ TQSize tqsizeHint() const;
bool eventFilter( TQObject* obj, TQEvent* e );
public slots:
diff --git a/kmix/mdwslider.cpp b/kmix/mdwslider.cpp
index 81d51668..3867af9f 100644
--- a/kmix/mdwslider.cpp
+++ b/kmix/mdwslider.cpp
@@ -58,15 +58,15 @@
MDWSlider::MDWSlider(Mixer *mixer, MixDevice* md,
bool showMuteLED, bool showRecordLED,
bool small, Qt::Orientation orientation,
- TQWidget* parent, ViewBase* mw, const char* name) :
- MixDeviceWidget(mixer,md,small,orientation,parent,mw,name),
+ TQWidget* tqparent, ViewBase* mw, const char* name) :
+ MixDeviceWidget(mixer,md,small,orientation,tqparent,mw,name),
m_linked(true), m_valueStyle( NNONE), m_iconLabel( 0 ), m_muteLED( 0 ), m_recordLED( 0 ), m_label( 0 ), _layout(0)
{
// create actions (on _mdwActions, see MixDeviceWidget)
- new KToggleAction( i18n("&Split Channels"), 0, this, TQT_SLOT(toggleStereoLinked()),
+ new KToggleAction( i18n("&Split Channels"), 0, TQT_TQOBJECT(this), TQT_SLOT(toggleStereoLinked()),
_mdwActions, "stereo" );
- new KToggleAction( i18n("&Hide"), 0, this, TQT_SLOT(setDisabled()), _mdwActions, "hide" );
+ new KToggleAction( i18n("&Hide"), 0, TQT_TQOBJECT(this), TQT_SLOT(setDisabled()), _mdwActions, "hide" );
KToggleAction *a = new KToggleAction(i18n("&Muted"), 0, 0, 0, _mdwActions, "mute" );
connect( a, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleMuted()) );
@@ -76,17 +76,17 @@ MDWSlider::MDWSlider(Mixer *mixer, MixDevice* md,
connect( a, TQT_SIGNAL(toggled(bool)), TQT_SLOT( toggleRecsrc()) );
}
- new KAction( i18n("C&onfigure Global Shortcuts..."), 0, this, TQT_SLOT(defineKeys()), _mdwActions, "keys" );
+ new KAction( i18n("C&onfigure Global Shortcuts..."), 0, TQT_TQOBJECT(this), TQT_SLOT(defineKeys()), _mdwActions, "keys" );
// create widgets
createWidgets( showMuteLED, showRecordLED );
- m_keys->insert( "Increase volume", i18n( "Increase Volume of '%1'" ).arg(m_mixdevice->name().utf8().data()), TQString::null,
- KShortcut(), KShortcut(), this, TQT_SLOT( increaseVolume() ) );
- m_keys->insert( "Decrease volume", i18n( "Decrease Volume of '%1'" ).arg(m_mixdevice->name().utf8().data()), TQString::null,
- KShortcut(), KShortcut(), this, TQT_SLOT( decreaseVolume() ) );
- m_keys->insert( "Toggle mute", i18n( "Toggle Mute of '%1'" ).arg(m_mixdevice->name().utf8().data()), TQString::null,
- KShortcut(), KShortcut(), this, TQT_SLOT( toggleMuted() ) );
+ 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'" ).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'" ).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(Qt::AlignCenter);
+ _layout->tqsetAlignment(TQt::AlignCenter);
}
else {
_layout = new TQHBoxLayout( this );
- _layout->setAlignment(Qt::AlignCenter);
+ _layout->tqsetAlignment(TQt::AlignCenter);
}
// -- MAIN SLIDERS LAYOUT ---
TQBoxLayout *slidersLayout;
if ( _orientation == Qt::Vertical ) {
slidersLayout = new TQHBoxLayout( _layout );
- slidersLayout->setAlignment(Qt::AlignVCenter);
+ slidersLayout->tqsetAlignment(TQt::AlignVCenter);
}
else {
slidersLayout = new TQVBoxLayout( _layout );
- slidersLayout->setAlignment(Qt::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(Qt::AlignHCenter);
+ labelLayout->tqsetAlignment(TQt::AlignHCenter);
}
else {
labelLayout = new TQHBoxLayout( slidersLayout );
- labelLayout->setAlignment(Qt::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(Qt::AlignHCenter);
+ sliLayout->tqsetAlignment(TQt::AlignHCenter);
}
else {
sliLayout = new TQHBoxLayout( slidersLayout );
- sliLayout->setAlignment(Qt::AlignVCenter);
+ sliLayout->tqsetAlignment(TQt::AlignVCenter);
}
// --- ICON ----------------------------
TQBoxLayout *iconLayout;
if ( _orientation == Qt::Vertical ) {
iconLayout = new TQHBoxLayout( sliLayout );
- iconLayout->setAlignment(Qt::AlignVCenter);
+ iconLayout->tqsetAlignment(TQt::AlignVCenter);
}
else {
iconLayout = new TQVBoxLayout( sliLayout );
- iconLayout->setAlignment(Qt::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(Qt::AlignVCenter);
+ ledtqlayout = new TQHBoxLayout( sliLayout );
+ ledtqlayout->tqsetAlignment(TQt::AlignVCenter);
}
else {
- ledlayout = new TQVBoxLayout( sliLayout );
- ledlayout->setAlignment(Qt::AlignHCenter);
+ ledtqlayout = new TQVBoxLayout( sliLayout );
+ ledtqlayout->tqsetAlignment(TQt::AlignHCenter);
}
if( m_mixdevice->hasMute() )
{
- ledlayout->addStretch();
+ ledtqlayout->addStretch();
// create mute LED
- m_muteLED = new KLedButton( Qt::green, KLed::On, KLed::Sunken,
+ 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)
+ // !! possibly not neccesary any more (we are tqlayouted)
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(Qt::AlignVCenter);
+ volLayout->tqsetAlignment(TQt::AlignVCenter);
}
else {
volLayout = new TQVBoxLayout( sliLayout );
- volLayout->setAlignment(Qt::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(Qt::AlignHCenter);
+ slinumLayout->tqsetAlignment(TQt::AlignHCenter);
}
else {
slinumLayout = new TQHBoxLayout( volLayout );
- slinumLayout->setAlignment(Qt::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,44 +327,44 @@ 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(Qt::AlignVCenter);
+ rectqlayout = new TQHBoxLayout( sliLayout );
+ rectqlayout->tqsetAlignment(TQt::AlignVCenter);
}
else {
- reclayout = new TQVBoxLayout( sliLayout );
- reclayout->setAlignment(Qt::AlignHCenter);
+ rectqlayout = new TQVBoxLayout( sliLayout );
+ rectqlayout->tqsetAlignment(TQt::AlignHCenter);
}
if( m_mixdevice->isRecordable() ) {
- reclayout->addStretch();
- m_recordLED = new KLedButton( Qt::red,
+ 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
{
// we don't have a RECORD LED. We create a dummy widget
- // !! possibly not neccesary any more (we are layouted)
+ // !! possibly not neccesary any more (we are tqlayouted)
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();
}
-QPixmap
+TQPixmap
MDWSlider::icon( int icontype )
{
TQPixmap miniDevPM;
@@ -432,13 +432,13 @@ MDWSlider::setIcon( int icontype )
m_iconLabel->resize( 10, 10 );
} else
m_iconLabel->setPixmap( miniDevPM );
- m_iconLabel->setAlignment( Qt::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<TQSlider *>(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
}
@@ -925,7 +925,7 @@ void MDWSlider::showContextMenu()
a = _mdwActions->action( "keys" );
if ( a && m_keys ) {
- KActionSeparator sep( this );
+ KActionSeparator sep( TQT_TQOBJECT(this) );
sep.plug( menu );
a->plug( menu );
}
@@ -934,24 +934,24 @@ 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();
}
}
/**
- * An event filter for the various QWidgets. We watch for Mouse press Events, so
+ * An event filter for the various TQWidgets. We watch for Mouse press Events, so
* that we can popup the context menu.
*/
bool MDWSlider::eventFilter( TQObject* obj, TQEvent* e )
{
if (e->type() == TQEvent::MouseButtonPress) {
- TQMouseEvent *qme = static_cast<TQMouseEvent*>(e);
+ TQMouseEvent *qme = TQT_TQMOUSEEVENT(e);
if (qme->button() == Qt::RightButton) {
showContextMenu();
return true;
@@ -959,7 +959,7 @@ bool MDWSlider::eventFilter( TQObject* obj, TQEvent* e )
}
// Attention: We don't filter WheelEvents for KSmallSlider, because it handles WheelEvents itself
else if ( (e->type() == TQEvent::Wheel) && !obj->isA("KSmallSlider") ) {
- TQWheelEvent *qwe = static_cast<TQWheelEvent*>(e);
+ TQWheelEvent *qwe = TQT_TQWHEELEVENT(e);
if (qwe->delta() > 0) {
increaseVolume();
}
diff --git a/kmix/mdwslider.h b/kmix/mdwslider.h
index fad6d983..17836bd1 100644
--- a/kmix/mdwslider.h
+++ b/kmix/mdwslider.h
@@ -56,12 +56,13 @@ class ViewBase;
class MDWSlider : public MixDeviceWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
MDWSlider( Mixer *mixer, MixDevice* md,
bool showMuteLED, bool showRecordLED,
bool small, Qt::Orientation,
- TQWidget* parent = 0, ViewBase* mw = 0, const char* name = 0);
+ TQWidget* tqparent = 0, ViewBase* mw = 0, const char* name = 0);
~MDWSlider() {}
void addActionToPopup( KAction *action );
@@ -76,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 sizeHint() const;
+ TQSize tqsizeHint() const;
bool eventFilter( TQObject* obj, TQEvent* e );
TQSizePolicy sizePolicy() const;
diff --git a/kmix/mdwswitch.cpp b/kmix/mdwswitch.cpp
index ee590146..7ee2b1e4 100644
--- a/kmix/mdwswitch.cpp
+++ b/kmix/mdwswitch.cpp
@@ -47,21 +47,21 @@
*/
MDWSwitch::MDWSwitch(Mixer *mixer, MixDevice* md,
bool small, Qt::Orientation orientation,
- TQWidget* parent, ViewBase* mw, const char* name) :
- MixDeviceWidget(mixer,md,small,orientation,parent,mw,name),
+ TQWidget* tqparent, ViewBase* mw, const char* name) :
+ MixDeviceWidget(mixer,md,small,orientation,tqparent,mw,name),
_label(0) , _labelV(0) , _switchLED(0), _layout(0)
{
// create actions (on _mdwActions, see MixDeviceWidget)
// KStdAction::showMenubar() is in MixDeviceWidget now
- new KToggleAction( i18n("&Hide"), 0, this, TQT_SLOT(setDisabled()), _mdwActions, "hide" );
- new KAction( i18n("C&onfigure Shortcuts..."), 0, this, TQT_SLOT(defineKeys()), _mdwActions, "keys" );
+ new KToggleAction( i18n("&Hide"), 0, TQT_TQOBJECT(this), TQT_SLOT(setDisabled()), _mdwActions, "hide" );
+ new KAction( i18n("C&onfigure Shortcuts..."), 0, TQT_TQOBJECT(this), TQT_SLOT(defineKeys()), _mdwActions, "keys" );
// create widgets
createWidgets();
- m_keys->insert( "Toggle switch", i18n( "Toggle Switch" ), TQString::null,
- KShortcut(), KShortcut(), this, TQT_SLOT( toggleSwitch() ) );
+ m_keys->insert( "Toggle switch", i18n( "Toggle Switch" ), TQString(),
+ KShortcut(), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( toggleSwitch() ) );
// The keys are loaded in KMixerWidget::loadConfig, see kmixerwidget.cpp (now: kmixtoolbox.cpp)
//m_keys->readSettings();
@@ -79,11 +79,11 @@ void MDWSwitch::createWidgets()
{
if ( _orientation == Qt::Vertical ) {
_layout = new TQVBoxLayout( this );
- _layout->setAlignment(Qt::AlignHCenter);
+ _layout->tqsetAlignment(TQt::AlignHCenter);
}
else {
_layout = new TQHBoxLayout( this );
- _layout->setAlignment(Qt::AlignVCenter);
+ _layout->tqsetAlignment(TQt::AlignVCenter);
}
TQToolTip::add( this, m_mixdevice->name() );
@@ -92,11 +92,11 @@ void MDWSwitch::createWidgets()
// --- LEDS --------------------------
if ( _orientation == Qt::Vertical ) {
if( m_mixdevice->isRecordable() )
- _switchLED = new KLedButton( Qt::red,
+ _switchLED = new KLedButton( TQt::red,
m_mixdevice->isRecSource()?KLed::On:KLed::Off,
KLed::Sunken, KLed::Circular, this, "RecordLED" );
else
- _switchLED = new KLedButton( Qt::yellow, KLed::On, KLed::Sunken, KLed::Circular, this, "SwitchLED" );
+ _switchLED = new KLedButton( TQt::yellow, KLed::On, KLed::Sunken, KLed::Circular, this, "SwitchLED" );
_switchLED->setFixedSize(16,16);
_labelV = new VerticalText( this, m_mixdevice->name().utf8().data() );
@@ -110,11 +110,11 @@ void MDWSwitch::createWidgets()
else
{
if( m_mixdevice->isRecordable() )
- _switchLED = new KLedButton( Qt::red,
+ _switchLED = new KLedButton( TQt::red,
m_mixdevice->isRecSource()?KLed::On:KLed::Off,
KLed::Sunken, KLed::Circular, this, "RecordLED" );
else
- _switchLED = new KLedButton( Qt::yellow, KLed::On, KLed::Sunken, KLed::Circular, this, "SwitchLED" );
+ _switchLED = new KLedButton( TQt::yellow, KLed::On, KLed::Sunken, KLed::Circular, this, "SwitchLED" );
_switchLED->setFixedSize(16,16);
_label = new TQLabel(m_mixdevice->name(), this, "SwitchName");
@@ -164,13 +164,13 @@ void MDWSwitch::showContextMenu()
menu->popup( pos );
}
-TQSize MDWSwitch::sizeHint() const {
+TQSize MDWSwitch::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();
}
}
@@ -213,13 +213,13 @@ void MDWSwitch::setDisabled( bool value ) {
}
/**
- * An event filter for the various QWidgets. We watch for Mouse press Events, so
+ * An event filter for the various TQWidgets. We watch for Mouse press Events, so
* that we can popup the context menu.
*/
bool MDWSwitch::eventFilter( TQObject* obj, TQEvent* e )
{
if (e->type() == TQEvent::MouseButtonPress) {
- TQMouseEvent *qme = static_cast<TQMouseEvent*>(e);
+ TQMouseEvent *qme = TQT_TQMOUSEEVENT(e);
if (qme->button() == Qt::RightButton) {
showContextMenu();
return true;
diff --git a/kmix/mdwswitch.h b/kmix/mdwswitch.h
index 3bb5eeab..4e2258ea 100644
--- a/kmix/mdwswitch.h
+++ b/kmix/mdwswitch.h
@@ -52,15 +52,16 @@ class ViewBase;
class MDWSwitch : public MixDeviceWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
MDWSwitch( Mixer *mixer, MixDevice* md,
bool small, Qt::Orientation orientation,
- TQWidget* parent = 0, ViewBase* mw = 0, const char* name = 0);
+ TQWidget* tqparent = 0, ViewBase* mw = 0, const char* name = 0);
~MDWSwitch();
void addActionToPopup( KAction *action );
- TQSize sizeHint() const;
+ TQSize tqsizeHint() const;
void setBackgroundMode(BackgroundMode m);
bool eventFilter( TQObject* obj, TQEvent* e );
diff --git a/kmix/mixdevice.cpp b/kmix/mixdevice.cpp
index d5c9f9c2..d647488f 100644
--- a/kmix/mixdevice.cpp
+++ b/kmix/mixdevice.cpp
@@ -71,7 +71,7 @@ MixDevice::MixDevice(const MixDevice &md) : TQObject()
}
MixDevice::~MixDevice() {
- // Clear MixDevices enum Strings (switch on auto-delete, so the QString's inside will be cleared)
+ // Clear MixDevices enum Strings (switch on auto-delete, so the TQString's inside will be cleared)
_enumValues.setAutoDelete(true);
_enumValues.clear();
}
@@ -123,7 +123,7 @@ TQString& MixDevice::getPK() {
void MixDevice::setPK(TQString &PK) {
_pk = PK;
// The key is used in the config file. It should not contain spaces
- _pk.replace(' ', '_');
+ _pk.tqreplace(' ', '_');
}
/**
diff --git a/kmix/mixdevice.h b/kmix/mixdevice.h
index 8683ce2b..5dca6d72 100644
--- a/kmix/mixdevice.h
+++ b/kmix/mixdevice.h
@@ -16,9 +16,10 @@
* They will show whether there are pending changes from both sides.
* Updates will be faster and more reliable by this.
*/
-class MixDevice : public QObject
+class MixDevice : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
// For each ChannelType a special icon exists
@@ -30,7 +31,7 @@ class MixDevice : public QObject
// The DeviceCategory tells the type of the device
- // It is used in bitmasks, so you must use values of 2^n .
+ // It is used in bittqmasks, so you must use values of 2^n .
enum DeviceCategory { UNDEFINED= 0x00, SLIDER=0x01, SWITCH=0x02, ENUM=0x04, ALL=0xff };
diff --git a/kmix/mixdevicewidget.cpp b/kmix/mixdevicewidget.cpp
index b5418303..b7e3b3ce 100644
--- a/kmix/mixdevicewidget.cpp
+++ b/kmix/mixdevicewidget.cpp
@@ -54,12 +54,12 @@
*/
MixDeviceWidget::MixDeviceWidget(Mixer *mixer, MixDevice* md,
bool small, Qt::Orientation orientation,
- TQWidget* parent, ViewBase* mw, const char* name) :
- TQWidget( parent, name ), m_mixer(mixer), m_mixdevice( md ), m_mixerwidget( mw ),
+ TQWidget* tqparent, ViewBase* mw, const char* name) :
+ TQWidget( tqparent, name ), m_mixer(mixer), m_mixdevice( md ), m_mixerwidget( mw ),
m_disabled( false ), _orientation( orientation ), m_small( small )
{
_mdwActions = new KActionCollection( this );
- m_keys = new KGlobalAccel( this, "Keys" );
+ m_keys = new KGlobalAccel( TQT_TQOBJECT(this), "Keys" );
}
MixDeviceWidget::~MixDeviceWidget()
@@ -109,7 +109,7 @@ void MixDeviceWidget::setMutedColors( TQColor , TQColor , TQColor ) { /* is virt
void MixDeviceWidget::mousePressEvent( TQMouseEvent *e )
{
- if ( e->button()==RightButton )
+ if ( e->button()==Qt::RightButton )
showContextMenu();
else {
TQWidget::mousePressEvent(e);
diff --git a/kmix/mixdevicewidget.h b/kmix/mixdevicewidget.h
index d3c533d8..d652a749 100644
--- a/kmix/mixdevicewidget.h
+++ b/kmix/mixdevicewidget.h
@@ -51,16 +51,17 @@ class Mixer;
class ViewBase;
class MixDeviceWidget
- : public QWidget
+ : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
enum ValueStyle { NNONE = 0, NABSOLUTE = 1, NRELATIVE = 2 } ;
MixDeviceWidget( Mixer *mixer, MixDevice* md,
bool small, Qt::Orientation orientation,
- TQWidget* parent = 0, ViewBase* mw = 0, const char* name = 0);
+ TQWidget* tqparent = 0, ViewBase* mw = 0, const char* name = 0);
~MixDeviceWidget();
void addActionToPopup( KAction *action );
diff --git a/kmix/mixer.cpp b/kmix/mixer.cpp
index 0e7c36fc..67960a53 100644
--- a/kmix/mixer.cpp
+++ b/kmix/mixer.cpp
@@ -474,7 +474,7 @@ void Mixer::setRecordSource( int devnum, bool on )
MixDevice* Mixer::masterDevice()
{
- return find( _masterDevicePK );
+ return tqfind( _masterDevicePK );
}
void Mixer::setMasterDevice(TQString &devPK)
@@ -483,7 +483,7 @@ void Mixer::setMasterDevice(TQString &devPK)
}
-MixDevice* Mixer::find(TQString& devPK)
+MixDevice* Mixer::tqfind(TQString& devPK)
{
MixDevice* md = 0;
for( md = _mixerBackend->m_mixDevices.first(); md != 0; md = _mixerBackend->m_mixDevices.next() ) {
diff --git a/kmix/mixer.h b/kmix/mixer.h
index 80bd24ae..0b6d25c2 100644
--- a/kmix/mixer.h
+++ b/kmix/mixer.h
@@ -44,6 +44,7 @@ class KConfig;
class Mixer : public TQObject, virtual public MixerIface
{
Q_OBJECT
+ TQ_OBJECT
public:
enum MixerError { ERR_PERM=1, ERR_WRITE, ERR_READ, ERR_NODEV, ERR_NOTSUPP,
@@ -54,7 +55,7 @@ class Mixer : public TQObject, virtual public MixerIface
static int numDrivers();
- MixDevice* find(TQString& devPK);
+ MixDevice* tqfind(TQString& devPK);
void volumeSave( KConfig *config );
void volumeLoad( KConfig *config );
diff --git a/kmix/mixer_alsa9.cpp b/kmix/mixer_alsa9.cpp
index effcd006..4037f342 100644
--- a/kmix/mixer_alsa9.cpp
+++ b/kmix/mixer_alsa9.cpp
@@ -77,7 +77,7 @@ Mixer_ALSA::identify( snd_mixer_selem_id_t *sid )
if ( name == "Master Mono" ) return MixDevice::VOLUME;
if ( name == "PC Speaker" ) return MixDevice::VOLUME;
if ( name == "Music" || name == "Synth" || name == "FM" ) return MixDevice::MIDI;
- if ( name.find( "Headphone", 0, false ) != -1 ) return MixDevice::HEADPHONE;
+ if ( name.tqfind( "Headphone", 0, false ) != -1 ) return MixDevice::HEADPHONE;
if ( name == "Bass" ) return MixDevice::BASS;
if ( name == "Treble" ) return MixDevice::TREBLE;
if ( name == "CD" ) return MixDevice::CD;
@@ -85,14 +85,14 @@ Mixer_ALSA::identify( snd_mixer_selem_id_t *sid )
if ( name == "PCM" || name == "Wave" ) return MixDevice::AUDIO;
if ( name == "Surround" ) return MixDevice::SURROUND_BACK;
if ( name == "Center" ) return MixDevice::SURROUND_CENTERFRONT;
- if ( name.find( "ac97", 0, false ) != -1 ) return MixDevice::AC97;
- if ( name.find( "coaxial", 0, false ) != -1 ) return MixDevice::DIGITAL;
- if ( name.find( "optical", 0, false ) != -1 ) return MixDevice::DIGITAL;
- if ( name.find( "IEC958", 0, false ) != -1 ) return MixDevice::DIGITAL;
- if ( name.find( "Mic" ) != -1 ) return MixDevice::MICROPHONE;
- if ( name.find( "LFE" ) != -1 ) return MixDevice::SURROUND_LFE;
- if ( name.find( "Monitor" ) != -1 ) return MixDevice::RECMONITOR;
- if ( name.find( "3D", 0, false ) != -1 ) return MixDevice::SURROUND; // Should be probably some own icon
+ if ( name.tqfind( "ac97", 0, false ) != -1 ) return MixDevice::AC97;
+ if ( name.tqfind( "coaxial", 0, false ) != -1 ) return MixDevice::DIGITAL;
+ if ( name.tqfind( "optical", 0, false ) != -1 ) return MixDevice::DIGITAL;
+ if ( name.tqfind( "IEC958", 0, false ) != -1 ) return MixDevice::DIGITAL;
+ if ( name.tqfind( "Mic" ) != -1 ) return MixDevice::MICROPHONE;
+ if ( name.tqfind( "LFE" ) != -1 ) return MixDevice::SURROUND_LFE;
+ if ( name.tqfind( "Monitor" ) != -1 ) return MixDevice::RECMONITOR;
+ if ( name.tqfind( "3D", 0, false ) != -1 ) return MixDevice::SURROUND; // Should be probably some own icon
return MixDevice::EXTERNAL;
}
@@ -115,7 +115,7 @@ Mixer_ALSA::open()
// Card information
if ((unsigned)m_devnum > 31) m_devnum = -1;
- devName = m_devnum == -1 ? "default" : TQString("hw:%1").arg(m_devnum);
+ devName = m_devnum == -1 ? "default" : TQString("hw:%1").tqarg(m_devnum);
TQString probeMessage;
@@ -507,7 +507,7 @@ bool Mixer_ALSA::prepareUpdateFromHW()
// Poll on fds with 10ms timeout
// Hint: alsamixer has an infinite timeout, but we cannot do this because we would block
- // the X11 event handling (Qt event loop) with this.
+ // the X11 event handling (TQt event loop) with this.
//kdDebug(67100) << "Mixer_ALSA::prepareUpdate() 3\n";
int finished = poll(m_fds, m_count, 10);
//kdDebug(67100) << "Mixer_ALSA::prepareUpdate() 4\n";
@@ -795,7 +795,7 @@ Mixer_ALSA::writeVolumeToHW( int devnum, Volume& volume )
return 0;
}
-QString
+TQString
Mixer_ALSA::errorText( int mixer_error )
{
TQString l_s_errmsg;
@@ -817,7 +817,7 @@ Mixer_ALSA::errorText( int mixer_error )
}
-QString
+TQString
ALSA_getDriverName()
{
return "ALSA";
diff --git a/kmix/mixer_hpux.cpp b/kmix/mixer_hpux.cpp
index 20ef91f3..82e1ad51 100644
--- a/kmix/mixer_hpux.cpp
+++ b/kmix/mixer_hpux.cpp
@@ -86,31 +86,31 @@ int Mixer_HPUX::open()
else
{
/* Mixer is open. Now define properties */
- stereodevs = devmask = (1<<ID_PCM); /* activate pcm */
- recmask = 0;
+ stereodevs = devtqmask = (1<<ID_PCM); /* activate pcm */
+ rectqmask = 0;
/* check Input devices... */
if (AInputSources(audio) & AMonoMicrophoneMask) {
- devmask |= (1<<ID_IN_MICROPHONE);
- recmask |= (1<<ID_IN_MICROPHONE);
+ devtqmask |= (1<<ID_IN_MICROPHONE);
+ rectqmask |= (1<<ID_IN_MICROPHONE);
}
if (AInputSources(audio) & (ALeftAuxiliaryMask|ARightAuxiliaryMask)) {
- devmask |= (1<<ID_IN_AUX);
- recmask |= (1<<ID_IN_AUX);
+ devtqmask |= (1<<ID_IN_AUX);
+ rectqmask |= (1<<ID_IN_AUX);
stereodevs |= (1<<ID_IN_AUX);
}
/* check Output devices... */
if (AOutputDestinations(audio) & AMonoIntSpeakerMask) {
- devmask |= (1<<ID_OUT_INT_SPEAKER);
+ devtqmask |= (1<<ID_OUT_INT_SPEAKER);
stereodevs |= (1<<ID_OUT_INT_SPEAKER);
}
/* implement later:
----------------
- if (AOutputDestinations(audio) & AMonoLineOutMask) devmask |= 64; // Line
- if (AOutputDestinations(audio) & AMonoJackMask) devmask |= (1<<14); // Line1
- if (AOutputDestinations(audio) & AMonoHeadphoneMask) devmask |= (1<<15); // Line2
+ if (AOutputDestinations(audio) & AMonoLineOutMask) devtqmask |= 64; // Line
+ if (AOutputDestinations(audio) & AMonoJackMask) devtqmask |= (1<<14); // Line1
+ if (AOutputDestinations(audio) & AMonoHeadphoneMask) devtqmask |= (1<<15); // Line2
*/
MaxVolume = 255;
diff --git a/kmix/mixer_hpux.h b/kmix/mixer_hpux.h
index 410758c9..85892b0f 100644
--- a/kmix/mixer_hpux.h
+++ b/kmix/mixer_hpux.h
@@ -28,7 +28,7 @@ protected:
virtual int close();
Audio *audio;
- unsigned int stereodevs,devmask, recmask, MaxVolume, i_recsrc;
+ unsigned int stereodevs,devtqmask, rectqmask, MaxVolume, i_recsrc;
};
diff --git a/kmix/mixer_irix.cpp b/kmix/mixer_irix.cpp
index eb407567..4a19e478 100644
--- a/kmix/mixer_irix.cpp
+++ b/kmix/mixer_irix.cpp
@@ -52,8 +52,8 @@ int Mixer_IRIX::open()
}
else {
// Mixer is open. Now define properties
- devmask = 1+128+2048;
- recmask = 128;
+ devtqmask = 1+128+2048;
+ rectqmask = 128;
i_recsrc = 128;
stereodevs = 1+128+2048;
MaxVolume = 255;
diff --git a/kmix/mixer_oss.cpp b/kmix/mixer_oss.cpp
index 7fcfb38e..5b51db16 100644
--- a/kmix/mixer_oss.cpp
+++ b/kmix/mixer_oss.cpp
@@ -108,31 +108,31 @@ int Mixer_OSS::open()
}
}
- int devmask, recmask, i_recsrc, stereodevs;
+ int devtqmask, rectqmask, i_recsrc, stereodevs;
// Mixer is open. Now define properties
- if (ioctl(m_fd, SOUND_MIXER_READ_DEVMASK, &devmask) == -1)
+ if (ioctl(m_fd, SOUND_MIXER_READ_DEVMASK, &devtqmask) == -1)
return Mixer::ERR_READ;
- if (ioctl(m_fd, SOUND_MIXER_READ_RECMASK, &recmask) == -1)
+ if (ioctl(m_fd, SOUND_MIXER_READ_RECMASK, &rectqmask) == -1)
return Mixer::ERR_READ;
if (ioctl(m_fd, SOUND_MIXER_READ_RECSRC, &i_recsrc) == -1)
return Mixer::ERR_READ;
if (ioctl(m_fd, SOUND_MIXER_READ_STEREODEVS, &stereodevs) == -1)
return Mixer::ERR_READ;
- if (!devmask)
+ if (!devtqmask)
return Mixer::ERR_NODEV;
int maxVolume =100;
if( m_mixDevices.isEmpty() )
{
int idx = 0;
- while( devmask && idx < MAX_MIXDEVS )
+ while( devtqmask && idx < MAX_MIXDEVS )
{
- if( devmask & ( 1 << idx ) ) // device active?
+ if( devtqmask & ( 1 << idx ) ) // device active?
{
Volume vol( stereodevs & ( 1 << idx ) ? 2 : 1, maxVolume);
readVolumeFromHW( idx, vol );
MixDevice* md =
- new MixDevice( idx, vol, recmask & ( 1 << idx ), true,
+ new MixDevice( idx, vol, rectqmask & ( 1 << idx ), true,
MixerDevNames[idx],
MixerChannelTypes[idx]);
md->setRecSource( isRecsrcHW( idx ) );
@@ -268,7 +268,7 @@ bool Mixer_OSS::setRecsrcHW( int devnum, bool on )
}
// PORTING: Hint: Do not forget to set i_recsrc to the new valid
- // record source mask.
+ // record source tqmask.
return i_recsrc == oldrecsrc;
}
@@ -280,7 +280,7 @@ bool Mixer_OSS::isRecsrcHW( int devnum )
if (ioctl(m_fd, SOUND_MIXER_READ_RECSRC, &recsrcMask) == -1)
errormsg(Mixer::ERR_READ);
else {
- // test if device bit is set in record bit mask
+ // test if device bit is set in record bit tqmask
isRecsrc = ( (recsrcMask & ( 1<<devnum)) != 0 );
}
return isRecsrc;
diff --git a/kmix/mixer_oss4.cpp b/kmix/mixer_oss4.cpp
index 01b167aa..8543915b 100644
--- a/kmix/mixer_oss4.cpp
+++ b/kmix/mixer_oss4.cpp
@@ -120,7 +120,7 @@ MixDevice::ChannelType Mixer_OSS4::classifyAndRename(TQString &name, int flags)
} else
if ( (*it).startsWith ( "pcm" ) )
{
- (*it).replace ( "pcm","PCM" );
+ (*it).tqreplace ( "pcm","PCM" );
cType = MixDevice::AUDIO;
} else
if ( *it == "src" )
@@ -138,7 +138,7 @@ MixDevice::ChannelType Mixer_OSS4::classifyAndRename(TQString &name, int flags)
}
if ( (*it).startsWith("vmix") )
{
- (*it).replace("vmix","Virtual Mixer");
+ (*it).tqreplace("vmix","Virtual Mixer");
cType = MixDevice::VOLUME;
} else
if ( (*it).endsWith("vol") )
@@ -227,8 +227,8 @@ int Mixer_OSS4::open()
TQString name = ext.extname;
//skip vmix volume controls and mute controls
- if ( (name.find("vmix") > -1 && name.find( "pcm") > -1) ||
- name.find("mute") > -1
+ if ( (name.tqfind("vmix") > -1 && name.tqfind( "pcm") > -1) ||
+ name.tqfind("mute") > -1
#ifdef MIXT_MUTE
|| (ext.type == MIXT_MUTE)
#endif
@@ -238,12 +238,12 @@ int Mixer_OSS4::open()
}
//fix for old legacy names, according to Hannu's suggestions
- if ( name.contains('_') )
+ if ( name.tqcontains('_') )
{
name = name.section('_',1,1).lower();
}
- if ( ext.flags & MIXF_RECVOL || ext.flags & MIXF_MONVOL || name.find(".in") > -1 )
+ if ( ext.flags & MIXF_RECVOL || ext.flags & MIXF_MONVOL || name.tqfind(".in") > -1 )
{
isCapture = true;
}
diff --git a/kmix/mixer_sun.cpp b/kmix/mixer_sun.cpp
index 12806bda..10299add 100644
--- a/kmix/mixer_sun.cpp
+++ b/kmix/mixer_sun.cpp
@@ -89,7 +89,7 @@ const MixDevice::ChannelType MixerChannelTypes[] =
};
//
-// Mapping from device numbers to Sun port mask values
+// Mapping from device numbers to Sun port tqmask values
//
const uint_t MixerSunPortMasks[] =
{
@@ -323,7 +323,7 @@ int Mixer_SUN::writeVolumeToHW( int devnum, Volume &volume )
//
// Now, based on the devnum that we are writing to, update the appropriate
- // volume field and twiddle the appropriate bitmask to enable/mute the
+ // volume field and twiddle the appropriate bittqmask to enable/mute the
// device as necessary.
//
switch ( devnum )
diff --git a/kmix/mixertoolbox.cpp b/kmix/mixertoolbox.cpp
index 66e0241c..c4953221 100644
--- a/kmix/mixertoolbox.cpp
+++ b/kmix/mixertoolbox.cpp
@@ -146,16 +146,16 @@ void MixerToolBox::initMixer(TQPtrList<Mixer> &mixers, bool multiDriverMode, TQS
* %3, the mixer number, is a number: it does not contain colons.
*/
TQString mixerName = mixer->mixerName();
- mixerName.replace(":","_");
+ mixerName.tqreplace(":","_");
TQString primaryKeyOfMixer = TQString("%1::%2:%3")
- .arg(driverName)
- .arg(mixerName)
- .arg(mixerNums[mixer->mixerName()]);
+ .tqarg(driverName)
+ .tqarg(mixerName)
+ .tqarg(mixerNums[mixer->mixerName()]);
// The following 3 replaces are for not messing up the config file
- primaryKeyOfMixer.replace("]","_");
- primaryKeyOfMixer.replace("[","_"); // not strictly neccesary, but lets play safe
- primaryKeyOfMixer.replace(" ","_");
- primaryKeyOfMixer.replace("=","_");
+ primaryKeyOfMixer.tqreplace("]","_");
+ primaryKeyOfMixer.tqreplace("[","_"); // not strictly neccesary, but lets play safe
+ primaryKeyOfMixer.tqreplace(" ","_");
+ primaryKeyOfMixer.tqreplace("=","_");
mixer->setID(primaryKeyOfMixer);
diff --git a/kmix/verticaltext.cpp b/kmix/verticaltext.cpp
index 77bda1af..723cb75b 100644
--- a/kmix/verticaltext.cpp
+++ b/kmix/verticaltext.cpp
@@ -24,10 +24,10 @@
#include <kdebug.h>
-VerticalText::VerticalText(TQWidget * parent, const char * name, WFlags f) : TQWidget(parent,name,f)
+VerticalText::VerticalText(TQWidget * tqparent, const char * name, WFlags f) : TQWidget(tqparent,name,f)
{
- resize(20,100 /*parent->height() */ );
- setMinimumSize(20,10); // neccesary for smooth integration into layouts (we only care for the widths).
+ resize(20,100 /*tqparent->height() */ );
+ setMinimumSize(20,10); // neccesary for smooth integration into tqlayouts (we only care for the widths).
}
VerticalText::~VerticalText() {
@@ -46,7 +46,7 @@ void VerticalText::paintEvent ( TQPaintEvent * /*event*/ ) {
paint.drawText( -height()+2, width(), TQString::fromUtf8(name()) );
}
-TQSize VerticalText::sizeHint() const {
+TQSize VerticalText::tqsizeHint() const {
return TQSize(20,100); // !! UGLY. Should be reworked
}
diff --git a/kmix/verticaltext.h b/kmix/verticaltext.h
index f68df4f4..b7f94f4d 100644
--- a/kmix/verticaltext.h
+++ b/kmix/verticaltext.h
@@ -3,13 +3,13 @@
#include <tqwidget.h>
-class VerticalText : public QWidget
+class VerticalText : public TQWidget
{
public:
- VerticalText(TQWidget * parent, const char * name, WFlags f = 0);
+ VerticalText(TQWidget * tqparent, const char * name, WFlags f = 0);
~VerticalText();
- TQSize sizeHint() const;
+ TQSize tqsizeHint() const;
TQSizePolicy sizePolicy () const;
protected:
diff --git a/kmix/viewapplet.cpp b/kmix/viewapplet.cpp
index 3948e60e..b26a7374 100644
--- a/kmix/viewapplet.cpp
+++ b/kmix/viewapplet.cpp
@@ -20,7 +20,7 @@
#include "viewapplet.h"
-// Qt
+// TQt
#include <tqwidget.h>
#include <tqlayout.h>
#include <tqsize.h>
@@ -36,13 +36,13 @@
#include "mdwslider.h"
#include "mixer.h"
-ViewApplet::ViewApplet(TQWidget* parent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KPanelApplet::Position position )
- : ViewBase(parent, name, TQString::null, mixer, WStyle_Customize|WStyle_NoBorder, vflags)
+ViewApplet::ViewApplet(TQWidget* tqparent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KPanelApplet::Position position )
+ : ViewBase(tqparent, name, TQString(), mixer, WStyle_Customize|WStyle_NoBorder, vflags)
{
setBackgroundOrigin(AncestorOrigin);
// remove the menu bar action, that is put by the "ViewBase" constructor in _actions.
//KToggleAction *m = static_cast<KToggleAction*>(KStdAction::showMenubar( this, TQT_SLOT(toggleMenuBarSlot()), _actions ));
- _actions->remove( KStdAction::showMenubar(this, TQT_SLOT(toggleMenuBarSlot()), _actions) );
+ _actions->remove( KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(toggleMenuBarSlot()), _actions) );
if ( position == KPanelApplet::pLeft || position == KPanelApplet::pRight ) {
@@ -56,11 +56,11 @@ ViewApplet::ViewApplet(TQWidget* parent, const char* name, Mixer* mixer, ViewBas
if ( _viewOrientation == Qt::Horizontal ) {
_layoutMDW = new TQHBoxLayout( this );
- setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred);
+ tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred);
}
else {
_layoutMDW = new TQVBoxLayout( this );
- setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
+ tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
}
@@ -118,8 +118,8 @@ TQWidget* ViewApplet::add(MixDevice *md)
false, // Show Mute LED
false, // Show Record LED
true, // Small
- sliderOrientation, // Orientation
- this, // parent
+ sliderOrientation, // Qt::Orientation
+ this, // tqparent
this, // View widget
md->name().latin1()
);
@@ -139,10 +139,10 @@ void ViewApplet::constructionFinished() {
}
-TQSize ViewApplet::sizeHint() const {
- // Basically out main layout knows very good what the sizes should be
- TQSize qsz = _layoutMDW->sizeHint();
- //kdDebug(67100) << "ViewApplet::sizeHint(): NewSize is " << qsz << "\n";
+TQSize ViewApplet::tqsizeHint() 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";
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 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.
updateGeometry();
}
@@ -230,7 +230,7 @@ void ViewApplet::refreshVolumeLevels() {
void ViewApplet::configurationUpdate() {
updateGeometry();
//_layoutMDW->activate();
- constructionFinished(); // contains "_layoutMDW->activate();"
+ constructionFinished(); // tqcontains "_layoutMDW->activate();"
emit appletContentChanged();
kdDebug(67100) << "ViewApplet::configurationUpdate()" << endl;
// the following "emit" is only here to be picked up by KMixApplet, because it has to
diff --git a/kmix/viewapplet.h b/kmix/viewapplet.h
index 80dc417e..9b9e1b9c 100644
--- a/kmix/viewapplet.h
+++ b/kmix/viewapplet.h
@@ -13,8 +13,9 @@ class Mixer;
class ViewApplet : public ViewBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- ViewApplet(TQWidget* parent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KPanelApplet::Position pos);
+ ViewApplet(TQWidget* tqparent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KPanelApplet::Position pos);
~ViewApplet();
virtual int count();
@@ -24,7 +25,7 @@ public:
virtual void constructionFinished();
virtual void configurationUpdate();
- TQSize sizeHint() const;
+ TQSize tqsizeHint() const;
TQSizePolicy sizePolicy() const;
virtual void resizeEvent(TQResizeEvent*);
@@ -39,7 +40,7 @@ private:
TQBoxLayout* _layoutMDW;
// Position of the applet (pLeft, pRight, pTop, pBottom)
//KPanelApplet::Position _KMIXposition;
- // Orientation of the applet (horizontal or vertical)
+ // Qt::Orientation of the applet (horizontal or vertical)
Qt::Orientation _viewOrientation;
};
diff --git a/kmix/viewbase.cpp b/kmix/viewbase.cpp
index 5d23860d..b140fce7 100644
--- a/kmix/viewbase.cpp
+++ b/kmix/viewbase.cpp
@@ -37,8 +37,8 @@
#include "mixer.h"
-ViewBase::ViewBase(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, WFlags f, ViewBase::ViewFlags vflags)
- : TQWidget(parent, name, f), _vflags(vflags), _caption(caption)
+ViewBase::ViewBase(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, WFlags f, ViewBase::ViewFlags vflags)
+ : TQWidget(tqparent, name, f), _vflags(vflags), _caption(caption)
{
_mixer = mixer;
_mixSet = new MixSet();
@@ -51,7 +51,7 @@ ViewBase::ViewBase(TQWidget* parent, const char* name, const TQString & caption,
// Plug in the "showMenubar" action, if the caller wants it. Typically this is only neccesary for views in the KMix main window.
if ( vflags & ViewBase::HasMenuBar ) {
- KToggleAction *m = static_cast<KToggleAction*>(KStdAction::showMenubar( this, TQT_SLOT(toggleMenuBarSlot()), _actions ));
+ KToggleAction *m = static_cast<KToggleAction*>(KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT(toggleMenuBarSlot()), _actions ));
if ( vflags & ViewBase::MenuBarVisible ) {
m->setChecked(true);
}
@@ -59,7 +59,7 @@ ViewBase::ViewBase(TQWidget* parent, const char* name, const TQString & caption,
m->setChecked(false);
}
}
- new KAction(i18n("&Channels"), 0, this, TQT_SLOT(configureView()), _actions, "toggle_channels");
+ new KAction(i18n("&Channels"), 0, TQT_TQOBJECT(this), TQT_SLOT(configureView()), _actions, "toggle_channels");
connect ( _mixer, TQT_SIGNAL(newVolumeLevels()), this, TQT_SLOT(refreshVolumeLevels()) );
}
@@ -112,7 +112,7 @@ void ViewBase::createDeviceWidgets()
// ---------- Popup stuff START ---------------------
void ViewBase::mousePressEvent( TQMouseEvent *e )
{
- if ( e->button()==RightButton )
+ if ( e->button()==Qt::RightButton )
showContextMenu();
}
diff --git a/kmix/viewbase.h b/kmix/viewbase.h
index 581ac39e..d0d4063c 100644
--- a/kmix/viewbase.h
+++ b/kmix/viewbase.h
@@ -14,9 +14,10 @@ class MixDevice;
/**
* The ViewBase is a virtual base class, to be used for subclassing the real Mixer Views.
*/
-class ViewBase : public QWidget
+class ViewBase : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
typedef uint ViewFlags;
@@ -31,7 +32,7 @@ public:
Experimental_GridView = 0x2000
};
- ViewBase(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, WFlags=0, ViewFlags vflags=0);
+ ViewBase(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, WFlags=0, ViewFlags vflags=0);
virtual ~ViewBase();
// Subclasses must define this method. It is called by the ViewBase() constuctor.
diff --git a/kmix/viewdockareapopup.cpp b/kmix/viewdockareapopup.cpp
index 60289aad..38b942dc 100644
--- a/kmix/viewdockareapopup.cpp
+++ b/kmix/viewdockareapopup.cpp
@@ -21,7 +21,7 @@
#include "viewdockareapopup.h"
-// Qt
+// TQt
#include <tqwidget.h>
#include <tqevent.h>
#include <tqlayout.h>
@@ -40,15 +40,15 @@
#include "mixer.h"
#include "kmixdockwidget.h"
-// !! Do NOT remove or mask out "WType_Popup"
+// !! Do NOT remove or tqmask out "WType_Popup"
// Users will not be able to close the Popup without opening the KMix main window then.
// See Bug #93443, #96332 and #96404 for further details. -- esken
-ViewDockAreaPopup::ViewDockAreaPopup(TQWidget* parent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KMixDockWidget *dockW )
- : ViewBase(parent, name, TQString::null, mixer, WStyle_Customize | WType_Popup | Qt::WStyle_DialogBorder, vflags), _mdw(0), _dock(dockW)
+ViewDockAreaPopup::ViewDockAreaPopup(TQWidget* tqparent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KMixDockWidget *dockW )
+ : ViewBase(tqparent, name, TQString(), mixer, WStyle_Customize | WType_Popup | TQt::WStyle_DialogBorder, vflags), _mdw(0), _dock(dockW)
{
- TQBoxLayout *layout = new TQHBoxLayout( this );
+ TQBoxLayout *tqlayout = new TQHBoxLayout( this );
_frame = new TQFrame( this );
- layout->addWidget( _frame );
+ tqlayout->addWidget( _frame );
_frame->setFrameStyle( TQFrame::PopupPanel | TQFrame::Raised );
_frame->setLineWidth( 1 );
@@ -70,7 +70,7 @@ void ViewDockAreaPopup::mousePressEvent(TQMouseEvent *)
Hide the popup:
This should work automatically, when the user clicks outside the bounds of this popup:
Alas - it does not work.
- Why it does not work, I do not know: this->isPopup() returns "true", so Qt should
+ Why it does not work, I do not know: this->isPopup() returns "true", so TQt should
properly take care of it in TQWidget.
*/
if ( ! this->hasMouse() ) {
@@ -128,7 +128,7 @@ TQWidget* ViewDockAreaPopup::add(MixDevice *md)
false, // Show Record LED
false, // Small
Qt::Vertical, // Direction: only 1 device, so doesn't matter
- _frame, // parent
+ _frame, // tqparent
0, // Is "NULL", so that there is no RMB-popup
_dockDevice->name().latin1() );
_layoutMDW->addItem( new TQSpacerItem( 5, 20 ), 0, 2 );
@@ -163,9 +163,9 @@ int ViewDockAreaPopup::advice() {
}
}
-TQSize ViewDockAreaPopup::sizeHint() const {
- // kdDebug(67100) << "ViewDockAreaPopup::sizeHint(): NewSize is " << _mdw->sizeHint() << "\n";
- return( _mdw->sizeHint() );
+TQSize ViewDockAreaPopup::tqsizeHint() const {
+ // kdDebug(67100) << "ViewDockAreaPopup::tqsizeHint(): NewSize is " << _mdw->tqsizeHint() << "\n";
+ return( _mdw->tqsizeHint() );
}
void ViewDockAreaPopup::constructionFinished() {
@@ -173,8 +173,8 @@ void ViewDockAreaPopup::constructionFinished() {
_mdw->move(0,0);
_mdw->show();
- _mdw->resize(_mdw->sizeHint() );
- resize(sizeHint());
+ _mdw->resize(_mdw->tqsizeHint() );
+ resize(tqsizeHint());
}
diff --git a/kmix/viewdockareapopup.h b/kmix/viewdockareapopup.h
index 7f0c1bf1..71100ec1 100644
--- a/kmix/viewdockareapopup.h
+++ b/kmix/viewdockareapopup.h
@@ -18,8 +18,9 @@ class TQTime;
class ViewDockAreaPopup : public ViewBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- ViewDockAreaPopup(TQWidget* parent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KMixDockWidget *dockW);
+ ViewDockAreaPopup(TQWidget* tqparent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KMixDockWidget *dockW);
~ViewDockAreaPopup();
MixDevice* dockDevice();
@@ -31,7 +32,7 @@ public:
virtual void refreshVolumeLevels();
virtual void showContextMenu();
- TQSize sizeHint() const;
+ TQSize tqsizeHint() const;
bool justHidden();
protected:
diff --git a/kmix/viewgrid.cpp b/kmix/viewgrid.cpp
index 59f03906..360953f8 100644
--- a/kmix/viewgrid.cpp
+++ b/kmix/viewgrid.cpp
@@ -21,7 +21,7 @@
#include "viewgrid.h"
-// Qt
+// TQt
#include <tqwidget.h>
// KDE
@@ -35,8 +35,8 @@
/**
*/
-ViewGrid::ViewGrid(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags)
- : ViewBase(parent, name, caption, mixer, WStyle_Customize|WStyle_NoBorder, vflags)
+ViewGrid::ViewGrid(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags)
+ : ViewBase(tqparent, name, caption, mixer, WStyle_Customize|WStyle_NoBorder, vflags)
{
m_spacingHorizontal = 5;
m_spacingVertical = 5;
@@ -88,8 +88,8 @@ TQWidget* ViewGrid::add(MixDevice *md)
mdw = new MDWEnum(
_mixer, // the mixer for this device
md, // MixDevice (parameter)
- orientation, // Orientation
- this, // parent
+ orientation, // Qt::Orientation
+ this, // tqparent
this, // View widget
md->name().latin1()
);
@@ -101,8 +101,8 @@ TQWidget* ViewGrid::add(MixDevice *md)
_mixer, // the mixer for this device
md, // MixDevice (parameter)
false, // Small
- orientation, // Orientation
- this, // parent
+ orientation, // Qt::Orientation
+ this, // tqparent
this, // View widget
md->name().latin1()
);
@@ -117,8 +117,8 @@ TQWidget* ViewGrid::add(MixDevice *md)
true, // Show Mute LED
true, // Show Record LED
false, // Small
- orientation, // Orientation
- this, // parent
+ orientation, // Qt::Orientation
+ this, // tqparent
this, // View widget
md->name().latin1()
);
@@ -126,23 +126,23 @@ TQWidget* ViewGrid::add(MixDevice *md)
return mdw;
}
-TQSize ViewGrid::sizeHint() const {
- // kdDebug(67100) << "ViewGrid::sizeHint(): NewSize is " << _layoutMDW->sizeHint() << "\n";
- return( m_sizeHint);
+TQSize ViewGrid::tqsizeHint() const {
+ // kdDebug(67100) << "ViewGrid::tqsizeHint(): NewSize is " << _layoutMDW->tqsizeHint() << "\n";
+ return( m_tqsizeHint);
}
void ViewGrid::constructionFinished() {
//_layoutMDW->activate();
- // do a manual layout
+ // do a manual tqlayout
configurationUpdate();
}
void ViewGrid::refreshVolumeLevels() {
// kdDebug(67100) << "ViewGrid::refreshVolumeLevels()\n";
- m_sizeHint.setWidth (0);
- m_sizeHint.setHeight(0);
+ m_tqsizeHint.setWidth (0);
+ m_tqsizeHint.setHeight(0);
m_testingX = 0;
m_testingY = 0;
@@ -178,12 +178,12 @@ void ViewGrid::refreshVolumeLevels() {
}
/**
- This implementation makes sure the Grid's geometry is updated
+ This implementation makes sure the Grid's tqgeometry is updated
after hiding/showing channels.
*/
void ViewGrid::configurationUpdate() {
- m_sizeHint.setWidth (0);
- m_sizeHint.setHeight(0);
+ m_tqsizeHint.setWidth (0);
+ m_tqsizeHint.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->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);
+ 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);
m_testingX += 5;
if ( m_testingX > 50 ) {
diff --git a/kmix/viewgrid.h b/kmix/viewgrid.h
index 94b03446..d0608794 100644
--- a/kmix/viewgrid.h
+++ b/kmix/viewgrid.h
@@ -11,8 +11,9 @@ class Mixer;
class ViewGrid : public ViewBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- ViewGrid(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags);
+ ViewGrid(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags);
~ViewGrid();
virtual int count();
@@ -22,7 +23,7 @@ public:
virtual void configurationUpdate();
virtual void constructionFinished();
- TQSize sizeHint() const;
+ TQSize tqsizeHint() const;
public slots:
virtual void refreshVolumeLevels();
@@ -32,7 +33,7 @@ private:
unsigned int m_spacingVertical;
// m_maxX and m_maxY are the highest coordiantes encountered
- TQSize m_sizeHint;
+ TQSize m_tqsizeHint;
unsigned int m_testingX;
unsigned int m_testingY;
diff --git a/kmix/viewinput.cpp b/kmix/viewinput.cpp
index eeadc61b..fa6f06e3 100644
--- a/kmix/viewinput.cpp
+++ b/kmix/viewinput.cpp
@@ -25,8 +25,8 @@
#include "mixer.h"
#include "mixdevicewidget.h"
-ViewInput::ViewInput(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags)
- : ViewSliders(parent, name, caption, mixer, vflags)
+ViewInput::ViewInput(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags)
+ : ViewSliders(tqparent, name, caption, mixer, vflags)
{
init();
connect ( _mixer, TQT_SIGNAL(newRecsrc()) , this, TQT_SLOT(refreshVolumeLevels()) ); // only the input widget has record sources
diff --git a/kmix/viewinput.h b/kmix/viewinput.h
index aa28c7d8..03aa101f 100644
--- a/kmix/viewinput.h
+++ b/kmix/viewinput.h
@@ -8,8 +8,9 @@ class Mixer;
class ViewInput : public ViewSliders
{
Q_OBJECT
+ TQ_OBJECT
public:
- ViewInput(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags);
+ ViewInput(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags);
~ViewInput();
virtual void setMixSet(MixSet *mixset);
diff --git a/kmix/viewoutput.cpp b/kmix/viewoutput.cpp
index 9550b1d1..6340291b 100644
--- a/kmix/viewoutput.cpp
+++ b/kmix/viewoutput.cpp
@@ -25,8 +25,8 @@
#include "mixer.h"
#include "mixdevicewidget.h"
-ViewOutput::ViewOutput(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags)
- : ViewSliders(parent, name, caption, mixer, vflags)
+ViewOutput::ViewOutput(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags)
+ : ViewSliders(tqparent, name, caption, mixer, vflags)
{
init();
}
diff --git a/kmix/viewoutput.h b/kmix/viewoutput.h
index d39c8680..9f3866dd 100644
--- a/kmix/viewoutput.h
+++ b/kmix/viewoutput.h
@@ -8,8 +8,9 @@ class Mixer;
class ViewOutput : public ViewSliders
{
Q_OBJECT
+ TQ_OBJECT
public:
- ViewOutput(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags);
+ ViewOutput(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags);
~ViewOutput();
virtual void setMixSet(MixSet *mixset);
diff --git a/kmix/viewsliders.cpp b/kmix/viewsliders.cpp
index 80142f5c..1191f202 100644
--- a/kmix/viewsliders.cpp
+++ b/kmix/viewsliders.cpp
@@ -21,7 +21,7 @@
#include "viewsliders.h"
-// Qt
+// TQt
#include <tqlayout.h>
#include <tqwidget.h>
@@ -37,8 +37,8 @@
* correctly because init() does not get called.
* See ViewInput and ViewOutput for "real" implementations.
*/
-ViewSliders::ViewSliders(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags)
- : ViewBase(parent, name, caption, mixer, WStyle_Customize|WStyle_NoBorder, vflags)
+ViewSliders::ViewSliders(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags)
+ : ViewBase(tqparent, name, caption, mixer, WStyle_Customize|WStyle_NoBorder, vflags)
{
if ( _vflags & ViewBase::Vertical ) {
_layoutMDW = new TQVBoxLayout(this);
@@ -93,8 +93,8 @@ TQWidget* ViewSliders::add(MixDevice *md)
true, // Show Mute LED
true, // Show Record LED
false, // Small
- orientation, // Orientation
- this, // parent
+ orientation, // Qt::Orientation
+ this, // tqparent
this, // View widget
md->name().latin1()
);
@@ -102,9 +102,9 @@ TQWidget* ViewSliders::add(MixDevice *md)
return mdw;
}
-TQSize ViewSliders::sizeHint() const {
- // kdDebug(67100) << "ViewSliders::sizeHint(): NewSize is " << _layoutMDW->sizeHint() << "\n";
- return( _layoutMDW->sizeHint() );
+TQSize ViewSliders::tqsizeHint() const {
+ // kdDebug(67100) << "ViewSliders::tqsizeHint(): NewSize is " << _layoutMDW->tqsizeHint() << "\n";
+ return( _layoutMDW->tqsizeHint() );
}
void ViewSliders::constructionFinished() {
diff --git a/kmix/viewsliders.h b/kmix/viewsliders.h
index c4c0c3d2..c078fb8c 100644
--- a/kmix/viewsliders.h
+++ b/kmix/viewsliders.h
@@ -10,8 +10,9 @@ class Mixer;
class ViewSliders : public ViewBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- ViewSliders(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags);
+ ViewSliders(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags);
~ViewSliders();
virtual int count();
@@ -20,7 +21,7 @@ public:
virtual TQWidget* add(MixDevice *mdw);
virtual void constructionFinished();
- TQSize sizeHint() const;
+ TQSize tqsizeHint() const;
public slots:
virtual void refreshVolumeLevels();
diff --git a/kmix/viewsurround.cpp b/kmix/viewsurround.cpp
index 02a7aace..7e653b32 100644
--- a/kmix/viewsurround.cpp
+++ b/kmix/viewsurround.cpp
@@ -21,7 +21,7 @@
#include "viewsurround.h"
-// Qt
+// TQt
#include <tqlabel.h>
#include <tqlayout.h>
#include <tqwidget.h>
@@ -39,8 +39,8 @@
* Demonstration verion of a "surround view"
* Not really usable right now.
*/
-ViewSurround::ViewSurround(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags)
- : ViewBase(parent, name, caption, mixer, WStyle_Customize|WStyle_NoBorder, vflags)
+ViewSurround::ViewSurround(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags)
+ : ViewBase(tqparent, name, caption, mixer, WStyle_Customize|WStyle_NoBorder, vflags)
{
_mdSurroundFront = 0;
_mdSurroundBack = 0;
@@ -135,26 +135,26 @@ TQWidget* ViewSurround::add(MixDevice *md)
switch ( md->type() ) {
case MixDevice::VOLUME:
- _layoutSurround->addWidget(mdw ,0,0, Qt::AlignBottom | Qt::AlignLeft);
+ _layoutSurround->addWidget(mdw ,0,0, TQt::AlignBottom | TQt::AlignLeft);
break;
case MixDevice::SURROUND_BACK:
- _layoutSurround->addWidget(mdw ,2,0, Qt::AlignTop | Qt::AlignLeft);
+ _layoutSurround->addWidget(mdw ,2,0, TQt::AlignTop | TQt::AlignLeft);
break;
case MixDevice::SURROUND_LFE:
- _layoutSurround->addWidget(mdw,1,3, Qt::AlignVCenter | Qt::AlignRight ); break;
+ _layoutSurround->addWidget(mdw,1,3, TQt::AlignVCenter | TQt::AlignRight ); break;
break;
case MixDevice::SURROUND_CENTERFRONT:
- _layoutSurround->addWidget(mdw,0,2, Qt::AlignTop | Qt::AlignHCenter); break;
+ _layoutSurround->addWidget(mdw,0,2, TQt::AlignTop | TQt::AlignHCenter); break;
break;
case MixDevice::SURROUND_CENTERBACK:
- _layoutSurround->addWidget(mdw,2,2, Qt::AlignBottom | Qt::AlignHCenter); break;
+ _layoutSurround->addWidget(mdw,2,2, TQt::AlignBottom | TQt::AlignHCenter); break;
break;
case MixDevice::SURROUND:
case MixDevice::AC97:
default:
- // Add as slider to the layout on the left side
+ // Add as slider to the tqlayout on the left side
_layoutSliders->add(mdw);
break;
} // switch(type)
@@ -162,9 +162,9 @@ TQWidget* ViewSurround::add(MixDevice *md)
return mdw;
}
-TQSize ViewSurround::sizeHint() const {
- // kdDebug(67100) << "ViewSurround::sizeHint(): NewSize is " << _layoutMDW->sizeHint() << "\n";
- return( _layoutMDW->sizeHint() );
+TQSize ViewSurround::tqsizeHint() const {
+ // kdDebug(67100) << "ViewSurround::tqsizeHint(): NewSize is " << _layoutMDW->tqsizeHint() << "\n";
+ return( _layoutMDW->tqsizeHint() );
}
void ViewSurround::constructionFinished() {
@@ -180,39 +180,39 @@ void ViewSurround::constructionFinished() {
// rear speaker support in this sound card
rowOfSpeaker = 1;
}
- _layoutSurround->addWidget(personLabel ,rowOfSpeaker, 2, Qt::AlignHCenter | Qt::AlignVCenter);
+ _layoutSurround->addWidget(personLabel ,rowOfSpeaker, 2, TQt::AlignHCenter | TQt::AlignVCenter);
if ( _mdSurroundFront != 0 ) {
MixDeviceWidget *mdw = createMDW(_mdSurroundFront, true, Qt::Vertical);
- _layoutSurround->addWidget(mdw,0,4, Qt::AlignBottom | Qt::AlignRight);
+ _layoutSurround->addWidget(mdw,0,4, TQt::AlignBottom | TQt::AlignRight);
_mdws.append(mdw);
TQLabel* speakerIcon = new TQLabel("Speaker", this);
icon = UserIcon( "SpeakerFrontLeft" );
if ( ! icon.isNull()) speakerIcon->setPixmap(icon);
- _layoutSurround->addWidget(speakerIcon,0,1, Qt::AlignTop | Qt::AlignLeft);
+ _layoutSurround->addWidget(speakerIcon,0,1, TQt::AlignTop | TQt::AlignLeft);
speakerIcon = new TQLabel("Speaker", this);
icon = UserIcon( "SpeakerFrontRight" );
if ( ! icon.isNull()) speakerIcon->setPixmap(icon);
- _layoutSurround->addWidget(speakerIcon,0,3, Qt::AlignTop | Qt::AlignRight);
+ _layoutSurround->addWidget(speakerIcon,0,3, TQt::AlignTop | TQt::AlignRight);
}
if ( _mdSurroundBack != 0 ) {
MixDeviceWidget *mdw = createMDW(_mdSurroundBack, true, Qt::Vertical);
- _layoutSurround->addWidget(mdw,2,4, Qt::AlignTop | Qt::AlignRight);
+ _layoutSurround->addWidget(mdw,2,4, TQt::AlignTop | TQt::AlignRight);
_mdws.append(mdw);
TQLabel* speakerIcon = new TQLabel("Speaker", this);
icon = UserIcon( "SpeakerRearLeft" );
if ( ! icon.isNull()) speakerIcon->setPixmap(icon);
- _layoutSurround->addWidget(speakerIcon,2,1, Qt::AlignBottom | Qt::AlignLeft);
+ _layoutSurround->addWidget(speakerIcon,2,1, TQt::AlignBottom | TQt::AlignLeft);
speakerIcon = new TQLabel("Speaker", this);
icon = UserIcon( "SpeakerRearRight" );
if ( ! icon.isNull()) speakerIcon->setPixmap(icon);
- _layoutSurround->addWidget(speakerIcon,2,3, Qt::AlignBottom | Qt::AlignRight);
+ _layoutSurround->addWidget(speakerIcon,2,3, TQt::AlignBottom | TQt::AlignRight);
}
@@ -259,8 +259,8 @@ MixDeviceWidget* ViewSurround::createMDW(MixDevice *md, bool small, Qt::Orientat
false, // Show Mute LED
false, // Show Record LED
small, // Small
- orientation, // Orientation
- this, // parent
+ orientation, // Qt::Orientation
+ this, // tqparent
this, // View widget
md->name().latin1()
);
diff --git a/kmix/viewsurround.h b/kmix/viewsurround.h
index 6690d35a..d0bc3c4e 100644
--- a/kmix/viewsurround.h
+++ b/kmix/viewsurround.h
@@ -13,8 +13,9 @@ class Mixer;
class ViewSurround : public ViewBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- ViewSurround(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags);
+ ViewSurround(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags);
~ViewSurround();
virtual int count();
@@ -23,7 +24,7 @@ public:
virtual TQWidget* add(MixDevice *mdw);
virtual void constructionFinished();
- TQSize sizeHint() const;
+ TQSize tqsizeHint() const;
public slots:
virtual void refreshVolumeLevels();
diff --git a/kmix/viewswitches.cpp b/kmix/viewswitches.cpp
index 15b555ac..cf5ac958 100644
--- a/kmix/viewswitches.cpp
+++ b/kmix/viewswitches.cpp
@@ -31,8 +31,8 @@
#include "mdwenum.h"
#include "mixer.h"
-ViewSwitches::ViewSwitches(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags)
- : ViewBase(parent, name, caption, mixer, 0, vflags)
+ViewSwitches::ViewSwitches(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags)
+ : ViewBase(tqparent, name, caption, mixer, 0, vflags)
{
// Create switch buttonGroup
if ( _vflags & ViewBase::Vertical ) {
@@ -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 layout issue.
+ // the _layoutEnum, so it might be a tqsizeHint() or some other subtle tqlayout issue.
_layoutEnum = new TQVBoxLayout(_layoutMDW);
}
init();
@@ -92,8 +92,8 @@ TQWidget* ViewSwitches::add(MixDevice *md)
mdw = new MDWEnum(
_mixer, // the mixer for this device
md, // MixDevice (parameter)
- orientation, // Orientation
- this, // parent
+ orientation, // Qt::Orientation
+ this, // tqparent
this, // View widget
md->name().latin1()
);
@@ -107,8 +107,8 @@ TQWidget* ViewSwitches::add(MixDevice *md)
_mixer, // the mixer for this device
md, // MixDevice (parameter)
false, // Small
- orientation, // Orientation
- this, // parent
+ orientation, // Qt::Orientation
+ this, // tqparent
this, // View widget
md->name().latin1()
);
@@ -118,9 +118,9 @@ TQWidget* ViewSwitches::add(MixDevice *md)
return mdw;
}
-TQSize ViewSwitches::sizeHint() const {
- //kdDebug(67100) << "ViewSwitches::sizeHint(): NewSize is " << _layoutMDW->sizeHint() << "\n";
- return( _layoutMDW->sizeHint() );
+TQSize ViewSwitches::tqsizeHint() const {
+ //kdDebug(67100) << "ViewSwitches::tqsizeHint(): NewSize is " << _layoutMDW->tqsizeHint() << "\n";
+ return( _layoutMDW->tqsizeHint() );
}
void ViewSwitches::constructionFinished() {
diff --git a/kmix/viewswitches.h b/kmix/viewswitches.h
index 0946ab8a..39b81f40 100644
--- a/kmix/viewswitches.h
+++ b/kmix/viewswitches.h
@@ -10,8 +10,9 @@ class Mixer;
class ViewSwitches : public ViewBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- ViewSwitches(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags);
+ ViewSwitches(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags);
~ViewSwitches();
virtual int count();
@@ -21,7 +22,7 @@ public:
virtual void constructionFinished();
virtual void configurationUpdate();
- TQSize sizeHint() const;
+ TQSize tqsizeHint() const;
public slots:
virtual void refreshVolumeLevels();
diff --git a/kmix/volume.cpp b/kmix/volume.cpp
index 99dd180b..d2eb4314 100644
--- a/kmix/volume.cpp
+++ b/kmix/volume.cpp
@@ -34,9 +34,9 @@ int Volume::_channelMaskEnum[10] =
MCUSTOM1, MCUSTOM2
};
-Volume::Volume( ChannelMask chmask, long maxVolume, long minVolume, bool isCapture )
+Volume::Volume( ChannelMask chtqmask, long maxVolume, long minVolume, bool isCapture )
{
- init(chmask, maxVolume, minVolume, isCapture);
+ init(chtqmask, maxVolume, minVolume, isCapture);
}
@@ -56,22 +56,22 @@ Volume::Volume( int channels, long maxVolume ) {
Volume::Volume( const Volume &v )
{
- _chmask = v._chmask;
+ _chtqmask = v._chtqmask;
_maxVolume = v._maxVolume;
_minVolume = v._minVolume;
_muted = v._muted;
_isCapture = v._isCapture;
- setVolume(v, (ChannelMask)v._chmask);
+ setVolume(v, (ChannelMask)v._chtqmask);
// kdDebug(67100) << "Volume::copy-constructor initialized " << v << "\n";
}
-void Volume::init( ChannelMask chmask, long maxVolume, long minVolume, bool isCapture )
+void Volume::init( ChannelMask chtqmask, long maxVolume, long minVolume, bool isCapture )
{
for ( int i=0; i<= Volume::CHIDMAX; i++ ) {
_volumes[i] = 0;
}
- _chmask = chmask;
+ _chtqmask = chtqmask;
_maxVolume = maxVolume;
_minVolume = minVolume;
_isCapture = isCapture;
@@ -82,7 +82,7 @@ void Volume::init( ChannelMask chmask, long maxVolume, long minVolume, bool isCa
void Volume::setAllVolumes(long vol)
{
for ( int i=0; i<= Volume::CHIDMAX; i++ ) {
- if ( (_channelMaskEnum[i]) & _chmask ) {
+ if ( (_channelMaskEnum[i]) & _chtqmask ) {
// we are supposed to set it
_volumes[i] = volrange(vol);
}
@@ -106,17 +106,17 @@ void Volume::setVolume( ChannelID chid, long vol)
*/
void Volume::setVolume(const Volume &v)
{
- setVolume(v, (ChannelMask)(v._chmask&_chmask) );
+ setVolume(v, (ChannelMask)(v._chtqmask&_chtqmask) );
}
/**
* Copy the volume elements contained in v to this Volume object.
* Only those elments are copied, that are supported in BOTH Volume objects
- * and match the ChannelMask given by chmask.
+ * and match the ChannelMask given by chtqmask.
*/
-void Volume::setVolume(const Volume &v, ChannelMask chmask) {
+void Volume::setVolume(const Volume &v, ChannelMask chtqmask) {
for ( int i=0; i<= Volume::CHIDMAX; i++ ) {
- if ( _channelMaskEnum[i] & _chmask & (int)chmask ) {
+ if ( _channelMaskEnum[i] & _chtqmask & (int)chtqmask ) {
// we are supposed to copy it
_volumes[i] = volrange(v._volumes[i]);
}
@@ -149,8 +149,8 @@ long Volume::getVolume(ChannelID chid) {
}
else {
// check if channel is supported
- int chmask = _channelMaskEnum[chid];
- if ( (chmask & _chmask) != 0 ) {
+ int chtqmask = _channelMaskEnum[chid];
+ if ( (chtqmask & _chtqmask) != 0 ) {
// channel is supported
vol = _volumes[chid];
}
@@ -162,11 +162,11 @@ long Volume::getVolume(ChannelID chid) {
return vol;
}
-long Volume::getAvgVolume(ChannelMask chmask) {
+long Volume::getAvgVolume(ChannelMask chtqmask) {
int avgVolumeCounter = 0;
long long sumOfActiveVolumes = 0;
for ( int i=0; i<= Volume::CHIDMAX; i++ ) {
- if ( (_channelMaskEnum[i] & _chmask) & (int)chmask ) {
+ if ( (_channelMaskEnum[i] & _chtqmask) & (int)chtqmask ) {
avgVolumeCounter++;
sumOfActiveVolumes += _volumes[i];
}
@@ -180,10 +180,10 @@ long Volume::getAvgVolume(ChannelMask chmask) {
return (long)sumOfActiveVolumes;
}
-long Volume::getTopStereoVolume(ChannelMask chmask) {
+long Volume::getTopStereoVolume(ChannelMask chtqmask) {
long long topVolumeCount = 0;
for ( int i=0; i<= Volume::CHIDMAX; i++ ) {
- if ( (_channelMaskEnum[i] & _chmask) & (int)chmask ) {
+ if ( (_channelMaskEnum[i] & _chtqmask) & (int)chtqmask ) {
if ( topVolumeCount < _volumes[i] )
topVolumeCount = _volumes[i];
}
@@ -194,7 +194,7 @@ long Volume::getTopStereoVolume(ChannelMask chmask) {
int Volume::count() {
int counter = 0;
for ( int i=0; i<= Volume::CHIDMAX; i++ ) {
- if ( _channelMaskEnum[i] & _chmask ) {
+ if ( _channelMaskEnum[i] & _chtqmask ) {
counter++;
}
}
@@ -225,7 +225,7 @@ std::ostream& operator<<(std::ostream& os, const Volume& vol) {
if ( i != 0 ) {
os << ",";
}
- if ( Volume::_channelMaskEnum[i] & vol._chmask ) {
+ if ( Volume::_channelMaskEnum[i] & vol._chtqmask ) {
// supported channel: Print Volume
os << vol._volumes[i];
}
@@ -248,7 +248,7 @@ kdbgstream& operator<<(kdbgstream &os, const Volume& vol) {
if ( i != 0 ) {
os << ",";
}
- if ( Volume::_channelMaskEnum[i] & vol._chmask ) {
+ if ( Volume::_channelMaskEnum[i] & vol._chtqmask ) {
// supported channel: Print Volume
os << vol._volumes[i];
}
diff --git a/kmix/volume.h b/kmix/volume.h
index 9051ed0c..a731ad59 100644
--- a/kmix/volume.h
+++ b/kmix/volume.h
@@ -27,7 +27,7 @@ class Volume
CUSTOM1 = 8, CUSTOM2 = 9, CHIDMAX = 9 };
- Volume( ChannelMask chmask = MALL, long maxVolume = 100, long minVolume=0, bool isCapture=false );
+ Volume( ChannelMask chtqmask = MALL, long maxVolume = 100, long minVolume=0, bool isCapture=false );
Volume( const Volume &v );
Volume( int channels, long maxVolume );
@@ -37,13 +37,13 @@ class Volume
void setAllVolumes(long vol);
// Set all volumes to the ones given in vol
void setVolume(const Volume &vol );
- // Set volumes as specified by the channel mask
- void setVolume( const Volume &vol, ChannelMask chmask);
+ // Set volumes as specified by the channel tqmask
+ void setVolume( const Volume &vol, ChannelMask chtqmask);
void setVolume( ChannelID chid, long volume);
long getVolume(ChannelID chid);
- long getAvgVolume(ChannelMask chmask);
- long getTopStereoVolume(ChannelMask chmask);
+ long getAvgVolume(ChannelMask chtqmask);
+ long getTopStereoVolume(ChannelMask chtqmask);
long operator[](int);
long maxVolume();
long minVolume();
@@ -61,13 +61,13 @@ class Volume
static int _channelMaskEnum[10];
bool _muted;
bool _isCapture; // true, when the Volume represents capture/record levels
- long _chmask;
+ long _chtqmask;
long _volumes[CHIDMAX+1];
long _maxVolume;
long _minVolume;
private:
- void init( ChannelMask chmask, long, long, bool );
+ void init( ChannelMask chtqmask, long, long, bool );
long volrange( int vol );
long volrangeRec( int vol );