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 --- juk/nowplaying.cpp | 2 +- juk/playlist.cpp | 6 +++--- juk/playlistbox.cpp | 4 ++-- juk/playlistsplitter.cpp | 4 ++-- juk/slideraction.cpp | 36 ++++++++++++++++++------------------ juk/slideraction.h | 4 ++-- juk/statuslabel.cpp | 2 +- juk/systemtray.cpp | 8 ++++---- juk/viewmode.cpp | 4 ++-- 9 files changed, 35 insertions(+), 35 deletions(-) (limited to 'juk') diff --git a/juk/nowplaying.cpp b/juk/nowplaying.cpp index e5f344a6..838aadd2 100644 --- a/juk/nowplaying.cpp +++ b/juk/nowplaying.cpp @@ -138,7 +138,7 @@ void CoverItem::mouseReleaseEvent(TQMouseEvent *event) if(event->x() >= 0 && event->y() >= 0 && event->x() < width() && event->y() < height() && - event->button() == Qt::LeftButton && + event->button() == TQt::LeftButton && m_file.coverInfo()->hasCover()) { m_file.coverInfo()->popup(); diff --git a/juk/playlist.cpp b/juk/playlist.cpp index 32caf879..7415d47e 100644 --- a/juk/playlist.cpp +++ b/juk/playlist.cpp @@ -1116,7 +1116,7 @@ bool Playlist::eventFilter(TQObject *watched, TQEvent *e) switch(e->type()) { case TQEvent::MouseMove: { - if((TQT_TQMOUSEEVENT(e)->state() & Qt::LeftButton) == Qt::LeftButton && + if((TQT_TQMOUSEEVENT(e)->state() & TQt::LeftButton) == TQt::LeftButton && !action("resizeColumnsManually")->isChecked()) { m_columnWidthModeChanged = true; @@ -1129,7 +1129,7 @@ bool Playlist::eventFilter(TQObject *watched, TQEvent *e) } case TQEvent::MouseButtonPress: { - if(TQT_TQMOUSEEVENT(e)->button() == Qt::RightButton) + if(TQT_TQMOUSEEVENT(e)->button() == TQt::RightButton) m_headerMenu->popup(TQCursor::pos()); break; @@ -1249,7 +1249,7 @@ void Playlist::contentsMouseDoubleClickEvent(TQMouseEvent *e) // Filter out non left button double clicks, that way users don't have the // weird experience of switching songs from a double right-click. - if(e->button() == Qt::LeftButton) + if(e->button() == TQt::LeftButton) TDEListView::contentsMouseDoubleClickEvent(e); } diff --git a/juk/playlistbox.cpp b/juk/playlistbox.cpp index 3da042d2..f0450166 100644 --- a/juk/playlistbox.cpp +++ b/juk/playlistbox.cpp @@ -524,14 +524,14 @@ void PlaylistBox::contentsDragLeaveEvent(TQDragLeaveEvent *e) void PlaylistBox::contentsMousePressEvent(TQMouseEvent *e) { - if(e->button() == Qt::LeftButton) + if(e->button() == TQt::LeftButton) m_doingMultiSelect = true; TDEListView::contentsMousePressEvent(e); } void PlaylistBox::contentsMouseReleaseEvent(TQMouseEvent *e) { - if(e->button() == Qt::LeftButton) { + if(e->button() == TQt::LeftButton) { m_doingMultiSelect = false; slotPlaylistChanged(); } diff --git a/juk/playlistsplitter.cpp b/juk/playlistsplitter.cpp index 08cecf18..17da7a07 100644 --- a/juk/playlistsplitter.cpp +++ b/juk/playlistsplitter.cpp @@ -35,7 +35,7 @@ using namespace ActionCollection; //////////////////////////////////////////////////////////////////////////////// PlaylistSplitter::PlaylistSplitter(TQWidget *parent, const char *name) : - TQSplitter(Qt::Horizontal, parent, name), + TQSplitter(TQt::Horizontal, parent, name), m_newVisible(0), m_playlistBox(0), m_searchWidget(0), @@ -130,7 +130,7 @@ void PlaylistSplitter::setupLayout() // Create a splitter to go between the playlists and the editor. - TQSplitter *editorSplitter = new TQSplitter(Qt::Vertical, this, "editorSplitter"); + TQSplitter *editorSplitter = new TQSplitter(TQt::Vertical, this, "editorSplitter"); // Create the playlist and the editor. diff --git a/juk/slideraction.cpp b/juk/slideraction.cpp index 24de828d..b632282e 100644 --- a/juk/slideraction.cpp +++ b/juk/slideraction.cpp @@ -47,13 +47,13 @@ public: protected: virtual void mousePressEvent(TQMouseEvent *e) { - if(e->button() == Qt::LeftButton) { - TQMouseEvent reverse(TQEvent::MouseButtonPress, e->pos(), Qt::MidButton, e->state()); + if(e->button() == TQt::LeftButton) { + TQMouseEvent reverse(TQEvent::MouseButtonPress, e->pos(), TQt::MidButton, e->state()); TQSlider::mousePressEvent(&reverse); emit sliderPressed(); } - else if(e->button() == Qt::MidButton) { - TQMouseEvent reverse(TQEvent::MouseButtonPress, e->pos(), Qt::LeftButton, e->state()); + else if(e->button() == TQt::MidButton) { + TQMouseEvent reverse(TQEvent::MouseButtonPress, e->pos(), TQt::LeftButton, e->state()); TQSlider::mousePressEvent(&reverse); } } @@ -63,7 +63,7 @@ protected: // VolumeSlider implementation //////////////////////////////////////////////////////////////////////////////// -VolumeSlider::VolumeSlider(Qt::Orientation o, TQWidget *parent, const char *name) : +VolumeSlider::VolumeSlider(TQt::Orientation o, TQWidget *parent, const char *name) : TQSlider(o, parent, name) { connect(this, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotValueChanged(int))); @@ -71,7 +71,7 @@ VolumeSlider::VolumeSlider(Qt::Orientation o, TQWidget *parent, const char *name void VolumeSlider::wheelEvent(TQWheelEvent *e) { - if(orientation() ==Qt::Horizontal) { + if(orientation() ==TQt::Horizontal) { TQWheelEvent transposed(e->pos(), -(e->delta()), e->state(), e->orientation()); TQSlider::wheelEvent(&transposed); } @@ -86,7 +86,7 @@ void VolumeSlider::focusInEvent(TQFocusEvent *) int VolumeSlider::volume() const { - if(orientation() ==Qt::Horizontal) + if(orientation() ==TQt::Horizontal) return value(); else return maxValue() - value(); @@ -94,13 +94,13 @@ int VolumeSlider::volume() const void VolumeSlider::setVolume(int value) { - if(orientation() ==Qt::Horizontal) + if(orientation() ==TQt::Horizontal) setValue(value); else setValue(maxValue() - value); } -void VolumeSlider::setOrientation(Qt::Orientation o) +void VolumeSlider::setOrientation(TQt::Orientation o) { if(o == orientation()) return; @@ -113,7 +113,7 @@ void VolumeSlider::setOrientation(Qt::Orientation o) void VolumeSlider::slotValueChanged(int value) { - if(orientation() ==Qt::Horizontal) + if(orientation() ==TQt::Horizontal) emit signalVolumeChanged(value); else emit signalVolumeChanged(maxValue() - value); @@ -163,7 +163,7 @@ int SliderAction::plug(TQWidget *parent, int index) addContainer(m_toolBar, id); connect(m_toolBar, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotToolbarDestroyed())); - connect(m_toolBar, TQT_SIGNAL(orientationChanged(Qt::Orientation)), + connect(m_toolBar, TQT_SIGNAL(orientationChanged(TQt::Orientation)), this, TQT_SLOT(slotUpdateOrientation())); connect(m_toolBar, TQT_SIGNAL(placeChanged(TQDockWindow::Place)), this, TQT_SLOT(slotUpdateOrientation())); @@ -205,13 +205,13 @@ void SliderAction::slotUpdateOrientation() return; if(m_toolBar->barPos() == TDEToolBar::Right || m_toolBar->barPos() == TDEToolBar::Left) { - m_trackPositionSlider->setOrientation(Qt::Vertical); - m_volumeSlider->setOrientation(Qt::Vertical); + m_trackPositionSlider->setOrientation(TQt::Vertical); + m_volumeSlider->setOrientation(TQt::Vertical); m_layout->setDirection(TQBoxLayout::TopToBottom); } else { - m_trackPositionSlider->setOrientation(Qt::Horizontal); - m_volumeSlider->setOrientation(Qt::Horizontal); + m_trackPositionSlider->setOrientation(TQt::Horizontal); + m_volumeSlider->setOrientation(TQt::Horizontal); m_layout->setDirection(TQBoxLayout::LeftToRight); } slotUpdateSize(); @@ -233,12 +233,12 @@ TQWidget *SliderAction::createWidget(TQWidget *parent) // virtual -- used by bas if(toolBar) toolBar->setStretchableWidget(base); - Qt::Orientation orientation; + TQt::Orientation orientation; if(toolBar && toolBar->barPos() == TDEToolBar::Right || toolBar->barPos() == TDEToolBar::Left) - orientation =Qt::Vertical; + orientation =TQt::Vertical; else - orientation =Qt::Horizontal; + orientation =TQt::Horizontal; m_layout = new TQBoxLayout(base, TQBoxLayout::TopToBottom, 5, 5); diff --git a/juk/slideraction.h b/juk/slideraction.h index 78db9117..7bdc556f 100644 --- a/juk/slideraction.h +++ b/juk/slideraction.h @@ -28,12 +28,12 @@ class VolumeSlider : public TQSlider public: - VolumeSlider(Qt::Orientation o, TQWidget *parent, const char *name); + VolumeSlider(TQt::Orientation o, TQWidget *parent, const char *name); int volume() const; void setVolume(int value); - void setOrientation(Qt::Orientation o); + void setOrientation(TQt::Orientation o); signals: void signalVolumeChanged(int value); diff --git a/juk/statuslabel.cpp b/juk/statuslabel.cpp index a75f67dc..c3c2da0f 100644 --- a/juk/statuslabel.cpp +++ b/juk/statuslabel.cpp @@ -177,7 +177,7 @@ bool StatusLabel::eventFilter(TQObject *o, TQEvent *e) TQMouseEvent *mouseEvent = TQT_TQMOUSEEVENT(e); if(e->type() == TQEvent::MouseButtonRelease && - mouseEvent->button() == Qt::LeftButton) + mouseEvent->button() == TQt::LeftButton) { if(o == m_itemTimeLabel) { m_showTimeRemaining = !m_showTimeRemaining; diff --git a/juk/systemtray.cpp b/juk/systemtray.cpp index 85abc339..ae3aee32 100644 --- a/juk/systemtray.cpp +++ b/juk/systemtray.cpp @@ -540,7 +540,7 @@ void SystemTray::setToolTip(const TQString &tip, const TQPixmap &cover) void SystemTray::wheelEvent(TQWheelEvent *e) { - if(e->orientation() ==Qt::Horizontal) + if(e->orientation() ==TQt::Horizontal) return; // I already know the type here, but this file doesn't (and I don't want it @@ -571,12 +571,12 @@ void SystemTray::wheelEvent(TQWheelEvent *e) void SystemTray::mousePressEvent(TQMouseEvent *e) { switch(e->button()) { - case Qt::LeftButton: - case Qt::RightButton: + case TQt::LeftButton: + case TQt::RightButton: default: KSystemTray::mousePressEvent(e); break; - case Qt::MidButton: + case TQt::MidButton: if(!rect().contains(e->pos())) return; if(action("pause")->isEnabled()) diff --git a/juk/viewmode.cpp b/juk/viewmode.cpp index 73a66771..bdb2b7a8 100644 --- a/juk/viewmode.cpp +++ b/juk/viewmode.cpp @@ -71,7 +71,7 @@ void ViewMode::paintCell(PlaylistBox::Item *item, TQPen newPen = oldPen; newPen.setWidth(5); - newPen.setJoinStyle(Qt::RoundJoin); + newPen.setJoinStyle(TQt::RoundJoin); newPen.setColor(TQColorGroup::Highlight); painter->setPen(newPen); @@ -168,7 +168,7 @@ void ViewMode::paintDropIndicator(TQPainter *painter, int width, int height) // TQPen newPen = oldPen; newPen.setWidth(lineWidth); - newPen.setStyle(Qt::DotLine); + newPen.setStyle(TQt::DotLine); painter->setPen(newPen); painter->drawRect(border, border, width - border * 2, height - border * 2); -- cgit v1.2.1