From daa879285a47809e41a13f6cf104191a32d291cb Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 4 Nov 2023 23:07:29 +0900 Subject: [PATCH] Replace Qt with TQt Signed-off-by: Michele Calgaro --- konversation/src/channel.cpp | 2 +- konversation/src/channellistpanel.cpp | 2 +- konversation/src/channeloptionsdialog.cpp | 6 +++--- konversation/src/chatwindow.cpp | 2 +- konversation/src/dccchat.cpp | 2 +- konversation/src/identitydialog.cpp | 8 ++++---- konversation/src/images.cpp | 4 ++-- konversation/src/inputfilter.cpp | 10 +++++----- konversation/src/ircinput.cpp | 2 +- konversation/src/ircview.cpp | 8 ++++---- konversation/src/logfilereader.cpp | 2 +- konversation/src/osd.cpp | 2 +- konversation/src/query.cpp | 2 +- konversation/src/topiclabel.cpp | 4 ++-- konversation/src/viewtree.cpp | 18 +++++++++--------- 15 files changed, 37 insertions(+), 37 deletions(-) diff --git a/konversation/src/channel.cpp b/konversation/src/channel.cpp index a8ac8a3..101a0bb 100644 --- a/konversation/src/channel.cpp +++ b/konversation/src/channel.cpp @@ -114,7 +114,7 @@ Channel::Channel(TQWidget* parent, TQString _name) : ChatWindow(parent) TQSizePolicy modest = TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred); TQSizePolicy greedy = TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); - m_vertSplitter = new TQSplitter(Qt::Vertical, this); + m_vertSplitter = new TQSplitter(TQt::Vertical, this); m_vertSplitter->setOpaqueResize(TDEGlobalSettings::opaqueResize()); diff --git a/konversation/src/channellistpanel.cpp b/konversation/src/channellistpanel.cpp index db6d2f5..30205d1 100644 --- a/konversation/src/channellistpanel.cpp +++ b/konversation/src/channellistpanel.cpp @@ -63,7 +63,7 @@ ChannelListPanel::ChannelListPanel(TQWidget* parent) : ChatWindow(parent) filterTextChanged(TQString()); TQHGroupBox* filterGroup=new TQHGroupBox(i18n("Filter Settings"),this); - TQGrid* mainGrid=new TQGrid(2,Qt::Vertical,filterGroup); + TQGrid* mainGrid=new TQGrid(2,TQt::Vertical,filterGroup); mainGrid->setSpacing(spacing()); TQLabel* minLabel=new TQLabel(i18n("Minimum users:"),mainGrid); diff --git a/konversation/src/channeloptionsdialog.cpp b/konversation/src/channeloptionsdialog.cpp index e9e9dbf..c4c109b 100644 --- a/konversation/src/channeloptionsdialog.cpp +++ b/konversation/src/channeloptionsdialog.cpp @@ -172,7 +172,7 @@ namespace Konversation { TQDateTime date; date.setTime_t((*it).section(' ', 0 ,0).toUInt()); - new TDEListViewItem(m_widget->topicHistoryList, (*it).section(' ', 1, 1), date.toString(Qt::LocalDate), (*it).section(' ', 2)); + new TDEListViewItem(m_widget->topicHistoryList, (*it).section(' ', 1, 1), date.toString(TQt::LocalDate), (*it).section(' ', 2)); } // update topic preview @@ -446,7 +446,7 @@ namespace Konversation { if (m_widget->banList->renameLineEdit()->isShown()) { - TQKeyEvent e(TQEvent::KeyPress, TQt::Key_Escape, 27, Qt::NoButton); + TQKeyEvent e(TQEvent::KeyPress, TQt::Key_Escape, 27, TQt::NoButton); TDEApplication::sendEvent(m_widget->banList->renameLineEdit(), &e); } @@ -459,7 +459,7 @@ namespace Konversation { if (m_widget->banList->renameLineEdit()->isShown()) { - TQKeyEvent e(TQEvent::KeyPress, TQt::Key_Return, 13, Qt::NoButton); + TQKeyEvent e(TQEvent::KeyPress, TQt::Key_Return, 13, TQt::NoButton); TDEApplication::sendEvent(m_widget->banList->renameLineEdit(), &e); } diff --git a/konversation/src/chatwindow.cpp b/konversation/src/chatwindow.cpp index 4e9c884..9960a49 100644 --- a/konversation/src/chatwindow.cpp +++ b/konversation/src/chatwindow.cpp @@ -349,7 +349,7 @@ void ChatWindow::logText(const TQString& text) } TQTime time=TQTime::currentTime(); - TQString logLine(TQString("[%1] [%2] %3\n").arg(TQDate::currentDate(Qt::LocalTime).toString()). + TQString logLine(TQString("[%1] [%2] %3\n").arg(TQDate::currentDate(TQt::LocalTime).toString()). arg(time.toString("hh:mm:ss")).arg(text)); logStream << logLine; diff --git a/konversation/src/dccchat.cpp b/konversation/src/dccchat.cpp index 7855029..b7d4151 100644 --- a/konversation/src/dccchat.cpp +++ b/konversation/src/dccchat.cpp @@ -62,7 +62,7 @@ DccChat::DccChat(TQWidget* parent, bool listen, Server* server, const TQString& setType(ChatWindow::DccChat); setChannelEncodingSupported(true); - m_headerSplitter = new TQSplitter(Qt::Vertical, this); + m_headerSplitter = new TQSplitter(TQt::Vertical, this); m_sourceLine = new Konversation::TopicLabel(m_headerSplitter); diff --git a/konversation/src/identitydialog.cpp b/konversation/src/identitydialog.cpp index 7174ce4..33f3a83 100644 --- a/konversation/src/identitydialog.cpp +++ b/konversation/src/identitydialog.cpp @@ -88,7 +88,7 @@ namespace Konversation TQWhatsThis::add(m_realNameEdit, i18n("Enter your real name here. IRC is not intended to keep you hidden from your friends or enemies. Keep this in mind if you are tempted to behave maliciously. A fake \"real name\" can be a good way to mask your gender from all the nerds out there, but the PC you use can always be traced so you will never be truly anonymous.")); realNameLabel->setBuddy(m_realNameEdit); - TQGroupBox* nicknameGBox = new TQGroupBox(0, Qt::Horizontal, i18n("Nickname"), generalWidget); + TQGroupBox* nicknameGBox = new TQGroupBox(0, TQt::Horizontal, i18n("Nickname"), generalWidget); nicknameGBox->setMargin(marginHint()); TQGridLayout* nicknameLayout = new TQGridLayout(nicknameGBox->layout(), 1, 2, spacingHint()); @@ -124,7 +124,7 @@ namespace Konversation nicknameLayout->addWidget(m_upNicknameBtn, 3, 2); nicknameLayout->addWidget(m_downNicknameBtn, 3, 3); - TQGroupBox* autoIdentifyGBox = new TQGroupBox(0, Qt::Horizontal, i18n("Auto Identify"), generalWidget); + TQGroupBox* autoIdentifyGBox = new TQGroupBox(0, TQt::Horizontal, i18n("Auto Identify"), generalWidget); autoIdentifyGBox->setMargin(marginHint()); TQGridLayout* autoIdentifyLayout = new TQGridLayout(autoIdentifyGBox->layout(), 1, 2, spacingHint()); @@ -165,7 +165,7 @@ namespace Konversation m_automaticAwayGBox = new TQGroupBox(i18n("Automatic Away"), awayWidget); m_automaticAwayGBox->setCheckable(true); - m_automaticAwayGBox->setColumnLayout(0, Qt::Horizontal); + m_automaticAwayGBox->setColumnLayout(0, TQt::Horizontal); m_automaticAwayGBox->setMargin(marginHint()); TQGridLayout* automaticAwayLayout = new TQGridLayout(m_automaticAwayGBox->layout(), 1, 2, spacingHint()); @@ -196,7 +196,7 @@ namespace Konversation m_awayMessageGBox = new TQGroupBox(i18n("Away Messages"), awayWidget); m_awayMessageGBox->setCheckable(true); - m_awayMessageGBox->setColumnLayout(0, Qt::Horizontal); + m_awayMessageGBox->setColumnLayout(0, TQt::Horizontal); m_awayMessageGBox->setMargin(marginHint()); TQGridLayout* messagesLayout = new TQGridLayout(m_awayMessageGBox->layout(), 1, 2, spacingHint()); diff --git a/konversation/src/images.cpp b/konversation/src/images.cpp index dcf7cc0..74f7557 100644 --- a/konversation/src/images.cpp +++ b/konversation/src/images.cpp @@ -165,7 +165,7 @@ TQIconSet Images::getLed(TQColor col,bool state) // Set the brush to SolidPattern, this fills the entire area // of the ellipse which is drawn first - brush.setStyle( Qt::SolidPattern ); + brush.setStyle( TQt::SolidPattern ); brush.setColor( color ); paint.setBrush( brush ); @@ -208,7 +208,7 @@ TQIconSet Images::getLed(TQColor col,bool state) color = TQColor("#7D7D7D"); pen.setColor( color ); // Set the pen accordingly paint.setPen( pen ); // Select pen for drawing - brush.setStyle( Qt::NoBrush ); // Switch off the brush + brush.setStyle( TQt::NoBrush ); // Switch off the brush paint.setBrush( brush ); // This avoids filling of the ellipse paint.drawEllipse( 2, 2, width, width ); paint.end(); diff --git a/konversation/src/inputfilter.cpp b/konversation/src/inputfilter.cpp index e272223..2694b32 100644 --- a/konversation/src/inputfilter.cpp +++ b/konversation/src/inputfilter.cpp @@ -862,7 +862,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com when.setTime_t(parameterList[2].toUInt()); server->appendCommandMessageToChannel(parameterList[1],i18n("Created"), i18n("This channel was created on %1.") - .arg(when.toString(Qt::LocalDate)) + .arg(when.toString(TQt::LocalDate)) ); if(Preferences::autoWhoContinuousEnabled()) @@ -962,7 +962,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com { server->appendCommandMessageToChannel(parameterList[1],i18n("Topic"), i18n("The topic was set by %1 on %2.") - .arg(parameterList[2]).arg(when.toString(Qt::LocalDate)), + .arg(parameterList[2]).arg(when.toString(TQt::LocalDate)), false); } else @@ -970,7 +970,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com server->appendMessageToFrontmost(i18n("Topic"),i18n("The topic for %1 was set by %2 on %3.") .arg(parameterList[1]) .arg(parameterList[2]) - .arg(when.toString(Qt::LocalDate)) + .arg(when.toString(TQt::LocalDate)) ); setAutomaticRequest("TOPIC",parameterList[1],false); } @@ -1535,7 +1535,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com { server->appendMessageToFrontmost(i18n("Whois"), i18n("%1 has been online since %2.") - .arg(parameterList[1]).arg(when.toString(Qt::LocalDate)) + .arg(parameterList[1]).arg(when.toString(TQt::LocalDate)) ); } } @@ -1668,7 +1668,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com TQDateTime when; when.setTime_t(parameterList[4].toUInt()); - server->appendMessageToFrontmost(i18n("BanList:%1").arg(parameterList[1]), i18n("BanList message: e.g. *!*@aol.com set by MrGrim on ", "%1 set by %2 on %3").arg(parameterList[2]).arg(parameterList[3].section('!', 0, 0)).arg(when.toString(Qt::LocalDate))); + server->appendMessageToFrontmost(i18n("BanList:%1").arg(parameterList[1]), i18n("BanList message: e.g. *!*@aol.com set by MrGrim on ", "%1 set by %2 on %3").arg(parameterList[2]).arg(parameterList[3].section('!', 0, 0)).arg(when.toString(TQt::LocalDate))); } break; } diff --git a/konversation/src/ircinput.cpp b/konversation/src/ircinput.cpp index 2fcc05a..3558d5f 100644 --- a/konversation/src/ircinput.cpp +++ b/konversation/src/ircinput.cpp @@ -349,7 +349,7 @@ void IRCInput::getHistory(bool up) */ void IRCInput::contentsMouseReleaseEvent( TQMouseEvent *ev) { - if (ev->button() == Qt::MidButton) + if (ev->button() == TQt::MidButton) { m_useSelection=true; } diff --git a/konversation/src/ircview.cpp b/konversation/src/ircview.cpp index 89dca72..2275f85 100644 --- a/konversation/src/ircview.cpp +++ b/konversation/src/ircview.cpp @@ -1190,7 +1190,7 @@ void IRCView::paintEvent(TQPaintEvent* event) void IRCView::contentsMouseReleaseEvent(TQMouseEvent *ev) { - if (ev->button() == Qt::MidButton) + if (ev->button() == TQt::MidButton) { if(m_copyUrlMenu) { @@ -1204,11 +1204,11 @@ void IRCView::contentsMouseReleaseEvent(TQMouseEvent *ev) } } - if (ev->button() == Qt::LeftButton) + if (ev->button() == TQt::LeftButton) { if (m_mousePressed) { - if (ev->state() == (Qt::LeftButton|TQt::ShiftButton)) + if (ev->state() == (TQt::LeftButton|TQt::ShiftButton)) saveLinkAs(m_highlightedURL); else openLink(m_highlightedURL); @@ -1223,7 +1223,7 @@ void IRCView::contentsMouseReleaseEvent(TQMouseEvent *ev) void IRCView::contentsMousePressEvent(TQMouseEvent* ev) { - if (ev->button() == Qt::LeftButton) + if (ev->button() == TQt::LeftButton) { m_urlToDrag = m_highlightedURL; diff --git a/konversation/src/logfilereader.cpp b/konversation/src/logfilereader.cpp index 98514dd..596c521 100644 --- a/konversation/src/logfilereader.cpp +++ b/konversation/src/logfilereader.cpp @@ -42,7 +42,7 @@ LogfileReader::LogfileReader(TQWidget* parent, const TQString& log) : ChatWindow setType(ChatWindow::LogFileReader); fileName = log; - TQDockArea* toolBarDock = new TQDockArea(Qt::Horizontal,TQDockArea::Normal,this,"logfile_toolbar_dock"); + TQDockArea* toolBarDock = new TQDockArea(TQt::Horizontal,TQDockArea::Normal,this,"logfile_toolbar_dock"); toolBar = new TDEToolBar(toolBarDock,"logfile_toolbar",true,true); toolBar->insertButton("document-save-as",0,TQT_SIGNAL(clicked()),TQT_TQOBJECT(this),TQT_SLOT(saveLog()),true,i18n("Save As...")); diff --git a/konversation/src/osd.cpp b/konversation/src/osd.cpp index a1567ab..53d3247 100644 --- a/konversation/src/osd.cpp +++ b/konversation/src/osd.cpp @@ -326,7 +326,7 @@ void OSDPreviewWidget::mousePressEvent( TQMouseEvent *event ) { m_dragOffset = event->pos(); - if ( event->button() == Qt::LeftButton && !m_dragging ) + if ( event->button() == TQt::LeftButton && !m_dragging ) { grabMouse( KCursor::sizeAllCursor() ); m_dragging = true; diff --git a/konversation/src/query.cpp b/konversation/src/query.cpp index 6370de7..6b7541b 100644 --- a/konversation/src/query.cpp +++ b/konversation/src/query.cpp @@ -50,7 +50,7 @@ Query::Query(TQWidget* parent, TQString _name) : ChatWindow(parent) setChannelEncodingSupported(true); - m_headerSplitter = new TQSplitter(Qt::Vertical, this); + m_headerSplitter = new TQSplitter(TQt::Vertical, this); m_initialShow = true; awayChanged=false; diff --git a/konversation/src/topiclabel.cpp b/konversation/src/topiclabel.cpp index 7036549..94c4613 100644 --- a/konversation/src/topiclabel.cpp +++ b/konversation/src/topiclabel.cpp @@ -79,7 +79,7 @@ namespace Konversation void TopicLabel::contentsMousePressEvent(TQMouseEvent *e) { - if (e->button()==Qt::LeftButton) + if (e->button()==TQt::LeftButton) { pressPosition=e->pos(); urlToDrag = anchorAt(pressPosition); @@ -98,7 +98,7 @@ namespace Konversation void TopicLabel::contentsMouseReleaseEvent(TQMouseEvent *e) { - if (e->button()==Qt::LeftButton) + if (e->button()==TQt::LeftButton) { if (mousePressed) openLink(urlToDrag); mousePressed=false; diff --git a/konversation/src/viewtree.cpp b/konversation/src/viewtree.cpp index 3351a90..bb036a4 100644 --- a/konversation/src/viewtree.cpp +++ b/konversation/src/viewtree.cpp @@ -538,10 +538,10 @@ void ViewTree::contentsMousePressEvent(TQMouseEvent* e) // Don't change the selected item when the user only // wants to get the context menu for a non-selected // item. - if (e->button() == Qt::RightButton && !item->isSelected()) + if (e->button() == TQt::RightButton && !item->isSelected()) return; - if (Preferences::closeButtons() && e->button() == Qt::LeftButton && isAboveIcon(vp, item)) + if (Preferences::closeButtons() && e->button() == TQt::LeftButton && isAboveIcon(vp, item)) { m_pressedAboveCloseButton = true; if (!item->getCloseButtonEnabled()) TDEListView::contentsMousePressEvent(e); @@ -551,7 +551,7 @@ void ViewTree::contentsMousePressEvent(TQMouseEvent* e) m_pressedAboveCloseButton = false; TDEListView::contentsMousePressEvent(e); } - m_middleClickItem = (Preferences::middleClickClose() && e->button() == Qt::MidButton) ? item : 0; + m_middleClickItem = (Preferences::middleClickClose() && e->button() == TQt::MidButton) ? item : 0; } } @@ -560,19 +560,19 @@ void ViewTree::contentsMouseReleaseEvent(TQMouseEvent* e) TQPoint vp = contentsToViewport(e->pos()); ViewTreeItem* item = static_cast(itemAt(vp)); - if (!item && e->button() == Qt::RightButton) + if (!item && e->button() == TQt::RightButton) return; if (item) { - if (Preferences::closeButtons() && e->button() == Qt::LeftButton + if (Preferences::closeButtons() && e->button() == TQt::LeftButton && isAboveIcon(vp, item) && m_pressedAboveCloseButton && item->getCloseButtonEnabled()) { emit closeView(item->getView()); } - if (Preferences::middleClickClose() && e->button() == Qt::MidButton + if (Preferences::middleClickClose() && e->button() == TQt::MidButton && item == m_middleClickItem) { emit closeView(item->getView()); @@ -597,9 +597,9 @@ void ViewTree::contentsMouseMoveEvent(TQMouseEvent* e) // Allow dragging only with the middle mouse button, just // like for the tab bar. - if ((e->state() & Qt::MidButton) == Qt::MidButton) + if ((e->state() & TQt::MidButton) == TQt::MidButton) TDEListView::contentsMouseMoveEvent(e); - else if ((e->state() & Qt::LeftButton) == Qt::LeftButton) + else if ((e->state() & TQt::LeftButton) == TQt::LeftButton) { if (item && (item != selectedItem()) && !item->isSeparator()) setSelected(item, true); @@ -607,7 +607,7 @@ void ViewTree::contentsMouseMoveEvent(TQMouseEvent* e) if (Preferences::closeButtons()) { - if (!(e->state() & Qt::LeftButton) && !(e->state() & Qt::MidButton) && !(e->state() & Qt::RightButton)) + if (!(e->state() & TQt::LeftButton) && !(e->state() & TQt::MidButton) && !(e->state() & TQt::RightButton)) { if (item) {