diff options
Diffstat (limited to 'kmix')
74 files changed, 1015 insertions, 1015 deletions
diff --git a/kmix/KMixApp.cpp b/kmix/KMixApp.cpp index d99d56a2..d1df895b 100644 --- a/kmix/KMixApp.cpp +++ b/kmix/KMixApp.cpp @@ -47,7 +47,7 @@ KMixApp::newInstance() else { m_kmix = new KMixWindow; - connect(this, SIGNAL(stopUpdatesOnVisibility()), m_kmix, SLOT(stopVisibilityUpdates())); + connect(this, TQT_SIGNAL(stopUpdatesOnVisibility()), m_kmix, TQT_SLOT(stopVisibilityUpdates())); if ( isRestored() && KMainWindow::canBeRestored(0) ) { m_kmix->restore(0, FALSE); diff --git a/kmix/dialogselectmaster.cpp b/kmix/dialogselectmaster.cpp index a19419ad..a201f33a 100644 --- a/kmix/dialogselectmaster.cpp +++ b/kmix/dialogselectmaster.cpp @@ -19,14 +19,14 @@ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qbuttongroup.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qptrlist.h> -#include <qradiobutton.h> -#include <qscrollview.h> -#include <qtooltip.h> -#include <qvbox.h> +#include <tqbuttongroup.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqptrlist.h> +#include <tqradiobutton.h> +#include <tqscrollview.h> +#include <tqtooltip.h> +#include <tqvbox.h> #include <kcombobox.h> #include <kdebug.h> @@ -57,26 +57,26 @@ DialogSelectMaster::~DialogSelectMaster() */ void DialogSelectMaster::createWidgets(Mixer *ptr_mixer) { - QFrame *m_mainFrame = plainPage(); - _layout = new QVBoxLayout(m_mainFrame,0,-1, "_layout" ); + TQFrame *m_mainFrame = plainPage(); + _layout = new TQVBoxLayout(m_mainFrame,0,-1, "_layout" ); if ( Mixer::mixers().count() > 1 ) { //kdDebug(67100) << "DialogSelectMaster::createPage count()>1" << "\n"; // More than one Mixer => show Combo-Box to select Mixer // Mixer widget line - QHBoxLayout* mixerNameLayout = new QHBoxLayout( _layout ); + TQHBoxLayout* mixerNameLayout = new TQHBoxLayout( _layout ); //widgetsLayout->setStretchFactor( mixerNameLayout, 0 ); - //QSizePolicy qsp( QSizePolicy::Ignored, QSizePolicy::Maximum); + //TQSizePolicy qsp( TQSizePolicy::Ignored, TQSizePolicy::Maximum); //mixerNameLayout->setSizePolicy(qsp); mixerNameLayout->setSpacing(KDialog::spacingHint()); - QLabel *qlbl = new QLabel( i18n("Current Mixer"), m_mainFrame ); + TQLabel *qlbl = new TQLabel( i18n("Current Mixer"), m_mainFrame ); mixerNameLayout->addWidget(qlbl); qlbl->setFixedHeight(qlbl->sizeHint().height()); m_cMixer = new KComboBox( FALSE, m_mainFrame, "mixerCombo" ); m_cMixer->setFixedHeight(m_cMixer->sizeHint().height()); - connect( m_cMixer, SIGNAL( activated( int ) ), this, SLOT( createPageByID( int ) ) ); + connect( m_cMixer, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( createPageByID( int ) ) ); //int id=1; for ( Mixer *mixer = Mixer::mixers().first(); mixer !=0; mixer = Mixer::mixers().next() ) { @@ -88,23 +88,23 @@ void DialogSelectMaster::createWidgets(Mixer *ptr_mixer) //id++; } // end for all_Mixers - QToolTip::add( m_cMixer, i18n("Current mixer" ) ); + TQToolTip::add( m_cMixer, i18n("Current mixer" ) ); mixerNameLayout->addWidget(m_cMixer); } // end if (more_than_1_Mixer) - QLabel *qlbl = new QLabel( i18n("Select the channel representing the master volume:"), m_mainFrame ); + TQLabel *qlbl = new TQLabel( i18n("Select the channel representing the master volume:"), m_mainFrame ); _layout->addWidget(qlbl); - m_scrollableChannelSelector = new QScrollView(m_mainFrame, "scrollableChannelSelector"); + m_scrollableChannelSelector = new TQScrollView(m_mainFrame, "scrollableChannelSelector"); m_scrollableChannelSelector->viewport()->setBackgroundMode(Qt::PaletteBackground); _layout->add(m_scrollableChannelSelector); - m_buttonGroupForScrollView = new QButtonGroup(this); // invisible QButtonGroup + m_buttonGroupForScrollView = new TQButtonGroup(this); // invisible QButtonGroup m_buttonGroupForScrollView->hide(); createPage(ptr_mixer); - connect( this, SIGNAL(okClicked()) , this, SLOT(apply()) ); + connect( this, TQT_SIGNAL(okClicked()) , this, TQT_SLOT(apply()) ); } /** @@ -138,10 +138,10 @@ void DialogSelectMaster::createPage(Mixer* mixer) m_mixerPKs.clear(); /** Reset page end -------------------------------------------------- */ - m_vboxForScrollView = new QVBox(m_scrollableChannelSelector->viewport()); + m_vboxForScrollView = new TQVBox(m_scrollableChannelSelector->viewport()); m_scrollableChannelSelector->addChild(m_vboxForScrollView); - QString masterKey = "----noMaster---"; // Use a non-matching name as default + TQString masterKey = "----noMaster---"; // Use a non-matching name as default MixDevice* master = mixer->masterDevice(); if ( master != 0 ) masterKey = master->getPK(); @@ -152,9 +152,9 @@ void DialogSelectMaster::createPage(Mixer* mixer) // Create a RadioButton for each MixDevice (excluding Enum's) if ( ! md->isEnum() && ! md->isSwitch() ) { //kdDebug(67100) << "DialogSelectMaster::createPage() mset append qrb" << endl; - QString mdName = md->name(); - mdName.replace('&', "&&"); // Quoting the '&' needed, to prevent QRadioButton creating an accelerator - QRadioButton* qrb = new QRadioButton( mdName, m_vboxForScrollView); + TQString mdName = md->name(); + mdName.replace('&', "&&"); // 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); m_mixerPKs.push_back(md->getPK()); diff --git a/kmix/dialogselectmaster.h b/kmix/dialogselectmaster.h index 912d870d..71ee1d57 100644 --- a/kmix/dialogselectmaster.h +++ b/kmix/dialogselectmaster.h @@ -2,9 +2,9 @@ #define DIALOGSELECTMASTER_H class QButtonGroup; -#include <qradiobutton.h> +#include <tqradiobutton.h> class QScrollView; -#include <qstringlist.h> +#include <tqstringlist.h> class QVBox; class QVBoxLayout; @@ -21,7 +21,7 @@ class DialogSelectMaster : public KDialogBase ~DialogSelectMaster(); signals: - void newMasterSelected(int, QString& ); + void newMasterSelected(int, TQString& ); public slots: void apply(); @@ -29,12 +29,12 @@ class DialogSelectMaster : public KDialogBase private: void createWidgets(Mixer*); void createPage(Mixer*); - QVBoxLayout* _layout; + TQVBoxLayout* _layout; KComboBox* m_cMixer; - QScrollView* m_scrollableChannelSelector; - QVBox *m_vboxForScrollView; - QButtonGroup *m_buttonGroupForScrollView; - QStringList m_mixerPKs; + TQScrollView* m_scrollableChannelSelector; + TQVBox *m_vboxForScrollView; + TQButtonGroup *m_buttonGroupForScrollView; + TQStringList m_mixerPKs; private slots: void createPageByID(int mixerId); diff --git a/kmix/dialogviewconfiguration.cpp b/kmix/dialogviewconfiguration.cpp index f6c035e9..09e88d23 100644 --- a/kmix/dialogviewconfiguration.cpp +++ b/kmix/dialogviewconfiguration.cpp @@ -19,10 +19,10 @@ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qcheckbox.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qptrlist.h> +#include <tqcheckbox.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqptrlist.h> #include <kdebug.h> #include <kdialogbase.h> @@ -33,25 +33,25 @@ #include "mixdevice.h" -DialogViewConfiguration::DialogViewConfiguration( QWidget*, ViewBase& view) +DialogViewConfiguration::DialogViewConfiguration( TQWidget*, ViewBase& view) : KDialogBase( Plain, i18n( "Configure" ), Ok|Cancel, Ok ), _view(view) { - QPtrList<QWidget> &mdws = view._mdws; - _layout = new QVBoxLayout(plainPage(),0,-1, "_layout" ); + TQPtrList<TQWidget> &mdws = view._mdws; + _layout = new TQVBoxLayout(plainPage(),0,-1, "_layout" ); // kdDebug(67100) << "DialogViewConfiguration::DialogViewConfiguration add header" << "\n"; - QLabel* qlb = new QLabel( i18n("Configure"), plainPage() ); - //QLabel* qlb = new QLabel( i18n("Show"), plainPage() ); + TQLabel* qlb = new TQLabel( i18n("Configure"), plainPage() ); + //TQLabel* qlb = new TQLabel( i18n("Show"), plainPage() ); _layout->addWidget(qlb); - for ( QWidget *qw = mdws.first(); qw != 0; qw = mdws.next()) + for ( TQWidget *qw = mdws.first(); qw != 0; qw = mdws.next()) { if ( qw->inherits("MixDeviceWidget") ) { MixDeviceWidget *mdw = static_cast<MixDeviceWidget*>(qw); - QString mdName = mdw->mixDevice()->name(); - mdName.replace('&', "&&"); // Quoting the '&' needed, to prevent QCheckBox creating an accelerator - QCheckBox* cb = new QCheckBox( mdName, plainPage() ); + TQString mdName = mdw->mixDevice()->name(); + mdName.replace('&', "&&"); // Quoting the '&' needed, to prevent TQCheckBox creating an accelerator + TQCheckBox* cb = new TQCheckBox( mdName, plainPage() ); _qEnabledCB.append(cb); cb->setChecked( !mdw->isDisabled() ); //mdw->isVisible() ); _layout->addWidget(cb); @@ -59,7 +59,7 @@ DialogViewConfiguration::DialogViewConfiguration( QWidget*, ViewBase& view) } _layout->activate(); resize(_layout->sizeHint() ); - connect( this, SIGNAL(okClicked()) , this, SLOT(apply()) ); + connect( this, TQT_SIGNAL(okClicked()) , this, TQT_SLOT(apply()) ); } DialogViewConfiguration::~DialogViewConfiguration() @@ -68,13 +68,13 @@ DialogViewConfiguration::~DialogViewConfiguration() void DialogViewConfiguration::apply() { - QPtrList<QWidget> &mdws = _view._mdws; + TQPtrList<TQWidget> &mdws = _view._mdws; // --- 2-Step Apply --- // --- Step 1: Show and Hide Widgets --- - QCheckBox *cb = _qEnabledCB.first(); - for ( QWidget *qw = mdws.first(); qw != 0; qw = mdws.next()) + TQCheckBox *cb = _qEnabledCB.first(); + for ( TQWidget *qw = mdws.first(); qw != 0; qw = mdws.next()) { if ( qw->inherits("MixDeviceWidget") ) { MixDeviceWidget *mdw = static_cast<MixDeviceWidget*>(qw); @@ -93,7 +93,7 @@ void DialogViewConfiguration::apply() _view.configurationUpdate(); } -QSize DialogViewConfiguration::sizeHint() const { +TQSize DialogViewConfiguration::sizeHint() const { // kdDebug(67100) << "DialogViewConfiguration::sizeHint() is (100,500)\n"; return _layout->sizeHint(); } diff --git a/kmix/dialogviewconfiguration.h b/kmix/dialogviewconfiguration.h index d63d1031..5ad17ba8 100644 --- a/kmix/dialogviewconfiguration.h +++ b/kmix/dialogviewconfiguration.h @@ -1,8 +1,8 @@ #ifndef DIALOGVIEWCONFIGURATION_H #define DIALOGVIEWCONFIGURATION_H -#include <qcheckbox.h> -#include <qptrlist.h> +#include <tqcheckbox.h> +#include <tqptrlist.h> class QVBoxLayout; #include <kdialogbase.h> @@ -14,17 +14,17 @@ class DialogViewConfiguration : public KDialogBase { Q_OBJECT public: - DialogViewConfiguration(QWidget* parent, ViewBase& view); + DialogViewConfiguration(TQWidget* parent, ViewBase& view); ~DialogViewConfiguration(); - QSize sizeHint() const; + TQSize sizeHint() const; public slots: void apply(); private: - QVBoxLayout* _layout; + TQVBoxLayout* _layout; ViewBase& _view; - QPtrList<QCheckBox> _qEnabledCB; + TQPtrList<TQCheckBox> _qEnabledCB; }; #endif diff --git a/kmix/kledbutton.cpp b/kmix/kledbutton.cpp index f788f8ea..e0a7bff1 100644 --- a/kmix/kledbutton.cpp +++ b/kmix/kledbutton.cpp @@ -19,12 +19,12 @@ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qsizepolicy.h> +#include <tqsizepolicy.h> #include "kledbutton.h" -KLedButton::KLedButton(const QColor &col, QWidget *parent, const char *name) +KLedButton::KLedButton(const TQColor &col, TQWidget *parent, const char *name) : KLed( col, parent, name ) { // KLed and thus KLedButtung does not do proper positioning in QLayout's. @@ -32,8 +32,8 @@ KLedButton::KLedButton(const QColor &col, QWidget *parent, const char *name) installEventFilter(parent); } -KLedButton::KLedButton(const QColor& col, KLed::State st, KLed::Look look, - KLed::Shape shape, QWidget *parent, const char *name) +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 ) { } @@ -42,7 +42,7 @@ KLedButton::~KLedButton() { } -void KLedButton::mousePressEvent( QMouseEvent *e ) +void KLedButton::mousePressEvent( TQMouseEvent *e ) { if (e->button() == LeftButton) { @@ -51,12 +51,12 @@ void KLedButton::mousePressEvent( QMouseEvent *e ) } } -bool KLedButton::eventFilter( QObject* /*obj*/ , QEvent* /*ev*/ ) { +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 /* No, this cannot work ! - if ( ev->type() == QEvent::Resize ) { - QResizeEvent* qre = (QResizeEvent*)ev; + if ( ev->type() == TQEvent::Resize ) { + TQResizeEvent* qre = (TQResizeEvent*)ev; this->move( qre->size().width() - width()/2, qre->size().height() - height()/2 ); } @@ -66,14 +66,14 @@ bool KLedButton::eventFilter( QObject* /*obj*/ , QEvent* /*ev*/ ) { } -QSize KLedButton::sizeHint() const +TQSize KLedButton::sizeHint() const { return size(); } -QSizePolicy KLedButton::sizePolicy () const +TQSizePolicy KLedButton::sizePolicy () const { - return QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + return TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); } #include "kledbutton.moc" diff --git a/kmix/kledbutton.h b/kmix/kledbutton.h index 8ea33aba..e8d562af 100644 --- a/kmix/kledbutton.h +++ b/kmix/kledbutton.h @@ -22,7 +22,7 @@ #ifndef KLEDBUTTON_H #define KLEDBUTTON_H -#include <qwidget.h> +#include <tqwidget.h> #include <kled.h> @@ -33,21 +33,21 @@ class KLedButton : public KLed { Q_OBJECT public: - KLedButton(const QColor &col=Qt::green, QWidget *parent=0, const char *name=0); - KLedButton(const QColor& col, KLed::State st, KLed::Look look, KLed::Shape shape, - QWidget *parent=0, const char *name=0); + 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(); - QSize sizeHint () const; - QSizePolicy sizePolicy () const; + TQSize sizeHint () const; + TQSizePolicy sizePolicy () const; signals: void stateChanged( bool newState ); protected: - void mousePressEvent ( QMouseEvent *e ); + void mousePressEvent ( TQMouseEvent *e ); private: - bool eventFilter( QObject*, QEvent* ); + bool eventFilter( TQObject*, TQEvent* ); }; #endif diff --git a/kmix/kmix-platforms.cpp b/kmix/kmix-platforms.cpp index 222119eb..d0c4d1d5 100644 --- a/kmix/kmix-platforms.cpp +++ b/kmix/kmix-platforms.cpp @@ -24,7 +24,7 @@ #include <config.h> -#include <qstring.h> +#include <tqstring.h> #include "mixer_backend.h" @@ -107,7 +107,7 @@ */ typedef Mixer_Backend *getMixerFunc( int device ); -typedef QString getDriverNameFunc( ); +typedef TQString getDriverNameFunc( ); typedef DevIterator* getDevIteratorFunc( ); struct MixerFactory { diff --git a/kmix/kmix.cpp b/kmix/kmix.cpp index cc603aed..85a3d39e 100644 --- a/kmix/kmix.cpp +++ b/kmix/kmix.cpp @@ -20,13 +20,13 @@ */ // include files for QT -#include <qmap.h> -#include <qhbox.h> -#include <qcheckbox.h> -#include <qradiobutton.h> -#include <qwidgetstack.h> -#include <qlayout.h> -#include <qtooltip.h> +#include <tqmap.h> +#include <tqhbox.h> +#include <tqcheckbox.h> +#include <tqradiobutton.h> +#include <tqwidgetstack.h> +#include <tqlayout.h> +#include <tqtooltip.h> // include files for KDE #include <kcombobox.h> @@ -93,7 +93,7 @@ KMixWindow::KMixWindow() { hide(); } - connect( kapp, SIGNAL( aboutToQuit()), SLOT( saveSettings()) ); + connect( kapp, TQT_SIGNAL( aboutToQuit()), TQT_SLOT( saveSettings()) ); } @@ -107,25 +107,25 @@ void KMixWindow::initActions() { // file menu - KStdAction::quit( this, SLOT(quit()), actionCollection()); + KStdAction::quit( this, TQT_SLOT(quit()), actionCollection()); // settings menu - KStdAction::showMenubar( this, SLOT(toggleMenuBar()), actionCollection()); - KStdAction::preferences( this, SLOT(showSettings()), actionCollection()); + KStdAction::showMenubar( this, TQT_SLOT(toggleMenuBar()), actionCollection()); + KStdAction::preferences( this, TQT_SLOT(showSettings()), actionCollection()); new KAction( i18n( "Configure &Global Shortcuts..." ), "configure_shortcuts", 0, this, - SLOT( configureGlobalShortcuts() ), actionCollection(), "settings_global" ); - KStdAction::keyBindings( guiFactory(), SLOT(configureShortcuts()), actionCollection()); + TQT_SLOT( configureGlobalShortcuts() ), actionCollection(), "settings_global" ); + KStdAction::keyBindings( guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection()); - (void) new KAction( i18n( "Hardware &Information" ), 0, this, SLOT( slotHWInfo() ), actionCollection(), "hwinfo" ); - (void) new KAction( i18n( "Hide Mixer Window" ), Key_Escape, this, SLOT(hide()), actionCollection(), "hide_kmixwindow" ); + (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" ); m_globalAccel = new KGlobalAccel( this ); - m_globalAccel->insert( "Increase volume", i18n( "Increase Volume of Master Channel"), QString::null, - KShortcut(), KShortcut(), this, SLOT( increaseVolume() ) ); - m_globalAccel->insert( "Decrease volume", i18n( "Decrease Volume of Master Channel"), QString::null, - KShortcut(), KShortcut(), this, SLOT( decreaseVolume() ) ); - m_globalAccel->insert( "Toggle mute", i18n( "Toggle Mute of Master Channel"), QString::null, - KShortcut(), KShortcut(), this, SLOT( toggleMuted() ) ); + 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->readSettings(); m_globalAccel->updateConnections(); @@ -137,8 +137,8 @@ void KMixWindow::initPrefDlg() { m_prefDlg = new KMixPrefDlg( this ); - connect( m_prefDlg, SIGNAL(signalApplied(KMixPrefDlg *)), - this, SLOT(applyPrefs(KMixPrefDlg *)) ); + connect( m_prefDlg, TQT_SIGNAL(signalApplied(KMixPrefDlg *)), + this, TQT_SLOT(applyPrefs(KMixPrefDlg *)) ); } @@ -146,30 +146,30 @@ void KMixWindow::initWidgets() { // Main widget and layout - setCentralWidget( new QWidget( this, "qt_central_widget" ) ); + setCentralWidget( new TQWidget( this, "qt_central_widget" ) ); // Widgets layout - widgetsLayout = new QVBoxLayout( centralWidget(), 0, 0, "widgetsLayout" ); - widgetsLayout->setResizeMode(QLayout::Minimum); // works fine + widgetsLayout = new TQVBoxLayout( centralWidget(), 0, 0, "widgetsLayout" ); + widgetsLayout->setResizeMode(TQLayout::Minimum); // works fine // Mixer widget line - mixerNameLayout = new QHBox( centralWidget(), "mixerNameLayout" ); + mixerNameLayout = new TQHBox( centralWidget(), "mixerNameLayout" ); widgetsLayout->setStretchFactor( mixerNameLayout, 0 ); - QSizePolicy qsp( QSizePolicy::Ignored, QSizePolicy::Maximum); + TQSizePolicy qsp( TQSizePolicy::Ignored, TQSizePolicy::Maximum); mixerNameLayout->setSizePolicy(qsp); mixerNameLayout->setSpacing(KDialog::spacingHint()); - QLabel *qlbl = new QLabel( i18n("Current mixer:"), mixerNameLayout ); + TQLabel *qlbl = new TQLabel( i18n("Current mixer:"), mixerNameLayout ); qlbl->setFixedHeight(qlbl->sizeHint().height()); m_cMixer = new KComboBox( FALSE, mixerNameLayout, "mixerCombo" ); m_cMixer->setFixedHeight(m_cMixer->sizeHint().height()); - connect( m_cMixer, SIGNAL( activated( int ) ), this, SLOT( showSelectedMixer( int ) ) ); - QToolTip::add( m_cMixer, i18n("Current mixer" ) ); + connect( m_cMixer, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( showSelectedMixer( int ) ) ); + TQToolTip::add( m_cMixer, i18n("Current mixer" ) ); // Add first layout to widgets widgetsLayout->addWidget( mixerNameLayout ); - m_wsMixers = new QWidgetStack( centralWidget(), "MixerWidgetStack" ); + m_wsMixers = new TQWidgetStack( centralWidget(), "MixerWidgetStack" ); widgetsLayout->setStretchFactor( m_wsMixers, 10 ); widgetsLayout->addWidget( m_wsMixers ); @@ -213,7 +213,7 @@ KMixWindow::updateDocking() * Preparation for fixing Bug #55078 - scheduled for KDE3.4.1 . * This text will be plugged into the dock-icon popup menu. */ - QString selectChannel = i18n("Select Channel"); // This text will be used in KDE3.4.1 !!! + TQString selectChannel = i18n("Select Channel"); // This text will be used in KDE3.4.1 !!! m_dockWidget->show(); } @@ -276,7 +276,7 @@ KMixWindow::saveConfig() { if ( mw->mixer()->isOpen() ) { // protect from unplugged devices (better do *not* save them) - QString grp; + TQString grp; grp.sprintf( "%i", mw->id() ); mw->saveConfig( config, grp ); } @@ -297,17 +297,17 @@ KMixWindow::loadConfig() m_hideOnClose = config->readBoolEntry("HideOnClose", true); m_showTicks = config->readBoolEntry("Tickmarks", true); m_showLabels = config->readBoolEntry("Labels", true); - const QString& valueStyleString = config->readEntry("ValueStyle", "None"); + const TQString& valueStyleString = config->readEntry("ValueStyle", "None"); m_onLogin = config->readBoolEntry("startkdeRestore", true ); m_dockIconMuting = config->readBoolEntry( "DockIconMuting", false); m_startVisible = config->readBoolEntry("Visible", true); m_multiDriverMode = config->readBoolEntry("MultiDriver", false); m_surroundView = config->readBoolEntry("Experimental-ViewSurround", false ); m_gridView = config->readBoolEntry("Experimental-ViewGrid", false ); - const QString& orientationString = config->readEntry("Orientation", "Horizontal"); - QString mixerMasterCard = config->readEntry( "MasterMixer", "" ); + const TQString& orientationString = config->readEntry("Orientation", "Horizontal"); + TQString mixerMasterCard = config->readEntry( "MasterMixer", "" ); Mixer::setMasterCard(mixerMasterCard); - QString masterDev = config->readEntry( "MasterMixerDevice", "" ); + TQString masterDev = config->readEntry( "MasterMixerDevice", "" ); Mixer::setMasterCardDevice(masterDev); if ( valueStyleString == "Absolute" ) @@ -331,12 +331,12 @@ KMixWindow::loadConfig() // restore window size and position if ( !kapp->isRestored() ) // done by the session manager otherwise { - QSize defSize( minimumWidth(), height() ); - QSize size = config->readSizeEntry("Size", &defSize ); + TQSize defSize( minimumWidth(), height() ); + TQSize size = config->readSizeEntry("Size", &defSize ); if(!size.isEmpty()) resize(size); - QPoint defPos = pos(); - QPoint pos = config->readPointEntry("Position", &defPos); + TQPoint defPos = pos(); + TQPoint pos = config->readPointEntry("Position", &defPos); move(pos); } } @@ -381,7 +381,7 @@ KMixWindow::initMixerWidgets() m_cMixer->insertItem( mixer->mixerName() ); m_wsMixers->addWidget( mw, id ); - QString grp; + TQString grp; grp.sprintf( "%i", mw->id() ); mw->loadConfig( kapp->config(), grp ); @@ -514,11 +514,11 @@ KMixWindow::applyPrefs( KMixPrefDlg *prefDlg ) ( prefDlg->_rbVertical->isChecked() && m_toplevelOrientation == Qt::Horizontal ) || ( prefDlg->_rbHorizontal->isChecked() && m_toplevelOrientation == Qt::Vertical ); if ( toplevelOrientationHasChanged ) { - QString msg = i18n("The change of orientation will be adopted on the next start of KMix."); + TQString msg = i18n("The change of orientation will be adopted on the next start of KMix."); KMessageBox::information(0,msg); } if ( prefDlg->_rbVertical->isChecked() ) { - //QString "For a change of language to take place, quit and restart KDiff3."; + //TQString "For a change of language to take place, quit and restart KDiff3."; //kdDebug(67100) << "KMix should change to Vertical layout\n"; m_toplevelOrientation = Qt::Vertical; } @@ -568,7 +568,7 @@ KMixWindow::toggleMenuBar() } void -KMixWindow::showEvent( QShowEvent * ) +KMixWindow::showEvent( TQShowEvent * ) { if ( m_visibilityUpdateAllowed ) m_isVisible = isVisible(); @@ -576,7 +576,7 @@ KMixWindow::showEvent( QShowEvent * ) } void -KMixWindow::hideEvent( QHideEvent * ) +KMixWindow::hideEvent( TQHideEvent * ) { if ( m_visibilityUpdateAllowed ) { diff --git a/kmix/kmix.h b/kmix/kmix.h index d5c2a0d0..4404e7f5 100644 --- a/kmix/kmix.h +++ b/kmix/kmix.h @@ -28,8 +28,8 @@ #endif // include files for Qt -#include <qstring.h> -#include <qmap.h> +#include <tqstring.h> +#include <tqmap.h> class QHBox; class QWidgetStack; @@ -75,8 +75,8 @@ KMixWindow : public KMainWindow void updateDocking(); bool queryClose(); - void showEvent( QShowEvent * ); - void hideEvent( QHideEvent * ); + void showEvent( TQShowEvent * ); + void hideEvent( TQHideEvent * ); public slots: void quit(); @@ -92,9 +92,9 @@ KMixWindow : public KMainWindow private: KAccel *m_keyAccel; KGlobalAccel *m_globalAccel; - QPopupMenu *m_fileMenu; - QPopupMenu *m_viewMenu; - QPopupMenu *m_helpMenu; + TQPopupMenu *m_fileMenu; + TQPopupMenu *m_viewMenu; + TQPopupMenu *m_helpMenu; bool m_showDockWidget; bool m_volumeWidget; @@ -113,15 +113,15 @@ KMixWindow : public KMainWindow bool m_gridView; // Experimental. Off by default Qt::Orientation m_toplevelOrientation; - QPtrList<KMixerWidget> m_mixerWidgets; + TQPtrList<KMixerWidget> m_mixerWidgets; - QHBox* mixerNameLayout; + TQHBox* mixerNameLayout; KComboBox *m_cMixer; - QWidgetStack *m_wsMixers; + TQWidgetStack *m_wsMixers; KMixPrefDlg *m_prefDlg; KMixDockWidget *m_dockWidget; - QString m_hwInfoString; - QVBoxLayout *widgetsLayout; + TQString m_hwInfoString; + TQVBoxLayout *widgetsLayout; private slots: //void removeMixerWidget( KMixerWidget *mw ); diff --git a/kmix/kmixapplet.cpp b/kmix/kmixapplet.cpp index 92e94682..c0fed889 100644 --- a/kmix/kmixapplet.cpp +++ b/kmix/kmixapplet.cpp @@ -24,14 +24,14 @@ #include <stdlib.h> // QT -#include <qgroupbox.h> -#include <qcheckbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qpixmap.h> -#include <qpushbutton.h> -#include <qradiobutton.h> -#include <qwmatrix.h> +#include <tqgroupbox.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpixmap.h> +#include <tqpushbutton.h> +#include <tqradiobutton.h> +#include <tqwmatrix.h> // KDE @@ -66,7 +66,7 @@ extern "C" { - KDE_EXPORT KPanelApplet* init(QWidget *parent, const QString& configFile) + KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { KGlobal::locale()->insertCatalogue("kmix"); return new KMixApplet(configFile, KPanelApplet::Normal, @@ -77,21 +77,21 @@ extern "C" int KMixApplet::s_instCount = 0; //<Mixer> KMixApplet::Mixer::mixers(); -static const QColor highColor = KGlobalSettings::baseColor(); -static const QColor lowColor = KGlobalSettings::highlightColor(); -static const QColor backColor = "#000000"; -static const QColor mutedHighColor = "#FFFFFF"; -static const QColor mutedLowColor = "#808080"; -static const QColor mutedBackColor = "#000000"; +static const TQColor highColor = KGlobalSettings::baseColor(); +static const TQColor lowColor = KGlobalSettings::highlightColor(); +static const TQColor backColor = "#000000"; +static const TQColor mutedHighColor = "#FFFFFF"; +static const TQColor mutedLowColor = "#808080"; +static const TQColor mutedBackColor = "#000000"; -AppletConfigDialog::AppletConfigDialog( QWidget * parent, const char * name ) - : KDialogBase( KDialogBase::Plain, QString::null, +AppletConfigDialog::AppletConfigDialog( TQWidget * parent, const char * name ) + : KDialogBase( KDialogBase::Plain, TQString::null, KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel, KDialogBase::Ok, parent, name, false, true) { setPlainCaption(i18n("Configure - Mixer Applet")); - QFrame* page = plainPage(); - QVBoxLayout *topLayout = new QVBoxLayout(page); + TQFrame* page = plainPage(); + TQVBoxLayout *topLayout = new TQVBoxLayout(page); colorWidget = new ColorWidget(page); topLayout->addWidget(colorWidget); setUseCustomColors(false); @@ -108,28 +108,28 @@ void AppletConfigDialog::slotApply() emit applied(); } -void AppletConfigDialog::setActiveColors(const QColor& high, const QColor& low, const QColor& back) +void AppletConfigDialog::setActiveColors(const TQColor& high, const TQColor& low, const TQColor& back) { colorWidget->activeHigh->setColor(high); colorWidget->activeLow->setColor(low); colorWidget->activeBack->setColor(back); } -void AppletConfigDialog::activeColors(QColor& high, QColor& low, QColor& back) const +void AppletConfigDialog::activeColors(TQColor& high, TQColor& low, TQColor& back) const { high = colorWidget->activeHigh->color(); low = colorWidget->activeLow->color(); back = colorWidget->activeBack->color(); } -void AppletConfigDialog::setMutedColors(const QColor& high, const QColor& low, const QColor& back) +void AppletConfigDialog::setMutedColors(const TQColor& high, const TQColor& low, const TQColor& back) { colorWidget->mutedHigh->setColor(high); colorWidget->mutedLow->setColor(low); colorWidget->mutedBack->setColor(back); } -void AppletConfigDialog::mutedColors(QColor& high, QColor& low, QColor& back) const +void AppletConfigDialog::mutedColors(TQColor& high, TQColor& low, TQColor& back) const { high = colorWidget->mutedHigh->color(); low = colorWidget->mutedLow->color(); @@ -149,8 +149,8 @@ bool AppletConfigDialog::useCustomColors() const } -KMixApplet::KMixApplet( const QString& configFile, Type t, - QWidget *parent, const char *name ) +KMixApplet::KMixApplet( const TQString& configFile, Type t, + TQWidget *parent, const char *name ) : KPanelApplet( configFile, t, KPanelApplet::Preferences | KPanelApplet::ReportBug | KPanelApplet::About, parent, name ), m_mixerWidget(0), m_errorLabel(0), m_pref(0), @@ -161,12 +161,12 @@ KMixApplet::KMixApplet( const QString& configFile, Type t, setBackgroundOrigin(AncestorOrigin); kdDebug(67100) << "KMixApplet::KMixApplet instancing Applet. Old s_instCount="<< s_instCount << " configfile=" << configFile << endl; //kdDebug(67100) << "KMixApplet::KMixApplet()" << endl; - _layout = new QHBoxLayout(this); // it will always only be one item in it, so we don't care whether it is HBox or VBox + _layout = new TQHBoxLayout(this); // it will always only be one item in it, so we don't care whether it is HBox or VBox // init static vars if ( s_instCount == 0) { Mixer::mixers().setAutoDelete( TRUE ); - QString dummyStringHwinfo; + TQString dummyStringHwinfo; MixerToolBox::initMixer(Mixer::mixers(), false, dummyStringHwinfo); } s_instCount++; @@ -204,10 +204,10 @@ KMixApplet::KMixApplet( const QString& 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 QPushButton( i18n("Select Mixer"), this ); + 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() ); - connect( m_errorLabel, SIGNAL(clicked()), this, SLOT(selectMixer()) ); + connect( m_errorLabel, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectMixer()) ); } else { // We know which mixer to use: Call positionChange(), which does all the creating @@ -266,7 +266,7 @@ void KMixApplet::loadConfig() cfg->setGroup(0); _mixerId = cfg->readEntry( "Mixer", "undef" ); - _mixerName = cfg->readEntry( "MixerName", QString::null ); + _mixerName = cfg->readEntry( "MixerName", TQString::null ); _customColors = cfg->readBoolEntry( "ColorCustom", false ); @@ -282,7 +282,7 @@ void KMixApplet::loadConfig() } -void KMixApplet::loadConfig( KConfig *config, const QString &grp ) +void KMixApplet::loadConfig( KConfig *config, const TQString &grp ) { if ( m_mixerWidget ) { //config->setGroup( grp ); @@ -291,7 +291,7 @@ void KMixApplet::loadConfig( KConfig *config, const QString &grp ) } -void KMixApplet::saveConfig( KConfig *config, const QString &grp ) +void KMixApplet::saveConfig( KConfig *config, const TQString &grp ) { if ( m_mixerWidget ) { config->setGroup( grp ); @@ -308,19 +308,19 @@ void KMixApplet::saveConfig( KConfig *config, const QString &grp ) */ void KMixApplet::selectMixer() { - QStringList lst; + TQStringList lst; int n=1; for (Mixer *mixer=Mixer::mixers().first(); mixer!=0; mixer=Mixer::mixers().next()) { - QString s; + TQString s; s.sprintf("%i. %s", n, mixer->mixerName().ascii()); lst << s; n++; } bool ok = FALSE; - QString res = KInputDialog::getItem( i18n("Mixers"), + TQString res = KInputDialog::getItem( i18n("Mixers"), i18n("Available mixers:"), lst, 1, FALSE, &ok, this ); if ( ok ) @@ -356,7 +356,7 @@ void KMixApplet::help() void KMixApplet::positionChange(Position pos) { orientationChange( orientation() ); - QResizeEvent e( size(), size() ); // from KPanelApplet::positionChange + TQResizeEvent e( size(), size() ); // from KPanelApplet::positionChange resizeEvent( &e ); // from KPanelApplet::positionChange if ( m_errorLabel == 0) { @@ -367,7 +367,7 @@ void KMixApplet::positionChange(Position pos) { delete m_mixerWidget; } m_mixerWidget = new ViewApplet( this, _mixer->name(), _mixer, 0, pos ); - connect ( m_mixerWidget, SIGNAL(appletContentChanged()), this, SLOT(updateGeometrySlot()) ); + connect ( m_mixerWidget, TQT_SIGNAL(appletContentChanged()), this, TQT_SLOT(updateGeometrySlot()) ); m_mixerWidget->createDeviceWidgets(); _layout->add(m_mixerWidget); _layout->activate(); @@ -375,19 +375,19 @@ void KMixApplet::positionChange(Position pos) { loadConfig(); setColors(); - const QSize panelAppletConstrainedSize = sizeHint(); + const TQSize panelAppletConstrainedSize = sizeHint(); m_mixerWidget->setGeometry( 0, 0, panelAppletConstrainedSize.width(), panelAppletConstrainedSize.height() ); resize( panelAppletConstrainedSize.width(), panelAppletConstrainedSize.height() ); //setFixedSize(panelAppletConstrainedSize.width(), panelAppletConstrainedSize.height() ); //kdDebug(67100) << "KMixApplet::positionChange(). New MDW is at " << panelAppletConstrainedSize << endl; m_mixerWidget->show(); - //connect( _mixer, SIGNAL(newVolumeLevels()), m_mixerWidget, SLOT(refreshVolumeLevels()) ); + //connect( _mixer, TQT_SIGNAL(newVolumeLevels()), m_mixerWidget, TQT_SLOT(refreshVolumeLevels()) ); } } /************* GEOMETRY STUFF START ********************************/ -void KMixApplet::resizeEvent(QResizeEvent *e) +void KMixApplet::resizeEvent(TQResizeEvent *e) { //kdDebug(67100) << "KMixApplet::resizeEvent(). New MDW is at " << e->size() << endl; @@ -414,9 +414,9 @@ void KMixApplet::updateGeometrySlot() { } -QSize KMixApplet::sizeHint() const { +TQSize KMixApplet::sizeHint() const { //kdDebug(67100) << "KMixApplet::sizeHint()\n"; - QSize qsz; + TQSize qsz; if ( m_errorLabel !=0 ) { qsz = m_errorLabel->sizeHint(); } @@ -448,15 +448,15 @@ int KMixApplet::heightForWidth(int) const { -QSizePolicy KMixApplet::sizePolicy() const { - // return QSizePolicy(QSizePolicy::Preferred,QSizePolicy::Preferred); +TQSizePolicy KMixApplet::sizePolicy() const { + // return TQSizePolicy(TQSizePolicy::Preferred,TQSizePolicy::Preferred); if ( orientation() == Qt::Vertical ) { //kdDebug(67100) << "KMixApplet::sizePolicy=(Ignored,Fixed)\n"; - return QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); + return TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); } else { //kdDebug(67100) << "KMixApplet::sizePolicy=(Fixed,Ignored)\n"; - return QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred); + return TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred); } } @@ -477,8 +477,8 @@ void KMixApplet::preferences() if ( !m_pref ) { m_pref = new AppletConfigDialog( this ); - connect(m_pref, SIGNAL(finished()), SLOT(preferencesDone())); - connect( m_pref, SIGNAL(applied()), SLOT(applyPreferences()) ); + connect(m_pref, TQT_SIGNAL(finished()), TQT_SLOT(preferencesDone())); + connect( m_pref, TQT_SIGNAL(applied()), TQT_SLOT(applyPreferences()) ); m_pref->setActiveColors(_colors.high , _colors.low , _colors.back); m_pref->setMutedColors (_colors.mutedHigh, _colors.mutedLow, _colors.mutedBack); @@ -511,17 +511,17 @@ void KMixApplet::applyPreferences() return; /* - QSize si = m_mixerWidget->size(); + TQSize si = m_mixerWidget->size(); m_mixerWidget->resize( si ); */ setColors(); saveConfig(); } -void KMixApplet::paletteChange ( const QPalette &) { +void KMixApplet::paletteChange ( const TQPalette &) { if ( ! _customColors ) { // We take over Colors from paletteChange(), if the user has not set custom colors. - // ignore the given QPalette and use the values from KGlobalSettings instead + // ignore the given TQPalette and use the values from KGlobalSettings instead _colors.high = KGlobalSettings::highlightColor(); _colors.low = KGlobalSettings::baseColor(); _colors.back = backColor; @@ -551,8 +551,8 @@ void KMixApplet::setColors( const Colors &color ) // can happen for example after a paletteChange() return; } - QPtrList<QWidget> &mdws = m_mixerWidget->_mdws; - for ( QWidget* qmdw=mdws.first(); qmdw != 0; qmdw=mdws.next() ) { + TQPtrList<TQWidget> &mdws = m_mixerWidget->_mdws; + for ( TQWidget* qmdw=mdws.first(); qmdw != 0; qmdw=mdws.next() ) { if ( qmdw->inherits("MixDeviceWidget") ) { // -<- temporary check. Later we *know* that it is correct static_cast<MixDeviceWidget*>(qmdw)->setColors( color.high, color.low, color.back ); static_cast<MixDeviceWidget*>(qmdw)->setMutedColors( color.mutedHigh, color.mutedLow, color.mutedBack ); diff --git a/kmix/kmixapplet.h b/kmix/kmixapplet.h index 3962b711..561a596f 100644 --- a/kmix/kmixapplet.h +++ b/kmix/kmixapplet.h @@ -23,9 +23,9 @@ #define KMIXAPPLET_H // Qt -#include <qlayout.h> -#include <qptrlist.h> -#include <qwidget.h> +#include <tqlayout.h> +#include <tqptrlist.h> +#include <tqwidget.h> // KDE #include <kaboutdata.h> @@ -44,14 +44,14 @@ class AppletConfigDialog : public KDialogBase { Q_OBJECT public: - AppletConfigDialog( QWidget * parent=0, const char * name=0 ); + AppletConfigDialog( TQWidget * parent=0, const char * name=0 ); virtual ~AppletConfigDialog() {}; - void setActiveColors(const QColor& high, const QColor& low, const QColor& back); - void activeColors(QColor& high, QColor& low, QColor& back) const; + void setActiveColors(const TQColor& high, const TQColor& low, const TQColor& back); + void activeColors(TQColor& high, TQColor& low, TQColor& back) const; - void setMutedColors(const QColor& high, const QColor& low, const QColor& back); - void mutedColors(QColor& high, QColor& low, QColor& back) const; + void setMutedColors(const TQColor& high, const TQColor& low, const TQColor& back); + void mutedColors(TQColor& high, TQColor& low, TQColor& back) const; void setUseCustomColors(bool); bool useCustomColors() const; @@ -72,22 +72,22 @@ class KMixApplet : public KPanelApplet Q_OBJECT public: - KMixApplet( const QString& configFile, Type t = Normal, - QWidget *parent = 0, const char *name = 0 ); + KMixApplet( const TQString& configFile, Type t = Normal, + TQWidget *parent = 0, const char *name = 0 ); virtual ~KMixApplet(); struct Colors { - QColor high, low, back, mutedHigh, mutedLow, mutedBack; + TQColor high, low, back, mutedHigh, mutedLow, mutedBack; }; void about(); void help(); void preferences(); void reportBug(); - void paletteChange ( const QPalette & oldPalette ); + void paletteChange ( const TQPalette & oldPalette ); - QSize sizeHint() const; - QSizePolicy sizePolicy() const; + TQSize sizeHint() const; + TQSizePolicy sizePolicy() const; int widthForHeight(int) const; int heightForWidth(int) const; @@ -98,11 +98,11 @@ protected slots: void updateGeometrySlot(); protected: - void resizeEvent( QResizeEvent * ); + void resizeEvent( TQResizeEvent * ); void saveConfig(); - void saveConfig( KConfig *config, const QString &grp ); + void saveConfig( KConfig *config, const TQString &grp ); void loadConfig(); - void loadConfig( KConfig *config, const QString &grp ); + void loadConfig( KConfig *config, const TQString &grp ); private: void positionChange(Position); @@ -110,7 +110,7 @@ private: void setColors( const Colors &color ); ViewApplet *m_mixerWidget; - QPushButton *m_errorLabel; + TQPushButton *m_errorLabel; AppletConfigDialog *m_pref; static int s_instCount; @@ -119,10 +119,10 @@ private: KMixApplet::Colors _colors; bool _customColors; - QLayout* _layout; + TQLayout* _layout; - QString _mixerId; - QString _mixerName; + TQString _mixerId; + TQString _mixerName; KAboutData m_aboutData; }; diff --git a/kmix/kmixctrl.cpp b/kmix/kmixctrl.cpp index 159df432..17d9bd8c 100644 --- a/kmix/kmixctrl.cpp +++ b/kmix/kmixctrl.cpp @@ -27,7 +27,7 @@ #include <kstandarddirs.h> #include <kconfig.h> #include <kdebug.h> -#include <qptrlist.h> +#include <tqptrlist.h> #include "kmixtoolbox.h" #include "mixer.h" @@ -66,7 +66,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) delete config; // create mixers - QString dummyStringHwinfo; + TQString dummyStringHwinfo; MixerToolBox::initMixer(Mixer::mixers(), false, dummyStringHwinfo); // load volumes diff --git a/kmix/kmixdockwidget.cpp b/kmix/kmixdockwidget.cpp index 19ef03e9..ae80ec49 100644 --- a/kmix/kmixdockwidget.cpp +++ b/kmix/kmixdockwidget.cpp @@ -34,9 +34,9 @@ #include <kdebug.h> #include <kwin.h> -#include <qapplication.h> -#include <qcursor.h> -#include <qtooltip.h> +#include <tqapplication.h> +#include <tqcursor.h> +#include <tqtooltip.h> #include <X11/Xlib.h> #include <fixx11h.h> @@ -47,7 +47,7 @@ #include "kwin.h" #include "viewdockareapopup.h" -KMixDockWidget::KMixDockWidget( Mixer *mixer, QWidget *parent, const char *name, bool volumePopup, bool dockIconMuting ) +KMixDockWidget::KMixDockWidget( Mixer *mixer, TQWidget *parent, const char *name, bool volumePopup, bool dockIconMuting ) : KSystemTray( parent, name ), m_mixer(mixer), _dockAreaPopup(0L), @@ -68,7 +68,7 @@ KMixDockWidget::KMixDockWidget( Mixer *mixer, QWidget *parent, const char *name, } createActions(); createMasterVolWidget(); - connect(this, SIGNAL(quitSelected()), kapp, SLOT(quitExtended())); + connect(this, TQT_SIGNAL(quitSelected()), kapp, TQT_SLOT(quitExtended())); } KMixDockWidget::~KMixDockWidget() @@ -80,7 +80,7 @@ KMixDockWidget::~KMixDockWidget() void KMixDockWidget::createActions() { // Put "Mute" selector in context menu - (void)new KToggleAction( i18n( "M&ute" ), 0, this, SLOT( dockMute() ), + (void)new KToggleAction( i18n( "M&ute" ), 0, this, TQT_SLOT( dockMute() ), actionCollection(), "dock_mute" ); KAction *a = actionCollection()->action( "dock_mute" ); KPopupMenu *popupMenu = contextMenu(); @@ -88,7 +88,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, SLOT(selectMaster()), + (void)new KAction( i18n("Select Master Channel..."), 0, this, TQT_SLOT(selectMaster()), actionCollection(), "select_master"); KAction *a2 = actionCollection()->action( "select_master" ); if (a2) a2->plug( popupMenu ); @@ -120,10 +120,10 @@ KMixDockWidget::createMasterVolWidget() _dockAreaPopup = new ViewDockAreaPopup(0, "dockArea", m_mixer, 0, this); _dockAreaPopup->createDeviceWidgets(); 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 QSocketNotifier stuff, we can't rely on regular timer updates + /* 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. - The call to m_mixer->readSetFromHWforceUpdate() is most likely superfluous, even if we don't use QSocketNotifier (e.g. in backends OSS, Solaris, ...) + The call to m_mixer->readSetFromHWforceUpdate() is most likely superfluous, even if we don't use TQSocketNotifier (e.g. in backends OSS, Solaris, ...) */ setVolumeTip(); updatePixmap(false); @@ -133,9 +133,9 @@ KMixDockWidget::createMasterVolWidget() * Refreshing the Icon * */ - // connect( m_mixer, SIGNAL(newVolumeLevels()), _dockAreaPopup, SLOT(refreshVolumeLevels()) ); - connect( m_mixer, SIGNAL(newVolumeLevels()), this, SLOT(setVolumeTip() ) ); - connect( m_mixer, SIGNAL(newVolumeLevels()), this, SLOT(slotUpdatePixmap() ) ); + // 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() ) ); } void KMixDockWidget::slotUpdatePixmap() @@ -146,13 +146,13 @@ void KMixDockWidget::slotUpdatePixmap() void KMixDockWidget::selectMaster() { DialogSelectMaster* dsm = new DialogSelectMaster(m_mixer); - connect ( dsm, SIGNAL(newMasterSelected(int, QString&)), SLOT( handleNewMaster(int,QString&)) ); + connect ( dsm, TQT_SIGNAL(newMasterSelected(int, TQString&)), TQT_SLOT( handleNewMaster(int,TQString&)) ); dsm->show(); // !! The dialog is modal. Does it delete itself? } -void KMixDockWidget::handleNewMaster(int soundcard_id, QString& channel_id) // !! @todo rework parameters +void KMixDockWidget::handleNewMaster(int soundcard_id, TQString& channel_id) // !! @todo rework parameters { //kdDebug(67100) << "KMixDockWidget::handleNewMaster() soundcard_id=" << soundcard_id << " , channel_id=" << channel_id << endl; Mixer *mixer = Mixer::mixers().at(soundcard_id); @@ -174,7 +174,7 @@ KMixDockWidget::setVolumeTip() if ( _dockAreaPopup != 0 ) { md = _dockAreaPopup->dockDevice(); } - QString tip = ""; + TQString tip = ""; int newToolTipValue = 0; if ( md == 0 ) @@ -204,9 +204,9 @@ KMixDockWidget::setVolumeTip() // changed (or completely new tooltip) if ( _oldToolTipValue >= 0 ) { // there was an old Tooltip: remove it - QToolTip::remove(this); + TQToolTip::remove(this); } - QToolTip::add(this, tip); + TQToolTip::add(this, tip); } _oldToolTipValue = newToolTipValue; } @@ -235,9 +235,9 @@ KMixDockWidget::updatePixmap(bool force) if (( newPixmapType != _oldPixmapType ) || (force == true)) { // Pixmap must be changed => do so // Honor Free Desktop specifications that allow for arbitrary system tray icon sizes - QPixmap origpixmap; - QPixmap scaledpixmap; - QImage newIcon; + TQPixmap origpixmap; + TQPixmap scaledpixmap; + TQImage newIcon; switch ( newPixmapType ) { case 'e': origpixmap = loadSizedIcon( "kmixdocked_error", width() ); break; case 'm': origpixmap = loadSizedIcon( "kmixdocked_mute" , width() ); break; @@ -252,13 +252,13 @@ KMixDockWidget::updatePixmap(bool force) } } -void KMixDockWidget::resizeEvent ( QResizeEvent * ) +void KMixDockWidget::resizeEvent ( TQResizeEvent * ) { updatePixmap(true); } void -KMixDockWidget::mousePressEvent(QMouseEvent *me) +KMixDockWidget::mousePressEvent(TQMouseEvent *me) { if ( _dockAreaPopup == 0 ) { return KSystemTray::mousePressEvent(me); @@ -284,8 +284,8 @@ KMixDockWidget::mousePressEvent(QMouseEvent *me) } int h = _dockAreaPopup->height(); - int x = this->mapToGlobal( QPoint( 0, 0 ) ).x() + this->width()/2 - _dockAreaPopup->width()/2; - int y = this->mapToGlobal( QPoint( 0, 0 ) ).y() - h; + int x = this->mapToGlobal( TQPoint( 0, 0 ) ).x() + this->width()/2 - _dockAreaPopup->width()/2; + int y = this->mapToGlobal( TQPoint( 0, 0 ) ).y() - h; if ( y < 0 ) y = y + h + this->height(); @@ -293,8 +293,8 @@ KMixDockWidget::mousePressEvent(QMouseEvent *me) // Now handle Multihead displays. And also make sure that the dialog is not // moved out-of-the screen on the right (see Bug 101742). - QDesktopWidget* vdesktop = QApplication::desktop(); - const QRect& vScreenSize = vdesktop->screenGeometry(_dockAreaPopup); + TQDesktopWidget* vdesktop = TQApplication::desktop(); + const TQRect& vScreenSize = vdesktop->screenGeometry(_dockAreaPopup); if ( (x+_dockAreaPopup->width()) > (vScreenSize.width() + vScreenSize.x()) ) { // move horizontally, so that it is completely visible _dockAreaPopup->move(vScreenSize.width() + vScreenSize.x() - _dockAreaPopup->width() -1 , y); @@ -307,7 +307,7 @@ KMixDockWidget::mousePressEvent(QMouseEvent *me) _dockAreaPopup->show(); KWin::setState(_dockAreaPopup->winId(), NET::StaysOnTop | NET::SkipTaskbar | NET::SkipPager ); - QWidget::mousePressEvent(me); // KSystemTray's shouldn't do the default action for this + TQWidget::mousePressEvent(me); // KSystemTray's shouldn't do the default action for this return; } // LeftMouseButton pressed else if ( me->button() == MidButton ) { @@ -325,14 +325,14 @@ KMixDockWidget::mousePressEvent(QMouseEvent *me) } void -KMixDockWidget::mouseReleaseEvent( QMouseEvent *me ) +KMixDockWidget::mouseReleaseEvent( TQMouseEvent *me ) { KSystemTray::mouseReleaseEvent(me); } void -KMixDockWidget::wheelEvent(QWheelEvent *e) +KMixDockWidget::wheelEvent(TQWheelEvent *e) { MixDevice *md = 0; if ( _dockAreaPopup != 0 ) { @@ -360,7 +360,7 @@ KMixDockWidget::wheelEvent(QWheelEvent *e) // Mhhh, it doesn't work. Qt does not show it again. setVolumeTip(); // Simulate a mouse move to make Qt show the tooltip again - QApplication::postEvent( this, new QMouseEvent( QEvent::MouseMove, QCursor::pos(), Qt::NoButton, Qt::NoButton ) ); + TQApplication::postEvent( this, new TQMouseEvent( TQEvent::MouseMove, TQCursor::pos(), Qt::NoButton, Qt::NoButton ) ); } } diff --git a/kmix/kmixdockwidget.h b/kmix/kmixdockwidget.h index 680d3115..ee4eb89e 100644 --- a/kmix/kmixdockwidget.h +++ b/kmix/kmixdockwidget.h @@ -25,8 +25,8 @@ class QFrame; class QString; -#include <qwidget.h> -#include <qvbox.h> +#include <tqwidget.h> +#include <tqvbox.h> #include <ksystemtray.h> @@ -43,7 +43,7 @@ class KMixDockWidget : public KSystemTray { friend class KMixWindow; public: - KMixDockWidget(Mixer *, QWidget *parent=0, const char *name=0, bool volumePopup=true, bool dockIconMuting=false); + KMixDockWidget(Mixer *, TQWidget *parent=0, const char *name=0, bool volumePopup=true, bool dockIconMuting=false); ~KMixDockWidget(); void setErrorPixmap(); @@ -62,12 +62,12 @@ class KMixDockWidget : public KSystemTray { protected: void createMasterVolWidget(); void createActions(); - void mousePressEvent(QMouseEvent *); - void mouseReleaseEvent(QMouseEvent *); - void wheelEvent(QWheelEvent *); + void mousePressEvent(TQMouseEvent *); + void mouseReleaseEvent(TQMouseEvent *); + void wheelEvent(TQWheelEvent *); void contextMenuAboutToShow( KPopupMenu* menu ); void toggleMinimizeRestore(); - void resizeEvent ( QResizeEvent * ); + void resizeEvent ( TQResizeEvent * ); private: bool _playBeepOnVolumeChange; @@ -79,7 +79,7 @@ class KMixDockWidget : public KSystemTray { private slots: void dockMute(); void selectMaster(); - void handleNewMaster(int soundcard_id, QString& channel_id); + void handleNewMaster(int soundcard_id, TQString& channel_id); }; #endif diff --git a/kmix/kmixerwidget.cpp b/kmix/kmixerwidget.cpp index f75191a3..45fbbf31 100644 --- a/kmix/kmixerwidget.cpp +++ b/kmix/kmixerwidget.cpp @@ -20,12 +20,12 @@ // Qt -#include <qlabel.h> -#include <qlayout.h> -#include <qslider.h> -#include <qstring.h> -#include <qtooltip.h> -#include <qapplication.h> // for QApplication::revsreseLayout() +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqslider.h> +#include <tqstring.h> +#include <tqtooltip.h> +#include <tqapplication.h> // for TQApplication::revsreseLayout() // KDE #include <kconfig.h> @@ -55,10 +55,10 @@ (c) A balancing slider (d) A label containg the mixer name */ -KMixerWidget::KMixerWidget( int _id, Mixer *mixer, const QString &mixerName, +KMixerWidget::KMixerWidget( int _id, Mixer *mixer, const TQString &mixerName, MixDevice::DeviceCategory categoryMask, - QWidget * parent, const char * name, ViewBase::ViewFlags vflags ) - : QWidget( parent, name ), _mixer(mixer), m_balanceSlider(0), + TQWidget * parent, const char * name, ViewBase::ViewFlags vflags ) + : TQWidget( parent, name ), _mixer(mixer), m_balanceSlider(0), m_topLayout(0), m_id( _id ), _iconsEnabled( true ), _labelsEnabled( false ), _ticksEnabled( false ), @@ -76,12 +76,12 @@ KMixerWidget::KMixerWidget( int _id, Mixer *mixer, const QString &mixerName, { // No mixer found // !! Fix this: This is actually never shown! - QBoxLayout *layout = new QHBoxLayout( this ); - QString s = i18n("Invalid mixer"); + TQBoxLayout *layout = new TQHBoxLayout( this ); + TQString s = i18n("Invalid mixer"); if ( !mixerName.isEmpty() ) s.append(" \"").append(mixerName).append("\""); - QLabel *errorLabel = new QLabel( s, this ); - errorLabel->setAlignment( QLabel::AlignCenter | QLabel::WordBreak ); + TQLabel *errorLabel = new TQLabel( s, this ); + errorLabel->setAlignment( TQLabel::AlignCenter | TQLabel::WordBreak ); layout->addWidget( errorLabel ); } } @@ -104,7 +104,7 @@ void KMixerWidget::createLayout(ViewBase::ViewFlags vflags) } // create main layout - m_topLayout = new QVBoxLayout( this, 0, 3, "m_topLayout" ); + m_topLayout = new TQVBoxLayout( this, 0, 3, "m_topLayout" ); // Create tabs of input + output + [...] m_ioTab = new KTabWidget( this, "ioTab" ); @@ -131,15 +131,15 @@ void KMixerWidget::createLayout(ViewBase::ViewFlags vflags) // *** Lower part: Slider and Mixer Name ************************************************ - QHBoxLayout *balanceAndDetail = new QHBoxLayout( m_topLayout, 8, "balanceAndDetail"); + TQHBoxLayout *balanceAndDetail = new TQHBoxLayout( m_topLayout, 8, "balanceAndDetail"); // Create the left-right-slider - m_balanceSlider = new QSlider( -100, 100, 25, 0, QSlider::Horizontal, this, "RightLeft" ); - m_balanceSlider->setTickmarks( QSlider::Below ); + m_balanceSlider = new TQSlider( -100, 100, 25, 0, TQSlider::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() ); - QLabel *mixerName = new QLabel(this, "mixerName"); + TQLabel *mixerName = new TQLabel(this, "mixerName"); mixerName->setText( _mixer->mixerName() ); balanceAndDetail->addSpacing( 10 ); @@ -148,8 +148,8 @@ void KMixerWidget::createLayout(ViewBase::ViewFlags vflags) balanceAndDetail->addWidget( mixerName ); balanceAndDetail->addSpacing( 10 ); - connect( m_balanceSlider, SIGNAL(valueChanged(int)), this, SLOT(balanceChanged(int)) ); - QToolTip::add( m_balanceSlider, i18n("Left/Right balancing") ); + connect( m_balanceSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(balanceChanged(int)) ); + TQToolTip::add( m_balanceSlider, i18n("Left/Right balancing") ); // --- "MenuBar" toggling from the various View's --- @@ -167,7 +167,7 @@ void KMixerWidget::possiblyAddView(ViewBase* vbase) _views.push_back(vbase); vbase ->createDeviceWidgets(); m_ioTab->addTab( vbase , vbase->caption() ); - connect( vbase, SIGNAL(toggleMenuBar()), parentWidget(), SLOT(toggleMenuBar()) ); + connect( vbase, TQT_SIGNAL(toggleMenuBar()), parentWidget(), TQT_SLOT(toggleMenuBar()) ); } } @@ -219,12 +219,12 @@ void KMixerWidget::setValueStyle( int vs ) /** * @todo : Is the view list already filled, when loadConfig() is called? */ -void KMixerWidget::loadConfig( KConfig *config, const QString &grp ) +void KMixerWidget::loadConfig( KConfig *config, const TQString &grp ) { for ( std::vector<ViewBase*>::iterator it = _views.begin(); it != _views.end(); it++) { ViewBase* mixerWidget = *it; - QString viewPrefix = "View."; + TQString viewPrefix = "View."; viewPrefix += mixerWidget->name(); KMixToolBox::loadConfig(mixerWidget->_mdws, config, grp, viewPrefix ); mixerWidget->configurationUpdate(); @@ -233,7 +233,7 @@ void KMixerWidget::loadConfig( KConfig *config, const QString &grp ) -void KMixerWidget::saveConfig( KConfig *config, const QString &grp ) +void KMixerWidget::saveConfig( KConfig *config, const TQString &grp ) { config->setGroup( grp ); // Write mixer name. It cannot be changed in the Mixer instance, @@ -242,7 +242,7 @@ void KMixerWidget::saveConfig( KConfig *config, const QString &grp ) for ( std::vector<ViewBase*>::iterator it = _views.begin(); it != _views.end(); it++) { ViewBase* mixerWidget = *it; - QString viewPrefix = "View."; + TQString viewPrefix = "View."; viewPrefix += mixerWidget->name(); KMixToolBox::saveConfig(mixerWidget->_mdws, config, grp, viewPrefix ); } // for all tabs @@ -257,7 +257,7 @@ void KMixerWidget::toggleMenuBarSlot() { // hack arround it before calling _mixer->setBalance() void KMixerWidget::balanceChanged(int balance) { - if (QApplication::reverseLayout()) + if (TQApplication::reverseLayout()) balance = -balance; _mixer->setBalance( balance ); diff --git a/kmix/kmixerwidget.h b/kmix/kmixerwidget.h index d7e378bc..b6733c02 100644 --- a/kmix/kmixerwidget.h +++ b/kmix/kmixerwidget.h @@ -24,8 +24,8 @@ #include <vector> -#include <qwidget.h> -#include <qptrlist.h> +#include <tqwidget.h> +#include <tqptrlist.h> class QString; class QGridLayout; @@ -56,14 +56,14 @@ class ViewGrid; class ViewSurround; -class KMixerWidget : public QWidget +class KMixerWidget : public TQWidget { Q_OBJECT public: - KMixerWidget( int _id, Mixer *mixer, const QString &mixerName, + KMixerWidget( int _id, Mixer *mixer, const TQString &mixerName, MixDevice::DeviceCategory categoryMask = MixDevice::ALL , - QWidget *parent=0, const char *name=0, ViewBase::ViewFlags vflags=0 ); + TQWidget *parent=0, const char *name=0, ViewBase::ViewFlags vflags=0 ); ~KMixerWidget(); enum KMixerWidgetIO { OUTPUT=0, INPUT }; @@ -86,8 +86,8 @@ class KMixerWidget : public QWidget void setValueStyle( int vs ); void toggleMenuBarSlot(); - void saveConfig( KConfig *config, const QString &grp ); - void loadConfig( KConfig *config, const QString &grp ); + void saveConfig( KConfig *config, const TQString &grp ); + void loadConfig( KConfig *config, const TQString &grp ); private slots: //void updateBalance(); @@ -95,8 +95,8 @@ class KMixerWidget : public QWidget private: Mixer *_mixer; - QSlider *m_balanceSlider; - QVBoxLayout *m_topLayout; // contains the Card selector, TabWidget and balance slider + TQSlider *m_balanceSlider; + TQVBoxLayout *m_topLayout; // contains the Card selector, TabWidget and balance slider KTabWidget* m_ioTab; diff --git a/kmix/kmixprefdlg.cpp b/kmix/kmixprefdlg.cpp index 27a09238..6e25cb63 100644 --- a/kmix/kmixprefdlg.cpp +++ b/kmix/kmixprefdlg.cpp @@ -20,12 +20,12 @@ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qbuttongroup.h> -#include <qlayout.h> -#include <qwhatsthis.h> -#include <qcheckbox.h> -#include <qlabel.h> -#include <qradiobutton.h> +#include <tqbuttongroup.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqradiobutton.h> #include <klocale.h> // For "kapp" @@ -36,49 +36,49 @@ #include "kmixerwidget.h" -KMixPrefDlg::KMixPrefDlg( QWidget *parent ) +KMixPrefDlg::KMixPrefDlg( TQWidget *parent ) : KDialogBase( Plain, i18n( "Configure" ), Ok|Cancel|Apply, Ok, parent ) { // general buttons m_generalTab = plainPage( /* i18n("&General") */ ); - QBoxLayout *layout = new QVBoxLayout( m_generalTab ); + TQBoxLayout *layout = new TQVBoxLayout( m_generalTab ); layout->setSpacing( KDialog::spacingHint() ); - m_dockingChk = new QCheckBox( i18n("&Dock into panel"), m_generalTab ); + m_dockingChk = new TQCheckBox( i18n("&Dock into panel"), m_generalTab ); layout->addWidget( m_dockingChk ); - QWhatsThis::add(m_dockingChk, i18n("Docks the mixer into the KDE panel")); + TQWhatsThis::add(m_dockingChk, i18n("Docks the mixer into the KDE panel")); - m_volumeChk = new QCheckBox(i18n("Enable system tray &volume control"), + m_volumeChk = new TQCheckBox(i18n("Enable system tray &volume control"), m_generalTab); layout->addWidget(m_volumeChk); - m_showTicks = new QCheckBox( i18n("Show &tickmarks"), m_generalTab ); + m_showTicks = new TQCheckBox( i18n("Show &tickmarks"), m_generalTab ); layout->addWidget( m_showTicks ); - QWhatsThis::add(m_showTicks, + TQWhatsThis::add(m_showTicks, i18n("Enable/disable tickmark scales on the sliders")); - m_showLabels = new QCheckBox( i18n("Show &labels"), m_generalTab ); + m_showLabels = new TQCheckBox( i18n("Show &labels"), m_generalTab ); layout->addWidget( m_showLabels ); - QWhatsThis::add(m_showLabels, + TQWhatsThis::add(m_showLabels, i18n("Enables/disables description labels above the sliders")); - m_onLogin = new QCheckBox( i18n("Restore volumes on login"), m_generalTab ); + m_onLogin = new TQCheckBox( i18n("Restore volumes on login"), m_generalTab ); layout->addWidget( m_onLogin ); - m_dockIconMuting = new QCheckBox( + m_dockIconMuting = new TQCheckBox( i18n("Middle click on system tray icon toggles muting"), m_generalTab ); layout->addWidget( m_dockIconMuting ); - QBoxLayout *numbersLayout = new QHBoxLayout( layout ); - QButtonGroup *numbersGroup = new QButtonGroup( 3, Qt::Horizontal, i18n("Numbers"), m_generalTab ); + TQBoxLayout *numbersLayout = new TQHBoxLayout( layout ); + TQButtonGroup *numbersGroup = new TQButtonGroup( 3, Qt::Horizontal, i18n("Numbers"), m_generalTab ); numbersGroup->setRadioButtonExclusive(true); - QLabel* qlbl = new QLabel( i18n("Volume Values: "), m_generalTab ); - _rbNone = new QRadioButton( i18n("&None"), m_generalTab ); - _rbAbsolute = new QRadioButton( i18n("A&bsolute"), m_generalTab ); - _rbRelative = new QRadioButton( i18n("&Relative"), m_generalTab ); + TQLabel* qlbl = new TQLabel( i18n("Volume Values: "), m_generalTab ); + _rbNone = new TQRadioButton( i18n("&None"), m_generalTab ); + _rbAbsolute = new TQRadioButton( i18n("A&bsolute"), m_generalTab ); + _rbRelative = new TQRadioButton( i18n("&Relative"), m_generalTab ); numbersGroup->insert(_rbNone); numbersGroup->insert(_rbAbsolute); numbersGroup->insert(_rbRelative); @@ -90,13 +90,13 @@ KMixPrefDlg::KMixPrefDlg( QWidget *parent ) numbersLayout->add(_rbRelative); numbersLayout->addStretch(); - QBoxLayout *orientationLayout = new QHBoxLayout( layout ); - QButtonGroup* orientationGroup = new QButtonGroup( 2, Qt::Horizontal, i18n("Orientation"), m_generalTab ); + TQBoxLayout *orientationLayout = new TQHBoxLayout( layout ); + TQButtonGroup* orientationGroup = new TQButtonGroup( 2, Qt::Horizontal, i18n("Orientation"), m_generalTab ); //orientationLayout->add(orientationGroup); orientationGroup->setRadioButtonExclusive(true); - QLabel* qlb = new QLabel( i18n("Slider Orientation: "), m_generalTab ); - _rbHorizontal = new QRadioButton(i18n("&Horizontal"), m_generalTab ); - _rbVertical = new QRadioButton(i18n("&Vertical" ), m_generalTab ); + TQLabel* qlb = new TQLabel( i18n("Slider Orientation: "), m_generalTab ); + _rbHorizontal = new TQRadioButton(i18n("&Horizontal"), m_generalTab ); + _rbVertical = new TQRadioButton(i18n("&Vertical" ), m_generalTab ); orientationGroup->insert(_rbHorizontal); orientationGroup->insert(_rbVertical); orientationGroup->hide(); @@ -111,8 +111,8 @@ KMixPrefDlg::KMixPrefDlg( QWidget *parent ) layout->addStretch(); enableButtonSeparator(true); - connect( this, SIGNAL(applyClicked()), this, SLOT(apply()) ); - connect( this, SIGNAL(okClicked()), this, SLOT(apply()) ); + connect( this, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(apply()) ); + connect( this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(apply()) ); } KMixPrefDlg::~KMixPrefDlg() diff --git a/kmix/kmixprefdlg.h b/kmix/kmixprefdlg.h index 0e153d78..13b6a761 100644 --- a/kmix/kmixprefdlg.h +++ b/kmix/kmixprefdlg.h @@ -37,7 +37,7 @@ KMixPrefDlg : public KDialogBase friend class KMixWindow; public: - KMixPrefDlg( QWidget *parent ); + KMixPrefDlg( TQWidget *parent ); ~KMixPrefDlg(); signals: @@ -47,22 +47,22 @@ KMixPrefDlg : public KDialogBase void apply(); private: - QFrame *m_generalTab; + TQFrame *m_generalTab; KMixApp *m_mixApp; KMixPrefWidget *m_mixPrefTab; - QCheckBox *m_dockingChk; - QCheckBox *m_volumeChk; - QCheckBox *m_hideOnCloseChk; - QCheckBox *m_showTicks; - QCheckBox *m_showLabels; - QCheckBox *m_onLogin; - QCheckBox *m_dockIconMuting; - QRadioButton *_rbVertical; - QRadioButton *_rbHorizontal; - QRadioButton *_rbNone; - QRadioButton *_rbAbsolute; - QRadioButton *_rbRelative; + TQCheckBox *m_dockingChk; + TQCheckBox *m_volumeChk; + TQCheckBox *m_hideOnCloseChk; + TQCheckBox *m_showTicks; + TQCheckBox *m_showLabels; + TQCheckBox *m_onLogin; + TQCheckBox *m_dockIconMuting; + TQRadioButton *_rbVertical; + TQRadioButton *_rbHorizontal; + TQRadioButton *_rbNone; + TQRadioButton *_rbAbsolute; + TQRadioButton *_rbRelative; }; #endif diff --git a/kmix/kmixtoolbox.cpp b/kmix/kmixtoolbox.cpp index d28e1858..02292a89 100644 --- a/kmix/kmixtoolbox.cpp +++ b/kmix/kmixtoolbox.cpp @@ -20,9 +20,9 @@ */ -#include "qcolor.h" -#include "qwidget.h" -#include "qstring.h" +#include "tqcolor.h" +#include "tqwidget.h" +#include "tqstring.h" //#include <kdebug.h> #include <kglobalaccel.h> @@ -44,16 +44,16 @@ This means: Shared GUI stuff goes into the KMixToolBox class , non-GUI stuff goes into the MixerToolBox class. ***********************************************************************************/ -void KMixToolBox::setIcons(QPtrList<QWidget> &mdws, bool on ) { - for ( QWidget *qmdw=mdws.first(); qmdw!=0; qmdw=mdws.next() ) { +void KMixToolBox::setIcons(TQPtrList<TQWidget> &mdws, bool on ) { + for ( TQWidget *qmdw=mdws.first(); qmdw!=0; qmdw=mdws.next() ) { if ( qmdw->inherits("MixDeviceWidget") ) { // -<- play safe here static_cast<MixDeviceWidget*>(qmdw)->setIcons( on ); } } } -void KMixToolBox::setLabels(QPtrList<QWidget> &mdws, bool on ) { - QWidget *qmdw; +void KMixToolBox::setLabels(TQPtrList<TQWidget> &mdws, bool on ) { + TQWidget *qmdw; for ( qmdw=mdws.first(); qmdw != 0; qmdw=mdws.next() ) { if ( qmdw->inherits("MixDeviceWidget") ) { // -<- play safe here static_cast<MixDeviceWidget*>(qmdw)->setLabeled( on ); @@ -61,8 +61,8 @@ void KMixToolBox::setLabels(QPtrList<QWidget> &mdws, bool on ) { } } -void KMixToolBox::setTicks(QPtrList<QWidget> &mdws, bool on ) { - QWidget *qmdw; +void KMixToolBox::setTicks(TQPtrList<TQWidget> &mdws, bool on ) { + TQWidget *qmdw; for ( qmdw=mdws.first(); qmdw != 0; qmdw=mdws.next() ) { if ( qmdw->inherits("MixDeviceWidget") ) { // -<- in reality it is only in MDWSlider static_cast<MixDeviceWidget*>(qmdw)->setTicks( on ); @@ -70,8 +70,8 @@ void KMixToolBox::setTicks(QPtrList<QWidget> &mdws, bool on ) { } } -void KMixToolBox::setValueStyle(QPtrList<QWidget> &mdws, int vs ) { - QWidget *qmdw; +void KMixToolBox::setValueStyle(TQPtrList<TQWidget> &mdws, int vs ) { + TQWidget *qmdw; for ( qmdw=mdws.first(); qmdw != 0; qmdw=mdws.next() ) { if ( qmdw->inherits("MixDeviceWidget") ) { // -<- in reality it is only in MDWSlider static_cast<MixDeviceWidget*>(qmdw)->setValueStyle( (MixDeviceWidget::ValueStyle) vs ); @@ -79,15 +79,15 @@ void KMixToolBox::setValueStyle(QPtrList<QWidget> &mdws, int vs ) { } } -void KMixToolBox::loadConfig(QPtrList<QWidget> &mdws, KConfig *config, const QString &grp, const QString &viewPrefix) { +void KMixToolBox::loadConfig(TQPtrList<TQWidget> &mdws, KConfig *config, const TQString &grp, const TQString &viewPrefix) { int n = 0; config->setGroup( grp ); int num = config->readNumEntry( viewPrefix + ".Devs", 0); - for ( QWidget *qmdw=mdws.first(); qmdw!=0 && n<num; qmdw=mdws.next() ) { + for ( TQWidget *qmdw=mdws.first(); qmdw!=0 && n<num; qmdw=mdws.next() ) { if ( qmdw->inherits("MixDeviceWidget") ) { // -<- play safe here MixDeviceWidget* mdw = static_cast<MixDeviceWidget*>(qmdw); - QString devgrp; + TQString devgrp; /* * Compatibility config loader! We use the old config group only, if the @@ -116,7 +116,7 @@ void KMixToolBox::loadConfig(QPtrList<QWidget> &mdws, KConfig *config, const QSt The name should have been set in the backend class, but we REALLY cannot do this for KDE3.5.x. !! This issue will be fixed in KDE4 by the great config cleanup. */ - QString devgrpTmp(devgrp); + TQString devgrpTmp(devgrp); devgrpTmp.append(".Capture"); if ( config->hasGroup(devgrpTmp) ) { // Group for capture device exists => take over the name @@ -145,7 +145,7 @@ void KMixToolBox::loadConfig(QPtrList<QWidget> &mdws, KConfig *config, const QSt KGlobalAccel *keys=mdw->keys(); if ( keys ) { - QString devgrpkeys; + TQString devgrpkeys; devgrpkeys.sprintf( "%s.%s.Dev%i.keys", viewPrefix.ascii(), grp.ascii(), n ); //kdDebug(67100) << "KMixToolBox::loadConfig() load Keys " << devgrpkeys << endl; @@ -161,16 +161,16 @@ void KMixToolBox::loadConfig(QPtrList<QWidget> &mdws, KConfig *config, const QSt } -void KMixToolBox::saveConfig(QPtrList<QWidget> &mdws, KConfig *config, const QString &grp, const QString &viewPrefix) { +void KMixToolBox::saveConfig(TQPtrList<TQWidget> &mdws, KConfig *config, const TQString &grp, const TQString &viewPrefix) { config->setGroup( grp ); config->writeEntry( viewPrefix + ".Devs", mdws.count() ); int n=0; - for ( QWidget *qmdw=mdws.first(); qmdw!=0; qmdw=mdws.next() ) { + for ( TQWidget *qmdw=mdws.first(); qmdw!=0; qmdw=mdws.next() ) { if ( qmdw->inherits("MixDeviceWidget") ) { // -<- play safe here MixDeviceWidget* mdw = static_cast<MixDeviceWidget*>(qmdw); - QString devgrp; + TQString devgrp; devgrp.sprintf( "%s.%s.Dev%i", viewPrefix.ascii(), grp.ascii(), n ); if ( ! config->hasGroup(devgrp) ) { // old-Style configuration (KMix2.1 and earlier => remove now unused group @@ -202,7 +202,7 @@ void KMixToolBox::saveConfig(QPtrList<QWidget> &mdws, KConfig *config, const QSt */ KGlobalAccel *keys=mdw->keys(); if (keys) { - QString devgrpkeys; + TQString devgrpkeys; devgrpkeys.sprintf( "%s.%s.Dev%i.keys", viewPrefix.ascii(), grp.ascii(), n ); //kdDebug(67100) << "KMixToolBox::saveConfig() save Keys " << devgrpkeys << endl; keys->setConfigGroup(devgrpkeys); diff --git a/kmix/kmixtoolbox.h b/kmix/kmixtoolbox.h index 4cb5dd8f..f39dd5a1 100644 --- a/kmix/kmixtoolbox.h +++ b/kmix/kmixtoolbox.h @@ -1,8 +1,8 @@ #ifndef KMIXTOOLBOX_H #define KMIXTOOLBOX_H -#include "qptrlist.h" -#include "qwidget.h" +#include "tqptrlist.h" +#include "tqwidget.h" class Mixer; @@ -16,12 +16,12 @@ class KConfig; class KMixToolBox { public: - static void setIcons (QPtrList<QWidget> &mdws, bool on ); - static void setLabels (QPtrList<QWidget> &mdws, bool on ); - static void setTicks (QPtrList<QWidget> &mdws, bool on ); - static void setValueStyle (QPtrList<QWidget> &mdws, int vs ); - static void loadConfig(QPtrList<QWidget> &mdws, KConfig *config, const QString &grp, const QString &viewPrefix ); - static void saveConfig(QPtrList<QWidget> &mdws, KConfig *config, const QString &grp, const QString &viewPrefix ); + static void setIcons (TQPtrList<TQWidget> &mdws, bool on ); + static void setLabels (TQPtrList<TQWidget> &mdws, bool on ); + static void setTicks (TQPtrList<TQWidget> &mdws, bool on ); + static void setValueStyle (TQPtrList<TQWidget> &mdws, int vs ); + static void loadConfig(TQPtrList<TQWidget> &mdws, KConfig *config, const TQString &grp, const TQString &viewPrefix ); + static void saveConfig(TQPtrList<TQWidget> &mdws, KConfig *config, const TQString &grp, const TQString &viewPrefix ); }; diff --git a/kmix/ksmallslider.cpp b/kmix/ksmallslider.cpp index e63f2d29..e10c46c8 100644 --- a/kmix/ksmallslider.cpp +++ b/kmix/ksmallslider.cpp @@ -21,38 +21,38 @@ #include <kdebug.h> -#include <qwidget.h> -#include <qpainter.h> -#include <qcolor.h> -#include <qbrush.h> -#include <qstyle.h> +#include <tqwidget.h> +#include <tqpainter.h> +#include <tqcolor.h> +#include <tqbrush.h> +#include <tqstyle.h> #include "kglobalsettings.h" #include "ksmallslider.h" /* -static const QColor mutedHighColor2 = "#FFFFFF"; -static const QColor mutedLowColor2 = "#808080"; -static const QColor backColor2 = "#000000"; +static const TQColor mutedHighColor2 = "#FFFFFF"; +static const TQColor mutedLowColor2 = "#808080"; +static const TQColor backColor2 = "#000000"; */ -KSmallSlider::KSmallSlider( QWidget *parent, const char *name ) - : QWidget( parent, name ), _orientation( Qt::Vertical ) +KSmallSlider::KSmallSlider( TQWidget *parent, const char *name ) + : TQWidget( parent, name ), _orientation( Qt::Vertical ) { init(); } -KSmallSlider::KSmallSlider( Qt::Orientation orientation, QWidget *parent, const char *name ) - : QWidget( parent, name ), _orientation( orientation ) +KSmallSlider::KSmallSlider( Qt::Orientation orientation, TQWidget *parent, const char *name ) + : TQWidget( parent, name ), _orientation( orientation ) { init(); } KSmallSlider::KSmallSlider( int minValue, int maxValue, int pageStep, int value, Qt::Orientation orientation, - QWidget *parent, const char *name ) - : QWidget( parent, name ), - QRangeControl( minValue, maxValue, 1, pageStep, value ), _orientation( orientation) + TQWidget *parent, const char *name ) + : TQWidget( parent, name ), + TQRangeControl( minValue, maxValue, 1, pageStep, value ), _orientation( orientation) { init(); // sliderVal = value; @@ -70,13 +70,13 @@ void KSmallSlider::init() grayed = false; setFocusPolicy( TabFocus ); - colHigh = QColor(0,255,0); - colLow = QColor(255,0,0); - colBack = QColor(0,0,0); + colHigh = TQColor(0,255,0); + colLow = TQColor(255,0,0); + colBack = TQColor(0,0,0); - grayHigh = QColor(255,255,255); - grayLow = QColor(128,128,128); - grayBack = QColor(0,0,0); + grayHigh = TQColor(255,255,255); + grayLow = TQColor(128,128,128); + grayBack = TQColor(0,0,0); } /* void KSmallSlider::setTracking( bool enable ) @@ -86,7 +86,7 @@ void KSmallSlider::setTracking( bool enable ) */ int KSmallSlider::positionFromValue( int v ) const { - return QRangeControl::positionFromValue( v, available() ); + return TQRangeControl::positionFromValue( v, available() ); } int KSmallSlider::valueFromPosition( int p ) const @@ -95,18 +95,18 @@ int KSmallSlider::valueFromPosition( int p ) const // Coordiante System starts at TopLeft, but the slider values increase from Bottom to Top // Thus "revert" the position int avail = available(); - return QRangeControl::valueFromPosition( avail - p, avail ); + return TQRangeControl::valueFromPosition( avail - p, avail ); } else { // Horizontal everything is fine. Slider values match with Coordinate System - return QRangeControl::valueFromPosition( p, available() ); + return TQRangeControl::valueFromPosition( p, available() ); } } void KSmallSlider::rangeChange() { /* - int newPos = positionFromValue( QRangeControl::value() ); + int newPos = positionFromValue( TQRangeControl::value() ); if ( newPos != sliderPos ) { sliderPos = newPos; } @@ -120,20 +120,20 @@ void KSmallSlider::valueChange() update(); emit valueChanged(value()); /* - if ( sliderVal != QRangeControl::value() ) { - //int newPos = positionFromValue( QRangeControl::value() ); + if ( sliderVal != TQRangeControl::value() ) { + //int newPos = positionFromValue( TQRangeControl::value() ); //sliderPos = newPos; - sliderVal = QRangeControl::value(); + sliderVal = TQRangeControl::value(); update(); emit valueChanged(value()); } */ } -void KSmallSlider::resizeEvent( QResizeEvent * ) +void KSmallSlider::resizeEvent( TQResizeEvent * ) { update(); - //QWidget::resizeEvent( ev ); + //TQWidget::resizeEvent( ev ); } // Returns the really available space for the slider. If there is no space, 0 is returned; @@ -160,7 +160,7 @@ int KSmallSlider::available() const namespace { -void gradient( QPainter &p, bool hor, const QRect &rect, const QColor &ca, const QColor &cb, int /*ncols*/) +void gradient( TQPainter &p, bool hor, const TQRect &rect, const TQColor &ca, const TQColor &cb, int /*ncols*/) { int rDiff, gDiff, bDiff; int rca, gca, bca, rcb, gcb, bcb; @@ -190,7 +190,7 @@ void gradient( QPainter &p, bool hor, const QRect &rect, const QColor &ca, const gl += gcdelta; bl += bcdelta; - p.setPen(QColor(rl>>16, gl>>16, bl>>16)); + p.setPen(TQColor(rl>>16, gl>>16, bl>>16)); p.drawLine(rect.left(), y, rect.right(), y); } } else @@ -200,16 +200,16 @@ void gradient( QPainter &p, bool hor, const QRect &rect, const QColor &ca, const gl += gcdelta; bl += bcdelta; - p.setPen(QColor(rl>>16, gl>>16, bl>>16)); + p.setPen(TQColor(rl>>16, gl>>16, bl>>16)); p.drawLine(x, rect.top(), x, rect.bottom()); } } } -QColor interpolate( QColor low, QColor high, int percent ) { +TQColor interpolate( TQColor low, TQColor high, int percent ) { if ( percent<=0 ) return low; else if ( percent>=100 ) return high; else - return QColor( + return TQColor( low.red() + (high.red()-low.red()) * percent/100, low.green() + (high.green()-low.green()) * percent/100, low.blue() + (high.blue()-low.blue()) * percent/100 ); @@ -217,22 +217,22 @@ QColor interpolate( QColor low, QColor high, int percent ) { } -void KSmallSlider::paintEvent( QPaintEvent * ) +void KSmallSlider::paintEvent( TQPaintEvent * ) { // kdDebug(67100) << "KSmallSlider::paintEvent: width() = " << width() << ", height() = " << height() << endl; - QPainter p( this ); + TQPainter p( this ); - int sliderPos = positionFromValue( QRangeControl::value() ); + int sliderPos = positionFromValue( TQRangeControl::value() ); // ------------------------ draw 3d border --------------------------------------------- - style().drawPrimitive ( QStyle::PE_Panel, &p, QRect( 0, 0, width(), height() ), colorGroup(), TRUE ); + style().drawPrimitive ( TQStyle::PE_Panel, &p, TQRect( 0, 0, width(), height() ), colorGroup(), TRUE ); // ------------------------ draw lower/left part ---------------------------------------- if ( width()>2 && height()>2 ) { if ( _orientation == Qt::Horizontal ) { - QRect outer = QRect( 1, 1, sliderPos, height() - 2 ); + TQRect outer = TQRect( 1, 1, sliderPos, height() - 2 ); // kdDebug(67100) << "KSmallSlider::paintEvent: outer = " << outer << endl; if ( grayed ) @@ -245,7 +245,7 @@ void KSmallSlider::paintEvent( QPaintEvent * ) 32 ); } else { - QRect outer = QRect( 1, height()-sliderPos-1, width() - 2, sliderPos-1 ); + TQRect outer = TQRect( 1, height()-sliderPos-1, width() - 2, sliderPos-1 ); /* kdDebug(67100) << "KSmallSlider::paintEvent: sliderPos=" << sliderPos << "height()=" << height() @@ -263,12 +263,12 @@ void KSmallSlider::paintEvent( QPaintEvent * ) } // -------- draw upper/right part -------------------------------------------------- - QRect inner; + TQRect inner; if ( _orientation == Qt::Vertical ) { - inner = QRect( 1, 1, width() - 2, height() - 2 -sliderPos ); + inner = TQRect( 1, 1, width() - 2, height() - 2 -sliderPos ); } else { - inner = QRect( sliderPos + 1, 1, width() - 2 - sliderPos, height() - 2 ); + inner = TQRect( sliderPos + 1, 1, width() - 2 - sliderPos, height() - 2 ); } if ( grayed ) { @@ -282,7 +282,7 @@ void KSmallSlider::paintEvent( QPaintEvent * ) } } -void KSmallSlider::mousePressEvent( QMouseEvent *e ) +void KSmallSlider::mousePressEvent( TQMouseEvent *e ) { //resetState(); @@ -297,7 +297,7 @@ void KSmallSlider::mousePressEvent( QMouseEvent *e ) moveSlider( pos ); } -void KSmallSlider::mouseMoveEvent( QMouseEvent *e ) +void KSmallSlider::mouseMoveEvent( TQMouseEvent *e ) { /* if ( state != Dragging ) @@ -307,7 +307,7 @@ void KSmallSlider::mouseMoveEvent( QMouseEvent *e ) moveSlider( pos ); } -void KSmallSlider::wheelEvent( QWheelEvent * e) +void KSmallSlider::wheelEvent( TQWheelEvent * e) { // kdDebug(67100) << "KSmallslider::wheelEvent()" << endl; /* Unfortunately KSmallSlider is no MixDeviceWidget, so we don't have access to @@ -319,17 +319,17 @@ void KSmallSlider::wheelEvent( QWheelEvent * e) //kdDebug(67100) << "KSmallslider::wheelEvent() inc=" << inc << "delta=" << e->delta() << endl; if ( e->delta() > 0 ) { - QRangeControl::setValue( QRangeControl::value() + inc ); + TQRangeControl::setValue( TQRangeControl::value() + inc ); } else { - QRangeControl::setValue( QRangeControl::value() - inc ); + TQRangeControl::setValue( TQRangeControl::value() - inc ); } e->accept(); // Accept the event // Hint: Qt autmatically triggers a valueChange() when we do setValue() } -void KSmallSlider::mouseReleaseEvent( QMouseEvent * ) +void KSmallSlider::mouseReleaseEvent( TQMouseEvent * ) { //resetState(); } @@ -343,9 +343,9 @@ void KSmallSlider::moveSlider( int pos ) int newPos = QMIN( a, QMAX( 0, pos ) ); // keep it inside the available bounds of the slider int newVal = valueFromPosition( newPos ); - if ( newVal != QRangeControl::value() ) { - //QRangeControl::directSetValue( sliderVal ); - QRangeControl::setValue( newVal ); + if ( newVal != TQRangeControl::value() ) { + //TQRangeControl::directSetValue( sliderVal ); + TQRangeControl::setValue( newVal ); emit valueChanged( value() ); // Only for external use } update(); @@ -356,7 +356,7 @@ void KSmallSlider::resetState() { switch ( state ) { case Dragging: { - QRangeControl::setValue( valueFromPosition( sliderPos ) ); + TQRangeControl::setValue( valueFromPosition( sliderPos ) ); emit sliderReleased(); break; } @@ -372,7 +372,7 @@ void KSmallSlider::resetState() void KSmallSlider::setValue( int value ) { - QRangeControl::setValue( value ); + TQRangeControl::setValue( value ); } void KSmallSlider::addStep() @@ -385,7 +385,7 @@ void KSmallSlider::subtractStep() subtractPage(); } -int KSmallSlider::goodPart( const QPoint &p ) const +int KSmallSlider::goodPart( const TQPoint &p ) const { if ( _orientation == Qt::Vertical ) { return p.y() - 1; @@ -396,36 +396,36 @@ int KSmallSlider::goodPart( const QPoint &p ) const } /***************** SIZE STUFF START ***************/ -QSize KSmallSlider::sizeHint() const +TQSize KSmallSlider::sizeHint() const { //constPolish(); const int length = 25; const int thick = 10; if ( _orientation == Qt::Vertical ) - return QSize( thick, length ); + return TQSize( thick, length ); else - return QSize( length, thick ); + return TQSize( length, thick ); } -QSize KSmallSlider::minimumSizeHint() const +TQSize KSmallSlider::minimumSizeHint() const { - QSize s(10,10); + TQSize s(10,10); return s; } -QSizePolicy KSmallSlider::sizePolicy() const +TQSizePolicy KSmallSlider::sizePolicy() const { if ( _orientation == Qt::Vertical ) { //kdDebug(67100) << "KSmallSlider::sizePolicy() vertical value=(Fixed,MinimumExpanding)\n"; - return QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Expanding ); + return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Expanding ); } else { //kdDebug(67100) << "KSmallSlider::sizePolicy() horizontal value=(MinimumExpanding,Fixed)\n"; - return QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ); + return TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); } } /***************** SIZE STUFF END ***************/ @@ -433,22 +433,22 @@ QSizePolicy KSmallSlider::sizePolicy() const int KSmallSlider::minValue() const { - return QRangeControl::minValue(); + return TQRangeControl::minValue(); } int KSmallSlider::maxValue() const { - return QRangeControl::maxValue(); + return TQRangeControl::maxValue(); } int KSmallSlider::lineStep() const { - return QRangeControl::lineStep(); + return TQRangeControl::lineStep(); } int KSmallSlider::pageStep() const { - return QRangeControl::pageStep(); + return TQRangeControl::pageStep(); } void KSmallSlider::setLineStep( int i ) @@ -461,20 +461,20 @@ void KSmallSlider::setPageStep( int i ) setSteps( lineStep(), i ); } -// Only for external acces. You MUST use QRangeControl::value() internally. +// Only for external acces. You MUST use TQRangeControl::value() internally. int KSmallSlider::value() const { - return QRangeControl::value(); + return TQRangeControl::value(); } /* -void KSmallSlider::paletteChange ( const QPalette &) { +void KSmallSlider::paletteChange ( const TQPalette &) { if ( grayed ) { setColors(mutedLowColor2, mutedHighColor2, backColor2 ); } else { - // ignore the QPalette and use the values from KGlobalSettings instead - //const QColorGroup& qcg = palette().active(); + // ignore the TQPalette and use the values from KGlobalSettings instead + //const TQColorGroup& qcg = palette().active(); setColors(KGlobalSettings::baseColor(), KGlobalSettings::highlightColor(), backColor2 ); } } @@ -495,7 +495,7 @@ bool KSmallSlider::gray() const return grayed; } -void KSmallSlider::setColors( QColor high, QColor low, QColor back ) +void KSmallSlider::setColors( TQColor high, TQColor low, TQColor back ) { colHigh = high; colLow = low; @@ -504,7 +504,7 @@ void KSmallSlider::setColors( QColor high, QColor low, QColor back ) //repaint(); } -void KSmallSlider::setGrayColors( QColor high, QColor low, QColor back ) +void KSmallSlider::setGrayColors( TQColor high, TQColor low, TQColor back ) { grayHigh = high; grayLow = low; diff --git a/kmix/ksmallslider.h b/kmix/ksmallslider.h index b26a238a..62849f7b 100644 --- a/kmix/ksmallslider.h +++ b/kmix/ksmallslider.h @@ -25,25 +25,25 @@ #include <kpanelapplet.h> -#include <qwidget.h> -#include <qpixmap.h> -#include <qrangecontrol.h> +#include <tqwidget.h> +#include <tqpixmap.h> +#include <tqrangecontrol.h> -class KSmallSlider : public QWidget, public QRangeControl +class KSmallSlider : public TQWidget, public QRangeControl { Q_OBJECT public: - KSmallSlider( QWidget *parent, const char *name=0 ); - KSmallSlider( Qt::Orientation, QWidget *parent, const char *name=0 ); + KSmallSlider( TQWidget *parent, const char *name=0 ); + KSmallSlider( Qt::Orientation, TQWidget *parent, const char *name=0 ); KSmallSlider( int minValue, int maxValue, int pageStep, int value, - Qt::Orientation, QWidget *parent, const char *name=0 ); + Qt::Orientation, TQWidget *parent, const char *name=0 ); //virtual void setTracking( bool enable ); //bool tracking() const; - QSize sizeHint() const; - QSizePolicy sizePolicy() const; - QSize minimumSizeHint() const; + TQSize sizeHint() const; + TQSizePolicy sizePolicy() const; + TQSize minimumSizeHint() const; int minValue() const; int maxValue() const; @@ -55,7 +55,7 @@ class KSmallSlider : public QWidget, public QRangeControl void setPageStep( int ); int value() const; - //void paletteChange ( const QPalette & oldPalette ); + //void paletteChange ( const TQPalette & oldPalette ); bool gray() const; public slots: @@ -64,8 +64,8 @@ public slots: void subtractStep(); void setGray( bool value ); - void setColors( QColor high, QColor low, QColor back ); - void setGrayColors( QColor high, QColor low, QColor back ); + void setColors( TQColor high, TQColor low, TQColor back ); + void setGrayColors( TQColor high, TQColor low, TQColor back ); signals: void valueChanged( int value ); @@ -74,13 +74,13 @@ public slots: void sliderReleased(); protected: - void resizeEvent( QResizeEvent * ); - void paintEvent( QPaintEvent * ); + void resizeEvent( TQResizeEvent * ); + void paintEvent( TQPaintEvent * ); - void mousePressEvent( QMouseEvent * ); - void mouseReleaseEvent( QMouseEvent * ); - void mouseMoveEvent( QMouseEvent * ); - void wheelEvent( QWheelEvent * ); + void mousePressEvent( TQMouseEvent * ); + void mouseReleaseEvent( TQMouseEvent * ); + void mouseMoveEvent( TQMouseEvent * ); + void wheelEvent( TQWheelEvent * ); void valueChange(); void rangeChange(); @@ -96,7 +96,7 @@ public slots: // int slideLength() const; int available() const; - int goodPart( const QPoint& ) const; + int goodPart( const TQPoint& ) const; //void initTicks(); //QCOORD sliderPos; @@ -105,8 +105,8 @@ public slots: //bool track; bool grayed; Qt::Orientation _orientation; - QColor colHigh, colLow, colBack; - QColor grayHigh, grayLow, grayBack; + TQColor colHigh, colLow, colBack; + TQColor grayHigh, grayLow, grayBack; }; diff --git a/kmix/mdwenum.cpp b/kmix/mdwenum.cpp index 3cf0533e..35ec4de8 100644 --- a/kmix/mdwenum.cpp +++ b/kmix/mdwenum.cpp @@ -19,11 +19,11 @@ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qcursor.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qobject.h> -#include <qtooltip.h> +#include <tqcursor.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqobject.h> +#include <tqtooltip.h> #include <klocale.h> #include <kconfig.h> @@ -46,22 +46,22 @@ */ MDWEnum::MDWEnum(Mixer *mixer, MixDevice* md, Qt::Orientation orientation, - QWidget* parent, ViewBase* mw, const char* name) : + TQWidget* parent, ViewBase* mw, const char* name) : MixDeviceWidget(mixer,md,false,orientation,parent,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, SLOT(setDisabled()), _mdwActions, "hide" ); - new KAction( i18n("C&onfigure Shortcuts..."), 0, this, SLOT(defineKeys()), _mdwActions, "keys" ); + new KToggleAction( i18n("&Hide"), 0, this, TQT_SLOT(setDisabled()), _mdwActions, "hide" ); + new KAction( i18n("C&onfigure Shortcuts..."), 0, this, TQT_SLOT(defineKeys()), _mdwActions, "keys" ); // create widgets createWidgets(); /* !!! remove this for production version */ - m_keys->insert( "Next Value", i18n( "Next Value" ), QString::null, - KShortcut(), KShortcut(), this, SLOT( nextEnumId() ) ); + m_keys->insert( "Next Value", i18n( "Next Value" ), TQString::null, + KShortcut(), KShortcut(), this, TQT_SLOT( nextEnumId() ) ); installEventFilter( this ); // filter for popup } @@ -74,20 +74,20 @@ MDWEnum::~MDWEnum() void MDWEnum::createWidgets() { if ( _orientation == Qt::Vertical ) { - _layout = new QVBoxLayout( this ); + _layout = new TQVBoxLayout( this ); _layout->setAlignment(Qt::AlignHCenter); } else { - _layout = new QHBoxLayout( this ); + _layout = new TQHBoxLayout( this ); _layout->setAlignment(Qt::AlignVCenter); } - QToolTip::add( this, m_mixdevice->name() ); + TQToolTip::add( this, m_mixdevice->name() ); //this->setStretchFactor( _layout, 0 ); - //QSizePolicy qsp( QSizePolicy::Ignored, QSizePolicy::Maximum); + //TQSizePolicy qsp( TQSizePolicy::Ignored, TQSizePolicy::Maximum); //_layout->setSizePolicy(qsp); //_layout->setSpacing(KDialog::spacingHint()); - _label = new QLabel( m_mixdevice->name(), this); + _label = new TQLabel( m_mixdevice->name(), this); _layout->addWidget(_label); _label->setFixedHeight(_label->sizeHint().height()); _enumCombo = new KComboBox( FALSE, this, "mixerCombo" ); @@ -99,8 +99,8 @@ void MDWEnum::createWidgets() // ------------ fill ComboBox end -------------- _layout->addWidget(_enumCombo); _enumCombo->setFixedHeight(_enumCombo->sizeHint().height()); - connect( _enumCombo, SIGNAL( activated( int ) ), this, SLOT( setEnumId( int ) ) ); - QToolTip::add( _enumCombo, m_mixdevice->name() ); + connect( _enumCombo, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( setEnumId( int ) ) ); + TQToolTip::add( _enumCombo, m_mixdevice->name() ); //_layout->addSpacing( 4 ); } @@ -123,17 +123,17 @@ void MDWEnum::showContextMenu() KPopupMenu *menu = m_mixerwidget->getPopup(); - QPoint pos = QCursor::pos(); + TQPoint pos = TQCursor::pos(); menu->popup( pos ); } -QSize MDWEnum::sizeHint() const { +TQSize MDWEnum::sizeHint() const { if ( _layout != 0 ) { return _layout->sizeHint(); } else { // layout not (yet) created - return QWidget::sizeHint(); + return TQWidget::sizeHint(); } } @@ -191,16 +191,16 @@ void MDWEnum::setDisabled( bool value ) { * An event filter for the various QWidgets. We watch for Mouse press Events, so * that we can popup the context menu. */ -bool MDWEnum::eventFilter( QObject* obj, QEvent* e ) +bool MDWEnum::eventFilter( TQObject* obj, TQEvent* e ) { - if (e->type() == QEvent::MouseButtonPress) { - QMouseEvent *qme = static_cast<QMouseEvent*>(e); + if (e->type() == TQEvent::MouseButtonPress) { + TQMouseEvent *qme = static_cast<TQMouseEvent*>(e); if (qme->button() == Qt::RightButton) { showContextMenu(); return true; } } - return QWidget::eventFilter(obj,e); + return TQWidget::eventFilter(obj,e); } #include "mdwenum.moc" diff --git a/kmix/mdwenum.h b/kmix/mdwenum.h index ba57a8e2..17fea239 100644 --- a/kmix/mdwenum.h +++ b/kmix/mdwenum.h @@ -23,7 +23,7 @@ #ifndef MDWENUM_H #define MDWENUM_H -#include <qwidget.h> +#include <tqwidget.h> #include "volume.h" class QBoxLayout; @@ -46,12 +46,12 @@ class MDWEnum : public MixDeviceWidget public: MDWEnum( Mixer *mixer, MixDevice* md, Qt::Orientation orientation, - QWidget* parent = 0, ViewBase* mw = 0, const char* name = 0); + TQWidget* parent = 0, ViewBase* mw = 0, const char* name = 0); ~MDWEnum(); void addActionToPopup( KAction *action ); - QSize sizeHint() const; - bool eventFilter( QObject* obj, QEvent* e ); + TQSize sizeHint() const; + bool eventFilter( TQObject* obj, TQEvent* e ); public slots: // GUI hide and show @@ -69,9 +69,9 @@ public slots: private: void createWidgets(); - QLabel *_label; + TQLabel *_label; KComboBox *_enumCombo; - QBoxLayout *_layout; + TQBoxLayout *_layout; }; #endif diff --git a/kmix/mdwslider.cpp b/kmix/mdwslider.cpp index ea936e6a..9062c408 100644 --- a/kmix/mdwslider.cpp +++ b/kmix/mdwslider.cpp @@ -29,14 +29,14 @@ #include <kkeydialog.h> #include <kdebug.h> -#include <qobject.h> -#include <qcursor.h> -#include <qslider.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qpixmap.h> -#include <qtooltip.h> -#include <qwmatrix.h> +#include <tqobject.h> +#include <tqcursor.h> +#include <tqslider.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpixmap.h> +#include <tqtooltip.h> +#include <tqwmatrix.h> #include "mdwslider.h" #include "mixer.h" @@ -51,42 +51,42 @@ * Used in KMix main window and DockWidget and PanelApplet. * It can be configured to include or exclude the recordLED and the muteLED. * The direction (horizontal, vertical) can be configured and whether it should - * be "small" (uses KSmallSlider instead of QSlider then). + * be "small" (uses KSmallSlider instead of TQSlider then). * * Due to the many options, this is the most complicated MixDeviceWidget subclass. */ MDWSlider::MDWSlider(Mixer *mixer, MixDevice* md, bool showMuteLED, bool showRecordLED, bool small, Qt::Orientation orientation, - QWidget* parent, ViewBase* mw, const char* name) : + TQWidget* parent, ViewBase* mw, const char* name) : MixDeviceWidget(mixer,md,small,orientation,parent,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, SLOT(toggleStereoLinked()), + new KToggleAction( i18n("&Split Channels"), 0, this, TQT_SLOT(toggleStereoLinked()), _mdwActions, "stereo" ); - new KToggleAction( i18n("&Hide"), 0, this, SLOT(setDisabled()), _mdwActions, "hide" ); + new KToggleAction( i18n("&Hide"), 0, this, TQT_SLOT(setDisabled()), _mdwActions, "hide" ); KToggleAction *a = new KToggleAction(i18n("&Muted"), 0, 0, 0, _mdwActions, "mute" ); - connect( a, SIGNAL(toggled(bool)), SLOT(toggleMuted()) ); + connect( a, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleMuted()) ); if( m_mixdevice->isRecordable() ) { a = new KToggleAction( i18n("Set &Record Source"), 0, 0, 0, _mdwActions, "recsrc" ); - connect( a, SIGNAL(toggled(bool)), SLOT( toggleRecsrc()) ); + connect( a, TQT_SIGNAL(toggled(bool)), TQT_SLOT( toggleRecsrc()) ); } - new KAction( i18n("C&onfigure Global Shortcuts..."), 0, this, SLOT(defineKeys()), _mdwActions, "keys" ); + new KAction( i18n("C&onfigure Global Shortcuts..."), 0, 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()), QString::null, - KShortcut(), KShortcut(), this, SLOT( increaseVolume() ) ); - m_keys->insert( "Decrease volume", i18n( "Decrease Volume of '%1'" ).arg(m_mixdevice->name().utf8().data()), QString::null, - KShortcut(), KShortcut(), this, SLOT( decreaseVolume() ) ); - m_keys->insert( "Toggle mute", i18n( "Toggle Mute of '%1'" ).arg(m_mixdevice->name().utf8().data()), QString::null, - KShortcut(), KShortcut(), this, SLOT( toggleMuted() ) ); + 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() ) ); installEventFilter( this ); // filter for popup @@ -94,13 +94,13 @@ MDWSlider::MDWSlider(Mixer *mixer, MixDevice* md, } -QSizePolicy MDWSlider::sizePolicy() const +TQSizePolicy MDWSlider::sizePolicy() const { if ( _orientation == Qt::Vertical ) { - return QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Expanding ); + return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Expanding ); } else { - return QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ); + return TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); } } @@ -114,22 +114,22 @@ QSizePolicy MDWSlider::sizePolicy() const void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) { if ( _orientation == Qt::Vertical ) { - _layout = new QVBoxLayout( this ); + _layout = new TQVBoxLayout( this ); _layout->setAlignment(Qt::AlignCenter); } else { - _layout = new QHBoxLayout( this ); + _layout = new TQHBoxLayout( this ); _layout->setAlignment(Qt::AlignCenter); } // -- MAIN SLIDERS LAYOUT --- - QBoxLayout *slidersLayout; + TQBoxLayout *slidersLayout; if ( _orientation == Qt::Vertical ) { - slidersLayout = new QHBoxLayout( _layout ); + slidersLayout = new TQHBoxLayout( _layout ); slidersLayout->setAlignment(Qt::AlignVCenter); } else { - slidersLayout = new QVBoxLayout( _layout ); + slidersLayout = new TQVBoxLayout( _layout ); slidersLayout->setAlignment(Qt::AlignHCenter); } @@ -142,24 +142,24 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) // -- LABEL LAYOUT TO POSITION - QBoxLayout *labelLayout; + TQBoxLayout *labelLayout; if ( _orientation == Qt::Vertical ) { - labelLayout = new QVBoxLayout( slidersLayout ); + labelLayout = new TQVBoxLayout( slidersLayout ); labelLayout->setAlignment(Qt::AlignHCenter); } else { - labelLayout = new QHBoxLayout( slidersLayout ); + labelLayout = new TQHBoxLayout( slidersLayout ); labelLayout->setAlignment(Qt::AlignVCenter); } if ( _orientation == Qt::Vertical ) { m_label = new VerticalText( this, m_mixdevice->name().utf8().data() ); - QToolTip::add( m_label, m_mixdevice->name() ); + TQToolTip::add( m_label, m_mixdevice->name() ); } else { - m_label = new QLabel(this); - static_cast<QLabel*>(m_label) ->setText(m_mixdevice->name()); - QToolTip::add( m_label, m_mixdevice->name() ); + m_label = new TQLabel(this); + static_cast<TQLabel*>(m_label) ->setText(m_mixdevice->name()); + TQToolTip::add( m_label, m_mixdevice->name() ); } m_label->hide(); @@ -180,24 +180,24 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) */ // -- SLIDERS, LEDS AND ICON - QBoxLayout *sliLayout; + TQBoxLayout *sliLayout; if ( _orientation == Qt::Vertical ) { - sliLayout = new QVBoxLayout( slidersLayout ); + sliLayout = new TQVBoxLayout( slidersLayout ); sliLayout->setAlignment(Qt::AlignHCenter); } else { - sliLayout = new QHBoxLayout( slidersLayout ); + sliLayout = new TQHBoxLayout( slidersLayout ); sliLayout->setAlignment(Qt::AlignVCenter); } // --- ICON ---------------------------- - QBoxLayout *iconLayout; + TQBoxLayout *iconLayout; if ( _orientation == Qt::Vertical ) { - iconLayout = new QHBoxLayout( sliLayout ); + iconLayout = new TQHBoxLayout( sliLayout ); iconLayout->setAlignment(Qt::AlignVCenter); } else { - iconLayout = new QVBoxLayout( sliLayout ); + iconLayout = new TQVBoxLayout( sliLayout ); iconLayout->setAlignment(Qt::AlignHCenter); } @@ -213,13 +213,13 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) // --- MUTE LED if ( showMuteLED ) { - QBoxLayout *ledlayout; + TQBoxLayout *ledlayout; if ( _orientation == Qt::Vertical ) { - ledlayout = new QHBoxLayout( sliLayout ); + ledlayout = new TQHBoxLayout( sliLayout ); ledlayout->setAlignment(Qt::AlignVCenter); } else { - ledlayout = new QVBoxLayout( sliLayout ); + ledlayout = new TQVBoxLayout( sliLayout ); ledlayout->setAlignment(Qt::AlignHCenter); } @@ -229,19 +229,19 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) // create mute LED m_muteLED = new KLedButton( Qt::green, KLed::On, KLed::Sunken, KLed::Circular, this, "MuteLED" ); - m_muteLED->setFixedSize( QSize(16, 16) ); - m_muteLED->resize( QSize(16, 16) ); + m_muteLED->setFixedSize( TQSize(16, 16) ); + m_muteLED->resize( TQSize(16, 16) ); ledlayout->addWidget( m_muteLED ); - QToolTip::add( m_muteLED, i18n( "Mute" ) ); - connect( m_muteLED, SIGNAL(stateChanged(bool)), this, SLOT(toggleMuted()) ); + TQToolTip::add( m_muteLED, i18n( "Mute" ) ); + connect( m_muteLED, TQT_SIGNAL(stateChanged(bool)), this, TQT_SLOT(toggleMuted()) ); m_muteLED->installEventFilter( this ); ledlayout->addStretch(); } // has Mute LED else { // we don't have a MUTE LED. We create a dummy widget // !! possibly not neccesary any more (we are layouted) - QWidget *qw = new QWidget(this, "Spacer"); - qw->setFixedSize( QSize(16, 16) ); + TQWidget *qw = new TQWidget(this, "Spacer"); + qw->setFixedSize( TQSize(16, 16) ); ledlayout->addWidget(qw); qw->installEventFilter( this ); } // has no Mute LED @@ -250,18 +250,18 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) } // showMuteLED // --- SLIDERS --------------------------- - QBoxLayout *volLayout; + TQBoxLayout *volLayout; if ( _orientation == Qt::Vertical ) { - volLayout = new QHBoxLayout( sliLayout ); + volLayout = new TQHBoxLayout( sliLayout ); volLayout->setAlignment(Qt::AlignVCenter); } else { - volLayout = new QVBoxLayout( sliLayout ); + volLayout = new TQVBoxLayout( sliLayout ); volLayout->setAlignment(Qt::AlignHCenter); } // Sliders and volume number indication - QBoxLayout *slinumLayout; + TQBoxLayout *slinumLayout; for( int i = 0; i < m_mixdevice->getVolume().count(); i++ ) { Volume::ChannelID chid = Volume::ChannelID(i); @@ -272,34 +272,34 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) int minvol = m_mixdevice->getVolume().minVolume(); if ( _orientation == Qt::Vertical ) { - slinumLayout = new QVBoxLayout( volLayout ); + slinumLayout = new TQVBoxLayout( volLayout ); slinumLayout->setAlignment(Qt::AlignHCenter); } else { - slinumLayout = new QHBoxLayout( volLayout ); + slinumLayout = new TQHBoxLayout( volLayout ); slinumLayout->setAlignment(Qt::AlignVCenter); } // create labels to hold volume values (taken from qamix/kamix) - QLabel *number = new QLabel( "100", this ); + TQLabel *number = new TQLabel( "100", this ); slinumLayout->addWidget( number ); - number->setFrameStyle( QFrame::Panel | QFrame::Sunken ); + number->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); number->setLineWidth( 2 ); number->setMinimumWidth( number->sizeHint().width() ); - number->setPaletteBackgroundColor( QColor(190, 250, 190) ); + number->setPaletteBackgroundColor( TQColor(190, 250, 190) ); // don't show the value by default number->hide(); updateValue( number, chid ); _numbers.append( number ); - QWidget* slider; + TQWidget* slider; if ( m_small ) { slider = new KSmallSlider( minvol, maxvol, maxvol/10, m_mixdevice->getVolume( chid ), _orientation, this, m_mixdevice->name().ascii() ); } else { - slider = new QSlider( 0, maxvol, maxvol/10, + slider = new TQSlider( 0, maxvol, maxvol/10, maxvol - m_mixdevice->getVolume( chid ), _orientation, this, m_mixdevice->name().ascii() ); slider->setMinimumSize( slider->sizeHint() ); @@ -307,7 +307,7 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) slider->setBackgroundOrigin(AncestorOrigin); slider->installEventFilter( this ); - QToolTip::add( slider, m_mixdevice->name() ); + TQToolTip::add( slider, m_mixdevice->name() ); if( i>0 && isStereoLinked() ) { // show only one (the first) slider, when the user wants it so @@ -317,7 +317,7 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) slinumLayout->addWidget( slider ); // add to layout m_sliders.append ( slider ); // add to list _slidersChids.append(chid); // Remember slider-chid association - connect( slider, SIGNAL(valueChanged(int)), SLOT(volumeChange(int)) ); + connect( slider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(volumeChange(int)) ); } // for all channels of this device @@ -327,13 +327,13 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) sliLayout->addSpacing( 5 ); // --- LED LAYOUT TO CENTER --- - QBoxLayout *reclayout; + TQBoxLayout *reclayout; if ( _orientation == Qt::Vertical ) { - reclayout = new QHBoxLayout( sliLayout ); + reclayout = new TQHBoxLayout( sliLayout ); reclayout->setAlignment(Qt::AlignVCenter); } else { - reclayout = new QVBoxLayout( sliLayout ); + reclayout = new TQVBoxLayout( sliLayout ); reclayout->setAlignment(Qt::AlignHCenter); } @@ -342,19 +342,19 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) m_recordLED = new KLedButton( Qt::red, m_mixdevice->isRecSource()?KLed::On:KLed::Off, KLed::Sunken, KLed::Circular, this, "RecordLED" ); - m_recordLED->setFixedSize( QSize(16, 16) ); + m_recordLED->setFixedSize( TQSize(16, 16) ); reclayout->addWidget( m_recordLED ); - connect(m_recordLED, SIGNAL(stateChanged(bool)), this, SLOT(setRecsrc(bool))); + connect(m_recordLED, TQT_SIGNAL(stateChanged(bool)), this, TQT_SLOT(setRecsrc(bool))); m_recordLED->installEventFilter( this ); - QToolTip::add( m_recordLED, i18n( "Record" ) ); + TQToolTip::add( m_recordLED, i18n( "Record" ) ); reclayout->addStretch(); } else { // we don't have a RECORD LED. We create a dummy widget // !! possibly not neccesary any more (we are layouted) - QWidget *qw = new QWidget(this, "Spacer"); - qw->setFixedSize( QSize(16, 16) ); + TQWidget *qw = new TQWidget(this, "Spacer"); + qw->setFixedSize( TQSize(16, 16) ); reclayout->addWidget(qw); qw->installEventFilter( this ); } // has no Record LED @@ -367,7 +367,7 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) QPixmap MDWSlider::icon( int icontype ) { - QPixmap miniDevPM; + TQPixmap miniDevPM; switch (icontype) { case MixDevice::AUDIO: miniDevPM = UserIcon("mix_audio"); break; @@ -415,18 +415,18 @@ MDWSlider::setIcon( int icontype ) { if( !m_iconLabel ) { - m_iconLabel = new QLabel(this); + m_iconLabel = new TQLabel(this); m_iconLabel->setBackgroundOrigin(AncestorOrigin); installEventFilter( m_iconLabel ); } - QPixmap miniDevPM = icon( icontype ); + TQPixmap miniDevPM = icon( icontype ); if ( !miniDevPM.isNull() ) { if ( m_small ) { // scale icon - QWMatrix t; + TQWMatrix t; t = t.scale( 10.0/miniDevPM.width(), 10.0/miniDevPM.height() ); m_iconLabel->setPixmap( miniDevPM.xForm( t ) ); m_iconLabel->resize( 10, 10 ); @@ -461,9 +461,9 @@ MDWSlider::setStereoLinked(bool value) { m_linked = value; - QWidget *slider = m_sliders.first(); - QLabel *number = _numbers.first(); - QString qs = number->text(); + TQWidget *slider = m_sliders.first(); + TQLabel *number = _numbers.first(); + TQString qs = number->text(); /*********************************************************** Remember value of first slider, so that it can be copied @@ -471,8 +471,8 @@ MDWSlider::setStereoLinked(bool value) ***********************************************************/ int firstSliderValue = 0; bool firstSliderValueValid = false; - if (slider->isA("QSlider") ) { - QSlider *sld = static_cast<QSlider*>(slider); + if (slider->isA("TQSlider") ) { + TQSlider *sld = static_cast<TQSlider*>(slider); firstSliderValue = sld->value(); firstSliderValueValid = true; } @@ -492,10 +492,10 @@ MDWSlider::setStereoLinked(bool value) // This might not be entirely true, but better than showing the random value // that was used to be shown before hot-fixing this. !! must be revised if ( firstSliderValueValid ) { - // Remark: firstSlider== 0 could happen, if the static_cast<QRangeControl*> above fails. + // Remark: firstSlider== 0 could happen, if the static_cast<TQRangeControl*> above fails. // It's a safety measure, if we got other Slider types in the future. - if (slider->isA("QSlider") ) { - QSlider *sld = static_cast<QSlider*>(slider); + if (slider->isA("TQSlider") ) { + TQSlider *sld = static_cast<TQSlider*>(slider); sld->setValue( firstSliderValue ); } if (slider->isA("KSmallSlider") ) { @@ -511,7 +511,7 @@ MDWSlider::setStereoLinked(bool value) } slider = m_sliders.last(); - if( slider && static_cast<QSlider *>(slider)->tickmarks() ) + if( slider && static_cast<TQSlider *>(slider)->tickmarks() ) setTicks( true ); layout()->activate(); @@ -535,26 +535,26 @@ MDWSlider::setLabeled(bool value) void MDWSlider::setTicks( bool ticks ) { - QWidget* slider; + TQWidget* slider; slider = m_sliders.first(); - if ( slider->inherits( "QSlider" ) ) + if ( slider->inherits( "TQSlider" ) ) { if( ticks ) if( isStereoLinked() ) - static_cast<QSlider *>(slider)->setTickmarks( QSlider::Right ); + static_cast<TQSlider *>(slider)->setTickmarks( TQSlider::Right ); else { - static_cast<QSlider *>(slider)->setTickmarks( QSlider::NoMarks ); + static_cast<TQSlider *>(slider)->setTickmarks( TQSlider::NoMarks ); slider = m_sliders.last(); - static_cast<QSlider *>(slider)->setTickmarks( QSlider::Left ); + static_cast<TQSlider *>(slider)->setTickmarks( TQSlider::Left ); } else { - static_cast<QSlider *>(slider)->setTickmarks( QSlider::NoMarks ); + static_cast<TQSlider *>(slider)->setTickmarks( TQSlider::NoMarks ); slider = m_sliders.last(); - static_cast<QSlider *>(slider)->setTickmarks( QSlider::NoMarks ); + static_cast<TQSlider *>(slider)->setTickmarks( TQSlider::NoMarks ); } } @@ -567,8 +567,8 @@ MDWSlider::setValueStyle( ValueStyle valueStyle ) m_valueStyle = valueStyle; int i = 0; - QValueList<Volume::ChannelID>::Iterator it = _slidersChids.begin(); - for(QLabel *number = _numbers.first(); number!=0; number = _numbers.next(), ++i, ++it) { + TQValueList<Volume::ChannelID>::Iterator it = _slidersChids.begin(); + for(TQLabel *number = _numbers.first(); number!=0; number = _numbers.next(), ++i, ++it) { Volume::ChannelID chid = *it; switch ( m_valueStyle ) { case NNONE: number->hide(); break; @@ -598,26 +598,26 @@ MDWSlider::setIcons(bool value) } void -MDWSlider::setColors( QColor high, QColor low, QColor back ) +MDWSlider::setColors( TQColor high, TQColor low, TQColor back ) { - for( QWidget *slider=m_sliders.first(); slider!=0; slider=m_sliders.next() ) { + for( TQWidget *slider=m_sliders.first(); slider!=0; slider=m_sliders.next() ) { KSmallSlider *smallSlider = dynamic_cast<KSmallSlider*>(slider); if ( smallSlider ) smallSlider->setColors( high, low, back ); } } void -MDWSlider::setMutedColors( QColor high, QColor low, QColor back ) +MDWSlider::setMutedColors( TQColor high, TQColor low, TQColor back ) { - for( QWidget *slider=m_sliders.first(); slider!=0; slider=m_sliders.next() ) { + for( TQWidget *slider=m_sliders.first(); slider!=0; slider=m_sliders.next() ) { KSmallSlider *smallSlider = dynamic_cast<KSmallSlider*>(slider); if ( smallSlider ) smallSlider->setGrayColors( high, low, back ); } } void -MDWSlider::updateValue( QLabel *value, Volume::ChannelID chid ) { - QString qs; +MDWSlider::updateValue( TQLabel *value, Volume::ChannelID chid ) { + TQString qs; Volume& vol = m_mixdevice->getVolume(); if (m_valueStyle == NABSOLUTE ) @@ -637,7 +637,7 @@ void MDWSlider::volumeChange( int ) // --- Step 2: Change the volumes directly in the Volume object to reflect the Sliders --- if ( isStereoLinked() ) { - QWidget *slider = m_sliders.first(); + TQWidget *slider = m_sliders.first(); Volume::ChannelID chid = _slidersChids.first(); int sliderValue = 0; @@ -649,7 +649,7 @@ void MDWSlider::volumeChange( int ) } } else { - QSlider *slider = dynamic_cast<QSlider *>(m_sliders.first()); + TQSlider *slider = dynamic_cast<TQSlider *>(m_sliders.first()); if (slider) { if ( _orientation == Qt::Vertical ) sliderValue= slider->maxValue() - slider->value(); @@ -676,9 +676,9 @@ void MDWSlider::volumeChange( int ) } // joined else { int n = 0; - QValueList<Volume::ChannelID>::Iterator it = _slidersChids.begin(); - QLabel *number = _numbers.first(); - for( QWidget *slider=m_sliders.first(); slider!=0 && number!=0; slider=m_sliders.next(), number=_numbers.next(), ++it ) + TQValueList<Volume::ChannelID>::Iterator it = _slidersChids.begin(); + TQLabel *number = _numbers.first(); + for( TQWidget *slider=m_sliders.first(); slider!=0 && number!=0; slider=m_sliders.next(), number=_numbers.next(), ++it ) { Volume::ChannelID chid = *it; if ( slider->inherits( "KSmallSlider" ) ) @@ -689,7 +689,7 @@ void MDWSlider::volumeChange( int ) } else { - QSlider *bigSlider = dynamic_cast<QSlider *>(slider); + TQSlider *bigSlider = dynamic_cast<TQSlider *>(slider); if (bigSlider) if ( _orientation == Qt::Vertical ) vol.setVolume( chid, bigSlider->maxValue() - bigSlider->value() ); @@ -791,7 +791,7 @@ void MDWSlider::decreaseVolume() /** This is called whenever there are volume updates pending from the hardware for this MDW. - At the moment it is called regulary via a QTimer (implicitely). + At the moment it is called regulary via a TQTimer (implicitely). */ void MDWSlider::update() { @@ -799,11 +799,11 @@ void MDWSlider::update() Volume vol = m_mixdevice->getVolume(); if( isStereoLinked() ) { - QValueList<Volume::ChannelID>::Iterator it = _slidersChids.begin(); + TQValueList<Volume::ChannelID>::Iterator it = _slidersChids.begin(); long avgVol = vol.getAvgVolume( Volume::MMAIN ); - QWidget *slider = m_sliders.first(); + TQWidget *slider = m_sliders.first(); if ( slider == 0 ) { return; // !!! Development version, check this !!! } @@ -817,7 +817,7 @@ void MDWSlider::update() } } // small slider else { - QSlider *bigSlider = dynamic_cast<QSlider *>(slider); + TQSlider *bigSlider = dynamic_cast<TQSlider *>(slider); if (bigSlider) { // In case of stereo linked and single slider, slider must @@ -835,9 +835,9 @@ void MDWSlider::update() slider->blockSignals( false ); } // only 1 slider (stereo-linked) else { - QValueList<Volume::ChannelID>::Iterator it = _slidersChids.begin(); + TQValueList<Volume::ChannelID>::Iterator it = _slidersChids.begin(); for( int i=0; i<vol.count(); i++, ++it ) { - QWidget *slider = m_sliders.at( i ); + TQWidget *slider = m_sliders.at( i ); Volume::ChannelID chid = *it; if (slider == 0) { // !!! not implemented !!! @@ -858,7 +858,7 @@ void MDWSlider::update() } else { - QSlider *bigSlider = dynamic_cast<QSlider *>(slider); + TQSlider *bigSlider = dynamic_cast<TQSlider *>(slider); if (bigSlider) if ( _orientation == Qt::Vertical ) { bigSlider->setValue( vol.maxVolume() - vol[i] ); @@ -930,17 +930,17 @@ void MDWSlider::showContextMenu() a->plug( menu ); } - QPoint pos = QCursor::pos(); + TQPoint pos = TQCursor::pos(); menu->popup( pos ); } -QSize MDWSlider::sizeHint() const { +TQSize MDWSlider::sizeHint() const { if ( _layout != 0 ) { return _layout->sizeHint(); } else { // layout not (yet) created - return QWidget::sizeHint(); + return TQWidget::sizeHint(); } } @@ -948,18 +948,18 @@ QSize MDWSlider::sizeHint() const { * An event filter for the various QWidgets. We watch for Mouse press Events, so * that we can popup the context menu. */ -bool MDWSlider::eventFilter( QObject* obj, QEvent* e ) +bool MDWSlider::eventFilter( TQObject* obj, TQEvent* e ) { - if (e->type() == QEvent::MouseButtonPress) { - QMouseEvent *qme = static_cast<QMouseEvent*>(e); + if (e->type() == TQEvent::MouseButtonPress) { + TQMouseEvent *qme = static_cast<TQMouseEvent*>(e); if (qme->button() == Qt::RightButton) { showContextMenu(); return true; } } // Attention: We don't filter WheelEvents for KSmallSlider, because it handles WheelEvents itself - else if ( (e->type() == QEvent::Wheel) && !obj->isA("KSmallSlider") ) { - QWheelEvent *qwe = static_cast<QWheelEvent*>(e); + else if ( (e->type() == TQEvent::Wheel) && !obj->isA("KSmallSlider") ) { + TQWheelEvent *qwe = static_cast<TQWheelEvent*>(e); if (qwe->delta() > 0) { increaseVolume(); } @@ -968,7 +968,7 @@ bool MDWSlider::eventFilter( QObject* obj, QEvent* e ) } return true; } - return QWidget::eventFilter(obj,e); + return TQWidget::eventFilter(obj,e); } #include "mdwslider.moc" diff --git a/kmix/mdwslider.h b/kmix/mdwslider.h index 01dd13aa..f55667ae 100644 --- a/kmix/mdwslider.h +++ b/kmix/mdwslider.h @@ -25,12 +25,12 @@ #include <kpanelapplet.h> -#include <qvaluelist.h> -#include <qwidget.h> -#include <qlabel.h> -#include <qptrlist.h> -#include <qpixmap.h> -#include <qrangecontrol.h> +#include <tqvaluelist.h> +#include <tqwidget.h> +#include <tqlabel.h> +#include <tqptrlist.h> +#include <tqpixmap.h> +#include <tqrangecontrol.h> class QBoxLayout; class QLabel; @@ -61,7 +61,7 @@ public: MDWSlider( Mixer *mixer, MixDevice* md, bool showMuteLED, bool showRecordLED, bool small, Qt::Orientation, - QWidget* parent = 0, ViewBase* mw = 0, const char* name = 0); + TQWidget* parent = 0, ViewBase* mw = 0, const char* name = 0); ~MDWSlider() {} void addActionToPopup( KAction *action ); @@ -74,11 +74,11 @@ public: void setTicks( bool ticks ); void setIcons( bool value ); void setValueStyle( ValueStyle valueStyle ); - void setColors( QColor high, QColor low, QColor back ); - void setMutedColors( QColor high, QColor low, QColor back ); - QSize sizeHint() const; - bool eventFilter( QObject* obj, QEvent* e ); - QSizePolicy sizePolicy() const; + void setColors( TQColor high, TQColor low, TQColor back ); + void setMutedColors( TQColor high, TQColor low, TQColor back ); + TQSize sizeHint() const; + bool eventFilter( TQObject* obj, TQEvent* e ); + TQSizePolicy sizePolicy() const; public slots: void toggleRecsrc(); @@ -107,22 +107,22 @@ private slots: void decreaseVolume(); private: - QPixmap icon( int icontype ); + TQPixmap icon( int icontype ); void setIcon( int icontype ); void createWidgets( bool showMuteLED, bool showRecordLED ); - void updateValue( QLabel *value, Volume::ChannelID chid ); + void updateValue( TQLabel *value, Volume::ChannelID chid ); bool m_linked; ValueStyle m_valueStyle; - QLabel *m_iconLabel; + TQLabel *m_iconLabel; KLedButton *m_muteLED; KLedButton *m_recordLED; - QWidget *m_label; // is either QLabel or VerticalText - QBoxLayout *_layout; - QPtrList<QWidget> m_sliders; - QValueList<Volume::ChannelID> _slidersChids; - QPtrList<QLabel> _numbers; - // QValueList<Volume::ChannelID> _numbersChids; + TQWidget *m_label; // is either TQLabel or VerticalText + TQBoxLayout *_layout; + TQPtrList<TQWidget> m_sliders; + TQValueList<Volume::ChannelID> _slidersChids; + TQPtrList<TQLabel> _numbers; + // TQValueList<Volume::ChannelID> _numbersChids; }; #endif diff --git a/kmix/mdwswitch.cpp b/kmix/mdwswitch.cpp index 3e630c18..ee590146 100644 --- a/kmix/mdwswitch.cpp +++ b/kmix/mdwswitch.cpp @@ -19,12 +19,12 @@ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qcursor.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qobject.h> -#include <qslider.h> -#include <qtooltip.h> +#include <tqcursor.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqobject.h> +#include <tqslider.h> +#include <tqtooltip.h> #include <klocale.h> #include <kconfig.h> @@ -43,25 +43,25 @@ /** * Class that represents a single Switch * The orientation (horizontal, vertical) can be configured and whether it should - * be "small" (uses KSmallSlider instead of QSlider then). + * be "small" (uses KSmallSlider instead of TQSlider then). */ MDWSwitch::MDWSwitch(Mixer *mixer, MixDevice* md, bool small, Qt::Orientation orientation, - QWidget* parent, ViewBase* mw, const char* name) : + TQWidget* parent, ViewBase* mw, const char* name) : MixDeviceWidget(mixer,md,small,orientation,parent,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, SLOT(setDisabled()), _mdwActions, "hide" ); - new KAction( i18n("C&onfigure Shortcuts..."), 0, this, SLOT(defineKeys()), _mdwActions, "keys" ); + new KToggleAction( i18n("&Hide"), 0, this, TQT_SLOT(setDisabled()), _mdwActions, "hide" ); + new KAction( i18n("C&onfigure Shortcuts..."), 0, this, TQT_SLOT(defineKeys()), _mdwActions, "keys" ); // create widgets createWidgets(); - m_keys->insert( "Toggle switch", i18n( "Toggle Switch" ), QString::null, - KShortcut(), KShortcut(), this, SLOT( toggleSwitch() ) ); + m_keys->insert( "Toggle switch", i18n( "Toggle Switch" ), TQString::null, + KShortcut(), KShortcut(), this, TQT_SLOT( toggleSwitch() ) ); // The keys are loaded in KMixerWidget::loadConfig, see kmixerwidget.cpp (now: kmixtoolbox.cpp) //m_keys->readSettings(); @@ -78,14 +78,14 @@ MDWSwitch::~MDWSwitch() void MDWSwitch::createWidgets() { if ( _orientation == Qt::Vertical ) { - _layout = new QVBoxLayout( this ); + _layout = new TQVBoxLayout( this ); _layout->setAlignment(Qt::AlignHCenter); } else { - _layout = new QHBoxLayout( this ); + _layout = new TQHBoxLayout( this ); _layout->setAlignment(Qt::AlignVCenter); } - QToolTip::add( this, m_mixdevice->name() ); + TQToolTip::add( this, m_mixdevice->name() ); _layout->addSpacing( 4 ); @@ -116,7 +116,7 @@ void MDWSwitch::createWidgets() else _switchLED = new KLedButton( Qt::yellow, KLed::On, KLed::Sunken, KLed::Circular, this, "SwitchLED" ); _switchLED->setFixedSize(16,16); - _label = new QLabel(m_mixdevice->name(), this, "SwitchName"); + _label = new TQLabel(m_mixdevice->name(), this, "SwitchName"); _layout->addWidget( _switchLED ); _layout->addSpacing( 1 ); @@ -124,7 +124,7 @@ void MDWSwitch::createWidgets() _switchLED->installEventFilter( this ); _label->installEventFilter( this ); } - connect( _switchLED, SIGNAL(stateChanged(bool)), this, SLOT(toggleSwitch()) ); + connect( _switchLED, TQT_SIGNAL(stateChanged(bool)), this, TQT_SLOT(toggleSwitch()) ); _layout->addSpacing( 4 ); } @@ -160,17 +160,17 @@ void MDWSwitch::showContextMenu() KPopupMenu *menu = m_mixerwidget->getPopup(); - QPoint pos = QCursor::pos(); + TQPoint pos = TQCursor::pos(); menu->popup( pos ); } -QSize MDWSwitch::sizeHint() const { +TQSize MDWSwitch::sizeHint() const { if ( _layout != 0 ) { return _layout->sizeHint(); } else { // layout not (yet) created - return QWidget::sizeHint(); + return TQWidget::sizeHint(); } } @@ -216,16 +216,16 @@ void MDWSwitch::setDisabled( bool value ) { * An event filter for the various QWidgets. We watch for Mouse press Events, so * that we can popup the context menu. */ -bool MDWSwitch::eventFilter( QObject* obj, QEvent* e ) +bool MDWSwitch::eventFilter( TQObject* obj, TQEvent* e ) { - if (e->type() == QEvent::MouseButtonPress) { - QMouseEvent *qme = static_cast<QMouseEvent*>(e); + if (e->type() == TQEvent::MouseButtonPress) { + TQMouseEvent *qme = static_cast<TQMouseEvent*>(e); if (qme->button() == Qt::RightButton) { showContextMenu(); return true; } } - return QWidget::eventFilter(obj,e); + return TQWidget::eventFilter(obj,e); } #include "mdwswitch.moc" diff --git a/kmix/mdwswitch.h b/kmix/mdwswitch.h index 80116399..44ddaa79 100644 --- a/kmix/mdwswitch.h +++ b/kmix/mdwswitch.h @@ -25,11 +25,11 @@ #include <kpanelapplet.h> -#include <qwidget.h> +#include <tqwidget.h> #include "volume.h" -#include <qptrlist.h> -#include <qpixmap.h> -#include <qrangecontrol.h> +#include <tqptrlist.h> +#include <tqpixmap.h> +#include <tqrangecontrol.h> class QBoxLayout; class QLabel; @@ -56,13 +56,13 @@ class MDWSwitch : public MixDeviceWidget public: MDWSwitch( Mixer *mixer, MixDevice* md, bool small, Qt::Orientation orientation, - QWidget* parent = 0, ViewBase* mw = 0, const char* name = 0); + TQWidget* parent = 0, ViewBase* mw = 0, const char* name = 0); ~MDWSwitch(); void addActionToPopup( KAction *action ); - QSize sizeHint() const; + TQSize sizeHint() const; void setBackgroundMode(BackgroundMode m); - bool eventFilter( QObject* obj, QEvent* e ); + bool eventFilter( TQObject* obj, TQEvent* e ); public slots: // GUI hide and show @@ -79,10 +79,10 @@ public slots: private: void createWidgets(); - QLabel *_label; + TQLabel *_label; VerticalText *_labelV; KLedButton *_switchLED; - QBoxLayout *_layout; + TQBoxLayout *_layout; }; #endif diff --git a/kmix/mixdevice.cpp b/kmix/mixdevice.cpp index efa48184..d5c9f9c2 100644 --- a/kmix/mixdevice.cpp +++ b/kmix/mixdevice.cpp @@ -36,7 +36,7 @@ * Volume objects, one for Output (Playback volume) and one for Input (Record volume). */ MixDevice::MixDevice( int num, Volume &vol, bool recordable, bool mute, - QString name, ChannelType type, DeviceCategory category ) : + TQString name, ChannelType type, DeviceCategory category ) : _volume( vol ), _type( type ), _num( num ), _recordable( recordable ), _mute( mute ), _category( category ) { @@ -55,7 +55,7 @@ MixDevice::MixDevice( int num, Volume &vol, bool recordable, bool mute, _switch = true; } -MixDevice::MixDevice(const MixDevice &md) : QObject() +MixDevice::MixDevice(const MixDevice &md) : TQObject() { _name = md._name; _volume = md._volume; @@ -105,7 +105,7 @@ unsigned int MixDevice::enumId() return _enumCurrentId; } -QPtrList<QString>& MixDevice::enumValues() { +TQPtrList<TQString>& MixDevice::enumValues() { return _enumValues; } @@ -116,11 +116,11 @@ void MixDevice::setVolume( int channel, int volume ) _volume.setVolume( (Volume::ChannelID)channel /* ARGH! */, volume ); } -QString& MixDevice::getPK() { +TQString& MixDevice::getPK() { return _pk; } -void MixDevice::setPK(QString &PK) { +void MixDevice::setPK(TQString &PK) { _pk = PK; // The key is used in the config file. It should not contain spaces _pk.replace(' ', '_'); @@ -133,9 +133,9 @@ void MixDevice::setPK(QString &PK) { * because we need to read the minimum and maximum volume levels. * (Another solutien would be to "equip" volFromConfig with maxInt and minInt values). */ -void MixDevice::read( KConfig *config, const QString& grp ) +void MixDevice::read( KConfig *config, const TQString& grp ) { - QString devgrp; + TQString devgrp; devgrp.sprintf( "%s.Dev%i", grp.ascii(), _num ); config->setGroup( devgrp ); //kdDebug(67100) << "MixDevice::read() of group devgrp=" << devgrp << endl; @@ -193,9 +193,9 @@ void MixDevice::read( KConfig *config, const QString& grp ) /** * called on "kmixctrl --save" and from the GUI's (currently only on exit) */ -void MixDevice::write( KConfig *config, const QString& grp ) +void MixDevice::write( KConfig *config, const TQString& grp ) { - QString devgrp; + TQString devgrp; devgrp.sprintf( "%s.Dev%i", grp.ascii(), _num ); config->setGroup(devgrp); // kdDebug(67100) << "MixDevice::write() of group devgrp=" << devgrp << endl; diff --git a/kmix/mixdevice.h b/kmix/mixdevice.h index 89ec052c..8683ce2b 100644 --- a/kmix/mixdevice.h +++ b/kmix/mixdevice.h @@ -2,10 +2,10 @@ #define MixDevice_h #include "volume.h" -#include <qstring.h> +#include <tqstring.h> #include <kconfig.h> -#include <qobject.h> -#include <qptrlist.h> +#include <tqobject.h> +#include <tqptrlist.h> // ! @todo : CONSIDER MERGING OF MixDevice and Volume classes: // Not easy possible, because Volume is used in the driver backends @@ -35,26 +35,26 @@ class MixDevice : public QObject MixDevice(int num, Volume &vol, bool recordable, bool mute, - QString name, ChannelType type = UNKNOWN, DeviceCategory category = + TQString name, ChannelType type = UNKNOWN, DeviceCategory category = SLIDER ); MixDevice(const MixDevice &md); ~MixDevice(); int num() { return _num; }; - QString name() { return _name; }; + TQString name() { return _name; }; /** * Returns an unique ID of this MixDevice. By default the number * 'num' from the constructor is returned. It is recommended that * a better ID is set directly after constructing the MixDevice using * the setUniqueID(). */ - QString& getPK(); + TQString& getPK(); /** * Set a suitable PK for this MixDevice. It is used in looking up * the keys in kmixrc. It is advised to set a nice name, like * 'PCM_2', which would mean "2nd PCM device of the sound card". */ - void setPK(QString &id); + void setPK(TQString &id); bool isRecordable() { return _recordable; }; bool isRecSource() { return _recSource; }; bool isSwitch() { return _switch; } // !! change to _category == MixDevice::SWITCH @@ -72,10 +72,10 @@ SLIDER ); void setEnumId(int); unsigned int enumId(); - QPtrList<QString>& enumValues(); + TQPtrList<TQString>& enumValues(); - void read( KConfig *config, const QString& grp ); - void write( KConfig *config, const QString& grp ); + void read( KConfig *config, const TQString& grp ); + void write( KConfig *config, const TQString& grp ); void setType( ChannelType channeltype ) { _type = channeltype; }; ChannelType type() { return _type; }; @@ -102,10 +102,10 @@ SLIDER ); bool _mute; // Available mute option bool _recSource; // Current rec status DeviceCategory _category; // category - QString _name; // Ascii channel name - QString _pk; // Primary key, used as part in config file keys + TQString _name; // Ascii channel name + TQString _pk; // Primary key, used as part in config file keys // A MixDevice, that is an ENUM, has these _enumValues - QPtrList<QString> _enumValues; + TQPtrList<TQString> _enumValues; int _enumCurrentId; }; diff --git a/kmix/mixdevicewidget.cpp b/kmix/mixdevicewidget.cpp index 7885cb92..b5418303 100644 --- a/kmix/mixdevicewidget.cpp +++ b/kmix/mixdevicewidget.cpp @@ -29,14 +29,14 @@ #include <kkeydialog.h> #include <kdebug.h> -#include <qobject.h> -#include <qcursor.h> -#include <qslider.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qpixmap.h> -#include <qtooltip.h> -#include <qwmatrix.h> +#include <tqobject.h> +#include <tqcursor.h> +#include <tqslider.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpixmap.h> +#include <tqtooltip.h> +#include <tqwmatrix.h> #include "mixer.h" #include "mixdevicewidget.h" @@ -50,12 +50,12 @@ * Used in KMix main window and DockWidget and PanelApplet. * It can be configured to include or exclude the recordLED and the muteLED. * The direction (horizontal, vertical) can be configured and whether it should - * be "small" (uses KSmallSlider instead of QSlider then). + * be "small" (uses KSmallSlider instead of TQSlider then). */ MixDeviceWidget::MixDeviceWidget(Mixer *mixer, MixDevice* md, bool small, Qt::Orientation orientation, - QWidget* parent, ViewBase* mw, const char* name) : - QWidget( parent, name ), m_mixer(mixer), m_mixdevice( md ), m_mixerwidget( mw ), + TQWidget* parent, ViewBase* mw, const char* name) : + TQWidget( parent, name ), m_mixer(mixer), m_mixdevice( md ), m_mixerwidget( mw ), m_disabled( false ), _orientation( orientation ), m_small( small ) { _mdwActions = new KActionCollection( this ); @@ -99,20 +99,20 @@ void MixDeviceWidget::setVolume( int /*channel*/, int /*vol*/ ) { /* is virtual void MixDeviceWidget::setVolume( Volume /*vol*/ ) { /* is virtual */ } void MixDeviceWidget::update() { /* is virtual */ } void MixDeviceWidget::showContextMenu() { /* is virtual */ } -void MixDeviceWidget::setColors( QColor , QColor , QColor ) { /* is virtual */ } +void MixDeviceWidget::setColors( TQColor , TQColor , TQColor ) { /* is virtual */ } void MixDeviceWidget::setIcons( bool ) { /* is virtual */ } void MixDeviceWidget::setLabeled( bool ) { /* is virtual */ } -void MixDeviceWidget::setMutedColors( QColor , QColor , QColor ) { /* is virtual */ } +void MixDeviceWidget::setMutedColors( TQColor , TQColor , TQColor ) { /* is virtual */ } -void MixDeviceWidget::mousePressEvent( QMouseEvent *e ) +void MixDeviceWidget::mousePressEvent( TQMouseEvent *e ) { if ( e->button()==RightButton ) showContextMenu(); else { - QWidget::mousePressEvent(e); + TQWidget::mousePressEvent(e); } } diff --git a/kmix/mixdevicewidget.h b/kmix/mixdevicewidget.h index d6d4057d..1f5fa0fc 100644 --- a/kmix/mixdevicewidget.h +++ b/kmix/mixdevicewidget.h @@ -27,11 +27,11 @@ #include <kpanelapplet.h> -#include <qwidget.h> +#include <tqwidget.h> #include "volume.h" -#include <qptrlist.h> -#include <qpixmap.h> -#include <qrangecontrol.h> +#include <tqptrlist.h> +#include <tqpixmap.h> +#include <tqrangecontrol.h> class QBoxLayout; class QLabel; @@ -60,7 +60,7 @@ public: MixDeviceWidget( Mixer *mixer, MixDevice* md, bool small, Qt::Orientation orientation, - QWidget* parent = 0, ViewBase* mw = 0, const char* name = 0); + TQWidget* parent = 0, ViewBase* mw = 0, const char* name = 0); ~MixDeviceWidget(); void addActionToPopup( KAction *action ); @@ -68,9 +68,9 @@ public: virtual bool isDisabled() const; MixDevice* mixDevice() { return m_mixdevice; }; - virtual void setColors( QColor high, QColor low, QColor back ); + virtual void setColors( TQColor high, TQColor low, TQColor back ); virtual void setIcons( bool value ); - virtual void setMutedColors( QColor high, QColor low, QColor back ); + virtual void setMutedColors( TQColor high, TQColor low, TQColor back ); virtual bool isStereoLinked() const { return false; }; //virtual bool isLabeled() const { return false; }; @@ -109,7 +109,7 @@ protected: bool m_small; private: - void mousePressEvent( QMouseEvent *e ); + void mousePressEvent( TQMouseEvent *e ); }; #endif diff --git a/kmix/mixer.cpp b/kmix/mixer.cpp index 116e6c23..0e7c36fc 100644 --- a/kmix/mixer.cpp +++ b/kmix/mixer.cpp @@ -20,7 +20,7 @@ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qtimer.h> +#include <tqtimer.h> #include <klocale.h> #include <kconfig.h> @@ -47,9 +47,9 @@ #undef KMIX_DCOP_OBJID_TEST int Mixer::_dcopID = 0; -QPtrList<Mixer> Mixer::s_mixers; -QString Mixer::_masterCard; -QString Mixer::_masterCardDevice; +TQPtrList<Mixer> Mixer::s_mixers; +TQString Mixer::_masterCard; +TQString Mixer::_masterCardDevice; int Mixer::numDrivers() { @@ -67,7 +67,7 @@ int Mixer::numDrivers() /* * Returns a reference of the current mixer list. */ -QPtrList<Mixer>& Mixer::mixers() +TQPtrList<Mixer>& Mixer::mixers() { return s_mixers; } @@ -88,10 +88,10 @@ Mixer::Mixer( int driver, int device ) : DCOPObject( "Mixer" ) m_balance = 0; m_profiles.setAutoDelete( true ); - _pollingTimer = new QTimer(); // will be started on open() and stopped on close() - connect( _pollingTimer, SIGNAL(timeout()), this, SLOT(readSetFromHW())); + _pollingTimer = new TQTimer(); // will be started on open() and stopped on close() + connect( _pollingTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(readSetFromHW())); - QCString objid; + TQCString objid; #ifndef KMIX_DCOP_OBJID_TEST objid.setNum(_mixerBackend->m_devnum); #else @@ -114,14 +114,14 @@ void Mixer::volumeSave( KConfig *config ) { // kdDebug(67100) << "Mixer::volumeSave()" << endl; readSetFromHW(); - QString grp("Mixer"); + TQString grp("Mixer"); grp.append(mixerName()); _mixerBackend->m_mixDevices.write( config, grp ); } void Mixer::volumeLoad( KConfig *config ) { - QString grp("Mixer"); + TQString grp("Mixer"); grp.append(mixerName()); if ( ! config->hasGroup(grp) ) { // no such group. Volumes (of this mixer) were never saved beforehand. @@ -133,7 +133,7 @@ void Mixer::volumeLoad( KConfig *config ) _mixerBackend->m_mixDevices.read( config, grp ); // set new settings - QPtrListIterator<MixDevice> it( _mixerBackend->m_mixDevices ); + TQPtrListIterator<MixDevice> it( _mixerBackend->m_mixDevices ); for(MixDevice *md=it.toFirst(); md!=0; md=++it ) { // kdDebug(67100) << "Mixer::volumeLoad() writeVolumeToHW(" << md->num() << ", "<< md->getVolume() << ")" << endl; @@ -173,7 +173,7 @@ int Mixer::open() } else { kdError(67100) << "Mixer::open() no master detected." << endl; - QString noMaster = "---no-master-detected---"; + TQString noMaster = "---no-master-detected---"; setMasterDevice(noMaster); // no master } /* @@ -207,7 +207,7 @@ int Mixer::open() else { _mixerBackend->prepareSignalling(this); // poll once to give the GUI a chance to rebuild it's info - QTimer::singleShot( 50, this, SLOT( readSetFromHW() ) ); + TQTimer::singleShot( 50, this, TQT_SLOT( readSetFromHW() ) ); } return err; } @@ -342,7 +342,7 @@ void Mixer::setBalance(int balance) emit newBalance( vol ); } -QString Mixer::mixerName() +TQString Mixer::mixerName() { return _mixerBackend->m_mixerName; } @@ -352,7 +352,7 @@ int Mixer::devnum() return _mixerBackend->m_devnum; } -QString Mixer::driverName( int driver ) +TQString Mixer::driverName( int driver ) { getDriverNameFunc *f = g_mixerFactories[driver].getDriverName; if( f!=0 ) @@ -361,18 +361,18 @@ QString Mixer::driverName( int driver ) return "unknown"; } -void Mixer::setID(QString& ref_id) +void Mixer::setID(TQString& ref_id) { _id = ref_id; } -QString& Mixer::id() +TQString& Mixer::id() { return _id; } -void Mixer::setMasterCard(QString& ref_id) +void Mixer::setMasterCard(TQString& ref_id) { // The value is taken over without checking on existance. This allows the User to define // a MasterCard that is not always available (e.g. it is an USB hotplugging device). @@ -400,7 +400,7 @@ Mixer* Mixer::masterCard() return mixer; } -void Mixer::setMasterCardDevice(QString& ref_id) +void Mixer::setMasterCardDevice(TQString& ref_id) { // The value is taken over without checking on existance. This allows the User to define // a MasterCard that is not always available (e.g. it is an USB hotplugging device). @@ -477,13 +477,13 @@ MixDevice* Mixer::masterDevice() return find( _masterDevicePK ); } -void Mixer::setMasterDevice(QString &devPK) +void Mixer::setMasterDevice(TQString &devPK) { _masterDevicePK = devPK; } -MixDevice* Mixer::find(QString& devPK) +MixDevice* Mixer::find(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 1a94dba6..80bd24ae 100644 --- a/kmix/mixer.h +++ b/kmix/mixer.h @@ -26,11 +26,11 @@ #ifndef MIXER_H #define MIXER_H -#include <qstring.h> -#include <qtimer.h> -#include <qobject.h> -#include <qintdict.h> -#include <qptrlist.h> +#include <tqstring.h> +#include <tqtimer.h> +#include <tqobject.h> +#include <tqintdict.h> +#include <tqptrlist.h> #include "volume.h" class Mixer_Backend; @@ -41,7 +41,7 @@ class Mixer_Backend; class Volume; class KConfig; -class Mixer : public QObject, virtual public MixerIface +class Mixer : public TQObject, virtual public MixerIface { Q_OBJECT @@ -54,7 +54,7 @@ class Mixer : public QObject, virtual public MixerIface static int numDrivers(); - MixDevice* find(QString& devPK); + MixDevice* find(TQString& devPK); void volumeSave( KConfig *config ); void volumeLoad( KConfig *config ); @@ -79,27 +79,27 @@ class Mixer : public QObject, virtual public MixerIface virtual int close(); /// Returns a detailed state message after errors. Only for diagnostic purposes, no i18n. - QString& stateMessage() const; + TQString& stateMessage() const; - virtual QString mixerName(); + virtual TQString mixerName(); virtual int devnum(); // Returns the name of the driver, e.g. "OSS" or "ALSA0.9" - static QString driverName(int num); + static TQString driverName(int num); /// Returns an unique ID of the Mixer. It currently looks like "<soundcard_descr>:<hw_number>@<driver>" - QString& id(); + TQString& id(); /// The owner/creator of the Mixer can set an unique name here. This key should never displayed to /// the user, but can be used for referencing configuration items and such. - void setID(QString& ref_id); + void setID(TQString& ref_id); /// The KMix global master card. Please note that KMix and KMixPanelApplet can have a /// different MasterCard's at the moment (but actually KMixPanelApplet does not read/save this yet). /// At the moment it is only used for selecting the Mixer to use in KMix's DockIcon. - static void setMasterCard(QString& ref_id); + static void setMasterCard(TQString& ref_id); static Mixer* masterCard(); /// The global Master Device inside the current MasterCard (as returned by masterCard()). - static void setMasterCardDevice(QString& ref_id); + static void setMasterCardDevice(TQString& ref_id); static MixDevice* masterCardDevice(); @@ -109,7 +109,7 @@ class Mixer : public QObject, virtual public MixerIface /// Returns the master volume device (doesn't work out :-(. See masterCard() and masterCardDevice() instead) MixDevice* masterDevice(); /// Sets the master volume device (doesn't work out :-(. See setMasterCard() and setMasterCardDevice() instead) - void setMasterDevice(QString&); + void setMasterDevice(TQString&); /// DCOP oriented methods (look at mixerIface.h for the descriptions) virtual void setVolume( int deviceidx, int percentage ); @@ -151,25 +151,25 @@ class Mixer : public QObject, virtual public MixerIface void newVolumeLevels(void); protected: - QTimer* _pollingTimer; + TQTimer* _pollingTimer; int m_balance; // from -100 (just left) to 100 (just right) - QPtrList<MixSet> m_profiles; - static QPtrList<Mixer> s_mixers; + TQPtrList<MixSet> m_profiles; + static TQPtrList<Mixer> s_mixers; public: int setupMixer( MixSet set ); - static QPtrList<Mixer>& mixers(); + static TQPtrList<Mixer>& mixers(); private: Mixer_Backend *_mixerBackend; mutable bool _readSetFromHWforceUpdate; static int _dcopID; - QString _id; - QString _masterDevicePK; - static QString _masterCard; - static QString _masterCardDevice; + TQString _id; + TQString _masterDevicePK; + static TQString _masterCard; + static TQString _masterCardDevice; }; #endif diff --git a/kmix/mixerIface.h b/kmix/mixerIface.h index 6c8da9fd..ef8bbbf5 100644 --- a/kmix/mixerIface.h +++ b/kmix/mixerIface.h @@ -114,7 +114,7 @@ k_dcop: /** Returns the name of the mixer. */ - virtual QString mixerName()=0; + virtual TQString mixerName()=0; /** * Open/grab the mixer for further intraction diff --git a/kmix/mixer_alsa.h b/kmix/mixer_alsa.h index 0d73dc77..5773181b 100644 --- a/kmix/mixer_alsa.h +++ b/kmix/mixer_alsa.h @@ -2,7 +2,7 @@ #define MIXER_ALSA_H // QT includes -#include <qvaluelist.h> +#include <tqvaluelist.h> // Forward QT includes class QString; @@ -35,17 +35,17 @@ class Mixer_ALSA : public Mixer_Backend snd_mixer_elem_t* getMixerElem(int devnum); void removeSignalling(); - virtual QString errorText(int mixer_error); - typedef QValueList<snd_mixer_selem_id_t *>AlsaMixerSidList; + virtual TQString errorText(int mixer_error); + typedef TQValueList<snd_mixer_selem_id_t *>AlsaMixerSidList; AlsaMixerSidList mixer_sid_list; - typedef QValueList<snd_mixer_elem_t *> AlsaMixerElemList; // !! remove + typedef TQValueList<snd_mixer_elem_t *> AlsaMixerElemList; // !! remove AlsaMixerElemList mixer_elem_list; // !! remove bool _initialUpdate; snd_mixer_t *_handle; - QString devName; + TQString devName; struct pollfd *m_fds; - QSocketNotifier **m_sns; + TQSocketNotifier **m_sns; int m_count; }; diff --git a/kmix/mixer_alsa9.cpp b/kmix/mixer_alsa9.cpp index 751d5f9e..effcd006 100644 --- a/kmix/mixer_alsa9.cpp +++ b/kmix/mixer_alsa9.cpp @@ -27,7 +27,7 @@ #include <stdio.h> #include <iostream> #include <assert.h> -#include <qsocketnotifier.h> +#include <tqsocketnotifier.h> extern "C" { @@ -70,7 +70,7 @@ Mixer_ALSA::~Mixer_ALSA() int Mixer_ALSA::identify( snd_mixer_selem_id_t *sid ) { - QString name = snd_mixer_selem_id_get_name( sid ); + TQString name = snd_mixer_selem_id_get_name( sid ); if ( name == "Master" ) return MixDevice::VOLUME; if ( name == "Capture" ) return MixDevice::RECMONITOR; @@ -115,9 +115,9 @@ Mixer_ALSA::open() // Card information if ((unsigned)m_devnum > 31) m_devnum = -1; - devName = m_devnum == -1 ? "default" : QString("hw:%1").arg(m_devnum); + devName = m_devnum == -1 ? "default" : TQString("hw:%1").arg(m_devnum); - QString probeMessage; + TQString probeMessage; if (virginOpen) probeMessage += "Trying ALSA Device '" + devName + "': "; @@ -224,7 +224,7 @@ Mixer_ALSA::open() //kdDebug() << "--- Loop: name=" << snd_mixer_selem_id_get_name( sid ) << " , mixerIdx=" << mixerIdx << "------------" << endl; Volume* volPlay = 0, *volCapture = 0; - QPtrList<QString> enumList; + TQPtrList<TQString> enumList; if ( snd_mixer_selem_is_enumerated(elem) ) { cc = MixDevice::ENUM; volPlay = new Volume(); // Dummy, unused @@ -240,7 +240,7 @@ Mixer_ALSA::open() char buffer[100]; int ret = snd_mixer_selem_get_enum_item_name(elem, iEnum, 99, buffer); if ( ret == 0 ) { - QString* enumName = new QString(buffer); + TQString* enumName = new TQString(buffer); //enumName->append(buffer); enumList.append( enumName); } // enumName could be read succesfully @@ -335,7 +335,7 @@ Mixer_ALSA::open() if ( enumList.count() > 0 ) { int maxEnumId= enumList.count(); - QPtrList<QString>& enumValuesRef = md->enumValues(); // retrieve a ref + TQPtrList<TQString>& enumValuesRef = md->enumValues(); // retrieve a ref for (int i=0; i<maxEnumId; i++ ) { // we have an enum. Lets set the names of the enum items in the MixDevice // the enum names are assumed to be static! @@ -412,12 +412,12 @@ void Mixer_ALSA::prepareSignalling( Mixer *mixer ) { assert( !m_sns ); - m_sns = new QSocketNotifier*[m_count]; + m_sns = new TQSocketNotifier*[m_count]; for ( int i = 0; i < m_count; ++i ) { kdDebug() << "socket " << i << endl; - m_sns[i] = new QSocketNotifier(m_fds[i].fd, QSocketNotifier::Read); - mixer->connect(m_sns[i], SIGNAL(activated(int)), mixer, SLOT(readSetFromHW())); + m_sns[i] = new TQSocketNotifier(m_fds[i].fd, TQSocketNotifier::Read); + mixer->connect(m_sns[i], TQT_SIGNAL(activated(int)), mixer, TQT_SLOT(readSetFromHW())); } } @@ -798,7 +798,7 @@ Mixer_ALSA::writeVolumeToHW( int devnum, Volume& volume ) QString Mixer_ALSA::errorText( int mixer_error ) { - QString l_s_errmsg; + TQString l_s_errmsg; switch ( mixer_error ) { case Mixer::ERR_PERM: diff --git a/kmix/mixer_backend.cpp b/kmix/mixer_backend.cpp index 0ad262b7..4f15a564 100644 --- a/kmix/mixer_backend.cpp +++ b/kmix/mixer_backend.cpp @@ -97,14 +97,14 @@ unsigned int Mixer_Backend::enumIdHW(int) { void Mixer_Backend::errormsg(int mixer_error) { - QString l_s_errText; + TQString l_s_errText; l_s_errText = errorText(mixer_error); kdError() << l_s_errText << "\n"; } -QString Mixer_Backend::errorText(int mixer_error) +TQString Mixer_Backend::errorText(int mixer_error) { - QString l_s_errmsg; + TQString l_s_errmsg; switch (mixer_error) { case Mixer::ERR_PERM: diff --git a/kmix/mixer_backend.h b/kmix/mixer_backend.h index f9823a78..d5a9ed18 100644 --- a/kmix/mixer_backend.h +++ b/kmix/mixer_backend.h @@ -80,7 +80,7 @@ protected: * Subclasses can override this method to produce platform * specific error descriptions. */ - virtual QString errorText(int mixer_error); + virtual TQString errorText(int mixer_error); /// Prints out a translated error text for the given error number on stderr void errormsg(int mixer_error); @@ -88,7 +88,7 @@ protected: int m_devnum; /// User friendly name of the Mixer (e.g. "IRIX Audio Mixer"). If your mixer API /// gives you a usable name, use that name. - QString m_mixerName; + TQString m_mixerName; // All mix devices of this phyisical device. MixSet m_mixDevices; diff --git a/kmix/mixer_hpux.cpp b/kmix/mixer_hpux.cpp index 3a4dbe5b..20ef91f3 100644 --- a/kmix/mixer_hpux.cpp +++ b/kmix/mixer_hpux.cpp @@ -225,9 +225,9 @@ printf("WRITE - Devnum: %d, Left: %d, Right: %d\n", devnum, vl, vr); } -QString Mixer_HPUX::errorText(int mixer_error) +TQString Mixer_HPUX::errorText(int mixer_error) { - QString l_s_errmsg; + TQString l_s_errmsg; if (mixer_error >= HPUX_ERROR_OFFSET) { char errorstr[200]; AGetErrorText(audio, (AError) (mixer_error-HPUX_ERROR_OFFSET), @@ -251,7 +251,7 @@ QString Mixer_HPUX::errorText(int mixer_error) return l_s_errmsg; } -QString HPUX_getDriverName() { +TQString HPUX_getDriverName() { return "HPUX"; } diff --git a/kmix/mixer_hpux.h b/kmix/mixer_hpux.h index bdc0d3d7..410758c9 100644 --- a/kmix/mixer_hpux.h +++ b/kmix/mixer_hpux.h @@ -15,7 +15,7 @@ public: Mixer_HPUX(int devnum); virtual ~Mixer_HPUX(); - virtual QString errorText(int mixer_error); + virtual TQString errorText(int mixer_error); virtual int readVolumeFromHW( int devnum, Volume &vol ); virtual int writeVolumeToHW( int devnum, Volume &vol ); diff --git a/kmix/mixer_irix.cpp b/kmix/mixer_irix.cpp index 1ba89c8a..eb407567 100644 --- a/kmix/mixer_irix.cpp +++ b/kmix/mixer_irix.cpp @@ -127,7 +127,7 @@ int Mixer_IRIX::writeVolumeToHW( int devnum, int volLeft, int volRight ) return 0; } -QString IRIX_getDriverName() { +TQString IRIX_getDriverName() { return "IRIX"; } diff --git a/kmix/mixer_none.cpp b/kmix/mixer_none.cpp index 94dddbc8..c1986522 100644 --- a/kmix/mixer_none.cpp +++ b/kmix/mixer_none.cpp @@ -72,7 +72,7 @@ bool Mixer_None::isRecsrcHW( int devnum ) return false; } -QString NONE_getDriverName() { +TQString NONE_getDriverName() { return "None"; } diff --git a/kmix/mixer_oss.cpp b/kmix/mixer_oss.cpp index c39c05b1..7fcfb38e 100644 --- a/kmix/mixer_oss.cpp +++ b/kmix/mixer_oss.cpp @@ -174,37 +174,37 @@ int Mixer_OSS::close() } -QString Mixer_OSS::deviceName(int devnum) +TQString Mixer_OSS::deviceName(int devnum) { switch (devnum) { case 0: - return QString("/dev/mixer"); + return TQString("/dev/mixer"); break; default: - QString devname("/dev/mixer"); + TQString devname("/dev/mixer"); devname += ('0'+devnum); return devname; } } -QString Mixer_OSS::deviceNameDevfs(int devnum) +TQString Mixer_OSS::deviceNameDevfs(int devnum) { switch (devnum) { case 0: - return QString("/dev/sound/mixer"); + return TQString("/dev/sound/mixer"); break; default: - QString devname("/dev/sound/mixer"); + TQString devname("/dev/sound/mixer"); devname += ('0'+devnum); return devname; } } -QString Mixer_OSS::errorText(int mixer_error) +TQString Mixer_OSS::errorText(int mixer_error) { - QString l_s_errmsg; + TQString l_s_errmsg; switch (mixer_error) { case Mixer::ERR_PERM: @@ -324,7 +324,7 @@ int Mixer_OSS::writeVolumeToHW( int devnum, Volume &vol ) return 0; } -QString OSS_getDriverName() { +TQString OSS_getDriverName() { return "OSS"; } diff --git a/kmix/mixer_oss.h b/kmix/mixer_oss.h index 592802ea..7bedf7f5 100644 --- a/kmix/mixer_oss.h +++ b/kmix/mixer_oss.h @@ -3,7 +3,7 @@ #ifndef MIXER_OSS_H #define MIXER_OSS_H -#include <qstring.h> +#include <tqstring.h> #include "mixer_backend.h" @@ -13,7 +13,7 @@ public: Mixer_OSS(int device = -1); virtual ~Mixer_OSS(); - virtual QString errorText(int mixer_error); + virtual TQString errorText(int mixer_error); virtual int readVolumeFromHW( int devnum, Volume &vol ); virtual int writeVolumeToHW( int devnum, Volume &vol ); @@ -24,10 +24,10 @@ protected: virtual int open(); virtual int close(); - virtual QString deviceName( int ); - virtual QString deviceNameDevfs( int ); + virtual TQString deviceName( int ); + virtual TQString deviceNameDevfs( int ); int m_fd; - QString m_deviceName; + TQString m_deviceName; }; #endif diff --git a/kmix/mixer_oss4.cpp b/kmix/mixer_oss4.cpp index ff1525b3..01b167aa 100644 --- a/kmix/mixer_oss4.cpp +++ b/kmix/mixer_oss4.cpp @@ -29,7 +29,7 @@ #include <sys/types.h> #include <sys/stat.h> -#include <qregexp.h> +#include <tqregexp.h> #include <kdebug.h> // Since we're guaranteed an OSS setup here, let's make life easier @@ -72,10 +72,10 @@ bool Mixer_OSS4::isRecsrcHW(int ctrlnum) } //classifies mixexts according to their name, last classification wins -MixDevice::ChannelType Mixer_OSS4::classifyAndRename(QString &name, int flags) +MixDevice::ChannelType Mixer_OSS4::classifyAndRename(TQString &name, int flags) { MixDevice::ChannelType cType = MixDevice::UNKNOWN; - QStringList classes = QStringList::split ( QRegExp ( "[-,.]" ), name ); + TQStringList classes = TQStringList::split ( TQRegExp ( "[-,.]" ), name ); if ( flags & MIXF_PCMVOL || @@ -85,7 +85,7 @@ MixDevice::ChannelType Mixer_OSS4::classifyAndRename(QString &name, int flags) cType = MixDevice::VOLUME; } - for ( QStringList::Iterator it = classes.begin(); it != classes.end(); ++it ) + for ( TQStringList::Iterator it = classes.begin(); it != classes.end(); ++it ) { if ( *it == "line" ) { @@ -143,13 +143,13 @@ MixDevice::ChannelType Mixer_OSS4::classifyAndRename(QString &name, int flags) } else if ( (*it).endsWith("vol") ) { - QChar &ref = (*it).ref(0); + TQChar &ref = (*it).ref(0); ref = ref.upper(); cType = MixDevice::VOLUME; } else { - QChar &ref = (*it).ref(0); + TQChar &ref = (*it).ref(0); ref = ref.upper(); } } @@ -224,7 +224,7 @@ int Mixer_OSS4::open() return 0; } - QString name = ext.extname; + TQString name = ext.extname; //skip vmix volume controls and mute controls if ( (name.find("vmix") > -1 && name.find( "pcm") > -1) || @@ -318,8 +318,8 @@ int Mixer_OSS4::open() name, MixDevice::UNKNOWN, MixDevice::ENUM); - QPtrList<QString> &enumValuesRef = md->enumValues(); - QString thisElement; + TQPtrList<TQString> &enumValuesRef = md->enumValues(); + TQString thisElement; for ( int i = 0; i < ei.nvalues; i++ ) { @@ -327,9 +327,9 @@ int Mixer_OSS4::open() if ( thisElement.isEmpty() ) { - thisElement = QString::number(i); + thisElement = TQString::number(i); } - enumValuesRef.append( new QString(thisElement) ); + enumValuesRef.append( new TQString(thisElement) ); } m_mixDevices.append(md); } @@ -354,9 +354,9 @@ int Mixer_OSS4::close() return l_i_ret; } -QString Mixer_OSS4::errorText(int mixer_error) +TQString Mixer_OSS4::errorText(int mixer_error) { - QString l_s_errmsg; + TQString l_s_errmsg; switch( mixer_error ) { @@ -663,7 +663,7 @@ int Mixer_OSS4::wrapIoctl(int ioctlRet) } -QString OSS4_getDriverName() +TQString OSS4_getDriverName() { return "OSS4"; } diff --git a/kmix/mixer_oss4.h b/kmix/mixer_oss4.h index 07a927d0..40f14785 100644 --- a/kmix/mixer_oss4.h +++ b/kmix/mixer_oss4.h @@ -3,7 +3,7 @@ #ifndef MIXER_OSS4_H #define MIXER_OSS4_H -#include <qstring.h> +#include <tqstring.h> #include "mixer_backend.h" #include <sys/soundcard.h> @@ -14,7 +14,7 @@ public: Mixer_OSS4(int device = -1); virtual ~Mixer_OSS4(); - virtual QString errorText(int mixer_error); + virtual TQString errorText(int mixer_error); virtual int readVolumeFromHW( int ctrlnum, Volume &vol ); virtual int writeVolumeToHW( int ctrlnum, Volume &vol ); virtual void setEnumIdHW(int ctrlnum, unsigned int idx); @@ -24,7 +24,7 @@ public: protected: - MixDevice::ChannelType classifyAndRename(QString &name, int flags); + MixDevice::ChannelType classifyAndRename(TQString &name, int flags); int wrapIoctl(int ioctlRet); @@ -37,6 +37,6 @@ protected: int m_fd; int m_numExtensions; int m_numMixers; - QString m_deviceName; + TQString m_deviceName; }; #endif diff --git a/kmix/mixer_sun.cpp b/kmix/mixer_sun.cpp index 4b90f4fd..12806bda 100644 --- a/kmix/mixer_sun.cpp +++ b/kmix/mixer_sun.cpp @@ -105,7 +105,7 @@ const uint_t MixerSunPortMasks[] = //====================================================================== -// FUNCTION/METHOD DEFINITIONS +// FUNCTION/TQT_METHOD DEFINITIONS //====================================================================== @@ -155,7 +155,7 @@ int Mixer_SUN::open() // // Open the mixer hardware driver // - QCString audiodev(getenv("AUDIODEV")); + TQCString audiodev(getenv("AUDIODEV")); if(audiodev.isNull()) audiodev = "/dev/audio"; audiodev += "ctl"; @@ -179,7 +179,7 @@ int Mixer_SUN::open() Volume vol( 2, AUDIO_MAX_GAIN ); readVolumeFromHW( idx, vol ); MixDevice* md = new MixDevice( idx, vol, false, true, - QString(MixerDevNames[idx]), MixerChannelTypes[idx]); + TQString(MixerDevNames[idx]), MixerChannelTypes[idx]); md->setRecSource( isRecsrcHW( idx ) ); m_mixDevices.append( md ); } @@ -218,9 +218,9 @@ int Mixer_SUN::close() // FUNCTION : Mixer::errorText // DESCRIPTION : Convert an error code enum to a text string. //====================================================================== -QString Mixer_SUN::errorText( int mixer_error ) +TQString Mixer_SUN::errorText( int mixer_error ) { - QString errmsg; + TQString errmsg; switch (mixer_error) { case Mixer::ERR_PERM: @@ -467,7 +467,7 @@ void Mixer_SUN::GainBalanceToVolume( uint_t& gain, uchar_t& balance, Volume& vol } } -QString SUN_getDriverName() { +TQString SUN_getDriverName() { return "SUNAudio"; } diff --git a/kmix/mixer_sun.h b/kmix/mixer_sun.h index 32b85cbe..f9380fe1 100644 --- a/kmix/mixer_sun.h +++ b/kmix/mixer_sun.h @@ -23,7 +23,7 @@ #ifndef MIXER_SUN_H #define MIXER_SUN_H -#include <qstring.h> +#include <tqstring.h> #include "mixer_backend.h" @@ -33,7 +33,7 @@ public: Mixer_SUN(int devnum); virtual ~Mixer_SUN(); - virtual QString errorText(int mixer_error); + virtual TQString errorText(int mixer_error); virtual int readVolumeFromHW( int devnum, Volume& volume ); virtual int writeVolumeToHW( int devnum, Volume& volume ); bool setRecsrcHW( int devnum, bool on ); diff --git a/kmix/mixertoolbox.cpp b/kmix/mixertoolbox.cpp index 38b404ac..857f8d79 100644 --- a/kmix/mixertoolbox.cpp +++ b/kmix/mixertoolbox.cpp @@ -20,8 +20,8 @@ */ -#include "qwidget.h" -#include "qstring.h" +#include "tqwidget.h" +#include "tqstring.h" //#include <kdebug.h> #include <klocale.h> @@ -49,23 +49,23 @@ * 'true' means to scan all backends. 'false' means: After scanning the * current backend the next backend is only scanned if no Mixers were found yet. */ -void MixerToolBox::initMixer(QPtrList<Mixer> &mixers, bool multiDriverMode, QString& ref_hwInfoString) +void MixerToolBox::initMixer(TQPtrList<Mixer> &mixers, bool multiDriverMode, TQString& ref_hwInfoString) { //kdDebug(67100) << "IN MixerToolBox::initMixer()"<<endl; // Find all mixers and initalize them - QMap<QString,int> mixerNums; + TQMap<TQString,int> mixerNums; int drvNum = Mixer::numDrivers(); int driverWithMixer = -1; bool multipleDriversActive = false; - QString driverInfo = ""; - QString driverInfoUsed = ""; + TQString driverInfo = ""; + TQString driverInfoUsed = ""; for( int drv1=0; drv1<drvNum; drv1++ ) { - QString driverName = Mixer::driverName(drv1); + TQString driverName = Mixer::driverName(drv1); if ( driverInfo.length() > 0 ) driverInfo += " + "; driverInfo += driverName; @@ -86,7 +86,7 @@ void MixerToolBox::initMixer(QPtrList<Mixer> &mixers, bool multiDriverMode, QStr bool autodetectionFinished = false; for( int drv=0; drv<drvNum; drv++ ) { - QString driverName = Mixer::driverName(drv); + TQString driverName = Mixer::driverName(drv); if ( autodetectionFinished ) { // sane exit from loop @@ -130,9 +130,9 @@ void MixerToolBox::initMixer(QPtrList<Mixer> &mixers, bool multiDriverMode, QStr * %2, the mixer name, is typically coming from an OS driver. It could contain colons. * %3, the mixer number, is a number: it does not contain colons. */ - QString mixerName = mixer->mixerName(); + TQString mixerName = mixer->mixerName(); mixerName.replace(":","_"); - QString primaryKeyOfMixer = QString("%1::%2:%3") + TQString primaryKeyOfMixer = TQString("%1::%2:%3") .arg(driverName) .arg(mixerName) .arg(mixerNums[mixer->mixerName()]); @@ -170,7 +170,7 @@ void MixerToolBox::initMixer(QPtrList<Mixer> &mixers, bool multiDriverMode, QStr if ( !drvInfoAppended ) { drvInfoAppended = true; - QString driverName = Mixer::driverName(drv); + TQString driverName = Mixer::driverName(drv); if ( drv!= 0 && mixers.count() > 0) { driverInfoUsed += " + "; } diff --git a/kmix/mixertoolbox.h b/kmix/mixertoolbox.h index 1af4f22c..884471ef 100644 --- a/kmix/mixertoolbox.h +++ b/kmix/mixertoolbox.h @@ -1,8 +1,8 @@ #ifndef MIXERTOOLBOX_H #define MIXERTOOLBOX_H -#include <qptrlist.h> -#include <qstring.h> +#include <tqptrlist.h> +#include <tqstring.h> class Mixer; @@ -14,7 +14,7 @@ class Mixer; */ class MixerToolBox { public: - static void initMixer(QPtrList<Mixer>&, bool, QString&); + static void initMixer(TQPtrList<Mixer>&, bool, TQString&); static void deinitMixer(); }; diff --git a/kmix/mixset.cpp b/kmix/mixset.cpp index 8d3273cb..63f87c84 100644 --- a/kmix/mixset.cpp +++ b/kmix/mixset.cpp @@ -20,7 +20,7 @@ */ -#include <qstring.h> +#include <tqstring.h> #include <kdebug.h> #include <kconfig.h> @@ -38,7 +38,7 @@ void MixSet::clone( MixSet &set ) } } -void MixSet::read( KConfig *config, const QString& grp ) +void MixSet::read( KConfig *config, const TQString& grp ) { kdDebug(67100) << "MixSet::read() of group " << grp << endl; config->setGroup(grp); @@ -51,7 +51,7 @@ void MixSet::read( KConfig *config, const QString& grp ) } } -void MixSet::write( KConfig *config, const QString& grp ) +void MixSet::write( KConfig *config, const TQString& grp ) { kdDebug(67100) << "MixSet::write() of group " << grp << endl; config->setGroup(grp); @@ -64,7 +64,7 @@ void MixSet::write( KConfig *config, const QString& grp ) } } -void MixSet::setName( const QString &name ) +void MixSet::setName( const TQString &name ) { m_name = name; } diff --git a/kmix/mixset.h b/kmix/mixset.h index 24448883..f66692b2 100644 --- a/kmix/mixset.h +++ b/kmix/mixset.h @@ -3,19 +3,19 @@ #include "mixdevice.h" -class MixSet : public QPtrList<MixDevice> +class MixSet : public TQPtrList<MixDevice> { public: - void read( KConfig *config, const QString& grp ); - void write( KConfig *config, const QString& grp ); + void read( KConfig *config, const TQString& grp ); + void write( KConfig *config, const TQString& grp ); void clone( MixSet &orig ); - QString name() { return m_name; }; - void setName( const QString &name ); + TQString name() { return m_name; }; + void setName( const TQString &name ); private: - QString m_name; + TQString m_name; }; #endif diff --git a/kmix/verticaltext.cpp b/kmix/verticaltext.cpp index e6c0e42d..77bda1af 100644 --- a/kmix/verticaltext.cpp +++ b/kmix/verticaltext.cpp @@ -20,11 +20,11 @@ */ #include "verticaltext.h" -#include <qpainter.h> +#include <tqpainter.h> #include <kdebug.h> -VerticalText::VerticalText(QWidget * parent, const char * name, WFlags f) : QWidget(parent,name,f) +VerticalText::VerticalText(TQWidget * parent, const char * name, WFlags f) : TQWidget(parent,name,f) { resize(20,100 /*parent->height() */ ); setMinimumSize(20,10); // neccesary for smooth integration into layouts (we only care for the widths). @@ -34,24 +34,24 @@ VerticalText::~VerticalText() { } -void VerticalText::paintEvent ( QPaintEvent * /*event*/ ) { +void VerticalText::paintEvent ( TQPaintEvent * /*event*/ ) { //kdDebug(67100) << "paintEvent(). height()=" << height() << "\n"; - QPainter paint(this); + TQPainter paint(this); paint.rotate(270); paint.translate(0,-4); // Silly "solution" to make underlengths work // Fix for bug 72520 //- paint.drawText(-height()+2,width(),name()); - //+ paint.drawText( -height()+2, width(), QString::fromUtf8(name()) ); - paint.drawText( -height()+2, width(), QString::fromUtf8(name()) ); + //+ paint.drawText( -height()+2, width(), TQString::fromUtf8(name()) ); + paint.drawText( -height()+2, width(), TQString::fromUtf8(name()) ); } -QSize VerticalText::sizeHint() const { - return QSize(20,100); // !! UGLY. Should be reworked +TQSize VerticalText::sizeHint() const { + return TQSize(20,100); // !! UGLY. Should be reworked } -QSizePolicy VerticalText::sizePolicy () const +TQSizePolicy VerticalText::sizePolicy () const { - return QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred); + return TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred); } diff --git a/kmix/verticaltext.h b/kmix/verticaltext.h index 7b1c07e0..f68df4f4 100644 --- a/kmix/verticaltext.h +++ b/kmix/verticaltext.h @@ -1,19 +1,19 @@ #ifndef VerticalText_h #define VerticalText_h -#include <qwidget.h> +#include <tqwidget.h> class VerticalText : public QWidget { public: - VerticalText(QWidget * parent, const char * name, WFlags f = 0); + VerticalText(TQWidget * parent, const char * name, WFlags f = 0); ~VerticalText(); - QSize sizeHint() const; - QSizePolicy sizePolicy () const; + TQSize sizeHint() const; + TQSizePolicy sizePolicy () const; protected: - void paintEvent ( QPaintEvent * event ); + void paintEvent ( TQPaintEvent * event ); }; #endif diff --git a/kmix/viewapplet.cpp b/kmix/viewapplet.cpp index c4edbfb0..3948e60e 100644 --- a/kmix/viewapplet.cpp +++ b/kmix/viewapplet.cpp @@ -21,9 +21,9 @@ #include "viewapplet.h" // Qt -#include <qwidget.h> -#include <qlayout.h> -#include <qsize.h> +#include <tqwidget.h> +#include <tqlayout.h> +#include <tqsize.h> // KDE #include <kactioncollection.h> @@ -36,13 +36,13 @@ #include "mdwslider.h" #include "mixer.h" -ViewApplet::ViewApplet(QWidget* parent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KPanelApplet::Position position ) - : ViewBase(parent, name, QString::null, mixer, WStyle_Customize|WStyle_NoBorder, vflags) +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) { setBackgroundOrigin(AncestorOrigin); // remove the menu bar action, that is put by the "ViewBase" constructor in _actions. - //KToggleAction *m = static_cast<KToggleAction*>(KStdAction::showMenubar( this, SLOT(toggleMenuBarSlot()), _actions )); - _actions->remove( KStdAction::showMenubar(this, SLOT(toggleMenuBarSlot()), _actions) ); + //KToggleAction *m = static_cast<KToggleAction*>(KStdAction::showMenubar( this, TQT_SLOT(toggleMenuBarSlot()), _actions )); + _actions->remove( KStdAction::showMenubar(this, TQT_SLOT(toggleMenuBarSlot()), _actions) ); if ( position == KPanelApplet::pLeft || position == KPanelApplet::pRight ) { @@ -55,16 +55,16 @@ ViewApplet::ViewApplet(QWidget* parent, const char* name, Mixer* mixer, ViewBase } if ( _viewOrientation == Qt::Horizontal ) { - _layoutMDW = new QHBoxLayout( this ); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred); + _layoutMDW = new TQHBoxLayout( this ); + setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred); } else { - _layoutMDW = new QVBoxLayout( this ); - setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); + _layoutMDW = new TQVBoxLayout( this ); + setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); } - //_layoutMDW->setResizeMode(QLayout::Fixed); + //_layoutMDW->setResizeMode(TQLayout::Fixed); init(); } @@ -98,7 +98,7 @@ int ViewApplet::advice() { -QWidget* ViewApplet::add(MixDevice *md) +TQWidget* ViewApplet::add(MixDevice *md) { /** Slider orientation is exactly the other way round. If the applet stretches horzontally, @@ -139,25 +139,25 @@ void ViewApplet::constructionFinished() { } -QSize ViewApplet::sizeHint() const { +TQSize ViewApplet::sizeHint() const { // Basically out main layout knows very good what the sizes should be - QSize qsz = _layoutMDW->sizeHint(); + TQSize qsz = _layoutMDW->sizeHint(); //kdDebug(67100) << "ViewApplet::sizeHint(): NewSize is " << qsz << "\n"; return qsz; } -QSizePolicy ViewApplet::sizePolicy() const { +TQSizePolicy ViewApplet::sizePolicy() const { if ( _viewOrientation == Qt::Horizontal ) { //kdDebug(67100) << "ViewApplet::sizePolicy=(Fixed,Expanding)\n"; - return QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding); + return TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding); } else { //kdDebug(67100) << "ViewApplet::sizePolicy=(Expanding,Fixed)\n"; - return QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); + return TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed); } } -bool ViewApplet::shouldShowIcons(QSize qsz) { +bool ViewApplet::shouldShowIcons(TQSize qsz) { bool showIcons = false; if ( _viewOrientation == Qt::Horizontal ) { if ( qsz.height() >= 32 ) { @@ -174,13 +174,13 @@ bool ViewApplet::shouldShowIcons(QSize qsz) { return showIcons; } -void ViewApplet::resizeEvent(QResizeEvent *qre) +void ViewApplet::resizeEvent(TQResizeEvent *qre) { //kdDebug(67100) << "ViewApplet::resizeEvent() size=" << qre->size() << "\n"; // decide whether we have to show or hide all icons bool showIcons = shouldShowIcons(qre->size()); - for ( QWidget *mdw = _mdws.first(); mdw != 0; mdw = _mdws.next() ) { + for ( TQWidget *mdw = _mdws.first(); mdw != 0; mdw = _mdws.next() ) { if ( mdw == 0 ) { kdError(67100) << "ViewApplet::resizeEvent(): mdw == 0\n"; break; // sanity check (normally the lists are set up correctly) @@ -194,7 +194,7 @@ void ViewApplet::resizeEvent(QResizeEvent *qre) } } // kdDebug(67100) << "ViewApplet::resizeEvent(). SHOULD resize _layoutMDW to " << qre->size() << endl; - //QWidget::resizeEvent(qre); + //TQWidget::resizeEvent(qre); // resizing changes our own sizeHint(), because we must take the new PanelSize in account. // So updateGeometry() is amust for us. @@ -205,7 +205,7 @@ void ViewApplet::resizeEvent(QResizeEvent *qre) void ViewApplet::refreshVolumeLevels() { //kdDebug(67100) << "ViewApplet::refreshVolumeLevels()\n"; - QWidget *mdw = _mdws.first(); + TQWidget *mdw = _mdws.first(); MixDevice* md; for ( md = _mixSet->first(); md != 0; md = _mixSet->next() ) { if ( mdw == 0 ) { diff --git a/kmix/viewapplet.h b/kmix/viewapplet.h index a03d90e2..7fd35b31 100644 --- a/kmix/viewapplet.h +++ b/kmix/viewapplet.h @@ -14,19 +14,19 @@ class ViewApplet : public ViewBase { Q_OBJECT public: - ViewApplet(QWidget* parent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KPanelApplet::Position pos); + ViewApplet(TQWidget* parent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KPanelApplet::Position pos); ~ViewApplet(); virtual int count(); virtual int advice(); virtual void setMixSet(MixSet *mixset); - virtual QWidget* add(MixDevice *mdw); + virtual TQWidget* add(MixDevice *mdw); virtual void constructionFinished(); virtual void configurationUpdate(); - QSize sizeHint() const; - QSizePolicy sizePolicy() const; - virtual void resizeEvent(QResizeEvent*); + TQSize sizeHint() const; + TQSizePolicy sizePolicy() const; + virtual void resizeEvent(TQResizeEvent*); signals: void appletContentChanged(); @@ -35,8 +35,8 @@ public slots: virtual void refreshVolumeLevels(); private: - bool shouldShowIcons(QSize); - QBoxLayout* _layoutMDW; + bool shouldShowIcons(TQSize); + TQBoxLayout* _layoutMDW; // Position of the applet (pLeft, pRight, pTop, pBottom) //KPanelApplet::Position _KMIXposition; // Orientation of the applet (horizontal or vertical) diff --git a/kmix/viewbase.cpp b/kmix/viewbase.cpp index 97816534..5d23860d 100644 --- a/kmix/viewbase.cpp +++ b/kmix/viewbase.cpp @@ -22,8 +22,8 @@ #include "viewbase.h" // QT -#include <qlabel.h> -#include <qcursor.h> +#include <tqlabel.h> +#include <tqcursor.h> // KDE #include <kaction.h> @@ -37,8 +37,8 @@ #include "mixer.h" -ViewBase::ViewBase(QWidget* parent, const char* name, const QString & caption, Mixer* mixer, WFlags f, ViewBase::ViewFlags vflags) - : QWidget(parent, name, f), _vflags(vflags), _caption(caption) +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) { _mixer = mixer; _mixSet = new MixSet(); @@ -51,7 +51,7 @@ ViewBase::ViewBase(QWidget* parent, const char* name, const QString & caption, M // 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, SLOT(toggleMenuBarSlot()), _actions )); + KToggleAction *m = static_cast<KToggleAction*>(KStdAction::showMenubar( this, TQT_SLOT(toggleMenuBarSlot()), _actions )); if ( vflags & ViewBase::MenuBarVisible ) { m->setChecked(true); } @@ -59,8 +59,8 @@ ViewBase::ViewBase(QWidget* parent, const char* name, const QString & caption, M m->setChecked(false); } } - new KAction(i18n("&Channels"), 0, this, SLOT(configureView()), _actions, "toggle_channels"); - connect ( _mixer, SIGNAL(newVolumeLevels()), this, SLOT(refreshVolumeLevels()) ); + new KAction(i18n("&Channels"), 0, this, TQT_SLOT(configureView()), _actions, "toggle_channels"); + connect ( _mixer, TQT_SIGNAL(newVolumeLevels()), this, TQT_SLOT(refreshVolumeLevels()) ); } ViewBase::~ViewBase() { @@ -80,8 +80,8 @@ void ViewBase::setMixSet(MixSet *) /** * Dummy implementation for add(). */ -QWidget* ViewBase::add(MixDevice* mdw) { - QWidget* label = new QLabel( mdw->name(), this, mdw->name().latin1()); +TQWidget* ViewBase::add(MixDevice* mdw) { + TQWidget* label = new TQLabel( mdw->name(), this, mdw->name().latin1()); label->move(0, mdw->num()*12); return label; } @@ -102,7 +102,7 @@ void ViewBase::createDeviceWidgets() MixDevice *mixDevice; for ( mixDevice = _mixSet->first(); mixDevice != 0; mixDevice = _mixSet->next()) { - QWidget* mdw = add(mixDevice); + TQWidget* mdw = add(mixDevice); _mdws.append(mdw); } // allow view to "polish" itself @@ -110,7 +110,7 @@ void ViewBase::createDeviceWidgets() } // ---------- Popup stuff START --------------------- -void ViewBase::mousePressEvent( QMouseEvent *e ) +void ViewBase::mousePressEvent( TQMouseEvent *e ) { if ( e->button()==RightButton ) showContextMenu(); @@ -151,7 +151,7 @@ void ViewBase::showContextMenu() //kdDebug(67100) << "ViewBase::showContextMenu()" << endl; popupReset(); - QPoint pos = QCursor::pos(); + TQPoint pos = TQCursor::pos(); _popMenu->popup( pos ); } diff --git a/kmix/viewbase.h b/kmix/viewbase.h index 50d92b10..581ac39e 100644 --- a/kmix/viewbase.h +++ b/kmix/viewbase.h @@ -2,7 +2,7 @@ #define ViewBase_h // QT -#include "qwidget.h" +#include "tqwidget.h" // KDE class KActionCollection; @@ -31,7 +31,7 @@ public: Experimental_GridView = 0x2000 }; - ViewBase(QWidget* parent, const char* name, const QString & caption, Mixer* mixer, WFlags=0, ViewFlags vflags=0); + ViewBase(TQWidget* parent, 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. @@ -72,7 +72,7 @@ public: * Creates a suitable representation for the given MixDevice. * The default implementation creates a label */ - virtual QWidget* add(MixDevice *); + virtual TQWidget* add(MixDevice *); /** * Popup stuff @@ -89,9 +89,9 @@ public: * Hint: The new ViewSurround class shows that a 1:1 relationship does not work in a general scenario. * I actually DID expect this. The solution is unclear yet, probably there will be a virtual mapper method. */ - QPtrList<QWidget> _mdws; // this obsoletes the former Channel class + TQPtrList<TQWidget> _mdws; // this obsoletes the former Channel class - QString caption() const { return _caption; } + TQString caption() const { return _caption; } protected: void init(); @@ -108,13 +108,13 @@ public slots: void toggleMenuBarSlot(); protected slots: - void mousePressEvent( QMouseEvent *e ); + void mousePressEvent( TQMouseEvent *e ); signals: void toggleMenuBar(); private: - QString _caption; + TQString _caption; }; #endif diff --git a/kmix/viewdockareapopup.cpp b/kmix/viewdockareapopup.cpp index 0063313f..60289aad 100644 --- a/kmix/viewdockareapopup.cpp +++ b/kmix/viewdockareapopup.cpp @@ -22,12 +22,12 @@ #include "viewdockareapopup.h" // Qt -#include <qwidget.h> -#include <qevent.h> -#include <qlayout.h> -#include <qframe.h> -#include <qpushbutton.h> -#include <qdatetime.h> +#include <tqwidget.h> +#include <tqevent.h> +#include <tqlayout.h> +#include <tqframe.h> +#include <tqpushbutton.h> +#include <tqdatetime.h> // KDE #include <kdebug.h> @@ -43,18 +43,18 @@ // !! Do NOT remove or mask 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(QWidget* parent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KMixDockWidget *dockW ) - : ViewBase(parent, name, QString::null, mixer, WStyle_Customize | WType_Popup | Qt::WStyle_DialogBorder, vflags), _mdw(0), _dock(dockW) +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) { - QBoxLayout *layout = new QHBoxLayout( this ); - _frame = new QFrame( this ); + TQBoxLayout *layout = new TQHBoxLayout( this ); + _frame = new TQFrame( this ); layout->addWidget( _frame ); - _frame->setFrameStyle( QFrame::PopupPanel | QFrame::Raised ); + _frame->setFrameStyle( TQFrame::PopupPanel | TQFrame::Raised ); _frame->setLineWidth( 1 ); - _layoutMDW = new QGridLayout( _frame, 1, 1, 2, 1, "KmixPopupLayout" ); - _hideTimer = new QTime(); + _layoutMDW = new TQGridLayout( _frame, 1, 1, 2, 1, "KmixPopupLayout" ); + _hideTimer = new TQTime(); init(); } @@ -63,7 +63,7 @@ ViewDockAreaPopup::~ViewDockAreaPopup() { -void ViewDockAreaPopup::mousePressEvent(QMouseEvent *) +void ViewDockAreaPopup::mousePressEvent(TQMouseEvent *) { // kdDebug() << "Teste pres mouse" << endl; /** @@ -71,7 +71,7 @@ void ViewDockAreaPopup::mousePressEvent(QMouseEvent *) 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 - properly take care of it in QWidget. + properly take care of it in TQWidget. */ if ( ! this->hasMouse() ) { _hideTimer->start(); @@ -85,10 +85,10 @@ bool ViewDockAreaPopup::justHidden() return _hideTimer->elapsed() < 300; } -void ViewDockAreaPopup::wheelEvent ( QWheelEvent * e ) { +void ViewDockAreaPopup::wheelEvent ( TQWheelEvent * e ) { // Pass wheel event from "border widget" to child if ( _mdw != 0 ) { - QApplication::sendEvent( _mdw, e); + TQApplication::sendEvent( _mdw, e); } } @@ -118,7 +118,7 @@ void ViewDockAreaPopup::setMixSet(MixSet *) _mixSet->append(_dockDevice); } -QWidget* ViewDockAreaPopup::add(MixDevice *md) +TQWidget* ViewDockAreaPopup::add(MixDevice *md) { _mdw = new MDWSlider( @@ -131,13 +131,13 @@ QWidget* ViewDockAreaPopup::add(MixDevice *md) _frame, // parent 0, // Is "NULL", so that there is no RMB-popup _dockDevice->name().latin1() ); - _layoutMDW->addItem( new QSpacerItem( 5, 20 ), 0, 2 ); - _layoutMDW->addItem( new QSpacerItem( 5, 20 ), 0, 0 ); + _layoutMDW->addItem( new TQSpacerItem( 5, 20 ), 0, 2 ); + _layoutMDW->addItem( new TQSpacerItem( 5, 20 ), 0, 0 ); _layoutMDW->addWidget( _mdw, 0, 1 ); // Add button to show main panel - _showPanelBox = new QPushButton( i18n("Mixer"), _frame, "MixerPanel" ); - connect ( _showPanelBox, SIGNAL( clicked() ), SLOT( showPanelSlot() ) ); + _showPanelBox = new TQPushButton( i18n("Mixer"), _frame, "MixerPanel" ); + connect ( _showPanelBox, TQT_SIGNAL( clicked() ), TQT_SLOT( showPanelSlot() ) ); _layoutMDW->addMultiCellWidget( _showPanelBox, 1, 1, 0, 2 ); return _mdw; @@ -163,7 +163,7 @@ int ViewDockAreaPopup::advice() { } } -QSize ViewDockAreaPopup::sizeHint() const { +TQSize ViewDockAreaPopup::sizeHint() const { // kdDebug(67100) << "ViewDockAreaPopup::sizeHint(): NewSize is " << _mdw->sizeHint() << "\n"; return( _mdw->sizeHint() ); } @@ -181,7 +181,7 @@ void ViewDockAreaPopup::constructionFinished() { void ViewDockAreaPopup::refreshVolumeLevels() { // kdDebug(67100) << "ViewDockAreaPopup::refreshVolumeLevels()\n"; - QWidget* mdw = _mdws.first(); + TQWidget* mdw = _mdws.first(); if ( mdw == 0 ) { kdError(67100) << "ViewDockAreaPopup::refreshVolumeLevels(): mdw == 0\n"; // sanity check (normally the lists are set up correctly) diff --git a/kmix/viewdockareapopup.h b/kmix/viewdockareapopup.h index 4205e831..1ba283f9 100644 --- a/kmix/viewdockareapopup.h +++ b/kmix/viewdockareapopup.h @@ -19,34 +19,34 @@ class ViewDockAreaPopup : public ViewBase { Q_OBJECT public: - ViewDockAreaPopup(QWidget* parent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KMixDockWidget *dockW); + ViewDockAreaPopup(TQWidget* parent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KMixDockWidget *dockW); ~ViewDockAreaPopup(); MixDevice* dockDevice(); virtual int count(); virtual int advice(); virtual void setMixSet(MixSet *mixset); - virtual QWidget* add(MixDevice *mdw); + virtual TQWidget* add(MixDevice *mdw); virtual void constructionFinished(); virtual void refreshVolumeLevels(); virtual void showContextMenu(); - QSize sizeHint() const; + TQSize sizeHint() const; bool justHidden(); protected: MixDeviceWidget *_mdw; KMixDockWidget *_dock; MixDevice *_dockDevice; - QPushButton *_showPanelBox; + TQPushButton *_showPanelBox; - void mousePressEvent(QMouseEvent *e); - void wheelEvent ( QWheelEvent * e ); + void mousePressEvent(TQMouseEvent *e); + void wheelEvent ( TQWheelEvent * e ); private: - QGridLayout* _layoutMDW; - QFrame *_frame; - QTime *_hideTimer; + TQGridLayout* _layoutMDW; + TQFrame *_frame; + TQTime *_hideTimer; private slots: void showPanelSlot(); diff --git a/kmix/viewgrid.cpp b/kmix/viewgrid.cpp index dd4ede97..59f03906 100644 --- a/kmix/viewgrid.cpp +++ b/kmix/viewgrid.cpp @@ -22,7 +22,7 @@ #include "viewgrid.h" // Qt -#include <qwidget.h> +#include <tqwidget.h> // KDE #include <kdebug.h> @@ -35,17 +35,17 @@ /** */ -ViewGrid::ViewGrid(QWidget* parent, const char* name, const QString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) +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) { m_spacingHorizontal = 5; m_spacingVertical = 5; if ( _vflags & ViewBase::Vertical ) { - //_layoutMDW = new QVBoxLayout(this); + //_layoutMDW = new TQVBoxLayout(this); } else { - //_layoutMDW = new QHBoxLayout(this); + //_layoutMDW = new TQHBoxLayout(this); } init(); } @@ -80,7 +80,7 @@ int ViewGrid::advice() { } } -QWidget* ViewGrid::add(MixDevice *md) +TQWidget* ViewGrid::add(MixDevice *md) { MixDeviceWidget *mdw = 0; if ( md->isEnum() ) { @@ -126,7 +126,7 @@ QWidget* ViewGrid::add(MixDevice *md) return mdw; } -QSize ViewGrid::sizeHint() const { +TQSize ViewGrid::sizeHint() const { // kdDebug(67100) << "ViewGrid::sizeHint(): NewSize is " << _layoutMDW->sizeHint() << "\n"; return( m_sizeHint); } @@ -147,7 +147,7 @@ void ViewGrid::refreshVolumeLevels() { m_testingX = 0; m_testingY = 0; - QWidget *mdw = _mdws.first(); + TQWidget *mdw = _mdws.first(); MixDevice* md; for ( md = _mixSet->first(); md != 0; md = _mixSet->next() ) { if ( mdw == 0 ) { @@ -188,7 +188,7 @@ void ViewGrid::configurationUpdate() { m_testingX = 0; m_testingY = 0; - for (QWidget *qw = _mdws.first(); qw !=0; qw = _mdws.next() ) { + for (TQWidget *qw = _mdws.first(); qw !=0; qw = _mdws.next() ) { if ( qw->inherits("MixDeviceWidget")) { MixDeviceWidget* mdw = static_cast<MixDeviceWidget*>(qw); diff --git a/kmix/viewgrid.h b/kmix/viewgrid.h index f57cdc59..c9440cdf 100644 --- a/kmix/viewgrid.h +++ b/kmix/viewgrid.h @@ -2,7 +2,7 @@ #define ViewGrid_h class QBoxLayout; -#include "qsize.h" +#include "tqsize.h" class QWidget; class Mixer; @@ -12,17 +12,17 @@ class ViewGrid : public ViewBase { Q_OBJECT public: - ViewGrid(QWidget* parent, const char* name, const QString & caption, Mixer* mixer, ViewBase::ViewFlags vflags); + ViewGrid(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags); ~ViewGrid(); virtual int count(); virtual int advice(); virtual void setMixSet(MixSet *mixset); - virtual QWidget* add(MixDevice *mdw); + virtual TQWidget* add(MixDevice *mdw); virtual void configurationUpdate(); virtual void constructionFinished(); - QSize sizeHint() const; + TQSize sizeHint() const; public slots: virtual void refreshVolumeLevels(); @@ -32,7 +32,7 @@ private: unsigned int m_spacingVertical; // m_maxX and m_maxY are the highest coordiantes encountered - QSize m_sizeHint; + TQSize m_sizeHint; unsigned int m_testingX; unsigned int m_testingY; diff --git a/kmix/viewinput.cpp b/kmix/viewinput.cpp index 1e71976d..eeadc61b 100644 --- a/kmix/viewinput.cpp +++ b/kmix/viewinput.cpp @@ -20,16 +20,16 @@ */ #include "viewinput.h" -#include <qwidget.h> +#include <tqwidget.h> #include "mixer.h" #include "mixdevicewidget.h" -ViewInput::ViewInput(QWidget* parent, const char* name, const QString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) +ViewInput::ViewInput(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) : ViewSliders(parent, name, caption, mixer, vflags) { init(); - connect ( _mixer, SIGNAL(newRecsrc()) , this, SLOT(refreshVolumeLevels()) ); // only the input widget has record sources + connect ( _mixer, TQT_SIGNAL(newRecsrc()) , this, TQT_SLOT(refreshVolumeLevels()) ); // only the input widget has record sources } ViewInput::~ViewInput() { diff --git a/kmix/viewinput.h b/kmix/viewinput.h index 1b5d5be8..c8d0f663 100644 --- a/kmix/viewinput.h +++ b/kmix/viewinput.h @@ -9,7 +9,7 @@ class ViewInput : public ViewSliders { Q_OBJECT public: - ViewInput(QWidget* parent, const char* name, const QString & caption, Mixer* mixer, ViewBase::ViewFlags vflags); + ViewInput(TQWidget* parent, 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 0f396fc0..9550b1d1 100644 --- a/kmix/viewoutput.cpp +++ b/kmix/viewoutput.cpp @@ -20,12 +20,12 @@ */ #include "viewoutput.h" -#include <qwidget.h> +#include <tqwidget.h> #include "mixer.h" #include "mixdevicewidget.h" -ViewOutput::ViewOutput(QWidget* parent, const char* name, const QString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) +ViewOutput::ViewOutput(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) : ViewSliders(parent, name, caption, mixer, vflags) { init(); diff --git a/kmix/viewoutput.h b/kmix/viewoutput.h index 439aa7d8..aa297a51 100644 --- a/kmix/viewoutput.h +++ b/kmix/viewoutput.h @@ -9,7 +9,7 @@ class ViewOutput : public ViewSliders { Q_OBJECT public: - ViewOutput(QWidget* parent, const char* name, const QString & caption, Mixer* mixer, ViewBase::ViewFlags vflags); + ViewOutput(TQWidget* parent, 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 87d1eb4f..80142f5c 100644 --- a/kmix/viewsliders.cpp +++ b/kmix/viewsliders.cpp @@ -22,8 +22,8 @@ #include "viewsliders.h" // Qt -#include <qlayout.h> -#include <qwidget.h> +#include <tqlayout.h> +#include <tqwidget.h> // KDE #include <kdebug.h> @@ -37,14 +37,14 @@ * correctly because init() does not get called. * See ViewInput and ViewOutput for "real" implementations. */ -ViewSliders::ViewSliders(QWidget* parent, const char* name, const QString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) +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) { if ( _vflags & ViewBase::Vertical ) { - _layoutMDW = new QVBoxLayout(this); + _layoutMDW = new TQVBoxLayout(this); } else { - _layoutMDW = new QHBoxLayout(this); + _layoutMDW = new TQHBoxLayout(this); } /* * Do not call init(). Call init() only for "end usage" classes. @@ -83,7 +83,7 @@ int ViewSliders::advice() { } } -QWidget* ViewSliders::add(MixDevice *md) +TQWidget* ViewSliders::add(MixDevice *md) { Qt::Orientation orientation = (_vflags & ViewBase::Vertical) ? Qt::Horizontal : Qt::Vertical; MixDeviceWidget *mdw = @@ -102,7 +102,7 @@ QWidget* ViewSliders::add(MixDevice *md) return mdw; } -QSize ViewSliders::sizeHint() const { +TQSize ViewSliders::sizeHint() const { // kdDebug(67100) << "ViewSliders::sizeHint(): NewSize is " << _layoutMDW->sizeHint() << "\n"; return( _layoutMDW->sizeHint() ); } @@ -114,7 +114,7 @@ void ViewSliders::constructionFinished() { void ViewSliders::refreshVolumeLevels() { // kdDebug(67100) << "ViewSliders::refreshVolumeLevels()\n"; - QWidget *mdw = _mdws.first(); + TQWidget *mdw = _mdws.first(); MixDevice* md; for ( md = _mixSet->first(); md != 0; md = _mixSet->next() ) { if ( mdw == 0 ) { diff --git a/kmix/viewsliders.h b/kmix/viewsliders.h index ea108ee3..43877758 100644 --- a/kmix/viewsliders.h +++ b/kmix/viewsliders.h @@ -11,22 +11,22 @@ class ViewSliders : public ViewBase { Q_OBJECT public: - ViewSliders(QWidget* parent, const char* name, const QString & caption, Mixer* mixer, ViewBase::ViewFlags vflags); + ViewSliders(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags); ~ViewSliders(); virtual int count(); virtual int advice(); virtual void setMixSet(MixSet *mixset); - virtual QWidget* add(MixDevice *mdw); + virtual TQWidget* add(MixDevice *mdw); virtual void constructionFinished(); - QSize sizeHint() const; + TQSize sizeHint() const; public slots: virtual void refreshVolumeLevels(); private: - QBoxLayout* _layoutMDW; + TQBoxLayout* _layoutMDW; }; #endif diff --git a/kmix/viewsurround.cpp b/kmix/viewsurround.cpp index 95e63405..02a7aace 100644 --- a/kmix/viewsurround.cpp +++ b/kmix/viewsurround.cpp @@ -22,9 +22,9 @@ #include "viewsurround.h" // Qt -#include <qlabel.h> -#include <qlayout.h> -#include <qwidget.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqwidget.h> // KDE #include <kdebug.h> @@ -39,21 +39,21 @@ * Demonstration verion of a "surround view" * Not really usable right now. */ -ViewSurround::ViewSurround(QWidget* parent, const char* name, const QString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) +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) { _mdSurroundFront = 0; _mdSurroundBack = 0; - _layoutMDW = new QHBoxLayout(this); + _layoutMDW = new TQHBoxLayout(this); _layoutMDW->setMargin(8); // Create switch buttonGroup if ( _vflags & ViewBase::Vertical ) { - _layoutSliders = new QVBoxLayout(_layoutMDW); + _layoutSliders = new TQVBoxLayout(_layoutMDW); } else { - _layoutSliders = new QHBoxLayout(_layoutMDW); + _layoutSliders = new TQHBoxLayout(_layoutMDW); } - _layoutSurround = new QGridLayout(_layoutMDW,3,5); + _layoutSurround = new TQGridLayout(_layoutMDW,3,5); // _layoutMDW->setMargin(8); init(); } @@ -99,7 +99,7 @@ int ViewSurround::advice() { } } -QWidget* ViewSurround::add(MixDevice *md) +TQWidget* ViewSurround::add(MixDevice *md) { bool small = false; Qt::Orientation orientation = Qt::Vertical; @@ -162,18 +162,18 @@ QWidget* ViewSurround::add(MixDevice *md) return mdw; } -QSize ViewSurround::sizeHint() const { +TQSize ViewSurround::sizeHint() const { // kdDebug(67100) << "ViewSurround::sizeHint(): NewSize is " << _layoutMDW->sizeHint() << "\n"; return( _layoutMDW->sizeHint() ); } void ViewSurround::constructionFinished() { - QLabel* personLabel = new QLabel("Listener", this); - QPixmap icon = UserIcon( "Listener" ); + TQLabel* personLabel = new TQLabel("Listener", this); + TQPixmap icon = UserIcon( "Listener" ); if ( ! icon.isNull()) personLabel->setPixmap(icon); personLabel->setLineWidth( 4 ); personLabel->setMidLineWidth( 3 ); - personLabel->setFrameStyle( QFrame::Panel | QFrame::Sunken ); + personLabel->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); int rowOfSpeaker = 0; if ( _mdSurroundBack != 0 ) { // let the speaker "sit" in the rear of the room, if there is @@ -187,12 +187,12 @@ void ViewSurround::constructionFinished() { _layoutSurround->addWidget(mdw,0,4, Qt::AlignBottom | Qt::AlignRight); _mdws.append(mdw); - QLabel* speakerIcon = new QLabel("Speaker", this); + TQLabel* speakerIcon = new TQLabel("Speaker", this); icon = UserIcon( "SpeakerFrontLeft" ); if ( ! icon.isNull()) speakerIcon->setPixmap(icon); _layoutSurround->addWidget(speakerIcon,0,1, Qt::AlignTop | Qt::AlignLeft); - speakerIcon = new QLabel("Speaker", this); + speakerIcon = new TQLabel("Speaker", this); icon = UserIcon( "SpeakerFrontRight" ); if ( ! icon.isNull()) speakerIcon->setPixmap(icon); _layoutSurround->addWidget(speakerIcon,0,3, Qt::AlignTop | Qt::AlignRight); @@ -204,12 +204,12 @@ void ViewSurround::constructionFinished() { _layoutSurround->addWidget(mdw,2,4, Qt::AlignTop | Qt::AlignRight); _mdws.append(mdw); - QLabel* speakerIcon = new QLabel("Speaker", this); + TQLabel* speakerIcon = new TQLabel("Speaker", this); icon = UserIcon( "SpeakerRearLeft" ); if ( ! icon.isNull()) speakerIcon->setPixmap(icon); _layoutSurround->addWidget(speakerIcon,2,1, Qt::AlignBottom | Qt::AlignLeft); - speakerIcon = new QLabel("Speaker", this); + speakerIcon = new TQLabel("Speaker", this); icon = UserIcon( "SpeakerRearRight" ); if ( ! icon.isNull()) speakerIcon->setPixmap(icon); _layoutSurround->addWidget(speakerIcon,2,3, Qt::AlignBottom | Qt::AlignRight); @@ -228,7 +228,7 @@ void ViewSurround::constructionFinished() { void ViewSurround::refreshVolumeLevels() { // kdDebug(67100) << "ViewSurround::refreshVolumeLevels()\n"; - QWidget *mdw = _mdws.first(); + TQWidget *mdw = _mdws.first(); MixDevice* md; for ( md = _mixSet->first(); md != 0; md = _mixSet->next() ) { if ( mdw == 0 ) { diff --git a/kmix/viewsurround.h b/kmix/viewsurround.h index 1427f41d..9eea6138 100644 --- a/kmix/viewsurround.h +++ b/kmix/viewsurround.h @@ -14,16 +14,16 @@ class ViewSurround : public ViewBase { Q_OBJECT public: - ViewSurround(QWidget* parent, const char* name, const QString & caption, Mixer* mixer, ViewBase::ViewFlags vflags); + ViewSurround(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags); ~ViewSurround(); virtual int count(); virtual int advice(); virtual void setMixSet(MixSet *mixset); - virtual QWidget* add(MixDevice *mdw); + virtual TQWidget* add(MixDevice *mdw); virtual void constructionFinished(); - QSize sizeHint() const; + TQSize sizeHint() const; public slots: virtual void refreshVolumeLevels(); @@ -33,9 +33,9 @@ private: MixDevice *_mdSurroundFront; MixDevice *_mdSurroundBack; - QBoxLayout* _layoutMDW; - QBoxLayout* _layoutSliders; - QGridLayout* _layoutSurround; + TQBoxLayout* _layoutMDW; + TQBoxLayout* _layoutSliders; + TQGridLayout* _layoutSurround; }; #endif diff --git a/kmix/viewswitches.cpp b/kmix/viewswitches.cpp index 6a5c96cc..15b555ac 100644 --- a/kmix/viewswitches.cpp +++ b/kmix/viewswitches.cpp @@ -21,8 +21,8 @@ #include "viewswitches.h" -#include <qlayout.h> -#include <qwidget.h> +#include <tqlayout.h> +#include <tqwidget.h> #include <kdebug.h> #include <klocale.h> @@ -31,23 +31,23 @@ #include "mdwenum.h" #include "mixer.h" -ViewSwitches::ViewSwitches(QWidget* parent, const char* name, const QString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) +ViewSwitches::ViewSwitches(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) : ViewBase(parent, name, caption, mixer, 0, vflags) { // Create switch buttonGroup if ( _vflags & ViewBase::Vertical ) { - _layoutMDW = new QVBoxLayout(this); - _layoutSwitch = new QVBoxLayout(_layoutMDW); - _layoutEnum = new QVBoxLayout(_layoutMDW); // always vertical! + _layoutMDW = new TQVBoxLayout(this); + _layoutSwitch = new TQVBoxLayout(_layoutMDW); + _layoutEnum = new TQVBoxLayout(_layoutMDW); // always vertical! } else { - _layoutMDW = new QHBoxLayout(this); - _layoutSwitch = new QHBoxLayout(_layoutMDW); + _layoutMDW = new TQHBoxLayout(this); + _layoutSwitch = new TQHBoxLayout(_layoutMDW); // 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. - _layoutEnum = new QVBoxLayout(_layoutMDW); + _layoutEnum = new TQVBoxLayout(_layoutMDW); } init(); } @@ -83,7 +83,7 @@ int ViewSwitches::advice() { } } -QWidget* ViewSwitches::add(MixDevice *md) +TQWidget* ViewSwitches::add(MixDevice *md) { MixDeviceWidget *mdw; @@ -118,7 +118,7 @@ QWidget* ViewSwitches::add(MixDevice *md) return mdw; } -QSize ViewSwitches::sizeHint() const { +TQSize ViewSwitches::sizeHint() const { //kdDebug(67100) << "ViewSwitches::sizeHint(): NewSize is " << _layoutMDW->sizeHint() << "\n"; return( _layoutMDW->sizeHint() ); } @@ -129,7 +129,7 @@ void ViewSwitches::constructionFinished() { void ViewSwitches::refreshVolumeLevels() { //kdDebug(67100) << "ViewSwitches::refreshVolumeLevels()\n"; - QWidget *mdw = _mdws.first(); + TQWidget *mdw = _mdws.first(); MixDevice* md; for ( md = _mixSet->first(); md != 0; md = _mixSet->next() ) { if ( mdw == 0 ) { @@ -162,7 +162,7 @@ void ViewSwitches::refreshVolumeLevels() { */ void ViewSwitches::configurationUpdate() { bool backGoundModeToggler = true; - for (QWidget *qw = _mdws.first(); qw !=0; qw = _mdws.next() ) { + for (TQWidget *qw = _mdws.first(); qw !=0; qw = _mdws.next() ) { if ( qw->inherits("MDWSwitch")) { MixDeviceWidget* mdw = static_cast<MDWSwitch*>(qw); if ( ! mdw->isDisabled() ) { diff --git a/kmix/viewswitches.h b/kmix/viewswitches.h index 043fce07..f58ba750 100644 --- a/kmix/viewswitches.h +++ b/kmix/viewswitches.h @@ -11,25 +11,25 @@ class ViewSwitches : public ViewBase { Q_OBJECT public: - ViewSwitches(QWidget* parent, const char* name, const QString & caption, Mixer* mixer, ViewBase::ViewFlags vflags); + ViewSwitches(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags); ~ViewSwitches(); virtual int count(); virtual int advice(); virtual void setMixSet(MixSet *mixset); - virtual QWidget* add(MixDevice *mdw); + virtual TQWidget* add(MixDevice *mdw); virtual void constructionFinished(); virtual void configurationUpdate(); - QSize sizeHint() const; + TQSize sizeHint() const; public slots: virtual void refreshVolumeLevels(); private: - QLayout* _layoutMDW; - QLayout* _layoutEnum; - QLayout* _layoutSwitch; + TQLayout* _layoutMDW; + TQLayout* _layoutEnum; + TQLayout* _layoutSwitch; }; #endif |