diff options
23 files changed, 60 insertions, 60 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 85b9621..a54e88c 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1141,7 +1141,7 @@ fi if test "$kde_qtver" = "3"; then cat >> conftest.$ac_ext <<EOF (void)QStyleFactory::create(TQString::null); - QCursor c(Qt::WhatsThisCursor); + QCursor c(TQt::WhatsThisCursor); EOF fi cat >> conftest.$ac_ext <<EOF diff --git a/krArc/krarc.cpp b/krArc/krarc.cpp index e94c135..4d26e76 100644 --- a/krArc/krarc.cpp +++ b/krArc/krarc.cpp @@ -86,7 +86,7 @@ tdeio_krarcProtocol::tdeio_krarcProtocol(const TQCString &pool_socket, const TQC dirDict.setAutoDelete(true); arcTempDir = locateLocal("tmp",TQString()); - TQString dirName = "krArc"+TQDateTime::currentDateTime().toString(Qt::ISODate); + TQString dirName = "krArc"+TQDateTime::currentDateTime().toString(TQt::ISODate); dirName.replace(TQRegExp(":"),"_"); TQDir(arcTempDir).mkdir(dirName); arcTempDir = arcTempDir+dirName+"/"; diff --git a/krusader/ActionMan/actionpropertybase.cpp b/krusader/ActionMan/actionpropertybase.cpp index afd66b7..a054e6d 100644 --- a/krusader/ActionMan/actionpropertybase.cpp +++ b/krusader/ActionMan/actionpropertybase.cpp @@ -63,7 +63,7 @@ ActionPropertyBase::ActionPropertyBase( TQWidget* parent, const char* name, WFla bgAccept = new TQButtonGroup( tab, "bgAccept" ); bgAccept->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)1, 0, 0, bgAccept->sizePolicy().hasHeightForWidth() ) ); - bgAccept->setColumnLayout(0, Qt::Vertical ); + bgAccept->setColumnLayout(0, TQt::Vertical ); bgAccept->layout()->setSpacing( 6 ); bgAccept->layout()->setMargin( 11 ); bgAcceptLayout = new TQGridLayout( bgAccept->layout() ); @@ -173,7 +173,7 @@ ActionPropertyBase::ActionPropertyBase( TQWidget* parent, const char* name, WFla bgExecType = new TQButtonGroup( tab, "bgExecType" ); bgExecType->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)1, 0, 0, bgExecType->sizePolicy().hasHeightForWidth() ) ); - bgExecType->setColumnLayout(0, Qt::Vertical ); + bgExecType->setColumnLayout(0, TQt::Vertical ); bgExecType->layout()->setSpacing( 6 ); bgExecType->layout()->setMargin( 11 ); bgExecTypeLayout = new TQGridLayout( bgExecType->layout() ); @@ -205,7 +205,7 @@ ActionPropertyBase::ActionPropertyBase( TQWidget* parent, const char* name, WFla gbShowonly = new TQGroupBox( tab_2, "gbShowonly" ); gbShowonly->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, gbShowonly->sizePolicy().hasHeightForWidth() ) ); - gbShowonly->setColumnLayout(0, Qt::Vertical ); + gbShowonly->setColumnLayout(0, TQt::Vertical ); gbShowonly->layout()->setSpacing( 6 ); gbShowonly->layout()->setMargin( 11 ); gbShowonlyLayout = new TQGridLayout( gbShowonly->layout() ); diff --git a/krusader/BookMan/krbookmarkhandler.cpp b/krusader/BookMan/krbookmarkhandler.cpp index 42c9770..ac5ffdd 100644 --- a/krusader/BookMan/krbookmarkhandler.cpp +++ b/krusader/BookMan/krbookmarkhandler.cpp @@ -432,7 +432,7 @@ void KrBookmarkHandler::bookmarksChanged(const TQString&, const TQString&) { bool KrBookmarkHandler::eventFilter( TQObject *obj, TQEvent *ev ) { if (ev->type() == TQEvent::MouseButtonRelease) { switch (TQT_TQMOUSEEVENT(ev)->button()) { - case Qt::RightButton: + case TQt::RightButton: _middleClick = false; if( obj->inherits( "TQPopupMenu" ) ) { int id = static_cast<TQPopupMenu*>(TQT_TQWIDGET(obj))->idAt( TQT_TQMOUSEEVENT(ev)->pos() ); @@ -451,10 +451,10 @@ bool KrBookmarkHandler::eventFilter( TQObject *obj, TQEvent *ev ) { } } } - case Qt::LeftButton: + case TQt::LeftButton: _middleClick = false; break; - case Qt::MidButton: + case TQt::MidButton: _middleClick = true; break; default: diff --git a/krusader/Dialogs/packguibase.cpp b/krusader/Dialogs/packguibase.cpp index d79897d..86f8a97 100644 --- a/krusader/Dialogs/packguibase.cpp +++ b/krusader/Dialogs/packguibase.cpp @@ -182,7 +182,7 @@ PackGUIBase::PackGUIBase( TQWidget* parent, const char* name, bool modal, WFlag TQVBox * sliderVBox = new TQVBox( advancedWidget ); - compressionSlider = new TQSlider( 1, 9, 1, 5, Qt::Horizontal, sliderVBox, "compressionSlider" ); + compressionSlider = new TQSlider( 1, 9, 1, 5, TQt::Horizontal, sliderVBox, "compressionSlider" ); compressionSlider->setTickmarks( TQSlider::Below ); TQHBox * minmaxHBox = new TQHBox( sliderVBox ); diff --git a/krusader/Dialogs/percentalsplitter.cpp b/krusader/Dialogs/percentalsplitter.cpp index ecf6597..2bb9dc6 100644 --- a/krusader/Dialogs/percentalsplitter.cpp +++ b/krusader/Dialogs/percentalsplitter.cpp @@ -49,7 +49,7 @@ public: TQString tipString = splitter->toolTipString(); TQRect rect = TQRect( parentWidget()->rect() ); - if( splitter->orientation() == Qt::Vertical ) { + if( splitter->orientation() == TQt::Vertical ) { rect.setY( splitter->sizes()[ 0 ] ); rect.setHeight( splitter->handleWidth() ); } @@ -94,7 +94,7 @@ void PercentalSplitter::setRubberband ( int p ) { const int rBord = 3; // customizable? int hw = handleWidth(); - if( orientation() == Qt::Horizontal ) { + if( orientation() == TQt::Horizontal ) { if ( opaqueOldPos >= 0 ) { if( label == 0 ) paint.drawRect( opaqueOldPos + hw / 2 - rBord, r.y(), 2 * rBord, r.height() ); @@ -148,7 +148,7 @@ void PercentalSplitter::setRubberband ( int p ) { label->setText( toolTipString( p ) ); label->adjustSize(); - if( orientation() == Qt::Horizontal ) { + if( orientation() == TQt::Horizontal ) { labelLocation = mapToGlobal( TQPoint( p - label->width()/2, r.y() + r.height()/2 ) ); if( labelLocation.x() < 0 ) labelLocation.setX( 0 ); @@ -165,7 +165,7 @@ void PercentalSplitter::setRubberband ( int p ) { #endif TQPoint labelLoc = mapFromGlobal( labelLocation ); - if( orientation() == Qt::Horizontal ) { + if( orientation() == TQt::Horizontal ) { if( labelLocation.x() + label->width() > screen.width() ) labelLocation.setX( screen.width() - label->width() ); label->move( labelLocation ); diff --git a/krusader/DiskUsage/diskusage.cpp b/krusader/DiskUsage/diskusage.cpp index a72dc63..1969ced 100644 --- a/krusader/DiskUsage/diskusage.cpp +++ b/krusader/DiskUsage/diskusage.cpp @@ -88,7 +88,7 @@ LoaderWidget::LoaderWidget( TQWidget *parent, const char *name ) : TQScrollView( TQGroupBox *loaderBox = new TQGroupBox( widget, "loaderGroupBox" ); loaderBox->setFrameShape( TQGroupBox::Box ); loaderBox->setFrameShadow( TQGroupBox::Sunken ); - loaderBox->setColumnLayout(0, Qt::Vertical ); + loaderBox->setColumnLayout(0, TQt::Vertical ); loaderBox->layout()->setSpacing( 0 ); loaderBox->layout()->setMargin( 0 ); loaderBox->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); @@ -1104,7 +1104,7 @@ bool DiskUsage::event( TQEvent * e ) { TQKeyEvent* ke = (TQKeyEvent*) e; - if ( ke->state() == Qt::NoButton || ke->state() == Keypad ) + if ( ke->state() == TQt::NoButton || ke->state() == Keypad ) { switch ( ke->key() ) { diff --git a/krusader/DiskUsage/dufilelight.cpp b/krusader/DiskUsage/dufilelight.cpp index 395aa33..0e4dfa8 100644 --- a/krusader/DiskUsage/dufilelight.cpp +++ b/krusader/DiskUsage/dufilelight.cpp @@ -83,7 +83,7 @@ File * DUFilelight::getCurrentFile() void DUFilelight::mousePressEvent( TQMouseEvent *event ) { - if( event->button() == Qt::RightButton ) + if( event->button() == TQt::RightButton ) { File * file = 0; @@ -120,7 +120,7 @@ void DUFilelight::mousePressEvent( TQMouseEvent *event ) diskUsage->rightClickMenu( file, &filelightPopup, i18n( "Filelight" ) ); return; - }else if( event->button() == Qt::LeftButton ) + }else if( event->button() == TQt::LeftButton ) { const RadialMap::Segment * focus = focusSegment(); diff --git a/krusader/DiskUsage/dulines.cpp b/krusader/DiskUsage/dulines.cpp index 5708ffa..afc7f46 100644 --- a/krusader/DiskUsage/dulines.cpp +++ b/krusader/DiskUsage/dulines.cpp @@ -410,7 +410,7 @@ bool DULines::doubleClicked( TQListViewItem * item ) void DULines::contentsMouseDoubleClickEvent ( TQMouseEvent * e ) { - if ( e || e->button() == Qt::LeftButton ) + if ( e || e->button() == TQt::LeftButton ) { TQPoint vp = contentsToViewport(e->pos()); TQListViewItem * item = itemAt( vp ); diff --git a/krusader/DiskUsage/dulistview.cpp b/krusader/DiskUsage/dulistview.cpp index 386a1a5..34a3f7b 100644 --- a/krusader/DiskUsage/dulistview.cpp +++ b/krusader/DiskUsage/dulistview.cpp @@ -239,7 +239,7 @@ bool DUListView::doubleClicked( TQListViewItem * item ) void DUListView::contentsMouseDoubleClickEvent ( TQMouseEvent * e ) { - if ( e || e->button() == Qt::LeftButton ) + if ( e || e->button() == TQt::LeftButton ) { TQPoint vp = contentsToViewport(e->pos()); TQListViewItem * item = itemAt( vp ); diff --git a/krusader/DiskUsage/radialMap/widget.cpp b/krusader/DiskUsage/radialMap/widget.cpp index 3f56fc9..7e670a1 100644 --- a/krusader/DiskUsage/radialMap/widget.cpp +++ b/krusader/DiskUsage/radialMap/widget.cpp @@ -116,7 +116,7 @@ RadialMap::Widget::createFromCache( const Directory *tree ) void RadialMap::Widget::sendFakeMouseEvent() //slot { - TQMouseEvent me( TQEvent::MouseMove, mapFromGlobal( TQCursor::pos() ), Qt::NoButton, Qt::NoButton ); + TQMouseEvent me( TQEvent::MouseMove, mapFromGlobal( TQCursor::pos() ), TQt::NoButton, TQt::NoButton ); TQApplication::sendEvent( this, &me ); } diff --git a/krusader/DiskUsage/radialMap/widgetEvents.cpp b/krusader/DiskUsage/radialMap/widgetEvents.cpp index 847bd1c..7c7b382 100644 --- a/krusader/DiskUsage/radialMap/widgetEvents.cpp +++ b/krusader/DiskUsage/radialMap/widgetEvents.cpp @@ -149,7 +149,7 @@ RadialMap::Widget::mousePressEvent( TQMouseEvent *e ) const KURL url = Widget::url( m_focus->file() ); const bool isDir = m_focus->file()->isDir(); - if( e->button() == Qt::RightButton ) + if( e->button() == TQt::RightButton ) { TDEPopupMenu popup; popup.insertTitle( m_focus->file()->fullPath( m_tree ) ); @@ -214,7 +214,7 @@ RadialMap::Widget::mousePressEvent( TQMouseEvent *e ) m_tip.hide(); //user expects this - if( !isDir || e->button() == Qt::MidButton ) + if( !isDir || e->button() == TQt::MidButton ) { TDEIconEffect::visualActivate( this, rect ); new KRun( url, this, true ); //FIXME see above diff --git a/krusader/Filter/advancedfilter.cpp b/krusader/Filter/advancedfilter.cpp index fcd7c29..070f8dd 100644 --- a/krusader/Filter/advancedfilter.cpp +++ b/krusader/Filter/advancedfilter.cpp @@ -57,7 +57,7 @@ AdvancedFilter::AdvancedFilter( FilterTabs *tabs, TQWidget *parent, const char * TQGroupBox *sizeGroup = new TQGroupBox( this, "sizeGroup" ); sizeGroup->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)1, sizeGroup->sizePolicy().hasHeightForWidth() ) ); sizeGroup->setTitle( i18n( "Size" ) ); - sizeGroup->setColumnLayout(0, Qt::Vertical ); + sizeGroup->setColumnLayout(0, TQt::Vertical ); sizeGroup->layout()->setSpacing( 0 ); sizeGroup->layout()->setMargin( 0 ); TQGridLayout *sizeLayout = new TQGridLayout( sizeGroup->layout() ); @@ -112,7 +112,7 @@ AdvancedFilter::AdvancedFilter( FilterTabs *tabs, TQWidget *parent, const char * TQButtonGroup *dateGroup = new TQButtonGroup( this, "dateGroup" ); dateGroup->setTitle( i18n( "Date" ) ); dateGroup->setExclusive( true ); - dateGroup->setColumnLayout(0, Qt::Vertical ); + dateGroup->setColumnLayout(0, TQt::Vertical ); dateGroup->layout()->setSpacing( 0 ); dateGroup->layout()->setMargin( 0 ); TQGridLayout *dateLayout = new TQGridLayout( dateGroup->layout() ); @@ -211,7 +211,7 @@ AdvancedFilter::AdvancedFilter( FilterTabs *tabs, TQWidget *parent, const char * TQGroupBox *ownershipGroup = new TQGroupBox( this, "ownershipGroup" ); ownershipGroup->setTitle( i18n( "Ownership" ) ); - ownershipGroup->setColumnLayout(0, Qt::Vertical ); + ownershipGroup->setColumnLayout(0, TQt::Vertical ); ownershipGroup->layout()->setSpacing( 0 ); ownershipGroup->layout()->setMargin( 0 ); TQGridLayout *ownershipLayout = new TQGridLayout( ownershipGroup->layout() ); diff --git a/krusader/Filter/generalfilter.cpp b/krusader/Filter/generalfilter.cpp index 67f317b..6d7e930 100644 --- a/krusader/Filter/generalfilter.cpp +++ b/krusader/Filter/generalfilter.cpp @@ -53,7 +53,7 @@ GeneralFilter::GeneralFilter( FilterTabs *tabs, int properties, TQWidget *parent TQGroupBox *nameGroup = new TQGroupBox( this, "nameGroup" ); nameGroup->setTitle( i18n( "File name" ) ); - nameGroup->setColumnLayout(0, Qt::Vertical ); + nameGroup->setColumnLayout(0, TQt::Vertical ); nameGroup->layout()->setSpacing( 0 ); nameGroup->layout()->setMargin( 0 ); TQGridLayout *nameGroupLayout = new TQGridLayout( nameGroup->layout() ); @@ -113,7 +113,7 @@ GeneralFilter::GeneralFilter( FilterTabs *tabs, int properties, TQWidget *parent TQGroupBox *profileHandler = new TQGroupBox( this, "profileHandler" ); profileHandler->setTitle( i18n( "&Profile handler" ) ); - profileHandler->setColumnLayout(0, Qt::Vertical ); + profileHandler->setColumnLayout(0, TQt::Vertical ); profileHandler->layout()->setSpacing( 0 ); profileHandler->layout()->setMargin( 0 ); TQGridLayout *profileLayout = new TQGridLayout( profileHandler->layout() ); @@ -153,7 +153,7 @@ GeneralFilter::GeneralFilter( FilterTabs *tabs, int properties, TQWidget *parent TQGroupBox *searchInGroup = new TQGroupBox( this, "searchInGroup" ); searchInGroup->setTitle( i18n( "&Search in" ) ); - searchInGroup->setColumnLayout(0, Qt::Vertical ); + searchInGroup->setColumnLayout(0, TQt::Vertical ); searchInGroup->layout()->setSpacing( 0 ); searchInGroup->layout()->setMargin( 0 ); TQGridLayout *searchInLayout = new TQGridLayout( searchInGroup->layout() ); @@ -173,7 +173,7 @@ GeneralFilter::GeneralFilter( FilterTabs *tabs, int properties, TQWidget *parent TQGroupBox *dontSearchInGroup = new TQGroupBox( this, "dontSearchInGroup" ); dontSearchInGroup->setTitle( i18n( "&Don't search in" ) ); - dontSearchInGroup->setColumnLayout(0, Qt::Vertical ); + dontSearchInGroup->setColumnLayout(0, TQt::Vertical ); dontSearchInGroup->layout()->setSpacing( 0 ); dontSearchInGroup->layout()->setMargin( 0 ); TQGridLayout *dontSearchInLayout = new TQGridLayout( dontSearchInGroup->layout() ); @@ -193,7 +193,7 @@ GeneralFilter::GeneralFilter( FilterTabs *tabs, int properties, TQWidget *parent TQGroupBox *containsGroup = new TQGroupBox( this, "containsGroup" ); containsGroup->setTitle( i18n( "Containing text" ) ); - containsGroup->setColumnLayout(0, Qt::Vertical ); + containsGroup->setColumnLayout(0, TQt::Vertical ); containsGroup->layout()->setSpacing( 0 ); containsGroup->layout()->setMargin( 0 ); TQGridLayout *containsLayout = new TQGridLayout( containsGroup->layout() ); diff --git a/krusader/GUI/mediabutton.cpp b/krusader/GUI/mediabutton.cpp index b043430..63d6abd 100644 --- a/krusader/GUI/mediabutton.cpp +++ b/krusader/GUI/mediabutton.cpp @@ -503,7 +503,7 @@ bool MediaButton::eventFilter( TQObject *o, TQEvent *e ) { if( o == popupMenu ) { if( e->type() == TQEvent::MouseButtonPress || e->type() == TQEvent::MouseButtonRelease ) { TQMouseEvent *m = TQT_TQMOUSEEVENT(e); - if( m->button() == Qt::RightButton ) { + if( m->button() == TQt::RightButton ) { if( e->type() == TQEvent::MouseButtonPress ) { int id = popupMenu->idAt( m->pos() ); if( id != -1 ) diff --git a/krusader/Konfigurator/konfiguratorpage.cpp b/krusader/Konfigurator/konfiguratorpage.cpp index 1bd1e5f..97b0510 100644 --- a/krusader/Konfigurator/konfiguratorpage.cpp +++ b/krusader/Konfigurator/konfiguratorpage.cpp @@ -155,7 +155,7 @@ TQGroupBox* KonfiguratorPage::createFrame( TQString text, TQWidget *parent, groupBox->setFrameShadow( TQGroupBox::Sunken ); if( !text.isNull() ) groupBox->setTitle( text ); - groupBox->setColumnLayout(0, Qt::Vertical ); + groupBox->setColumnLayout(0, TQt::Vertical ); groupBox->layout()->setSpacing( 0 ); groupBox->layout()->setMargin( 0 ); return groupBox; @@ -232,7 +232,7 @@ KonfiguratorRadioButtons* KonfiguratorPage::createRadioButtonGroup( TQString cls radioWidget->setTitle( "" ); radioWidget->setExclusive( true ); radioWidget->setRadioButtonExclusive( true ); - radioWidget->setColumnLayout(0, Qt::Vertical ); + radioWidget->setColumnLayout(0, TQt::Vertical ); TQGridLayout *layout = new TQGridLayout( radioWidget->layout() ); layout->setAlignment( TQt::AlignTop ); diff --git a/krusader/Panel/krbriefview.cpp b/krusader/Panel/krbriefview.cpp index 25b4dc1..8e9cb9c 100644 --- a/krusader/Panel/krbriefview.cpp +++ b/krusader/Panel/krbriefview.cpp @@ -443,7 +443,7 @@ void KrBriefView::contentsMousePressEvent( TQMouseEvent * e ) { TQIconViewItem * oldCurrent = currentItem(); TQIconViewItem *newCurrent = findItem( e->pos() ); - if (e->button() == Qt::RightButton) + if (e->button() == TQt::RightButton) { if (KrSelectionMode::getSelectionHandler()->rightButtonSelects() || (((e->state() & ShiftButton) || (e->state() & ControlButton))) && KrSelectionMode::getSelectionHandler()->shiftCtrlRightButtonSelects()) @@ -501,7 +501,7 @@ void KrBriefView::contentsMousePressEvent( TQMouseEvent * e ) { e->accept(); } } - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { dragStartPos = e->pos(); if (KrSelectionMode::getSelectionHandler()->leftButtonSelects() || @@ -629,7 +629,7 @@ void KrBriefView::contentsMousePressEvent( TQMouseEvent * e ) { } void KrBriefView::contentsMouseReleaseEvent( TQMouseEvent * e ) { - if (e->button() == Qt::RightButton) + if (e->button() == TQt::RightButton) contextMenuTimer.stop(); e = transformMouseEvent( e ); @@ -663,11 +663,11 @@ void KrBriefView::contentsMouseMoveEvent ( TQMouseEvent * e ) { CANCEL_TWO_CLICK_RENAME; if ( dragStartPos != TQPoint( -1, -1 ) && - e->state() & Qt::LeftButton && ( dragStartPos - e->pos() ).manhattanLength() > TQApplication::startDragDistance() ) + e->state() & TQt::LeftButton && ( dragStartPos - e->pos() ).manhattanLength() > TQApplication::startDragDistance() ) startDrag(); if (KrSelectionMode::getSelectionHandler()->rightButtonPreservesSelection() && KrSelectionMode::getSelectionHandler()->rightButtonSelects() - && KrSelectionMode::getSelectionHandler()->showContextMenu() >= 0 && e->state() == Qt::RightButton) + && KrSelectionMode::getSelectionHandler()->showContextMenu() >= 0 && e->state() == TQt::RightButton) { TQIconViewItem *newItem = findItem( e->pos() ); e->accept(); @@ -1220,7 +1220,7 @@ void KrBriefView::setNameToMakeCurrent( TQIconViewItem * it ) { void KrBriefView::slotMouseClicked( int button, TQIconViewItem * item, const TQPoint& ) { pressedItem = 0; // if the signals are emitted, don't emit twice at contentsMouseReleaseEvent - if ( button == Qt::MidButton ) + if ( button == TQt::MidButton ) emit middleButtonClicked( dynamic_cast<KrViewItem *>( item ) ); } @@ -1277,7 +1277,7 @@ bool KrBriefView::eventFilter( TQObject * watched, TQEvent * e ) } else if( watched == header ) { - if( e->type() == TQEvent::MouseButtonPress && ((TQMouseEvent *)e )->button() == Qt::RightButton ) + if( e->type() == TQEvent::MouseButtonPress && ((TQMouseEvent *)e )->button() == TQt::RightButton ) { setColumnNr(); return TRUE; diff --git a/krusader/Panel/krdetailedview.cpp b/krusader/Panel/krdetailedview.cpp index 9238df8..8e16766 100644 --- a/krusader/Panel/krdetailedview.cpp +++ b/krusader/Panel/krdetailedview.cpp @@ -533,7 +533,7 @@ void KrDetailedView::contentsMousePressEvent( TQMouseEvent * e ) { TQListViewItem * oldCurrent = currentItem(); TQListViewItem *newCurrent = itemAt( contentsToViewport( e->pos() ) ); - if (e->button() == Qt::RightButton) + if (e->button() == TQt::RightButton) { if (KrSelectionMode::getSelectionHandler()->rightButtonSelects() || (((e->state() & ShiftButton) || (e->state() & ControlButton))) && KrSelectionMode::getSelectionHandler()->shiftCtrlRightButtonSelects()) @@ -591,7 +591,7 @@ void KrDetailedView::contentsMousePressEvent( TQMouseEvent * e ) { e->accept(); } } - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { dragStartPos = e->pos(); if (KrSelectionMode::getSelectionHandler()->leftButtonSelects() || @@ -715,7 +715,7 @@ void KrDetailedView::contentsMousePressEvent( TQMouseEvent * e ) { } void KrDetailedView::contentsMouseReleaseEvent( TQMouseEvent * e ) { - if (e->button() == Qt::RightButton) + if (e->button() == TQt::RightButton) contextMenuTimer.stop(); TDEListView::contentsMouseReleaseEvent( e ); @@ -743,11 +743,11 @@ void KrDetailedView::contentsMouseMoveEvent ( TQMouseEvent * e ) { if ( ( singleClicked || renameTimer.isActive() ) && itemAt( contentsToViewport( e->pos() ) ) != clickedItem ) CANCEL_TWO_CLICK_RENAME; if ( dragStartPos != TQPoint( -1, -1 ) && - e->state() & Qt::LeftButton && ( dragStartPos - e->pos() ).manhattanLength() > TQApplication::startDragDistance() ) + e->state() & TQt::LeftButton && ( dragStartPos - e->pos() ).manhattanLength() > TQApplication::startDragDistance() ) startDrag(); if (KrSelectionMode::getSelectionHandler()->rightButtonPreservesSelection() && KrSelectionMode::getSelectionHandler()->rightButtonSelects() - && KrSelectionMode::getSelectionHandler()->showContextMenu() >= 0 && e->state() == Qt::RightButton) + && KrSelectionMode::getSelectionHandler()->showContextMenu() >= 0 && e->state() == TQt::RightButton) { TQListViewItem *newItem = itemAt( contentsToViewport( e->pos() ) ); e->accept(); @@ -1312,7 +1312,7 @@ void KrDetailedView::setNameToMakeCurrent( TQListViewItem * it ) { void KrDetailedView::slotMouseClicked( int button, TQListViewItem * item, const TQPoint&, int ) { pressedItem = 0; // if the signals are emitted, don't emit twice at contentsMouseReleaseEvent - if ( button == Qt::MidButton ) + if ( button == TQt::MidButton ) emit middleButtonClicked( dynamic_cast<KrViewItem *>( item ) ); } @@ -1373,7 +1373,7 @@ bool KrDetailedView::eventFilter( TQObject * watched, TQEvent * e ) } else if( watched == header() ) { - if( e->type() == TQEvent::MouseButtonPress && ((TQMouseEvent *)e )->button() == Qt::RightButton ) + if( e->type() == TQEvent::MouseButtonPress && ((TQMouseEvent *)e )->button() == TQt::RightButton ) { selectColumns(); return TRUE; diff --git a/krusader/Panel/listpanel.cpp b/krusader/Panel/listpanel.cpp index a2e5536..403cfc8 100644 --- a/krusader/Panel/listpanel.cpp +++ b/krusader/Panel/listpanel.cpp @@ -260,7 +260,7 @@ ListPanel::ListPanel( TQString typeIn, TQWidget *parent, bool &left, const char // create a splitter to hold the view and the popup splt = new PercentalSplitter(this); splt->setChildrenCollapsible(true); - splt->setOrientation(Qt::Vertical); + splt->setOrientation(TQt::Vertical); createView(); @@ -996,7 +996,7 @@ void ListPanel::keyPressEvent( TQKeyEvent *e ) { default: // if we got this, it means that the view is not doing // the quick search thing, so send the characters to the commandline, if normal key - if ( e->state() == Qt::NoButton ) + if ( e->state() == TQt::NoButton ) MAIN_VIEW->cmdLine->addText( e->text() ); //e->ignore(); diff --git a/krusader/Synchronizer/synchronizergui.cpp b/krusader/Synchronizer/synchronizergui.cpp index 670864f..e6f4bdf 100644 --- a/krusader/Synchronizer/synchronizergui.cpp +++ b/krusader/Synchronizer/synchronizergui.cpp @@ -1110,7 +1110,7 @@ void SynchronizerGUI::initGUI(TQWidget* /* parent */, TQString profileName, KURL TQGroupBox *compareDirs = new TQGroupBox( synchronizerTab, "SyncCompareDirectories" ); compareDirs->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed); compareDirs->setTitle( i18n( "Directory Comparison" ) ); - compareDirs->setColumnLayout(0, Qt::Vertical ); + compareDirs->setColumnLayout(0, TQt::Vertical ); compareDirs->layout()->setSpacing( 0 ); compareDirs->layout()->setMargin( 0 ); @@ -1210,7 +1210,7 @@ void SynchronizerGUI::initGUI(TQWidget* /* parent */, TQString profileName, KURL TQGroupBox *showOptions = new TQGroupBox( optionBox, "SyncOptionBox" ); showOptions->setTitle( i18n( "S&how options" ) ); showOptions->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed); - showOptions->setColumnLayout(0, Qt::Vertical ); + showOptions->setColumnLayout(0, TQt::Vertical ); showOptions->layout()->setSpacing( 0 ); showOptions->layout()->setMargin( 0 ); TQGridLayout *showOptionsLayout = new TQGridLayout( showOptions->layout() ); @@ -1353,7 +1353,7 @@ void SynchronizerGUI::initGUI(TQWidget* /* parent */, TQString profileName, KURL TQGroupBox *optionsGroup = new TQGroupBox( generalFilter, "options" ); optionsGroup->setTitle( i18n( "&Options" ) ); - optionsGroup->setColumnLayout(0, Qt::Vertical ); + optionsGroup->setColumnLayout(0, TQt::Vertical ); optionsGroup->layout()->setSpacing( 0 ); optionsGroup->layout()->setMargin( 0 ); TQGridLayout *optionsLayout = new TQGridLayout( optionsGroup->layout() ); diff --git a/krusader/UserAction/kraction.cpp b/krusader/UserAction/kraction.cpp index 205ec97..fbd5f18 100644 --- a/krusader/UserAction/kraction.cpp +++ b/krusader/UserAction/kraction.cpp @@ -56,7 +56,7 @@ _stdout(0), _stderr(0), _currentTextEdit(0) { TQVBox *page = makeVBoxMainWidget(); // do we need to separate stderr and stdout? if ( enableStderr ) { - TQSplitter *splitt = new TQSplitter( Qt::Vertical, page ); + TQSplitter *splitt = new TQSplitter( TQt::Vertical, page ); // create stdout TQVBox *stdoutBox = new TQVBox( splitt, "stdout VBox" ); stdoutBox->setSpacing( 6 ); diff --git a/krusader/krusaderview.cpp b/krusader/krusaderview.cpp index dbbb167..72ddf21 100644 --- a/krusader/krusaderview.cpp +++ b/krusader/krusaderview.cpp @@ -61,7 +61,7 @@ void KrusaderView::start( TQStringList leftTabs, TQStringList leftTypes, TQValue mainLayout = new TQGridLayout( this, 1, 1 ); // vertical splitter vert_splitter = new TQSplitter( this ); // splits between panels and terminal/cmdline - vert_splitter->setOrientation( Qt::Vertical ); + vert_splitter->setOrientation( TQt::Vertical ); // horizontal splitter horiz_splitter = new PercentalSplitter( vert_splitter ); ( terminal_dock = new TQHBox( vert_splitter ) ) ->hide(); // create it hidden @@ -407,9 +407,9 @@ void KrusaderView::savePanelProfiles( TQString group ) } void KrusaderView::toggleVerticalMode() { - if (horiz_splitter->orientation() == Qt::Vertical) - horiz_splitter->setOrientation(Qt::Horizontal); - else horiz_splitter->setOrientation(Qt::Vertical); + if (horiz_splitter->orientation() == TQt::Vertical) + horiz_splitter->setOrientation(TQt::Horizontal); + else horiz_splitter->setOrientation(TQt::Vertical); } #include "krusaderview.moc" diff --git a/krusader/paneltabbar.cpp b/krusader/paneltabbar.cpp index 0578e1b..75ba7c3 100644 --- a/krusader/paneltabbar.cpp +++ b/krusader/paneltabbar.cpp @@ -55,17 +55,17 @@ void PanelTabBar::mousePressEvent( TQMouseEvent* e ) { setCurrentTab( clickedTab ); emit changePanel(dynamic_cast<PanelTab*>(clickedTab)->panel); - if ( e->button() == Qt::RightButton ) { + if ( e->button() == TQt::RightButton ) { // show the popup menu _panelActionMenu->popup( e->globalPos() ); } else - if ( e->button() == Qt::LeftButton ) { // we need to change tabs + if ( e->button() == TQt::LeftButton ) { // we need to change tabs // first, find the correct panel to load int id = currentTab(); ListPanel *listpanel = dynamic_cast<PanelTab*>(tab(id))->panel; emit changePanel(listpanel); } else - if (e->button() == Qt::MidButton) { // close the current tab + if (e->button() == TQt::MidButton) { // close the current tab emit closeCurrentTab(); } TQTabBar::mousePressEvent(e); |