From 7367a616169a4ec8b35b5a993852c336aaeec25b Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 9 Nov 2023 10:36:57 +0900 Subject: Replace Qt with TQt Signed-off-by: Michele Calgaro (cherry picked from commit b53c83209a6b927b27600899a780db1efc985ecb) --- dcoprss/xmlrpciface.cpp | 4 ++-- kdict/applet/kdictapplet.cpp | 6 +++--- kdict/matchview.cpp | 2 +- kdict/queryview.cpp | 2 +- kdict/toplevel.cpp | 4 ++-- kget/docking.cpp | 2 +- kget/droptarget.cpp | 8 ++++---- knewsticker/knewsticker.cpp | 12 ++++++------ knewsticker/newsscroller.cpp | 8 ++++---- kopete/kopete/chatwindow/kopeteemailwindow.cpp | 2 +- kopete/kopete/contactlist/kopetecontactlistview.cpp | 2 +- kopete/kopete/kopeteaccountstatusbaricon.cpp | 4 ++-- kopete/kopete/kopeteeditglobalidentitywidget.cpp | 2 +- kopete/kopete/kopetewindow.cpp | 2 +- kopete/kopete/systemtray.cpp | 4 ++-- kopete/plugins/cryptography/popuppublic.cpp | 2 +- kopete/plugins/history/historydialog.cpp | 2 +- kopete/plugins/history/historylogger.cpp | 6 +++--- kopete/protocols/gadu/gadusession.cpp | 2 +- kopete/protocols/jabber/jabberbasecontact.cpp | 2 +- kopete/protocols/jabber/jabbercapabilitiesmanager.cpp | 4 ++-- kopete/protocols/jabber/jabbercontact.cpp | 4 ++-- kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp | 2 +- kopete/protocols/yahoo/yahooaccount.cpp | 4 ++-- kopete/protocols/yahoo/yahoocontact.cpp | 8 ++++---- kpf/src/Applet.cpp | 12 ++++++------ kpf/src/Applet.h | 2 +- kpf/src/AppletItem.cpp | 4 ++-- kppp/docking.cpp | 4 ++-- kppp/general.cpp | 4 ++-- kppp/logview/monthly.cpp | 2 +- kppp/modemcmds.cpp | 8 ++++---- krdc/krdc.cpp | 2 +- krdc/vnc/kvncview.cpp | 12 ++++++------ krfb/krfb/configuration.cpp | 4 ++-- krfb/krfb/personalinvitedialog.cpp | 2 +- krfb/krfb/trayicon.cpp | 2 +- ksirc/KSPrefs/page_shortcuts.cpp | 2 +- ksirc/KSTicker/kspainter.cpp | 12 ++++++------ ksirc/KSTicker/ksticker.cpp | 10 +++++----- ksirc/KSTicker/speeddialog.dlg | 4 ++-- ksirc/KSTicker/speeddialogData.cpp | 4 ++-- ksirc/ahistlineedit.cpp | 2 +- ksirc/dockservercontroller.cpp | 2 +- ksirc/kstextview.cpp | 18 +++++++++--------- ksirc/ksview.cpp | 6 +++--- ksirc/mditoplevel.cpp | 2 +- ksirc/toplevel.cpp | 4 ++-- ktalkd/kcmktalkd/soundpage.cpp | 2 +- lanbrowsing/kcmlisa/kcmlisa.cpp | 4 ++-- lanbrowsing/kcmlisa/kcmreslisa.cpp | 2 +- lanbrowsing/kcmlisa/kcmtdeiolan.cpp | 2 +- wifi/kwireless/kwirelesswidget.cpp | 14 +++++++------- wifi/status.cpp | 2 +- 54 files changed, 125 insertions(+), 125 deletions(-) diff --git a/dcoprss/xmlrpciface.cpp b/dcoprss/xmlrpciface.cpp index ebb45023..e34907e2 100644 --- a/dcoprss/xmlrpciface.cpp +++ b/dcoprss/xmlrpciface.cpp @@ -200,7 +200,7 @@ TQString Query::marshal( const TQVariant &arg ) s += "" + KCodecs::base64Encode( arg.toByteArray() ) + ""; break; case TQVariant::DateTime: - s += "" + arg.toDateTime().toString( Qt::ISODate ) + ""; + s += "" + arg.toDateTime().toString( TQt::ISODate ) + ""; break; case TQVariant::List: { s += ""; @@ -257,7 +257,7 @@ TQVariant Query::demarshal( const TQDomElement &elem ) } else if ( typeName == "base64" ) return TQVariant( KCodecs::base64Decode( TQCString(typeElement.text().latin1() )) ); else if ( typeName == "datetime" || typeName == "datetime.iso8601" ) - return TQVariant( TQDateTime::fromString( typeElement.text(), Qt::ISODate ) ); + return TQVariant( TQDateTime::fromString( typeElement.text(), TQt::ISODate ) ); else if ( typeName == "array" ) { TQValueList values; TQDomNode valueNode = typeElement.firstChild().firstChild(); diff --git a/kdict/applet/kdictapplet.cpp b/kdict/applet/kdictapplet.cpp index e4bb9b14..04268177 100644 --- a/kdict/applet/kdictapplet.cpp +++ b/kdict/applet/kdictapplet.cpp @@ -219,7 +219,7 @@ int DictApplet::heightForWidth(int width) const void DictApplet::resizeEvent(TQResizeEvent*) { - if (orientation() ==Qt::Horizontal) { + if (orientation() ==TQt::Horizontal) { verticalBtn->hide(); baseWidget->show(); baseWidget->setFixedSize(width(),height()); @@ -246,7 +246,7 @@ void DictApplet::resizeEvent(TQResizeEvent*) } baseWidget->updateGeometry(); - } else { // orientation() ==Qt::Vertical + } else { // orientation() ==TQt::Vertical verticalBtn->show(); baseWidget->hide(); verticalBtn->setFixedSize(width(),width()); @@ -338,7 +338,7 @@ void DictApplet::startQuery(const TQString &s) sendCommand("definePhrase(TQString)",query); - if (orientation() ==Qt::Vertical) + if (orientation() ==TQt::Vertical) popupBox->hide(); } diff --git a/kdict/matchview.cpp b/kdict/matchview.cpp index 8d4a7dc6..556685f5 100644 --- a/kdict/matchview.cpp +++ b/kdict/matchview.cpp @@ -217,7 +217,7 @@ void MatchView::enableGetButton() void MatchView::mouseButtonPressed(int button, TQListViewItem *, const TQPoint &, int) { - if (button == Qt::MidButton) + if (button == TQt::MidButton) emit(clipboardRequested()); } diff --git a/kdict/queryview.cpp b/kdict/queryview.cpp index ea108c60..c96dc540 100644 --- a/kdict/queryview.cpp +++ b/kdict/queryview.cpp @@ -120,7 +120,7 @@ DictHTMLPart::~DictHTMLPart() void DictHTMLPart::tdehtmlMouseReleaseEvent(tdehtml::MouseReleaseEvent *event) { - if (event->qmouseEvent()->button()==Qt::MidButton) + if (event->qmouseEvent()->button()==TQt::MidButton) emit(middleButtonClicked()); else TDEHTMLPart::tdehtmlMouseReleaseEvent(event); diff --git a/kdict/toplevel.cpp b/kdict/toplevel.cpp index 7f05207b..862d83ab 100644 --- a/kdict/toplevel.cpp +++ b/kdict/toplevel.cpp @@ -89,7 +89,7 @@ TopLevel::TopLevel(TQWidget* parent, const char* name) if (global->showMatchList) { // show splitter, html view & match list - splitter = new TQSplitter(Qt::Horizontal,this); + splitter = new TQSplitter(TQt::Horizontal,this); splitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() ); queryView->reparent(splitter,0,queryView->pos(),true); matchView->reparent(splitter,0,matchView->pos(),true); @@ -648,7 +648,7 @@ void TopLevel::toggleMatchListShow() else // list is not visible -> show it { global->showMatchList = true; - splitter = new TQSplitter(Qt::Horizontal,this); + splitter = new TQSplitter(TQt::Horizontal,this); splitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() ); setCentralWidget(splitter); splitter->show(); diff --git a/kget/docking.cpp b/kget/docking.cpp index fa1adb97..54c0d96a 100644 --- a/kget/docking.cpp +++ b/kget/docking.cpp @@ -90,7 +90,7 @@ void DockWidget::dropEvent(TQDropEvent * event) void DockWidget::mousePressEvent(TQMouseEvent * e) { - if (e->button() == Qt::MidButton) { + if (e->button() == TQt::MidButton) { parent->slotPasteTransfer(); } else { KSystemTray::mousePressEvent(e); diff --git a/kget/droptarget.cpp b/kget/droptarget.cpp index ed600f88..b415461c 100644 --- a/kget/droptarget.cpp +++ b/kget/droptarget.cpp @@ -118,7 +118,7 @@ DropTarget::~DropTarget() void DropTarget::mousePressEvent(TQMouseEvent * e) { - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { // toggleMinimizeRestore (); // oldX = 0; @@ -127,14 +127,14 @@ DropTarget::mousePressEvent(TQMouseEvent * e) dx = TQCursor::pos().x() - pos().x(); dy = TQCursor::pos().y() - pos().y(); } - else if (e->button() == Qt::RightButton) + else if (e->button() == TQt::RightButton) { popupMenu->setItemEnabled(pop_Min, tdemain->isVisible()); popupMenu->setItemEnabled(pop_Max, tdemain->isHidden()); popupMenu->popup(TQCursor::pos()); } - else if (e->button() == Qt::MidButton) + else if (e->button() == TQt::MidButton) { tdemain->slotPasteTransfer(); } @@ -224,7 +224,7 @@ void DropTarget::mouseReleaseEvent(TQMouseEvent *) /** No descriptions */ void DropTarget::mouseDoubleClickEvent(TQMouseEvent * e) { - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) toggleMinimizeRestore(); } diff --git a/knewsticker/knewsticker.cpp b/knewsticker/knewsticker.cpp index 49344eaa..9fb5a2e6 100644 --- a/knewsticker/knewsticker.cpp +++ b/knewsticker/knewsticker.cpp @@ -224,7 +224,7 @@ void KNewsTicker::slotNewsSourceFailed(const NewsSourceBase::Ptr &ns) void KNewsTicker::mousePressEvent(TQMouseEvent *e) { - if (e->button() == Qt::RightButton) + if (e->button() == TQt::RightButton) slotOpenContextMenu(); } @@ -261,7 +261,7 @@ void KNewsTicker::positionChange(Position) TQBoxLayout *layout; - if (orientation() ==Qt::Horizontal) + if (orientation() ==TQt::Horizontal) layout = new TQHBoxLayout(this); else layout = new TQVBoxLayout(this); @@ -387,16 +387,16 @@ void KNewsTicker::setHighlightedColor(const TQColor &highlightedColor) void KNewsTicker::setupArrowButton() { - Qt::ArrowType at; + TQt::ArrowType at; - if (orientation() ==Qt::Horizontal) { + if (orientation() ==TQt::Horizontal) { m_arrowButton->setFixedWidth(12); m_arrowButton->setMaximumHeight(128); - at = (position() == KPanelApplet::pTop ? Qt::DownArrow : Qt::UpArrow); + at = (position() == KPanelApplet::pTop ? TQt::DownArrow : TQt::UpArrow); } else { m_arrowButton->setMaximumWidth(128); m_arrowButton->setFixedHeight(12); - at = (position() == KPanelApplet::pLeft ? Qt::RightArrow : Qt::LeftArrow); + at = (position() == KPanelApplet::pLeft ? TQt::RightArrow : TQt::LeftArrow); } m_arrowButton->setArrowType(at); } diff --git a/knewsticker/newsscroller.cpp b/knewsticker/newsscroller.cpp index 4c5f3861..c9df6429 100644 --- a/knewsticker/newsscroller.cpp +++ b/knewsticker/newsscroller.cpp @@ -270,7 +270,7 @@ void NewsScroller::enterEvent(TQEvent *) void NewsScroller::mousePressEvent(TQMouseEvent *e) { - if (e->button() == Qt::LeftButton || e->button() == Qt::MidButton) { + if (e->button() == TQt::LeftButton || e->button() == TQt::MidButton) { m_dragPos = e->pos(); if (m_activeHeadline) @@ -280,14 +280,14 @@ void NewsScroller::mousePressEvent(TQMouseEvent *e) void NewsScroller::mouseReleaseEvent(TQMouseEvent *e) { - if ((e->button() == Qt::LeftButton || e->button() == Qt::MidButton) + if ((e->button() == TQt::LeftButton || e->button() == TQt::MidButton) && m_activeHeadline && m_activeHeadline->article()->headline() == m_tempHeadline && !m_mouseDrag) { m_activeHeadline->article()->open(); m_tempHeadline = TQString(); } - if (e->button() == Qt::RightButton) + if (e->button() == TQt::RightButton) emit(contextMenu()); if (m_mouseDrag) { @@ -307,7 +307,7 @@ void NewsScroller::mouseMoveEvent(TQMouseEvent *e) dragDistance = TQABS(e->x() - m_dragPos.x()); else dragDistance = TQABS(e->y() - m_dragPos.y()); - m_mouseDrag = (e->state() & Qt::LeftButton != 0) && + m_mouseDrag = (e->state() & TQt::LeftButton != 0) && dragDistance >= TDEGlobal::config()->readNumEntry("StartDragDist", TDEApplication::startDragDistance()); if (m_mouseDrag) // Stop the scroller if we just started a drag. m_scrollTimer->stop(); diff --git a/kopete/kopete/chatwindow/kopeteemailwindow.cpp b/kopete/kopete/chatwindow/kopeteemailwindow.cpp index b921a92b..9bd4aaf6 100644 --- a/kopete/kopete/chatwindow/kopeteemailwindow.cpp +++ b/kopete/kopete/chatwindow/kopeteemailwindow.cpp @@ -106,7 +106,7 @@ KopeteEmailWindow::KopeteEmailWindow( Kopete::ChatSession *manager, EmailWindowP setMinimumSize( TQSize( 75, 20 ) ); d->split = new TQSplitter( v ); - d->split->setOrientation( Qt::Vertical ); + d->split->setOrientation( TQt::Vertical ); d->messagePart = new ChatMessagePart( manager, d->split, "messagePart" ); diff --git a/kopete/kopete/contactlist/kopetecontactlistview.cpp b/kopete/kopete/contactlist/kopetecontactlistview.cpp index 9678aa5a..a7b214b6 100644 --- a/kopete/kopete/contactlist/kopetecontactlistview.cpp +++ b/kopete/kopete/contactlist/kopetecontactlistview.cpp @@ -1205,7 +1205,7 @@ void KopeteContactListView::findDrop(const TQPoint &pos, TQListViewItem *&parent void KopeteContactListView::contentsMousePressEvent( TQMouseEvent *e ) { TDEListView::contentsMousePressEvent( e ); - if (e->button() == Qt::LeftButton ) + if (e->button() == TQt::LeftButton ) { TQPoint p=contentsToViewport(e->pos()); TQListViewItem *i=itemAt( p ); diff --git a/kopete/kopete/kopeteaccountstatusbaricon.cpp b/kopete/kopete/kopeteaccountstatusbaricon.cpp index 45228788..d08f7f96 100644 --- a/kopete/kopete/kopeteaccountstatusbaricon.cpp +++ b/kopete/kopete/kopeteaccountstatusbaricon.cpp @@ -44,11 +44,11 @@ KopeteAccountStatusBarIcon::~KopeteAccountStatusBarIcon() void KopeteAccountStatusBarIcon::mousePressEvent( TQMouseEvent *me ) { - if( me->button() == Qt::RightButton ) + if( me->button() == TQt::RightButton ) { emit rightClicked( m_account, TQPoint( me->globalX(), me->globalY() ) ); } - else if( me->button() == Qt::LeftButton ) + else if( me->button() == TQt::LeftButton ) { emit leftClicked( m_account, TQPoint( me->globalX(), me->globalY() ) ); } diff --git a/kopete/kopete/kopeteeditglobalidentitywidget.cpp b/kopete/kopete/kopeteeditglobalidentitywidget.cpp index 92c88f2e..8d510694 100644 --- a/kopete/kopete/kopeteeditglobalidentitywidget.cpp +++ b/kopete/kopete/kopeteeditglobalidentitywidget.cpp @@ -50,7 +50,7 @@ ClickableLabel::ClickableLabel(TQWidget *parent, const char *name) void ClickableLabel::mouseReleaseEvent(TQMouseEvent *event) { - if(event->button() == Qt::LeftButton) + if(event->button() == TQt::LeftButton) { emit clicked(); event->accept(); diff --git a/kopete/kopete/kopetewindow.cpp b/kopete/kopete/kopetewindow.cpp index ef8cec71..329f4944 100644 --- a/kopete/kopete/kopetewindow.cpp +++ b/kopete/kopete/kopetewindow.cpp @@ -88,7 +88,7 @@ GlobalStatusMessageIconLabel::GlobalStatusMessageIconLabel(TQWidget *parent, con void GlobalStatusMessageIconLabel::mouseReleaseEvent( TQMouseEvent *event ) { - if( event->button() == Qt::LeftButton || event->button() == Qt::RightButton ) + if( event->button() == TQt::LeftButton || event->button() == TQt::RightButton ) { emit iconClicked( event->globalPos() ); event->accept(); diff --git a/kopete/kopete/systemtray.cpp b/kopete/kopete/systemtray.cpp index f84bea13..8a18b0dd 100644 --- a/kopete/kopete/systemtray.cpp +++ b/kopete/kopete/systemtray.cpp @@ -100,8 +100,8 @@ KopeteSystemTray::~KopeteSystemTray() void KopeteSystemTray::mousePressEvent( TQMouseEvent *me ) { if ( - (me->button() == Qt::MidButton || - (me->button() == Qt::LeftButton && KopetePrefs::prefs()->trayflashNotifyLeftClickOpensMessage())) && + (me->button() == TQt::MidButton || + (me->button() == TQt::LeftButton && KopetePrefs::prefs()->trayflashNotifyLeftClickOpensMessage())) && mIsBlinking ) { mouseDoubleClickEvent( me ); diff --git a/kopete/plugins/cryptography/popuppublic.cpp b/kopete/plugins/cryptography/popuppublic.cpp index e5aaeebf..c5ef4fa5 100644 --- a/kopete/plugins/cryptography/popuppublic.cpp +++ b/kopete/plugins/cryptography/popuppublic.cpp @@ -141,7 +141,7 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent keysList->setColumnWidth(0,210); keysList->setColumnWidth(1,210); - boutonboxoptions=new TQButtonGroup(5,Qt::Vertical ,page,0); + boutonboxoptions=new TQButtonGroup(5,TQt::Vertical ,page,0); TDEActionCollection *actcol=new TDEActionCollection(this); (void) new TDEAction(i18n("&Go to Default Key"),goDefaultKey, TQT_TQOBJECT(this), TQT_SLOT(slotGotoDefaultKey()),actcol,"go_default_key"); diff --git a/kopete/plugins/history/historydialog.cpp b/kopete/plugins/history/historydialog.cpp index 0ce07aad..7a4e1795 100644 --- a/kopete/plugins/history/historydialog.cpp +++ b/kopete/plugins/history/historydialog.cpp @@ -74,7 +74,7 @@ private: TDEListViewDateItem::TDEListViewDateItem(TDEListView* parent, TQDate date, Kopete::MetaContact *mc) - : TDEListViewItem(parent, date.toString(Qt::ISODate), mc->displayName()) + : TDEListViewItem(parent, date.toString(TQt::ISODate), mc->displayName()) { mDate = date; mMetaContact = mc; diff --git a/kopete/plugins/history/historylogger.cpp b/kopete/plugins/history/historylogger.cpp index f03d165b..78bf25b2 100644 --- a/kopete/plugins/history/historylogger.cpp +++ b/kopete/plugins/history/historylogger.cpp @@ -377,7 +377,7 @@ TQValueList HistoryLogger::readMessages(TQDate date) Kopete::Message msg(dt, from, to, msgElem2.text(), dir); msg.setBody( TQString::fromLatin1("%2") - .arg( dt.toString(Qt::LocalDate), msg.escapedBody() ), + .arg( dt.toString(TQt::LocalDate), msg.escapedBody() ), Kopete::Message::RichText); @@ -595,7 +595,7 @@ TQValueList HistoryLogger::readMessages(unsigned int lines, if (colorize) { msg.setBody( TQString::fromLatin1("%3") - .arg( fgColor.name(), timestamp.toString(Qt::LocalDate), msg.escapedBody() ), + .arg( fgColor.name(), timestamp.toString(TQt::LocalDate), msg.escapedBody() ), Kopete::Message::RichText ); msg.setFg( fgColor ); @@ -603,7 +603,7 @@ TQValueList HistoryLogger::readMessages(unsigned int lines, else { msg.setBody( TQString::fromLatin1("%2") - .arg( timestamp.toString(Qt::LocalDate), msg.escapedBody() ), + .arg( timestamp.toString(TQt::LocalDate), msg.escapedBody() ), Kopete::Message::RichText ); } diff --git a/kopete/protocols/gadu/gadusession.cpp b/kopete/protocols/gadu/gadusession.cpp index e4218cb2..f1660ffd 100644 --- a/kopete/protocols/gadu/gadusession.cpp +++ b/kopete/protocols/gadu/gadusession.cpp @@ -714,7 +714,7 @@ GaduSession::checkDescriptor() gaduMessage.message = textcodec->toUnicode((const char*)event->event.msg.message); gaduMessage.sender_id = event->event.msg.sender; - gaduMessage.sendTime.setTime_t( event->event.msg.time, Qt::LocalTime ); + gaduMessage.sendTime.setTime_t( event->event.msg.time, TQt::LocalTime ); gaduMessage.message = rtf->convertToHtml( gaduMessage.message, event->event.msg.formats_length, event->event.msg.formats ); emit messageReceived( &gaduMessage ); } diff --git a/kopete/protocols/jabber/jabberbasecontact.cpp b/kopete/protocols/jabber/jabberbasecontact.cpp index e3bc2ed9..54d4e427 100644 --- a/kopete/protocols/jabber/jabberbasecontact.cpp +++ b/kopete/protocols/jabber/jabberbasecontact.cpp @@ -414,7 +414,7 @@ void JabberBaseContact::setPropertiesFromVCard ( const XMPP::VCard &vCard ) // update vCard cache timestamp if this is not a temporary contact if ( metaContact() && !metaContact()->isTemporary () ) { - setProperty ( protocol()->propVCardCacheTimeStamp, TQDateTime::currentDateTime().toString ( Qt::ISODate ) ); + setProperty ( protocol()->propVCardCacheTimeStamp, TQDateTime::currentDateTime().toString ( TQt::ISODate ) ); } diff --git a/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp b/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp index c1affb1e..deb62a1e 100644 --- a/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp +++ b/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp @@ -246,7 +246,7 @@ void JabberCapabilitiesManager::CapabilitiesInformation::updateLastSeen() TQDomElement JabberCapabilitiesManager::CapabilitiesInformation::toXml(TQDomDocument *doc) const { TQDomElement info = doc->createElement("info"); - //info.setAttribute("last-seen",lastSeen_.toString(Qt::ISODate)); + //info.setAttribute("last-seen",lastSeen_.toString(TQt::ISODate)); // Identities DiscoItem::Identities::ConstIterator discoIt = m_identities.constBegin(), discoItEnd = m_identities.constEnd(); @@ -280,7 +280,7 @@ void JabberCapabilitiesManager::CapabilitiesInformation::fromXml(const TQDomElem } //if (!e.attribute("last-seen").isEmpty()) - // lastSeen_ = TQDate::fromString(e.attribute("last-seen"),Qt::ISODate); + // lastSeen_ = TQDate::fromString(e.attribute("last-seen"),TQt::ISODate); for(TQDomNode node = element.firstChild(); !node.isNull(); node = node.nextSibling()) { diff --git a/kopete/protocols/jabber/jabbercontact.cpp b/kopete/protocols/jabber/jabbercontact.cpp index 54bc7f7e..7d8035f9 100644 --- a/kopete/protocols/jabber/jabbercontact.cpp +++ b/kopete/protocols/jabber/jabbercontact.cpp @@ -442,7 +442,7 @@ void JabberContact::slotCheckVCard () if ( cacheDateString.isNull () ) cacheDate = TQDateTime::currentDateTime().addDays ( -2 ); else - cacheDate = TQDateTime::fromString ( cacheDateString.value().toString (), Qt::ISODate ); + cacheDate = TQDateTime::fromString ( cacheDateString.value().toString (), TQt::ISODate ); kdDebug ( JABBER_DEBUG_GLOBAL ) << k_funcinfo << "Cached vCard data for " << contactId () << " from " << cacheDate.toString () << endl; @@ -506,7 +506,7 @@ void JabberContact::slotGotVCard () // update timestamp of last vCard retrieval if ( metaContact() && !metaContact()->isTemporary () ) { - setProperty ( protocol()->propVCardCacheTimeStamp, TQDateTime::currentDateTime().toString ( Qt::ISODate ) ); + setProperty ( protocol()->propVCardCacheTimeStamp, TQDateTime::currentDateTime().toString ( TQt::ISODate ) ); } mVCardUpdateInProgress = false; diff --git a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp index 2d51eea3..497f13fe 100644 --- a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp +++ b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp @@ -282,7 +282,7 @@ void WinPopupLib::readMessages(const KFileItemList &items) // second line is time TQString tmpTime = stream.readLine(); - time = TQDateTime::fromString(tmpTime, Qt::ISODate); + time = TQDateTime::fromString(tmpTime, TQt::ISODate); while (!stream.atEnd()) { text.append(stream.readLine()); diff --git a/kopete/protocols/yahoo/yahooaccount.cpp b/kopete/protocols/yahoo/yahooaccount.cpp index 91d845df..f5c2e26b 100644 --- a/kopete/protocols/yahoo/yahooaccount.cpp +++ b/kopete/protocols/yahoo/yahooaccount.cpp @@ -1147,7 +1147,7 @@ void YahooAccount::slotGotIm( const TQString &who, const TQString &msg, long tm, msgDT.setTime_t(time(0L)); else //msgDT = TQDateTime::fromTime_t(tm); - msgDT.setTime_t(tm, Qt::LocalTime); + msgDT.setTime_t(tm, TQt::LocalTime); TQString newMsgText = prepareIncomingMessage( msg ); @@ -1185,7 +1185,7 @@ void YahooAccount::slotGotBuzz( const TQString &who, long tm ) msgDT.setTime_t(time(0L)); else //msgDT = TQDateTime::fromTime_t(tm); - msgDT.setTime_t(tm, Qt::LocalTime); + msgDT.setTime_t(tm, TQt::LocalTime); justMe.append(myself()); diff --git a/kopete/protocols/yahoo/yahoocontact.cpp b/kopete/protocols/yahoo/yahoocontact.cpp index c5e0f3ce..4f93ea3a 100644 --- a/kopete/protocols/yahoo/yahoocontact.cpp +++ b/kopete/protocols/yahoo/yahoocontact.cpp @@ -763,8 +763,8 @@ void YahooContact::writeYABEntry() setProperty( YahooProtocol::protocol()->propWorkURL, m_YABEntry->workURL ); // Miscellanous - setProperty( YahooProtocol::protocol()->propBirthday, TQString(m_YABEntry->birthday.toString( Qt::ISODate )) ); - setProperty( YahooProtocol::protocol()->propAnniversary, TQString(m_YABEntry->anniversary.toString( Qt::ISODate )) ); + setProperty( YahooProtocol::protocol()->propBirthday, TQString(m_YABEntry->birthday.toString( TQt::ISODate )) ); + setProperty( YahooProtocol::protocol()->propAnniversary, TQString(m_YABEntry->anniversary.toString( TQt::ISODate )) ); setProperty( YahooProtocol::protocol()->propNotes, m_YABEntry->notes ); setProperty( YahooProtocol::protocol()->propAdditional1, m_YABEntry->additional1 ); setProperty( YahooProtocol::protocol()->propAdditional2, m_YABEntry->additional2 ); @@ -826,8 +826,8 @@ void YahooContact::readYABEntry() m_YABEntry->workURL = property( YahooProtocol::protocol()->propWorkURL ).value().toString(); // Miscellanous - m_YABEntry->birthday = TQDate::fromString( property( YahooProtocol::protocol()->propBirthday ).value().toString(), Qt::ISODate ); - m_YABEntry->anniversary = TQDate::fromString( property( YahooProtocol::protocol()->propAnniversary ).value().toString(), Qt::ISODate ); + m_YABEntry->birthday = TQDate::fromString( property( YahooProtocol::protocol()->propBirthday ).value().toString(), TQt::ISODate ); + m_YABEntry->anniversary = TQDate::fromString( property( YahooProtocol::protocol()->propAnniversary ).value().toString(), TQt::ISODate ); m_YABEntry->notes = property( YahooProtocol::protocol()->propNotes ).value().toString(); m_YABEntry->additional1 = property( YahooProtocol::protocol()->propAdditional1 ).value().toString(); m_YABEntry->additional2 = property( YahooProtocol::protocol()->propAdditional2 ).value().toString(); diff --git a/kpf/src/Applet.cpp b/kpf/src/Applet.cpp index 0ee0b264..dca2c4aa 100644 --- a/kpf/src/Applet.cpp +++ b/kpf/src/Applet.cpp @@ -148,7 +148,7 @@ namespace KPF if (0 == serverCount) serverCount = 1; - if (Qt::Vertical == orientation()) + if (TQt::Vertical == orientation()) return h / serverCount; else return h * serverCount; @@ -162,7 +162,7 @@ namespace KPF if (0 == serverCount) serverCount = 1; - if (Qt::Vertical == orientation()) + if (TQt::Vertical == orientation()) return w * serverCount; else return w / serverCount; @@ -220,7 +220,7 @@ namespace KPF } void - Applet::orientationChange(Qt::Orientation) + Applet::orientationChange(TQt::Orientation) { resetLayout(); } @@ -248,7 +248,7 @@ namespace KPF switch (orientation()) { - case Qt::Vertical: + case TQt::Vertical: { uint itemHeight = height() / itemList_.count(); @@ -262,7 +262,7 @@ namespace KPF } break; - case Qt::Horizontal: + case TQt::Horizontal: { uint itemWidth = width() / itemList_.count(); @@ -282,7 +282,7 @@ namespace KPF void Applet::mousePressEvent(TQMouseEvent * ev) { - if (Qt::RightButton != ev->button() && Qt::LeftButton != ev->button()) + if (TQt::RightButton != ev->button() && TQt::LeftButton != ev->button()) return; switch (popup_->exec(TQCursor::pos())) diff --git a/kpf/src/Applet.h b/kpf/src/Applet.h index 185a36be..74e87d59 100644 --- a/kpf/src/Applet.h +++ b/kpf/src/Applet.h @@ -124,7 +124,7 @@ namespace KPF * Overridden to keep track of orientation change and update layout * accordingly. */ - virtual void orientationChange(Qt::Orientation); + virtual void orientationChange(TQt::Orientation); /** * Overridden to update layout accordingly. diff --git a/kpf/src/AppletItem.cpp b/kpf/src/AppletItem.cpp index 2a8e22d3..3a3b9021 100644 --- a/kpf/src/AppletItem.cpp +++ b/kpf/src/AppletItem.cpp @@ -137,7 +137,7 @@ namespace KPF break; } - if (Qt::LeftButton == e->button()) + if (TQt::LeftButton == e->button()) { // Show monitor. @@ -168,7 +168,7 @@ namespace KPF break; } - if (Qt::RightButton != e->button() && Qt::LeftButton != e->button()) + if (TQt::RightButton != e->button() && TQt::LeftButton != e->button()) break; if (server_->paused()) diff --git a/kppp/docking.cpp b/kppp/docking.cpp index cfb41529..792d80a6 100644 --- a/kppp/docking.cpp +++ b/kppp/docking.cpp @@ -114,12 +114,12 @@ void DockWidget::stop_stats() { void DockWidget::mousePressEvent(TQMouseEvent *e) { // open/close connect-window on right mouse button - if ( e->button() == Qt::LeftButton ) { + if ( e->button() == TQt::LeftButton ) { toggle_window_state(); } // open popup menu on left mouse button - if ( e->button() == Qt::RightButton ) { + if ( e->button() == TQt::RightButton ) { TQString text; if(p_kppp->con_win->isVisible()) text = i18n("Minimize"); diff --git a/kppp/general.cpp b/kppp/general.cpp index 1dbe4aad..b1e2c0b0 100644 --- a/kppp/general.cpp +++ b/kppp/general.cpp @@ -487,7 +487,7 @@ ModemWidget2::ModemWidget2(TQWidget *parent, const char *name) TQLabel *volumeLabel = new TQLabel(i18n("Modem &volume:"), parent); hbl->addWidget(volumeLabel); - volume = new TQSlider(0, 2, 1, gpppdata.volume(), Qt::Horizontal, parent); + volume = new TQSlider(0, 2, 1, gpppdata.volume(), TQt::Horizontal, parent); volumeLabel->setBuddy(volume); volume->setTickmarks(TQSlider::Below); hbl->addWidget(volume); @@ -619,7 +619,7 @@ GraphSetup::GraphSetup(TQWidget *parent, const char *name) : enable_check = new TQCheckBox(i18n("&Enable throughput graph"), parent); tl->addWidget(enable_check); - grpColor = new TQGroupBox(2, Qt::Horizontal, + grpColor = new TQGroupBox(2, TQt::Horizontal, i18n("Graph Colors"), parent); tl->addWidget(grpColor); diff --git a/kppp/logview/monthly.cpp b/kppp/logview/monthly.cpp index e36a6219..1a6b5a1f 100644 --- a/kppp/logview/monthly.cpp +++ b/kppp/logview/monthly.cpp @@ -228,7 +228,7 @@ MonthlyWidget::MonthlyWidget(TQWidget *parent) : connect(cboConnections, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotConnections(int))); - bbox = new KButtonBox(this, Qt::Vertical); + bbox = new KButtonBox(this, TQt::Vertical); prev = bbox->addButton(i18n("&Prev Month")); next = bbox->addButton(i18n("&Next Month")); bbox->addStretch(1); diff --git a/kppp/modemcmds.cpp b/kppp/modemcmds.cpp index 43900295..625ee40b 100644 --- a/kppp/modemcmds.cpp +++ b/kppp/modemcmds.cpp @@ -71,7 +71,7 @@ ModemCommands::ModemCommands(TQWidget *parent, const char *name) FORMATSLIDERLABEL(lpreinitslider); preinitslider = new TQSlider(0, 300, 1, 0, - Qt::Horizontal, dummyWidget); + TQt::Horizontal, dummyWidget); preinitslider->setFixedHeight(preinitslider->sizeHint().height()); connect(preinitslider, TQT_SIGNAL(valueChanged(int)), lpreinitslider, TQT_SLOT(setNum(int))); @@ -95,7 +95,7 @@ ModemCommands::ModemCommands(TQWidget *parent, const char *name) linitslider = new TQLabel("MMMM", dummyWidget); FORMATSLIDERLABEL(linitslider); initslider = new TQSlider(1, 300, 1, 0, - Qt::Horizontal, dummyWidget); + TQt::Horizontal, dummyWidget); initslider->setFixedHeight(initslider->sizeHint().height()); connect(initslider, TQT_SIGNAL(valueChanged(int)), linitslider, TQT_SLOT(setNum(int))); @@ -111,7 +111,7 @@ ModemCommands::ModemCommands(TQWidget *parent, const char *name) ldurationslider = new TQLabel("MMMM", dummyWidget); FORMATSLIDERLABEL(ldurationslider); durationslider = new TQSlider(1, 255, 1, 0, - Qt::Horizontal, dummyWidget); + TQt::Horizontal, dummyWidget); durationslider->setFixedHeight(durationslider->sizeHint().height()); connect(durationslider, TQT_SIGNAL(valueChanged(int)), ldurationslider, TQT_SLOT(setNum(int))); @@ -227,7 +227,7 @@ ModemCommands::ModemCommands(TQWidget *parent, const char *name) FORMATSLIDERLABEL(lslider); slider = new TQSlider(0, 255, 1, 0, - Qt::Horizontal, dummyWidget); + TQt::Horizontal, dummyWidget); slider->setFixedHeight(slider->sizeHint().height()); connect(slider, TQT_SIGNAL(valueChanged(int)), lslider, TQT_SLOT(setNum(int))); diff --git a/krdc/krdc.cpp b/krdc/krdc.cpp index 6053d7b8..31e90d55 100644 --- a/krdc/krdc.cpp +++ b/krdc/krdc.cpp @@ -585,7 +585,7 @@ void KRDC::switchToNormal(bool scaling) } if (!m_toolbar) { - m_dockArea = new TQDockArea(Qt::Horizontal, TQDockArea::Normal, this); + m_dockArea = new TQDockArea(TQt::Horizontal, TQDockArea::Normal, this); m_dockArea->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed)); TDEToolBar *t = new TDEToolBar(m_dockArea); diff --git a/krdc/vnc/kvncview.cpp b/krdc/vnc/kvncview.cpp index 3cc22228..d30ea356 100644 --- a/krdc/vnc/kvncview.cpp +++ b/krdc/vnc/kvncview.cpp @@ -542,19 +542,19 @@ void KVncView::mouseEvent(TQMouseEvent *e) { if ( e->type() != TQEvent::MouseMove ) { if ( (e->type() == TQEvent::MouseButtonPress) || (e->type() == TQEvent::MouseButtonDblClick)) { - if ( e->button() & Qt::LeftButton ) + if ( e->button() & TQt::LeftButton ) m_buttonMask |= 0x01; - if ( e->button() & Qt::MidButton ) + if ( e->button() & TQt::MidButton ) m_buttonMask |= 0x02; - if ( e->button() & Qt::RightButton ) + if ( e->button() & TQt::RightButton ) m_buttonMask |= 0x04; } else if ( e->type() == TQEvent::MouseButtonRelease ) { - if ( e->button() & Qt::LeftButton ) + if ( e->button() & TQt::LeftButton ) m_buttonMask &= 0xfe; - if ( e->button() & Qt::MidButton ) + if ( e->button() & TQt::MidButton ) m_buttonMask &= 0xfd; - if ( e->button() & Qt::RightButton ) + if ( e->button() & TQt::RightButton ) m_buttonMask &= 0xfb; } } diff --git a/krfb/krfb/configuration.cpp b/krfb/krfb/configuration.cpp index 069b5696..c4acbfe4 100644 --- a/krfb/krfb/configuration.cpp +++ b/krfb/krfb/configuration.cpp @@ -218,8 +218,8 @@ void Configuration::saveToDialogs() { Invitation &inv = *(it++); if (!inv.getViewItem()) inv.setViewItem(new TDEListViewItem(invMngDlg.listView, - inv.creationTime().toString(Qt::LocalDate), - inv.expirationTime().toString(Qt::LocalDate))); + inv.creationTime().toString(TQt::LocalDate), + inv.expirationTime().toString(TQt::LocalDate))); } invMngDlg.adjustSize(); } diff --git a/krfb/krfb/personalinvitedialog.cpp b/krfb/krfb/personalinvitedialog.cpp index 2949ba03..230eb97a 100644 --- a/krfb/krfb/personalinvitedialog.cpp +++ b/krfb/krfb/personalinvitedialog.cpp @@ -50,5 +50,5 @@ void PersonalInviteDialog::setPassword( const TQString &passwd ) void PersonalInviteDialog::setExpiration( const TQDateTime &expire ) { - m_inviteWidget->expirationLabel->setText( expire.toString( Qt::LocalDate ) ); + m_inviteWidget->expirationLabel->setText( expire.toString( TQt::LocalDate ) ); } diff --git a/krfb/krfb/trayicon.cpp b/krfb/krfb/trayicon.cpp index aa848f90..7464fd03 100644 --- a/krfb/krfb/trayicon.cpp +++ b/krfb/krfb/trayicon.cpp @@ -127,7 +127,7 @@ void TrayIcon::mousePressEvent(TQMouseEvent *e) if (!rect().contains(e->pos())) return; - if (e->button() == Qt::LeftButton) { + if (e->button() == TQt::LeftButton) { contextMenuAboutToShow(contextMenu()); contextMenu()->popup(e->globalPos()); } diff --git a/ksirc/KSPrefs/page_shortcuts.cpp b/ksirc/KSPrefs/page_shortcuts.cpp index 4d2fda54..c1f3da12 100644 --- a/ksirc/KSPrefs/page_shortcuts.cpp +++ b/ksirc/KSPrefs/page_shortcuts.cpp @@ -18,7 +18,7 @@ PageShortcuts::PageShortcuts( TQWidget *parent, const char *name ) : PageShortcutsBase( parent, name) { - globalGB->setColumnLayout( 0, Qt::Horizontal ); + globalGB->setColumnLayout( 0, TQt::Horizontal ); m_key = new KKeyChooser(servercontroller::self()->getGlobalAccel(), globalGB); connect(m_key, TQT_SIGNAL(keyChange()), this, TQT_SLOT(changed())); diff --git a/ksirc/KSTicker/kspainter.cpp b/ksirc/KSTicker/kspainter.cpp index e9e63bce..2b8f83a8 100644 --- a/ksirc/KSTicker/kspainter.cpp +++ b/ksirc/KSTicker/kspainter.cpp @@ -109,7 +109,7 @@ void KSPainter::colourDrawText(TQPainter *p, int startx, int starty, } if(bcolour < maxcolour ){ p->setBackgroundColor(num2colour[bcolour]); - p->setBackgroundMode(Qt::OpaqueMode); + p->setBackgroundMode(TQt::OpaqueMode); } } @@ -118,7 +118,7 @@ void KSPainter::colourDrawText(TQPainter *p, int startx, int starty, else if(str[i] == 0x03){ i++; p->setPen(qpDefPen); - p->setBackgroundMode(Qt::TransparentMode); + p->setBackgroundMode(TQt::TransparentMode); } else if((str[i] == '~') && ((str[i+1] >= 0x61) || (str[i+1] <= 0x7a))){ TQFont fnt = p->font(); @@ -126,11 +126,11 @@ void KSPainter::colourDrawText(TQPainter *p, int startx, int starty, switch(str[i+1]){ case 'c': p->setPen(qpDefPen); - p->setBackgroundMode(Qt::TransparentMode); + p->setBackgroundMode(TQt::TransparentMode); break; case 'C': p->setPen(qpDefPen); - p->setBackgroundMode(Qt::TransparentMode); + p->setBackgroundMode(TQt::TransparentMode); fnt.setBold(FALSE); fnt.setItalic(FALSE); fnt.setUnderline(FALSE); @@ -139,11 +139,11 @@ void KSPainter::colourDrawText(TQPainter *p, int startx, int starty, case 'r': if(ReverseText == TRUE) { ReverseText = FALSE; - p->setBackgroundMode(Qt::TransparentMode); + p->setBackgroundMode(TQt::TransparentMode); } else { ReverseText = TRUE; - p->setBackgroundMode(Qt::OpaqueMode); + p->setBackgroundMode(TQt::OpaqueMode); } temppen = p->pen().color(); p->setPen( p->backgroundColor() ); diff --git a/ksirc/KSTicker/ksticker.cpp b/ksirc/KSTicker/ksticker.cpp index f6afc2a1..1183e414 100644 --- a/ksirc/KSTicker/ksticker.cpp +++ b/ksirc/KSTicker/ksticker.cpp @@ -231,7 +231,7 @@ void KSTicker::timerEvent(TQTimerEvent *) } bAtEnd = FALSE; - static Qt::BGMode bgmode = Qt::TransparentMode; + static TQt::BGMode bgmode = TQt::TransparentMode; bitBlt(pic, -tickStep, 0, pic); TQPainter p(pic); @@ -275,12 +275,12 @@ void KSTicker::timerEvent(TQTimerEvent *) int col = buf.toInt(); if((col >= 0) || (col <= KSPainter::maxcolour)){ bg = KSPainter::num2colour[col]; - bgmode = Qt::OpaqueMode; + bgmode = TQt::OpaqueMode; } } } else{ - bgmode = Qt::TransparentMode; + bgmode = TQt::TransparentMode; } } else { @@ -352,7 +352,7 @@ void KSTicker::timerEvent(TQTimerEvent *) p.setPen(fg); p.setBackgroundColor(bg); - p.setBackgroundMode(Qt::OpaqueMode); + p.setBackgroundMode(TQt::OpaqueMode); p.drawText(this->width() - cOffset + onechar, // remove -onechar. this->height() / 4 + p.fontMetrics().height() / 2, currentStr.mid(currentChar, 1), @@ -415,7 +415,7 @@ void KSTicker::mouseDoubleClickEvent( TQMouseEvent * ) void KSTicker::mousePressEvent( TQMouseEvent *e) { - if(e->button() == Qt::RightButton){ + if(e->button() == TQt::RightButton){ popup->popup(this->cursor().pos()); } else{ diff --git a/ksirc/KSTicker/speeddialog.dlg b/ksirc/KSTicker/speeddialog.dlg index 08526647..11f29b4a 100644 --- a/ksirc/KSTicker/speeddialog.dlg +++ b/ksirc/KSTicker/speeddialog.dlg @@ -18,7 +18,7 @@ MaxSize {32767 32767} Grid {10} Slider { - Qt::Orientation {Horizontal} + TQt::Orientation {Horizontal} MinValue {10} MaxValue {200} Initial {30} @@ -36,7 +36,7 @@ Slider { MaximumSize {32767 32767} } Slider { - Qt::Orientation {Horizontal} + TQt::Orientation {Horizontal} MinValue {1} MaxValue {10} Initial {3} diff --git a/ksirc/KSTicker/speeddialogData.cpp b/ksirc/KSTicker/speeddialogData.cpp index b5ea86c9..38d5b524 100644 --- a/ksirc/KSTicker/speeddialogData.cpp +++ b/ksirc/KSTicker/speeddialogData.cpp @@ -26,7 +26,7 @@ speeddialogData::speeddialogData ( TQWidget* parent, const char* name ) sliderTick = new TQSlider( this, "Slider_1" ); grid->addWidget( sliderTick, 0, 1 ); connect( sliderTick, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(updateTick(int)) ); - sliderTick->setOrientation( Qt::Horizontal ); + sliderTick->setOrientation( TQt::Horizontal ); sliderTick->setRange( 10, 200 ); sliderTick->setSteps( 10, 50 ); sliderTick->setValue( 30 ); @@ -38,7 +38,7 @@ speeddialogData::speeddialogData ( TQWidget* parent, const char* name ) grid->addWidget( sliderStep, 1, 1 ); connect( sliderStep, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(updateStep(int)) ); - sliderStep->setOrientation( Qt::Horizontal ); + sliderStep->setOrientation( TQt::Horizontal ); sliderStep->setRange( 1, 10 ); sliderStep->setSteps( 1, 2 ); sliderStep->setValue( 3 ); diff --git a/ksirc/ahistlineedit.cpp b/ksirc/ahistlineedit.cpp index 468b6dc1..0e0be1c6 100644 --- a/ksirc/ahistlineedit.cpp +++ b/ksirc/ahistlineedit.cpp @@ -398,7 +398,7 @@ void aHistLineEdit::paintEvent ( TQPaintEvent *p ) TQPainter paint(this); TQPen pen = paint.pen(); pen.setWidth(5); - pen.setStyle(Qt::SolidLine); + pen.setStyle(TQt::SolidLine); pen.setColor(palette().active().highlight()); paint.setPen(pen); TQRect r = frameRect(); diff --git a/ksirc/dockservercontroller.cpp b/ksirc/dockservercontroller.cpp index 6fef4f97..1766a824 100644 --- a/ksirc/dockservercontroller.cpp +++ b/ksirc/dockservercontroller.cpp @@ -261,7 +261,7 @@ void dockServerController::subItemActivated(int sub_id) void dockServerController::mousePressEvent( TQMouseEvent *e ) { - if(e->button() == Qt::LeftButton){ + if(e->button() == TQt::LeftButton){ showPopupMenu(mainPop); } else { diff --git a/ksirc/kstextview.cpp b/ksirc/kstextview.cpp index 625b8dda..12a6747e 100644 --- a/ksirc/kstextview.cpp +++ b/ksirc/kstextview.cpp @@ -1827,18 +1827,18 @@ void TextView::clearSelectionInternal() void TextView::contentsMousePressEvent( TQMouseEvent *ev ) { - if ( ev->button() & Qt::RightButton ) { + if ( ev->button() & TQt::RightButton ) { emitLinkClickedForMouseEvent( ev ); return; } - if ( !( ev->button() & Qt::LeftButton ) && !(ev->button() & Qt::MidButton ) ) + if ( !( ev->button() & TQt::LeftButton ) && !(ev->button() & TQt::MidButton ) ) return; clearSelection( true ); SelectionPoint p; Item *itemUnderMouse = itemAt( ev->pos(), &p, Item::SelectFuzzy ); - if ( p.item && ( ev->button() & Qt::LeftButton ) ) { + if ( p.item && ( ev->button() & TQt::LeftButton ) ) { m_selectionMaybeStart = p; p.item->setSelectionStatus( Item::NoSelection ); } @@ -1847,7 +1847,7 @@ void TextView::contentsMousePressEvent( TQMouseEvent *ev ) if ( !href.isNull() ) { m_dragStartPos = ev->pos(); m_dragURL = href.toTQString(); - if ( ev->button() & Qt::LeftButton ) + if ( ev->button() & TQt::LeftButton ) m_mousePressed = true; else m_mmbPressed = true; @@ -1857,7 +1857,7 @@ void TextView::contentsMousePressEvent( TQMouseEvent *ev ) void TextView::contentsMouseMoveEvent( TQMouseEvent *ev ) { - if ( m_mousePressed && ev->state() == Qt::NoButton ) + if ( m_mousePressed && ev->state() == TQt::NoButton ) { m_mousePressed = false; m_mmbPressed = false; @@ -1881,8 +1881,8 @@ void TextView::contentsMouseMoveEvent( TQMouseEvent *ev ) if ( !i && !p.item ) return; - if ( (ev->state() & Qt::LeftButton && m_selectionStart.item && p.item) || - (ev->state() & Qt::LeftButton && m_selectionMaybeStart.item && p.item)) + if ( (ev->state() & TQt::LeftButton && m_selectionStart.item && p.item) || + (ev->state() & TQt::LeftButton && m_selectionMaybeStart.item && p.item)) { if(m_selectionMaybeStart.item != 0){ @@ -1952,7 +1952,7 @@ void TextView::contentsMouseReleaseEvent( TQMouseEvent *ev ) m_selectionMaybeStart = SelectionPoint(); - if ( (ev->button() & Qt::LeftButton) && !m_selectedText.isEmpty() ) + if ( (ev->button() & TQt::LeftButton) && !m_selectedText.isEmpty() ) TQApplication::clipboard()->setText( m_selectedText, TQClipboard::Selection ); if ( clicked ) { @@ -1960,7 +1960,7 @@ void TextView::contentsMouseReleaseEvent( TQMouseEvent *ev ) return; } - if (ev->button() & Qt::MidButton) + if (ev->button() & TQt::MidButton) { emit pasteReq( TDEApplication::clipboard()->text( TQClipboard::Selection ) ); return; diff --git a/ksirc/ksview.cpp b/ksirc/ksview.cpp index 9dc2d3b0..5a34d95a 100644 --- a/ksirc/ksview.cpp +++ b/ksirc/ksview.cpp @@ -270,13 +270,13 @@ void KSircView::enableTimeStamps(bool enable) void KSircView::anchorClicked(const TQMouseEvent *ev, const TQString &url) { - if ( (ev->button() & Qt::LeftButton) && (ev->state() & ShiftButton ) ) + if ( (ev->button() & TQt::LeftButton) && (ev->state() & ShiftButton ) ) saveURL( url ); - else if ( (ev->button() & Qt::LeftButton) || (ev->button() & Qt::MidButton) ) + else if ( (ev->button() & TQt::LeftButton) || (ev->button() & TQt::MidButton) ) { openBrowser( url ); } - else if ( ev->button() & Qt::RightButton ) + else if ( ev->button() & TQt::RightButton ) { static const int openURLID = 0; static const int copyLinkLocationID = 1; diff --git a/ksirc/mditoplevel.cpp b/ksirc/mditoplevel.cpp index f04acd8e..326286de 100644 --- a/ksirc/mditoplevel.cpp +++ b/ksirc/mditoplevel.cpp @@ -19,7 +19,7 @@ void KSTabWidget::mousePressEvent(TQMouseEvent *e) { - if(e->button() == Qt::RightButton){ + if(e->button() == TQt::RightButton){ TQPoint p = tabBar()->mapFromParent(e->pos()); TQTab *tab = tabBar()->selectTab(p); if(tab){ diff --git a/ksirc/toplevel.cpp b/ksirc/toplevel.cpp index 5bf678d2..beb96799 100644 --- a/ksirc/toplevel.cpp +++ b/ksirc/toplevel.cpp @@ -236,7 +236,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf TQCString kstn = TQCString(TQT_TQOBJECT(this)->name()) + "_"; - pan = new TQSplitter(Qt::Horizontal, top, kstn + "splitter"); + pan = new TQSplitter(TQt::Horizontal, top, kstn + "splitter"); #if KDE_IS_VERSION(3,1,92) pan->setOpaqueResize( TDEGlobalSettings::opaqueResize() ); #else @@ -1505,7 +1505,7 @@ void KSircTopLevel::pasteToNickList(int button, TQListBoxItem *item, const TQPoint &) { - if(button == Qt::MidButton && item){ + if(button == TQt::MidButton && item){ KSircChannel ci(m_channelInfo.server(), item->text().lower()); emit open_toplevel(ci); diff --git a/ktalkd/kcmktalkd/soundpage.cpp b/ktalkd/kcmktalkd/soundpage.cpp index da298c00..e3cac09b 100644 --- a/ktalkd/kcmktalkd/soundpage.cpp +++ b/ktalkd/kcmktalkd/soundpage.cpp @@ -63,7 +63,7 @@ KSoundPageConfig::KSoundPageConfig( TQWidget *parent, const char* name, KDialog::spacingHint() ); TQGroupBox* extprg_box = new TQGroupBox(this); - extprg_box->setColumnLayout( 0, Qt::Horizontal ); + extprg_box->setColumnLayout( 0, TQt::Horizontal ); toplay->addWidget(extprg_box); TQGridLayout* l = new TQGridLayout(extprg_box->layout()); diff --git a/lanbrowsing/kcmlisa/kcmlisa.cpp b/lanbrowsing/kcmlisa/kcmlisa.cpp index 5809d51b..ee1bf4c7 100644 --- a/lanbrowsing/kcmlisa/kcmlisa.cpp +++ b/lanbrowsing/kcmlisa/kcmlisa.cpp @@ -81,7 +81,7 @@ LisaSettings::LisaSettings(const TQString& config, TQWidget *parent) TQToolTip::add(m_pingAddresses, comment); label->setBuddy(m_pingAddresses); - TQGrid *addressesGrid = new TQGrid(2, Qt::Horizontal, this); + TQGrid *addressesGrid = new TQGrid(2, TQt::Horizontal, this); addressesGrid->setSpacing(10); layout->setStretchFactor(addressesGrid,0); @@ -129,7 +129,7 @@ LisaSettings::LisaSettings(const TQString& config, TQWidget *parent) dummy->setMinimumHeight(10); m_deliverUnnamedHosts=new TQCheckBox(i18n("Show &hosts without DNS names"),vbox); - TQGrid *advGrid = new TQGrid(2, Qt::Horizontal, vbox); + TQGrid *advGrid = new TQGrid(2, TQt::Horizontal, vbox); advGrid->setSpacing(10); label=new TQLabel(i18n("Host list update interval:"),advGrid); diff --git a/lanbrowsing/kcmlisa/kcmreslisa.cpp b/lanbrowsing/kcmlisa/kcmreslisa.cpp index 7026e3a6..a08a1336 100644 --- a/lanbrowsing/kcmlisa/kcmreslisa.cpp +++ b/lanbrowsing/kcmlisa/kcmreslisa.cpp @@ -91,7 +91,7 @@ ResLisaSettings::ResLisaSettings(const TQString& config, TQWidget *parent) m_deliverUnnamedHosts=new TQCheckBox(i18n("Show &hosts without DNS names"),vbox); - TQGrid *advGrid = new TQGrid(2, Qt::Horizontal, vbox); + TQGrid *advGrid = new TQGrid(2, TQt::Horizontal, vbox); advGrid->setSpacing(10); label=new TQLabel(i18n("Host list update interval:"),advGrid); diff --git a/lanbrowsing/kcmlisa/kcmtdeiolan.cpp b/lanbrowsing/kcmlisa/kcmtdeiolan.cpp index 144c7262..850e5238 100644 --- a/lanbrowsing/kcmlisa/kcmtdeiolan.cpp +++ b/lanbrowsing/kcmlisa/kcmtdeiolan.cpp @@ -38,7 +38,7 @@ IOSlaveSettings::IOSlaveSettings(const TQString& config, TQWidget *parent) TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); layout->setAutoAdd(true); - TQGroupBox* group=new TQGroupBox(1,Qt::Horizontal, i18n("Show Links for Following Services"), this); + TQGroupBox* group=new TQGroupBox(1,TQt::Horizontal, i18n("Show Links for Following Services"), this); m_ftpSettings=new PortSettingsBar(i18n("FTP (TCP, port 21): "), group); m_httpSettings=new PortSettingsBar(i18n("HTTP (TCP, port 80): "),group); diff --git a/wifi/kwireless/kwirelesswidget.cpp b/wifi/kwireless/kwirelesswidget.cpp index e7b6a719..ada6cabb 100644 --- a/wifi/kwireless/kwirelesswidget.cpp +++ b/wifi/kwireless/kwirelesswidget.cpp @@ -183,7 +183,7 @@ void KWireLessWidget::setMode(KWireLessWidget::Mode _mode) void KWireLessWidget::mousePressEvent(TQMouseEvent *e) { - if( e->button() == Qt::LeftButton) + if( e->button() == TQt::LeftButton) { PropertiesDialog dialog(this); connect(this, TQT_SIGNAL(updateDeviceInfo(TQPtrList *)), @@ -206,7 +206,7 @@ void KWireLessWidget::paintEvent(TQPaintEvent*) // non-nil): space = 3 * frameWidth + qualityBarWidth + signalBarWidth + noiseBarWidth+1; - if(mode ==Qt::Horizontal) + if(mode ==TQt::Horizontal) { h = space; w = width(); @@ -221,11 +221,11 @@ void KWireLessWidget::paintEvent(TQPaintEvent*) painter.drawRect(0, 0, w, h); int x = qualityBarWidth + frameWidth; - mode ==Qt::Vertical + mode ==TQt::Vertical ? painter.drawLine(x, frameWidth, x, h-frameWidth) : painter.drawLine(frameWidth, x, w-frameWidth, x); x += signalBarWidth + frameWidth; - mode ==Qt::Vertical + mode ==TQt::Vertical ? painter.drawLine(x, frameWidth, x, h-frameWidth) : painter.drawLine(frameWidth, x, w-frameWidth, x); @@ -247,7 +247,7 @@ void KWireLessWidget::paintEvent(TQPaintEvent*) color = TQt::darkGreen; brush = TQt::green; }; - if(mode ==Qt::Vertical) + if(mode ==TQt::Vertical) { int position = (int)(((float)(h-2*frameWidth))*(1-device->quality())+0.5); @@ -275,7 +275,7 @@ void KWireLessWidget::paintEvent(TQPaintEvent*) painter.setPen(TQPen(TQt::darkRed)); painter.setBrush(TQt::red); - if(mode ==Qt::Vertical) + if(mode ==TQt::Vertical) { int x = 2 * frameWidth + qualityBarWidth; int h1 = (int)(((float)(h-2*frameWidth))*(1-device->signal())+0.5); @@ -292,7 +292,7 @@ void KWireLessWidget::paintEvent(TQPaintEvent*) painter.setPen(TQPen(TQt::gray)); painter.setBrush(TQt::lightGray); - if(mode ==Qt::Vertical) + if(mode ==TQt::Vertical) { int x = 3 * frameWidth + qualityBarWidth + signalBarWidth; int h1 = (int)(((float)(h-2*frameWidth))*(1-device->noise())+0.5); diff --git a/wifi/status.cpp b/wifi/status.cpp index 3632342e..65c264c9 100644 --- a/wifi/status.cpp +++ b/wifi/status.cpp @@ -38,7 +38,7 @@ bool Status::generateStatsWidget () qual = 0; device->get_current_quality (sig, noi, qual); content = - new TQGroupBox (2, Qt::Horizontal, i18n ("Status of Active Connection"), + new TQGroupBox (2, TQt::Horizontal, i18n ("Status of Active Connection"), this); bool has_freq = device->get_device_freq (freq); if ((!has_freq) || (qual == 0)) -- cgit v1.2.1