diff options
Diffstat (limited to 'konqueror')
-rw-r--r-- | konqueror/iconview/konq_iconview.cpp | 6 | ||||
-rw-r--r-- | konqueror/keditbookmarks/listview.cpp | 6 | ||||
-rw-r--r-- | konqueror/keditbookmarks/toplevel.cpp | 2 | ||||
-rw-r--r-- | konqueror/konq_combo.cpp | 14 | ||||
-rw-r--r-- | konqueror/konq_frame.cpp | 8 | ||||
-rw-r--r-- | konqueror/konq_guiclients.cpp | 2 | ||||
-rw-r--r-- | konqueror/konq_mainwindow.cpp | 24 | ||||
-rw-r--r-- | konqueror/konq_misc.cpp | 4 | ||||
-rw-r--r-- | konqueror/konq_view.cpp | 6 | ||||
-rw-r--r-- | konqueror/konq_viewmgr.cpp | 12 | ||||
-rw-r--r-- | konqueror/konq_viewmgr.h | 4 | ||||
-rw-r--r-- | konqueror/listview/konq_listviewitems.cpp | 6 | ||||
-rw-r--r-- | konqueror/listview/konq_listviewwidget.cpp | 6 | ||||
-rw-r--r-- | konqueror/listview/konq_textviewitem.cpp | 4 | ||||
-rw-r--r-- | konqueror/listview/konq_textviewwidget.cpp | 20 | ||||
-rw-r--r-- | konqueror/sidebar/sidebar_widget.cpp | 4 | ||||
-rw-r--r-- | konqueror/sidebar/trees/konq_sidebartree.cpp | 6 | ||||
-rw-r--r-- | konqueror/sidebar/web_module/web_module.h | 4 |
18 files changed, 69 insertions, 69 deletions
diff --git a/konqueror/iconview/konq_iconview.cpp b/konqueror/iconview/konq_iconview.cpp index 17f62744d..47e3322b8 100644 --- a/konqueror/iconview/konq_iconview.cpp +++ b/konqueror/iconview/konq_iconview.cpp @@ -839,7 +839,7 @@ void KonqKfmIconView::slotContextMenuRequested(TQIconViewItem* _item, const TQPo void KonqKfmIconView::slotMouseButtonPressed(int _button, TQIconViewItem* _item, const TQPoint&) { - if ( _button == Qt::RightButton && !_item ) + if ( _button == TQt::RightButton && !_item ) { // Right click on viewport KFileItem * item = m_dirLister->rootItem(); @@ -876,11 +876,11 @@ void KonqKfmIconView::slotMouseButtonPressed(int _button, TQIconViewItem* _item, void KonqKfmIconView::slotMouseButtonClicked(int _button, TQIconViewItem* _item, const TQPoint& ) { - if (_button == Qt::MidButton) + if (_button == TQt::MidButton) { mmbClicked( _item ? static_cast<KFileIVI*>(_item)->item() : 0L ); } - else if (!_item && _button == Qt::LeftButton) + else if (!_item && _button == TQt::LeftButton) { if (m_pActivateDoubleClickTimer->isActive()) { diff --git a/konqueror/keditbookmarks/listview.cpp b/konqueror/keditbookmarks/listview.cpp index c533fa8c2..1fd5cf222 100644 --- a/konqueror/keditbookmarks/listview.cpp +++ b/konqueror/keditbookmarks/listview.cpp @@ -646,7 +646,7 @@ class KeyPressEater : public TQObject { bool KeyPressEater::eventFilter(TQObject *, TQEvent *pe) { if (pe->type() == TQEvent::KeyPress) { TQKeyEvent *k = (TQKeyEvent *) pe; - if ((k->key() == Qt::Key_Backtab || k->key() == Qt::Key_Tab) + if ((k->key() == TQt::Key_Backtab || k->key() == TQt::Key_Tab) && !(k->state() & ControlButton || k->state() & AltButton) ) { if (m_allowedToTab) { @@ -655,7 +655,7 @@ bool KeyPressEater::eventFilter(TQObject *, TQEvent *pe) { } return true; } else { - m_allowedToTab = (k->key() == Qt::Key_Escape || k->key() == Qt::Key_Enter); + m_allowedToTab = (k->key() == TQt::Key_Escape || k->key() == TQt::Key_Enter); } } return false; @@ -911,7 +911,7 @@ void KEBListViewItem::setOpen(bool open) { void KEBListViewItem::greyStyle(TQColorGroup &cg) { int h, s, v; cg.background().hsv(&h, &s, &v); - TQColor color = (v > 180 && v < 220) ? (Qt::darkGray) : (Qt::gray); + TQColor color = (v > 180 && v < 220) ? (TQt::darkGray) : (TQt::gray); cg.setColor(TQColorGroup::Text, color); } diff --git a/konqueror/keditbookmarks/toplevel.cpp b/konqueror/keditbookmarks/toplevel.cpp index decd07e05..cc8161f4e 100644 --- a/konqueror/keditbookmarks/toplevel.cpp +++ b/konqueror/keditbookmarks/toplevel.cpp @@ -229,7 +229,7 @@ KEBApp::KEBApp( m_bkinfo = new BookmarkInfoWidget(vsplitter); - vsplitter->setOrientation(Qt::Vertical); + vsplitter->setOrientation(TQt::Vertical); vsplitter->setSizes(TQValueList<int>() << h << 380 << m_bkinfo->sizeHint().height() ); diff --git a/konqueror/konq_combo.cpp b/konqueror/konq_combo.cpp index c1cbe734b..354a4a590 100644 --- a/konqueror/konq_combo.cpp +++ b/konqueror/konq_combo.cpp @@ -95,7 +95,7 @@ KonqCombo::KonqCombo( TQWidget *parent, const char *name ) : KHistoryCombo( parent, name ), m_returnPressed( false ), m_permanent( false ), - m_modifier( Qt::NoButton ), + m_modifier( TQt::NoButton ), m_pageSecurity( KonqMainWindow::NotCrypted ) { setInsertionPolicy( NoInsertion ); @@ -537,7 +537,7 @@ void KonqCombo::mousePressEvent( TQMouseEvent *e ) { m_dragStart = TQPoint(); // null QPoint - if ( e->button() == Qt::LeftButton && pixmap( currentItem()) ) { + if ( e->button() == TQt::LeftButton && pixmap( currentItem()) ) { // check if the pixmap was clicked int x = e->pos().x(); int x0 = TQStyle::visualRect( style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ), this ).x(); @@ -548,7 +548,7 @@ void KonqCombo::mousePressEvent( TQMouseEvent *e ) } } - if ( e->button() == Qt::LeftButton && m_pageSecurity!=KonqMainWindow::NotCrypted ) { + if ( e->button() == TQt::LeftButton && m_pageSecurity!=KonqMainWindow::NotCrypted ) { // check if the lock icon was clicked int x = e->pos().x(); int x0 = TQStyle::visualRect( style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxArrow ), this ).x(); @@ -566,7 +566,7 @@ void KonqCombo::mouseMoveEvent( TQMouseEvent *e ) if ( m_dragStart.isNull() || currentText().isEmpty() ) return; - if ( e->state() & Qt::LeftButton && + if ( e->state() & TQt::LeftButton && (e->pos() - m_dragStart).manhattanLength() > TDEGlobalSettings::dndEventDelay() ) { @@ -591,7 +591,7 @@ void KonqCombo::slotActivated( const TQString& text ) applyPermanent(); m_returnPressed = true; emit activated( text, m_modifier ); - m_modifier = Qt::NoButton; + m_modifier = TQt::NoButton; } void KonqCombo::setConfig( TDEConfig *kc ) @@ -731,7 +731,7 @@ void KonqComboListBoxPixmap::paint( TQPainter *painter ) if ( !text().isEmpty() ) { TQString squeezedText = KStringHandler::rPixelSqueeze( text(), listBox()->fontMetrics(), urlWidth ); painter->drawText( pmWidth, 0, urlWidth + pmWidth, itemHeight, - Qt::AlignLeft | Qt::AlignTop, squeezedText ); + TQt::AlignLeft | TQt::AlignTop, squeezedText ); //painter->setPen( TDEGlobalSettings::inactiveTextColor() ); squeezedText = KStringHandler::rPixelSqueeze( title, listBox()->fontMetrics(), titleWidth ); @@ -739,7 +739,7 @@ void KonqComboListBoxPixmap::paint( TQPainter *painter ) font.setItalic( true ); painter->setFont( font ); painter->drawText( entryWidth - titleWidth, 0, titleWidth, - itemHeight, Qt::AlignLeft | Qt::AlignTop, squeezedText ); + itemHeight, TQt::AlignLeft | TQt::AlignTop, squeezedText ); } } diff --git a/konqueror/konq_frame.cpp b/konqueror/konq_frame.cpp index 63f33aff1..8efe3fe38 100644 --- a/konqueror/konq_frame.cpp +++ b/konqueror/konq_frame.cpp @@ -68,7 +68,7 @@ KonqFrameStatusBar::KonqFrameStatusBar( KonqFrame *_parent, const char *_name ) setSizeGripEnabled( false ); m_led = new TQLabel( this ); - m_led->setAlignment( Qt::AlignCenter ); + m_led->setAlignment( TQt::AlignCenter ); m_led->setSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed )); addWidget( m_led, 0, false ); // led (active view indicator) m_led->hide(); @@ -177,7 +177,7 @@ bool KonqFrameStatusBar::eventFilter(TQObject* o, TQEvent *e) { emit clicked(); update(); - if ( TQT_TQMOUSEEVENT(e)->button() == Qt::RightButton) + if ( TQT_TQMOUSEEVENT(e)->button() == TQt::RightButton) splitFrameMenu(); return true; } @@ -530,9 +530,9 @@ void KonqFrameContainer::saveConfig( TDEConfig* config, const TQString &prefix, //write orientation TQString o; - if( orientation() == Qt::Horizontal ) + if( orientation() == TQt::Horizontal ) o = TQString::fromLatin1("Horizontal"); - else if( orientation() == Qt::Vertical ) + else if( orientation() == TQt::Vertical ) o = TQString::fromLatin1("Vertical"); config->writeEntry( TQString::fromLatin1( "Orientation" ).prepend( prefix ), o ); diff --git a/konqueror/konq_guiclients.cpp b/konqueror/konq_guiclients.cpp index 94f6eedc9..fd7a1c29d 100644 --- a/konqueror/konq_guiclients.cpp +++ b/konqueror/konq_guiclients.cpp @@ -244,7 +244,7 @@ void ToggleViewGUIClient::slotToggleView( bool toggle ) if ( toggle ) { - KonqView *childView = viewManager->splitWindow( horizontal ? Qt::Vertical : Qt::Horizontal, + KonqView *childView = viewManager->splitWindow( horizontal ? TQt::Vertical : TQt::Horizontal, TQString::fromLatin1( "Browser/View" ), serviceName, !horizontal /* vertical = make it first */); diff --git a/konqueror/konq_mainwindow.cpp b/konqueror/konq_mainwindow.cpp index 2880fad8a..3fbc8ebbe 100644 --- a/konqueror/konq_mainwindow.cpp +++ b/konqueror/konq_mainwindow.cpp @@ -1903,7 +1903,7 @@ void KonqMainWindow::slotHome(TDEAction::ActivationReason, TQt::ButtonState stat if( state & TQt::ControlButton ) // Ctrl Left/MMB openFilteredURL( homeURL, req); - else if( state & Qt::MidButton ) + else if( state & TQt::MidButton ) { if(KonqSettings::mmbOpensTab()) openFilteredURL( homeURL, req); @@ -1920,7 +1920,7 @@ void KonqMainWindow::slotHome(TDEAction::ActivationReason, TQt::ButtonState stat void KonqMainWindow::slotHome() { - slotHome(TDEAction::UnknownActivation, Qt::LeftButton); + slotHome(TDEAction::UnknownActivation, TQt::LeftButton); } void KonqMainWindow::slotGoSystem() @@ -2642,14 +2642,14 @@ void KonqMainWindow::slotFileNewAboutToShow() void KonqMainWindow::slotSplitViewHorizontal() { - KonqView * newView = m_pViewManager->splitView( Qt::Horizontal ); + KonqView * newView = m_pViewManager->splitView( TQt::Horizontal ); if (newView == 0L) return; newView->openURL( m_currentView->url(), m_currentView->locationBarURL() ); } void KonqMainWindow::slotSplitViewVertical() { - KonqView * newView = m_pViewManager->splitView( Qt::Vertical ); + KonqView * newView = m_pViewManager->splitView( TQt::Vertical ); if (newView == 0L) return; newView->openURL( m_currentView->url(), m_currentView->locationBarURL() ); } @@ -3133,7 +3133,7 @@ void KonqMainWindow::slotUp(TDEAction::ActivationReason, TQt::ButtonState state) void KonqMainWindow::slotUp() { - m_goState = Qt::LeftButton; + m_goState = TQt::LeftButton; TQTimer::singleShot( 0, this, TQT_SLOT( slotUpDelayed() ) ); } @@ -3151,7 +3151,7 @@ void KonqMainWindow::slotUpDelayed() const TQString& url = m_currentView->upURL().url(); if(m_goState & TQt::ControlButton) openFilteredURL(url, req ); - else if(m_goState & Qt::MidButton) + else if(m_goState & TQt::MidButton) { if(KonqSettings::mmbOpensTab()) openFilteredURL( url, req); @@ -3160,7 +3160,7 @@ void KonqMainWindow::slotUpDelayed() } else openFilteredURL( url, false ); - m_goState = Qt::LeftButton; + m_goState = TQt::LeftButton; } void KonqMainWindow::slotUpActivated( int id ) @@ -3181,7 +3181,7 @@ void KonqMainWindow::slotGoMenuAboutToShow() void KonqMainWindow::slotGoHistoryActivated( int steps ) { - slotGoHistoryActivated( steps, Qt::LeftButton ); + slotGoHistoryActivated( steps, TQt::LeftButton ); } void KonqMainWindow::slotGoHistoryActivated( int steps, TQt::ButtonState state ) @@ -3212,7 +3212,7 @@ void KonqMainWindow::slotGoHistoryDelayed() if (newView && inFront) m_pViewManager->showTab( newView ); } - else if(m_goState & Qt::MidButton) + else if(m_goState & TQt::MidButton) { if(mmbOpensTab) { @@ -3230,7 +3230,7 @@ void KonqMainWindow::slotGoHistoryDelayed() } m_goBuffer = 0; - m_goState = Qt::LeftButton; + m_goState = TQt::LeftButton; } @@ -3605,7 +3605,7 @@ void KonqMainWindow::slotClearLocationBar( TDEAction::ActivationReason, TQt::But slotStop(); m_combo->clearTemporary(); focusLocationBar(); - if ( state & Qt::MidButton ) + if ( state & TQt::MidButton ) m_combo->setURL( TQApplication::clipboard()->text( TQClipboard::Selection ) ); } @@ -4143,7 +4143,7 @@ void KonqMainWindow::slotOpenBookmarkURL( const TQString & url, TQt::ButtonState if( state & TQt::ControlButton ) // Ctrl Left/MMB openFilteredURL( url, req); - else if( state & Qt::MidButton ) + else if( state & TQt::MidButton ) { if(KonqSettings::mmbOpensTab()) openFilteredURL( url, req); diff --git a/konqueror/konq_misc.cpp b/konqueror/konq_misc.cpp index b2f0ad47f..e24426c8d 100644 --- a/konqueror/konq_misc.cpp +++ b/konqueror/konq_misc.cpp @@ -225,8 +225,8 @@ KonqDraggableLabel::KonqDraggableLabel( KonqMainWindow* mw, const TQString& text , m_mw(mw) { setBackgroundMode( TQt::PaletteButton ); - setAlignment( (TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft) | - Qt::AlignVCenter | TQt::ShowPrefix ); + setAlignment( (TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft) | + TQt::AlignVCenter | TQt::ShowPrefix ); setAcceptDrops(true); adjustSize(); validDrag = false; diff --git a/konqueror/konq_view.cpp b/konqueror/konq_view.cpp index 5a7ea1244..0306df565 100644 --- a/konqueror/konq_view.cpp +++ b/konqueror/konq_view.cpp @@ -1302,7 +1302,7 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e ) else if ( e->type() == TQEvent::MouseButtonPress ) { TQMouseEvent *ev = TQT_TQMOUSEEVENT( e ); - if ( ev->button() == Qt::RightButton ) + if ( ev->button() == TQt::RightButton ) { return true; } @@ -1310,7 +1310,7 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e ) else if ( e->type() == TQEvent::MouseButtonRelease ) { TQMouseEvent *ev = TQT_TQMOUSEEVENT( e ); - if ( ev->button() == Qt::RightButton ) + if ( ev->button() == TQt::RightButton ) { emit backRightClick(); return true; @@ -1319,7 +1319,7 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e ) else if ( e->type() == TQEvent::MouseMove ) { TQMouseEvent *ev = TQT_TQMOUSEEVENT( e ); - if ( ev->state() == Qt::RightButton ) + if ( ev->state() == TQt::RightButton ) { obj->removeEventFilter( this ); TQMouseEvent me( TQEvent::MouseButtonPress, ev->pos(), 2, 2 ); diff --git a/konqueror/konq_viewmgr.cpp b/konqueror/konq_viewmgr.cpp index 495d267e8..2bcd3e52c 100644 --- a/konqueror/konq_viewmgr.cpp +++ b/konqueror/konq_viewmgr.cpp @@ -90,7 +90,7 @@ KonqViewManager::~KonqViewManager() clear(); } -KonqView* KonqViewManager::splitView ( Qt::Orientation orientation, +KonqView* KonqViewManager::splitView ( TQt::Orientation orientation, const TQString &serviceType, const TQString &serviceName, bool newOneFirst, bool forceAutoEmbed ) @@ -200,7 +200,7 @@ KonqView* KonqViewManager::splitView ( Qt::Orientation orientation, return newView; } -KonqView* KonqViewManager::splitWindow( Qt::Orientation orientation, +KonqView* KonqViewManager::splitWindow( TQt::Orientation orientation, const TQString &serviceType, const TQString &serviceName, bool newOneFirst ) @@ -1574,14 +1574,14 @@ void KonqViewManager::loadItem( TDEConfig &cfg, KonqFrameContainerBase *parent, //load container config TQString ostr = cfg.readEntry( TQString::fromLatin1( "Orientation" ).prepend( prefix ) ); //kdDebug(1202) << "Orientation: " << ostr << endl; - Qt::Orientation o; + TQt::Orientation o; if( ostr == "Vertical" ) - o = Qt::Vertical; + o = TQt::Vertical; else if( ostr == "Horizontal" ) - o = Qt::Horizontal; + o = TQt::Horizontal; else { kdWarning() << "Profile Loading Error: No orientation specified in " << name << endl; - o = Qt::Horizontal; + o = TQt::Horizontal; } TQValueList<int> sizes = diff --git a/konqueror/konq_viewmgr.h b/konqueror/konq_viewmgr.h index 2c0887b3b..829decc86 100644 --- a/konqueror/konq_viewmgr.h +++ b/konqueror/konq_viewmgr.h @@ -68,7 +68,7 @@ public: * * @param newOneFirst if true, move the new view as the first one (left or top) */ - KonqView* splitView( Qt::Orientation orientation, + KonqView* splitView( TQt::Orientation orientation, const TQString & serviceType = TQString::null, const TQString & serviceName = TQString::null, bool newOneFirst = false, bool forceAutoEmbed = false ); @@ -80,7 +80,7 @@ public: * * @param newOneFirst if true, move the new view as the first one (left or top) */ - KonqView* splitWindow( Qt::Orientation orientation, + KonqView* splitWindow( TQt::Orientation orientation, const TQString & serviceType = TQString::null, const TQString & serviceName = TQString::null, bool newOneFirst = false); diff --git a/konqueror/listview/konq_listviewitems.cpp b/konqueror/listview/konq_listviewitems.cpp index 94c090189..3910095f9 100644 --- a/konqueror/listview/konq_listviewitems.cpp +++ b/konqueror/listview/konq_listviewitems.cpp @@ -161,7 +161,7 @@ void KonqListViewItem::updateContents() const TQString entryStr = retrieveExtraEntry( m_fileitem, numExtra ); if ( tmpColumn->type == TQVariant::DateTime ) { - TQDateTime dt = TQDateTime::fromString( entryStr, Qt::ISODate ); + TQDateTime dt = TQDateTime::fromString( entryStr, TQt::ISODate ); setText(tmpColumn->displayInColumn, TDEGlobal::locale()->formatDateTime(dt)); } @@ -292,9 +292,9 @@ int KonqBaseListViewItem::compare( TQListViewItem* item, int col, bool ascending { if ( cInfo->type & TQVariant::DateTime ) { const TQString entryStr1 = retrieveExtraEntry( m_fileitem, numExtra ); - TQDateTime dt1 = TQDateTime::fromString( entryStr1, Qt::ISODate ); + TQDateTime dt1 = TQDateTime::fromString( entryStr1, TQt::ISODate ); const TQString entryStr2 = retrieveExtraEntry( k->m_fileitem, numExtra ); - TQDateTime dt2 = TQDateTime::fromString( entryStr2, Qt::ISODate ); + TQDateTime dt2 = TQDateTime::fromString( entryStr2, TQt::ISODate ); return ( dt1 > dt2 ) ? 1 : ( dt1 < dt2 ) ? -1 : 0; } } diff --git a/konqueror/listview/konq_listviewwidget.cpp b/konqueror/listview/konq_listviewwidget.cpp index 8c27c740b..1efda479c 100644 --- a/konqueror/listview/konq_listviewwidget.cpp +++ b/konqueror/listview/konq_listviewwidget.cpp @@ -426,13 +426,13 @@ void KonqBaseListViewWidget::contentsMousePressEvent( TQMouseEvent *e ) { TDEListView::contentsMousePressEvent( e ); } else { - if ( e->button() == Qt::LeftButton ) { + if ( e->button() == TQt::LeftButton ) { m_rubber = new TQRect( e->x(), e->y(), 0, 0 ); clearSelection(); emit selectionChanged(); m_fileTip->setItem( 0 ); } - if ( e->button() != Qt::RightButton ) { + if ( e->button() != TQt::RightButton ) { TQListView::contentsMousePressEvent( e ); } } @@ -972,7 +972,7 @@ void KonqBaseListViewWidget::slotSelectionChanged() void KonqBaseListViewWidget::slotMouseButtonClicked2( int _button, TQListViewItem *_item, const TQPoint& pos, int ) { - if ( _button == Qt::MidButton ) + if ( _button == TQt::MidButton ) { if ( _item && isExecuteArea( viewport()->mapFromGlobal(pos) ) ) m_pBrowserView->mmbClicked( static_cast<KonqBaseListViewItem *>(_item)->item() ); diff --git a/konqueror/listview/konq_textviewitem.cpp b/konqueror/listview/konq_textviewitem.cpp index 1076e10af..625e10f79 100644 --- a/konqueror/listview/konq_textviewitem.cpp +++ b/konqueror/listview/konq_textviewitem.cpp @@ -210,7 +210,7 @@ void KonqTextViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, cg.setColor(TQColorGroup::Text, static_cast<KonqTextViewWidget *>(listView())->colors[type]); // Don't do that! Keep things readable whatever the selection background color is // cg.setColor(TQColorGroup::HighlightedText, static_cast<KonqTextViewWidget *>(listView())->highlight[type]); -// cg.setColor(TQColorGroup::Highlight, Qt::darkGray); +// cg.setColor(TQColorGroup::Highlight, TQt::darkGray); TDEListViewItem::paintCell( _painter, cg, _column, _width, _alignment ); } @@ -223,7 +223,7 @@ void KonqTextViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, TQPixmap pix( _r.width(), _r.height() ); bitBlt( &pix, 0, 0, _p->device(), _r.left(), _r.top(), _r.width(), _r.height() ); TQImage im = pix.convertToImage(); - im = KImageEffect::fade( im, 0.25, Qt::black ); + im = KImageEffect::fade( im, 0.25, TQt::black ); _p->drawImage( _r.topLeft(), im ); }*/ diff --git a/konqueror/listview/konq_textviewwidget.cpp b/konqueror/listview/konq_textviewwidget.cpp index ab227899a..d814d2fbc 100644 --- a/konqueror/listview/konq_textviewwidget.cpp +++ b/konqueror/listview/konq_textviewwidget.cpp @@ -43,17 +43,17 @@ KonqTextViewWidget::KonqTextViewWidget( KonqListView *parent, TQWidget *parentWi setAllColumnsShowFocus(TRUE); setRootIsDecorated(false); - colors[KTVI_REGULAR]=Qt::black; + colors[KTVI_REGULAR]=TQt::black; colors[KTVI_EXEC]=TQColor(0,170,0); - colors[KTVI_REGULARLINK]=Qt::black; - colors[KTVI_DIR]=Qt::black; - colors[KTVI_DIRLINK]=Qt::black; - colors[KTVI_BADLINK]=Qt::red; - colors[KTVI_SOCKET]=Qt::magenta; - colors[KTVI_FIFO]=Qt::magenta; - colors[KTVI_UNKNOWN]=Qt::red; - colors[KTVI_CHARDEV]=Qt::blue; - colors[KTVI_BLOCKDEV]=Qt::blue; + colors[KTVI_REGULARLINK]=TQt::black; + colors[KTVI_DIR]=TQt::black; + colors[KTVI_DIRLINK]=TQt::black; + colors[KTVI_BADLINK]=TQt::red; + colors[KTVI_SOCKET]=TQt::magenta; + colors[KTVI_FIFO]=TQt::magenta; + colors[KTVI_UNKNOWN]=TQt::red; + colors[KTVI_CHARDEV]=TQt::blue; + colors[KTVI_BLOCKDEV]=TQt::blue; m_showIcons=FALSE; } diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp index e3477b2f8..a17d594f2 100644 --- a/konqueror/sidebar/sidebar_widget.cpp +++ b/konqueror/sidebar/sidebar_widget.cpp @@ -853,7 +853,7 @@ bool Sidebar_Widget::addButton(const TQString &desktoppath,int pos) bool Sidebar_Widget::eventFilter(TQObject *obj, TQEvent *ev) { if ( kapp->authorize( "action/konqsidebarmenu" ) ) { - if (ev->type()==TQEvent::MouseButtonPress && ((TQMouseEvent *)ev)->button()==Qt::RightButton) + if (ev->type()==TQEvent::MouseButtonPress && ((TQMouseEvent *)ev)->button()==TQt::RightButton) { KMultiTabBarTab *bt=tqt_dynamic_cast<KMultiTabBarTab*>(obj); if (bt) @@ -902,7 +902,7 @@ bool Sidebar_Widget::eventFilter(TQObject *obj, TQEvent *ev) void Sidebar_Widget::mousePressEvent(TQMouseEvent *ev) { if ( kapp->authorize( "action/konqsidebarmenu" ) ) { - if (ev->type()==TQEvent::MouseButtonPress && ((TQMouseEvent *)ev)->button()==Qt::RightButton) { + if (ev->type()==TQEvent::MouseButtonPress && ((TQMouseEvent *)ev)->button()==TQt::RightButton) { m_menu->exec(TQCursor::pos()); } } diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp index f3a539c85..aa318826a 100644 --- a/konqueror/sidebar/trees/konq_sidebartree.cpp +++ b/konqueror/sidebar/trees/konq_sidebartree.cpp @@ -483,7 +483,7 @@ void KonqSidebarTree::slotExecuted( TQListViewItem *item ) void KonqSidebarTree::slotMouseButtonPressed( int _button, TQListViewItem* _item, const TQPoint&, int col ) { KonqSidebarTreeItem * item = static_cast<KonqSidebarTreeItem*>( _item ); - if (_button == Qt::RightButton) + if (_button == TQt::RightButton) { if ( item && col < 2) { @@ -502,10 +502,10 @@ void KonqSidebarTree::slotSidebarMouseButtonClicked(int _button, TQListViewItem* if(_item && col < 2) { switch( _button ) { - case Qt::LeftButton: + case TQt::LeftButton: slotExecuted( item ); break; - case Qt::MidButton: + case TQt::MidButton: item->middleButtonClicked(); break; } diff --git a/konqueror/sidebar/web_module/web_module.h b/konqueror/sidebar/web_module/web_module.h index a8f6fa6c2..e4669da89 100644 --- a/konqueror/sidebar/web_module/web_module.h +++ b/konqueror/sidebar/web_module/web_module.h @@ -82,7 +82,7 @@ class TDEHTMLSideBar : public TDEHTMLPart virtual void urlSelected( const TQString &url, int button, int state, const TQString &_target, KParts::URLArgs args = KParts::URLArgs()) { - if (button == Qt::LeftButton ){ + if (button == TQt::LeftButton ){ if (_target.lower() == "_self") { openURL(url); } else if (_target.lower() == "_blank") { @@ -92,7 +92,7 @@ class TDEHTMLSideBar : public TDEHTMLPart } return; } - if (button == Qt::MidButton) { + if (button == TQt::MidButton) { emit openURLNewWindow(completeURL(url).url(), args); return; |