From b3df4d055e72863ca51ec9c0428a490306989ff4 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 9 Nov 2023 10:36:44 +0900 Subject: Replace Qt with TQt Signed-off-by: Michele Calgaro --- noatun/library/cmodule.cpp | 2 +- noatun/library/controls.cpp | 8 ++++---- noatun/library/equalizerview.cpp | 2 +- noatun/library/noatun/controls.h | 4 ++-- noatun/library/noatuntags/tags.cpp | 2 +- noatun/library/video.cpp | 2 +- noatun/modules/artseffects/extrastereogui_impl.cpp | 2 +- noatun/modules/excellent/userinterface.cpp | 4 ++-- noatun/modules/kaiman/style.cpp | 2 +- noatun/modules/kjofol-skin/kjloader.cpp | 2 +- noatun/modules/noatunui/userinterface.cpp | 8 ++++---- noatun/modules/simple/userinterface.cpp | 4 ++-- noatun/modules/systray/kitsystemtray.cpp | 4 ++-- noatun/modules/winskin/guiSpectrumAnalyser.cpp | 4 ++-- noatun/modules/winskin/waButton.cpp | 2 +- noatun/modules/winskin/waDigit.cpp | 2 +- noatun/modules/winskin/waInfo.cpp | 2 +- noatun/modules/winskin/waSlider.cpp | 2 +- noatun/modules/winskin/waTitleBar.cpp | 4 ++-- noatun/modules/winskin/waWidget.cpp | 2 +- noatun/modules/winskin/winSkinConfig.cpp | 4 ++-- 21 files changed, 34 insertions(+), 34 deletions(-) (limited to 'noatun') diff --git a/noatun/library/cmodule.cpp b/noatun/library/cmodule.cpp index 8e5f184a..92058c85 100644 --- a/noatun/library/cmodule.cpp +++ b/noatun/library/cmodule.cpp @@ -68,7 +68,7 @@ General::General(TQObject *parent) this, TQT_SLOT( slotRequesterClicked( KURLRequester * ))); TQWhatsThis::add(mDlSaver, i18n("When opening a non-local file, download it to the selected folder.")); - mPlayOnStartup = new TQButtonGroup(1,Qt::Horizontal, i18n("Play Behavior on Startup"), this); + mPlayOnStartup = new TQButtonGroup(1,TQt::Horizontal, i18n("Play Behavior on Startup"), this); mPlayOnStartup->setExclusive(true); mPlayOnStartup->insert( new TQRadioButton(i18n("Restore &play state"), mPlayOnStartup), diff --git a/noatun/library/controls.cpp b/noatun/library/controls.cpp index 4a6ca9a8..fef7768f 100644 --- a/noatun/library/controls.cpp +++ b/noatun/library/controls.cpp @@ -3,11 +3,11 @@ L33tSlider::L33tSlider(TQWidget * parent, const char * name) : TQSlider(parent,name), pressed(false) {} -L33tSlider::L33tSlider(Qt::Orientation o, TQWidget * parent, const char * name) : +L33tSlider::L33tSlider(TQt::Orientation o, TQWidget * parent, const char * name) : TQSlider(o,parent,name), pressed(false) {} L33tSlider::L33tSlider(int minValue, int maxValue, int pageStep, int value, - Qt::Orientation o, TQWidget * parent, const char * name) : + TQt::Orientation o, TQWidget * parent, const char * name) : TQSlider(minValue, maxValue, pageStep, value, o, parent,name), pressed(false) {} @@ -24,7 +24,7 @@ void L33tSlider::setValue(int i) void L33tSlider::mousePressEvent(TQMouseEvent*e) { - if (e->button()!=Qt::RightButton) + if (e->button()!=TQt::RightButton) { pressed=true; TQSlider::mousePressEvent(e); @@ -67,7 +67,7 @@ int SliderAction::plug( TQWidget *w, int index ) int id = TDEAction::getToolButtonID(); //Create it. - m_slider=new L33tSlider(0, 1000, 100, 0,Qt::Horizontal, toolBar); + m_slider=new L33tSlider(0, 1000, 100, 0,TQt::Horizontal, toolBar); m_slider->setMinimumWidth(10); toolBar->insertWidget(id, 10, m_slider, index ); diff --git a/noatun/library/equalizerview.cpp b/noatun/library/equalizerview.cpp index bf779e39..dd809257 100644 --- a/noatun/library/equalizerview.cpp +++ b/noatun/library/equalizerview.cpp @@ -67,7 +67,7 @@ EqualizerLevel::EqualizerLevel(TQWidget *parent, VBand band) TQVBoxLayout *layout = new TQVBoxLayout(this, 0, 0, "EqualizerLevel::layout"); - mSlider = new TQSlider(-200, 200, 25, 0, Qt::Vertical, this, "EqualizerLevel::mSlider"); + mSlider = new TQSlider(-200, 200, 25, 0, TQt::Vertical, this, "EqualizerLevel::mSlider"); mSlider->setTickmarks(TQSlider::Left); mSlider->setTickInterval(25); layout->addWidget(mSlider); diff --git a/noatun/library/noatun/controls.h b/noatun/library/noatun/controls.h index 693b3fdc..813be2ee 100644 --- a/noatun/library/noatun/controls.h +++ b/noatun/library/noatun/controls.h @@ -26,9 +26,9 @@ TQ_OBJECT public: L33tSlider(TQWidget * parent, const char * name=0); - L33tSlider(Qt::Orientation, TQWidget * parent, const char * name=0); + L33tSlider(TQt::Orientation, TQWidget * parent, const char * name=0); L33tSlider(int minValue, int maxValue, int pageStep, int value, - Qt::Orientation, TQWidget * parent, const char * name=0); + TQt::Orientation, TQWidget * parent, const char * name=0); bool currentlyPressed() const; signals: diff --git a/noatun/library/noatuntags/tags.cpp b/noatun/library/noatuntags/tags.cpp index 3c1bb2ac..7ac9e07f 100644 --- a/noatun/library/noatuntags/tags.cpp +++ b/noatun/library/noatuntags/tags.cpp @@ -201,7 +201,7 @@ Control::Control(TagsGetter *parent) ", and updates tags (e.g., ID3)", "Interval:"), intervalLine); TQSlider *slider=new TQSlider( - 0, 2000, 100, 0,Qt::Horizontal, intervalLine + 0, 2000, 100, 0,TQt::Horizontal, intervalLine ); TQSpinBox *spin=new TQSpinBox( 0, 2000, 10, intervalLine diff --git a/noatun/library/video.cpp b/noatun/library/video.cpp index db6886b3..0fceeb2d 100644 --- a/noatun/library/video.cpp +++ b/noatun/library/video.cpp @@ -151,7 +151,7 @@ void GlobalVideo::hide() void GlobalVideo::mouseReleaseEvent(TQMouseEvent *e) { - if (e->button() == Qt::RightButton) + if (e->button() == TQt::RightButton) { menu->exec(mapToGlobal(e->pos())); } diff --git a/noatun/modules/artseffects/extrastereogui_impl.cpp b/noatun/modules/artseffects/extrastereogui_impl.cpp index 92148ba0..c65ff19f 100644 --- a/noatun/modules/artseffects/extrastereogui_impl.cpp +++ b/noatun/modules/artseffects/extrastereogui_impl.cpp @@ -7,7 +7,7 @@ namespace Arts { ExtraStereoGUI_impl::ExtraStereoGUI_impl() : TQWidget(0) { (new TQHBoxLayout(this))->setAutoAdd(true); - mSlider=new TQSlider(0,100,10, 0,Qt::Horizontal, this); + mSlider=new TQSlider(0,100,10, 0,TQt::Horizontal, this); mSlider->show(); show(); } diff --git a/noatun/modules/excellent/userinterface.cpp b/noatun/modules/excellent/userinterface.cpp index 12e7169b..40154489 100644 --- a/noatun/modules/excellent/userinterface.cpp +++ b/noatun/modules/excellent/userinterface.cpp @@ -98,7 +98,7 @@ Excellent::Excellent() mainFrame = new TQHBox(this); mainFrame->setSpacing(KDialog::spacingHint()); mainFrame->setMargin(0); - slider = new L33tSlider(0, 1000, 10, 0, Qt::Horizontal, mainFrame); + slider = new L33tSlider(0, 1000, 10, 0, TQt::Horizontal, mainFrame); slider->setTickmarks(TQSlider::NoMarks); elapsed = new TQLabel(mainFrame); @@ -373,7 +373,7 @@ void Excellent::handleLengthString(const TQString &text) void Excellent::growVolumeControl(void) { - volumeSlider = new L33tSlider(0, 100, 10, 0,Qt::Vertical, mainFrame); + volumeSlider = new L33tSlider(0, 100, 10, 0,TQt::Vertical, mainFrame); volumeSlider->setValue(100 - napp->player()->volume()); volumeSlider->show(); connect(volumeSlider, TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(changeVolume(int))); diff --git a/noatun/modules/kaiman/style.cpp b/noatun/modules/kaiman/style.cpp index a11f569b..1e4da725 100644 --- a/noatun/modules/kaiman/style.cpp +++ b/noatun/modules/kaiman/style.cpp @@ -1400,7 +1400,7 @@ bool KaimanStyle::eventFilter( TQObject *o, TQEvent *e ) TQMouseEvent *m = (TQMouseEvent*)e; // handle noatun context menu - if (m->button()==Qt::RightButton) { + if (m->button()==TQt::RightButton) { NoatunStdAction::ContextMenu::showContextMenu(); return true; } diff --git a/noatun/modules/kjofol-skin/kjloader.cpp b/noatun/modules/kjofol-skin/kjloader.cpp index 9db30363..ce9c88c8 100644 --- a/noatun/modules/kjofol-skin/kjloader.cpp +++ b/noatun/modules/kjofol-skin/kjloader.cpp @@ -742,7 +742,7 @@ void KJLoader::mousePressEvent(TQMouseEvent *e) // TQWidget::mousePressEvent(e); - if ( e->button()==Qt::RightButton ) + if ( e->button()==TQt::RightButton ) NoatunStdAction::ContextMenu::showContextMenu(); else /* if ( e->button()==LeftButton ) */ { diff --git a/noatun/modules/noatunui/userinterface.cpp b/noatun/modules/noatunui/userinterface.cpp index 1919fade..7019aea5 100644 --- a/noatun/modules/noatunui/userinterface.cpp +++ b/noatun/modules/noatunui/userinterface.cpp @@ -80,9 +80,9 @@ MilkChocolate::MilkChocolate() : TQWidget(0,"NoatunUI"), UserInterface() } - mVolume=new L33tSlider(0,100,10,0,Qt::Horizontal, this); + mVolume=new L33tSlider(0,100,10,0,TQt::Horizontal, this); mVolume->setValue(napp->player()->volume()); - mSeeker=new L33tSlider(0,1000,10,0,Qt::Horizontal, this); + mSeeker=new L33tSlider(0,1000,10,0,TQt::Horizontal, this); mStatusBar=new KStatusBar(this); @@ -179,7 +179,7 @@ void MilkChocolate::dropEvent(TQDropEvent *event) void MilkChocolate::mouseReleaseEvent(TQMouseEvent *e) { TQWidget::mouseReleaseEvent(e); - if (e->button()!=Qt::RightButton) return; + if (e->button()!=TQt::RightButton) return; NoatunStdAction::ContextMenu::showContextMenu(); } @@ -281,7 +281,7 @@ void MilkChocolate::changeLoopType(int t) bool MilkChocolate::eventFilter(TQObject *o, TQEvent *e) { if ((e->type() == TQEvent::MouseButtonRelease) - && ((TQT_TQMOUSEEVENT(e))->button()==Qt::RightButton)) + && ((TQT_TQMOUSEEVENT(e))->button()==TQt::RightButton)) { mouseReleaseEvent(TQT_TQMOUSEEVENT(e)); return true; diff --git a/noatun/modules/simple/userinterface.cpp b/noatun/modules/simple/userinterface.cpp index c600338d..929ada84 100644 --- a/noatun/modules/simple/userinterface.cpp +++ b/noatun/modules/simple/userinterface.cpp @@ -214,7 +214,7 @@ void SimpleUI::setupCentralWidget() TQToolTip::add( forwButton, i18n("Forward") ); connect( forwButton, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(forward()) ); - slider = new L33tSlider( 0, 1000, 10, 0, Qt::Horizontal, ctlFrame ); + slider = new L33tSlider( 0, 1000, 10, 0, TQt::Horizontal, ctlFrame ); slider->setFixedHeight( 24 ); slider->setMinimumWidth( 100 ); slider->setTickmarks( TQSlider::NoMarks ); @@ -242,7 +242,7 @@ void SimpleUI::setupCentralWidget() volumeLabel->setFixedSize( volumeLabel->sizeHint() ); TQHBox *volumeSubFrame = new TQHBox( volumeFrame ); - volumeSlider = new L33tSlider( 0, 100, 10, 0,Qt::Vertical, volumeSubFrame ); + volumeSlider = new L33tSlider( 0, 100, 10, 0,TQt::Vertical, volumeSubFrame ); volumeSlider->setValue( 100 - napp->player()->volume() ); volumeSlider->setFixedSize( volumeSlider->sizeHint() ); diff --git a/noatun/modules/systray/kitsystemtray.cpp b/noatun/modules/systray/kitsystemtray.cpp index 963a9c69..358efb59 100644 --- a/noatun/modules/systray/kitsystemtray.cpp +++ b/noatun/modules/systray/kitsystemtray.cpp @@ -67,10 +67,10 @@ void KitSystemTray::mousePressEvent(TQMouseEvent *event) { switch(event->button()) { - case Qt::LeftButton: + case TQt::LeftButton: napp->toggleInterfaces(); break; - case Qt::MidButton: + case TQt::MidButton: if (YHConfig::self()->middleMouseAction() == YHConfig::HideShowPlaylist) napp->playlist()->toggleList(); else // play or pause diff --git a/noatun/modules/winskin/guiSpectrumAnalyser.cpp b/noatun/modules/winskin/guiSpectrumAnalyser.cpp index ee01777a..a1ff8cdc 100644 --- a/noatun/modules/winskin/guiSpectrumAnalyser.cpp +++ b/noatun/modules/winskin/guiSpectrumAnalyser.cpp @@ -72,13 +72,13 @@ GuiSpectrumAnalyser::~GuiSpectrumAnalyser() void GuiSpectrumAnalyser::mousePressEvent ( TQMouseEvent *e ) { - if (e->button() == Qt::LeftButton) { + if (e->button() == TQt::LeftButton) { if (visualization_mode == MODE_DISABLED) setVisualizationMode(MODE_ANALYSER); else setVisualizationMode(MODE_DISABLED); } - else if (e->button() == Qt::RightButton) { + else if (e->button() == TQt::RightButton) { contextMenu->popup(mapToGlobal(TQPoint(e->x(), e->y()))); } } diff --git a/noatun/modules/winskin/waButton.cpp b/noatun/modules/winskin/waButton.cpp index 6ecf4050..318b5323 100644 --- a/noatun/modules/winskin/waButton.cpp +++ b/noatun/modules/winskin/waButton.cpp @@ -50,7 +50,7 @@ void WaButton::paintEvent(TQPaintEvent *) { void WaButton::mousePressEvent(TQMouseEvent* e) { - if (e->button() != Qt::LeftButton) { + if (e->button() != TQt::LeftButton) { // We can't deal with it, but maybe the widget can do something clever WaWidget::mousePressEvent(e); } diff --git a/noatun/modules/winskin/waDigit.cpp b/noatun/modules/winskin/waDigit.cpp index 8e53c45f..3e953e6b 100644 --- a/noatun/modules/winskin/waDigit.cpp +++ b/noatun/modules/winskin/waDigit.cpp @@ -78,7 +78,7 @@ void WaDigit::paintEvent(TQPaintEvent *) } void WaDigit::mousePressEvent(TQMouseEvent* e) { - if (e->button() == Qt::LeftButton) { + if (e->button() == TQt::LeftButton) { reverse_time = !reverse_time; emit digitsClicked(); } diff --git a/noatun/modules/winskin/waInfo.cpp b/noatun/modules/winskin/waInfo.cpp index 25c088e3..af64ecc2 100644 --- a/noatun/modules/winskin/waInfo.cpp +++ b/noatun/modules/winskin/waInfo.cpp @@ -150,7 +150,7 @@ void WaInfo::pixmapChange() } void WaInfo::mousePressEvent (TQMouseEvent *e) { - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) xGrabbedPos = (e->x() + xScrollPos) % completePixmap->width(); } diff --git a/noatun/modules/winskin/waSlider.cpp b/noatun/modules/winskin/waSlider.cpp index 8c97c272..b3705e9d 100644 --- a/noatun/modules/winskin/waSlider.cpp +++ b/noatun/modules/winskin/waSlider.cpp @@ -102,7 +102,7 @@ void WaSlider::updateSliderPos(int value) } void WaSlider::mousePressEvent(TQMouseEvent *e) { - if (e->button() != Qt::LeftButton && e->button() != Qt::MidButton) { + if (e->button() != TQt::LeftButton && e->button() != TQt::MidButton) { WaWidget::mousePressEvent(e); return; } diff --git a/noatun/modules/winskin/waTitleBar.cpp b/noatun/modules/winskin/waTitleBar.cpp index 9570dac0..fa1e0e7c 100644 --- a/noatun/modules/winskin/waTitleBar.cpp +++ b/noatun/modules/winskin/waTitleBar.cpp @@ -34,7 +34,7 @@ WaTitleBar::~WaTitleBar() void WaTitleBar::mousePressEvent(TQMouseEvent * e) { - if (e->button() != Qt::RightButton) { + if (e->button() != TQt::RightButton) { if (!moving) { moving = true; mDragStart = e->pos(); @@ -55,7 +55,7 @@ void WaTitleBar::mouseDoubleClickEvent(TQMouseEvent *) { void WaTitleBar::mouseReleaseEvent(TQMouseEvent * e) { - if (e->button() != Qt::RightButton) { + if (e->button() != TQt::RightButton) { moving = false; update(); return; diff --git a/noatun/modules/winskin/waWidget.cpp b/noatun/modules/winskin/waWidget.cpp index 4a44f252..69f797f5 100644 --- a/noatun/modules/winskin/waWidget.cpp +++ b/noatun/modules/winskin/waWidget.cpp @@ -46,7 +46,7 @@ TQSize WaWidget::sizeHint() { } void WaWidget::mousePressEvent(TQMouseEvent *e) { - if (e->button() == Qt::RightButton) + if (e->button() == TQt::RightButton) NoatunStdAction::ContextMenu::showContextMenu(); } diff --git a/noatun/modules/winskin/winSkinConfig.cpp b/noatun/modules/winskin/winSkinConfig.cpp index c7dad1ae..961ed457 100644 --- a/noatun/modules/winskin/winSkinConfig.cpp +++ b/noatun/modules/winskin/winSkinConfig.cpp @@ -55,7 +55,7 @@ WinSkinConfig::WinSkinConfig(TQWidget * parent, WaSkinManager *waSkinManager) : mWaSkinManager = waSkinManager; - TQGroupBox *settingsBox = new TQGroupBox( 1,Qt::Vertical, i18n("Settings"), this ); + TQGroupBox *settingsBox = new TQGroupBox( 1,TQt::Vertical, i18n("Settings"), this ); vbox->addWidget(settingsBox); TQHBox *box = new TQHBox(settingsBox); @@ -68,7 +68,7 @@ WinSkinConfig::WinSkinConfig(TQWidget * parent, WaSkinManager *waSkinManager) : scrollSpeed->setMinValue( 0 ); scrollSpeed->setMaxValue( 50 ); scrollSpeed->setPageStep( 1 ); - scrollSpeed->setOrientation( Qt::Horizontal ); + scrollSpeed->setOrientation( TQt::Horizontal ); scrollSpeed->setTickmarks( TQSlider::NoMarks ); label = new TQLabel(i18n("Fast"), box); -- cgit v1.2.1