diff options
Diffstat (limited to 'kmix/kmix.cpp')
| -rw-r--r-- | kmix/kmix.cpp | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/kmix/kmix.cpp b/kmix/kmix.cpp index ce4ab910..f0a2e4db 100644 --- a/kmix/kmix.cpp +++ b/kmix/kmix.cpp @@ -107,25 +107,25 @@ void KMixWindow::initActions() { // file menu - KStdAction::quit( this, TQT_SLOT(quit()), actionCollection()); + KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(quit()), actionCollection()); // settings menu - KStdAction::showMenubar( this, TQT_SLOT(toggleMenuBar()), actionCollection()); - KStdAction::preferences( this, TQT_SLOT(showSettings()), actionCollection()); - new KAction( i18n( "Configure &Global Shortcuts..." ), "configure_shortcuts", 0, this, + KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT(toggleMenuBar()), actionCollection()); + KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(showSettings()), actionCollection()); + new KAction( i18n( "Configure &Global Shortcuts..." ), "configure_shortcuts", 0, TQT_TQOBJECT(this), TQT_SLOT( configureGlobalShortcuts() ), actionCollection(), "settings_global" ); KStdAction::keyBindings( guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection()); - (void) new KAction( i18n( "Hardware &Information" ), 0, this, TQT_SLOT( slotHWInfo() ), actionCollection(), "hwinfo" ); - (void) new KAction( i18n( "Hide Mixer Window" ), Key_Escape, this, TQT_SLOT(hide()), actionCollection(), "hide_kmixwindow" ); + (void) new KAction( i18n( "Hardware &Information" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotHWInfo() ), actionCollection(), "hwinfo" ); + (void) new KAction( i18n( "Hide Mixer Window" ), Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(hide()), actionCollection(), "hide_kmixwindow" ); - m_globalAccel = new KGlobalAccel( this ); - m_globalAccel->insert( "Increase volume", i18n( "Increase Volume of Master Channel"), TQString::null, - KShortcut(), KShortcut(), this, TQT_SLOT( increaseVolume() ) ); - m_globalAccel->insert( "Decrease volume", i18n( "Decrease Volume of Master Channel"), TQString::null, - KShortcut(), KShortcut(), this, TQT_SLOT( decreaseVolume() ) ); - m_globalAccel->insert( "Toggle mute", i18n( "Toggle Mute of Master Channel"), TQString::null, - KShortcut(), KShortcut(), this, TQT_SLOT( toggleMuted() ) ); + m_globalAccel = new KGlobalAccel( TQT_TQOBJECT(this) ); + m_globalAccel->insert( "Increase volume", i18n( "Increase Volume of Master Channel"), TQString(), + KShortcut(), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( increaseVolume() ) ); + m_globalAccel->insert( "Decrease volume", i18n( "Decrease Volume of Master Channel"), TQString(), + KShortcut(), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( decreaseVolume() ) ); + m_globalAccel->insert( "Toggle mute", i18n( "Toggle Mute of Master Channel"), TQString(), + KShortcut(), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( toggleMuted() ) ); m_globalAccel->readSettings(); m_globalAccel->updateConnections(); @@ -145,10 +145,10 @@ KMixWindow::initPrefDlg() void KMixWindow::initWidgets() { - // Main widget and layout + // Main widget and tqlayout setCentralWidget( new TQWidget( this, "qt_central_widget" ) ); - // Widgets layout + // Widgets tqlayout widgetsLayout = new TQVBoxLayout( centralWidget(), 0, 0, "widgetsLayout" ); widgetsLayout->setResizeMode(TQLayout::Minimum); // works fine @@ -157,16 +157,16 @@ KMixWindow::initWidgets() mixerNameLayout = new TQHBox( centralWidget(), "mixerNameLayout" ); widgetsLayout->setStretchFactor( mixerNameLayout, 0 ); TQSizePolicy qsp( TQSizePolicy::Ignored, TQSizePolicy::Maximum); - mixerNameLayout->setSizePolicy(qsp); + mixerNameLayout->tqsetSizePolicy(qsp); mixerNameLayout->setSpacing(KDialog::spacingHint()); TQLabel *qlbl = new TQLabel( i18n("Current mixer:"), mixerNameLayout ); - qlbl->setFixedHeight(qlbl->sizeHint().height()); + qlbl->setFixedHeight(qlbl->tqsizeHint().height()); m_cMixer = new KComboBox( FALSE, mixerNameLayout, "mixerCombo" ); - m_cMixer->setFixedHeight(m_cMixer->sizeHint().height()); - connect( m_cMixer, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( showSelectedMixer( int ) ) ); + m_cMixer->setFixedHeight(m_cMixer->tqsizeHint().height()); + connect( m_cMixer, TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( showSelectedMixer( int ) ) ); TQToolTip::add( m_cMixer, i18n("Current mixer" ) ); - // Add first layout to widgets + // Add first tqlayout to widgets widgetsLayout->addWidget( mixerNameLayout ); m_wsMixers = new TQWidgetStack( centralWidget(), "MixerWidgetStack" ); @@ -267,9 +267,9 @@ KMixWindow::saveConfig() config->writeEntry( "ValueStyle", "None" ); if ( m_toplevelOrientation == Qt::Vertical ) - config->writeEntry( "Orientation","Vertical" ); + config->writeEntry( "Qt::Orientation","Vertical" ); else - config->writeEntry( "Orientation","Horizontal" ); + config->writeEntry( "Qt::Orientation","Horizontal" ); config->writeEntry( "Autostart", m_autoStart ); // save mixer widgets @@ -305,7 +305,7 @@ KMixWindow::loadConfig() m_multiDriverMode = config->readBoolEntry("MultiDriver", false); m_surroundView = config->readBoolEntry("Experimental-ViewSurround", false ); m_gridView = config->readBoolEntry("Experimental-ViewGrid", false ); - const TQString& orientationString = config->readEntry("Orientation", "Horizontal"); + const TQString& orientationString = config->readEntry("Qt::Orientation", "Horizontal"); TQString mixerMasterCard = config->readEntry( "MasterMixer", "" ); Mixer::setMasterCard(mixerMasterCard); TQString masterDev = config->readEntry( "MasterMixerDevice", "" ); @@ -522,11 +522,11 @@ KMixWindow::applyPrefs( KMixPrefDlg *prefDlg ) } if ( prefDlg->_rbVertical->isChecked() ) { //TQString "For a change of language to take place, quit and restart KDiff3."; - //kdDebug(67100) << "KMix should change to Vertical layout\n"; + //kdDebug(67100) << "KMix should change toQt::Vertical tqlayout\n"; m_toplevelOrientation = Qt::Vertical; } else if ( prefDlg->_rbHorizontal->isChecked() ) { - //kdDebug(67100) << "KMix should change to Horizontal layout\n"; + //kdDebug(67100) << "KMix should change toQt::Horizontal tqlayout\n"; m_toplevelOrientation = Qt::Horizontal; } m_autoStart = prefDlg->m_autoStartChk->isChecked(); @@ -551,7 +551,7 @@ KMixWindow::applyPrefs( KMixPrefDlg *prefDlg ) show(); } - this->repaint(); // make KMix look fast (saveConfig() often uses several seconds) + this->tqrepaint(); // make KMix look fast (saveConfig() often uses several seconds) kapp->processEvents(); saveConfig(); } |