diff options
Diffstat (limited to 'lib')
50 files changed, 251 insertions, 251 deletions
diff --git a/lib/kformula/kformulaconfigpage.cpp b/lib/kformula/kformulaconfigpage.cpp index ce95c40c..380bfcd2 100644 --- a/lib/kformula/kformulaconfigpage.cpp +++ b/lib/kformula/kformulaconfigpage.cpp @@ -61,7 +61,7 @@ ConfigurePage::ConfigurePage( Document* document, TQWidget* view, TDEConfig* con // fonts TQGroupBox *gbox = new TQGroupBox( i18n( "Fonts" ), box ); - gbox->setColumnLayout( 0, Qt::Horizontal ); + gbox->setColumnLayout( 0, TQt::Horizontal ); TQGridLayout* grid = new TQGridLayout( gbox->layout(), 5, 3 ); grid->setSpacing( KDialog::spacingHint() ); @@ -106,7 +106,7 @@ ConfigurePage::ConfigurePage( Document* document, TQWidget* view, TDEConfig* con syntaxHighlighting->setChecked( contextStyle.syntaxHighlighting() ); // hlBox = new TQGroupBox( i18n( "Highlight Colors" ), box ); -// hlBox->setColumnLayout( 0, Qt::Horizontal ); +// hlBox->setColumnLayout( 0, TQt::Horizontal ); // grid = new TQGridLayout( hlBox->layout(), 5, 2 ); // grid->setSpacing( KDialog::spacingHint() ); diff --git a/lib/kofficecore/KoContainerHandler.cpp b/lib/kofficecore/KoContainerHandler.cpp index ae4dbeab..ff81b632 100644 --- a/lib/kofficecore/KoContainerHandler.cpp +++ b/lib/kofficecore/KoContainerHandler.cpp @@ -305,17 +305,17 @@ bool KoContainerHandler::eventFilter( TQObject*, TQEvent* ev ) TQMouseEvent *e=TQT_TQMOUSEEVENT(ev); KoChild *ch=child(gadget, pos, e); - if ( e->button() == Qt::RightButton && gadget != KoChild::NoGadget ) + if ( e->button() == TQt::RightButton && gadget != KoChild::NoGadget ) { emit popupMenu( ch, e->globalPos() ); return true; } - else if ( e->button() == Qt::LeftButton && gadget == KoChild::Move ) + else if ( e->button() == TQt::LeftButton && gadget == KoChild::Move ) { (void)new KoPartMoveHandler( TQT_TQWIDGET(target()), m_view->matrix(), m_view, ch, pos ); return true; } - else if ( e->button() == Qt::LeftButton && gadget != KoChild::NoGadget ) + else if ( e->button() == TQt::LeftButton && gadget != KoChild::NoGadget ) { (void)new KoPartResizeHandler( TQT_TQWIDGET(target()), m_view->matrix(), m_view, ch, gadget, pos ); return true; diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp index 3f32927e..4c3854fe 100644 --- a/lib/kofficecore/KoDocument.cpp +++ b/lib/kofficecore/KoDocument.cpp @@ -1185,7 +1185,7 @@ bool KoDocument::saveToStore( KoStore* _store, const TQString & _path ) bool KoDocument::saveOasisPreview( KoStore* store, KoXmlWriter* manifestWriter ) { const TQPixmap pix = generatePreview( TQSize( 128, 128 ) ); - TQImage preview ( pix.convertToImage().convertDepth( 32, Qt::ColorOnly ) ); + TQImage preview ( pix.convertToImage().convertDepth( 32, TQt::ColorOnly ) ); if ( !preview.hasAlphaBuffer() ) { preview.setAlphaBuffer( true ); @@ -1206,7 +1206,7 @@ bool KoDocument::savePreview( KoStore* store ) { TQPixmap pix = generatePreview(TQSize(256, 256)); // Reducing to 8bpp reduces file sizes quite a lot. - const TQImage preview ( pix.convertToImage().convertDepth( 8, Qt::AvoidDither | Qt::DiffuseDither) ); + const TQImage preview ( pix.convertToImage().convertDepth( 8, TQt::AvoidDither | TQt::DiffuseDither) ); KoStoreDevice io ( store ); if ( !io.open( IO_WriteOnly ) ) return false; @@ -1298,7 +1298,7 @@ bool KoDocument::checkAutoSaveFile() if ( TQFile::exists( asf ) ) { TQDateTime date = TQFileInfo(asf).lastModified(); - TQString dateStr = date.toString(Qt::LocalDate); + TQString dateStr = date.toString(TQt::LocalDate); int res = KMessageBox::warningYesNoCancel( 0, i18n( "An autosaved file for an unnamed document exists in %1.\nThis file is dated %2\nDo you want to open it?" ) .arg(asf, dateStr) ); diff --git a/lib/kofficecore/KoDocumentInfo.cpp b/lib/kofficecore/KoDocumentInfo.cpp index d50c256d..ae50ba28 100644 --- a/lib/kofficecore/KoDocumentInfo.cpp +++ b/lib/kofficecore/KoDocumentInfo.cpp @@ -682,14 +682,14 @@ bool KoDocumentInfoAbout::saveOasis( KoXmlWriter &xmlWriter ) if ( m_creationDate.isValid() ) { xmlWriter.startElement( "meta:creation-date" ); - xmlWriter.addTextNode( m_creationDate.toString( Qt::ISODate ) ); + xmlWriter.addTextNode( m_creationDate.toString( TQt::ISODate ) ); xmlWriter.endElement(); } if ( m_modificationDate.isValid() ) { xmlWriter.startElement( "dc:date" ); - xmlWriter.addTextNode( m_modificationDate.toString( Qt::ISODate ) ); + xmlWriter.addTextNode( m_modificationDate.toString( TQt::ISODate ) ); xmlWriter.endElement(); } return true; @@ -729,13 +729,13 @@ bool KoDocumentInfoAbout::loadOasis( const TQDomNode& metaDoc ) e = KoDom::namedItemNS( metaDoc, KoXmlNS::meta, "creation-date" ); if ( !e.isNull() && !e.text().isEmpty() ) - m_creationDate = TQDateTime::fromString( e.text(), Qt::ISODate ); + m_creationDate = TQDateTime::fromString( e.text(), TQt::ISODate ); else m_creationDate = TQDateTime(); e = KoDom::namedItemNS( metaDoc, KoXmlNS::dc, "date" ); if ( !e.isNull() && !e.text().isEmpty() ) - m_modificationDate = TQDateTime::fromString( e.text(), Qt::ISODate ); + m_modificationDate = TQDateTime::fromString( e.text(), TQt::ISODate ); return true; } @@ -760,9 +760,9 @@ bool KoDocumentInfoAbout::load( const TQDomElement& e ) else if ( e.tagName() == "editing-cycles" ) m_editingCycles = e.text().toInt(); else if ( e.tagName() == "creation-date" ) - m_creationDate = TQDateTime::fromString( e.text(), Qt::ISODate ); + m_creationDate = TQDateTime::fromString( e.text(), TQt::ISODate ); else if ( e.tagName() == "date" ) - m_modificationDate = TQDateTime::fromString( e.text(), Qt::ISODate ); + m_modificationDate = TQDateTime::fromString( e.text(), TQt::ISODate ); } return true; @@ -800,11 +800,11 @@ TQDomElement KoDocumentInfoAbout::save( TQDomDocument& doc ) t = doc.createElement( "creation-date" ); e.appendChild( t ); - t.appendChild( doc.createTextNode( m_creationDate.toString( Qt::ISODate ) ) ); + t.appendChild( doc.createTextNode( m_creationDate.toString( TQt::ISODate ) ) ); t = doc.createElement( "date" ); e.appendChild( t ); - t.appendChild( doc.createTextNode( m_modificationDate.toString( Qt::ISODate ) ) ); + t.appendChild( doc.createTextNode( m_modificationDate.toString( TQt::ISODate ) ) ); return e; } diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp index 36d5fbdc..3641f58c 100644 --- a/lib/kofficecore/KoMainWindow.cpp +++ b/lib/kofficecore/KoMainWindow.cpp @@ -72,7 +72,7 @@ public: // Allow right-click on embedded objects (without activating them) // But beware: this means right-click on parent, from embedded object, // doesn't make the parent active first... - setActivationButtonMask( Qt::LeftButton | Qt::MidButton ); + setActivationButtonMask( TQt::LeftButton | TQt::MidButton ); } virtual bool eventFilter( TQObject *obj, TQEvent *ev ) { @@ -253,7 +253,7 @@ KoMainWindow::KoMainWindow( TDEInstance *instance, const char* name ) d->m_sendfile->setEnabled( false); d->m_paCloseFile->setEnabled( false); - d->m_splitter=new TQSplitter(Qt::Vertical, this, "mw-splitter"); + d->m_splitter=new TQSplitter(TQt::Vertical, this, "mw-splitter"); setCentralWidget( d->m_splitter ); // Keyboard accessibility enhancements. new KKbdAccessExtensions(this, "mw-panelSizer"); @@ -1424,7 +1424,7 @@ void KoMainWindow::slotRemoveView() { } void KoMainWindow::slotSetOrientation() { - d->m_splitter->setOrientation(static_cast<Qt::Orientation> + d->m_splitter->setOrientation(static_cast<TQt::Orientation> (d->m_orientation->currentItem())); } diff --git a/lib/kofficecore/KoOasisStyles.cpp b/lib/kofficecore/KoOasisStyles.cpp index 9560a559..a5d34c0b 100644 --- a/lib/kofficecore/KoOasisStyles.cpp +++ b/lib/kofficecore/KoOasisStyles.cpp @@ -1431,7 +1431,7 @@ TQBrush KoOasisStyles::loadOasisFillStyle( const KoStyleStack &styleStack, const TQBrush tmpBrush; if ( fill == "solid" ) { - tmpBrush.setStyle(static_cast<Qt::BrushStyle>( 1 ) ); + tmpBrush.setStyle(static_cast<TQt::BrushStyle>( 1 ) ); if ( styleStack.hasAttributeNS( KoXmlNS::draw, "fill-color" ) ) tmpBrush.setColor(styleStack.attributeNS( KoXmlNS::draw, "fill-color" ) ); if ( styleStack.hasAttributeNS( KoXmlNS::draw, "transparency" ) ) @@ -1439,35 +1439,35 @@ TQBrush KoOasisStyles::loadOasisFillStyle( const KoStyleStack &styleStack, const TQString transparency = styleStack.attributeNS( KoXmlNS::draw, "transparency" ); if ( transparency == "94%" ) { - tmpBrush.setStyle(Qt::Dense1Pattern); + tmpBrush.setStyle(TQt::Dense1Pattern); } else if ( transparency == "88%" ) { - tmpBrush.setStyle(Qt::Dense2Pattern); + tmpBrush.setStyle(TQt::Dense2Pattern); } else if ( transparency == "63%" ) { - tmpBrush.setStyle(Qt::Dense3Pattern); + tmpBrush.setStyle(TQt::Dense3Pattern); } else if ( transparency == "50%" ) { - tmpBrush.setStyle(Qt::Dense4Pattern); + tmpBrush.setStyle(TQt::Dense4Pattern); } else if ( transparency == "37%" ) { - tmpBrush.setStyle(Qt::Dense5Pattern); + tmpBrush.setStyle(TQt::Dense5Pattern); } else if ( transparency == "12%" ) { - tmpBrush.setStyle(Qt::Dense6Pattern); + tmpBrush.setStyle(TQt::Dense6Pattern); } else if ( transparency == "6%" ) { - tmpBrush.setStyle(Qt::Dense7Pattern); + tmpBrush.setStyle(TQt::Dense7Pattern); } else @@ -1514,19 +1514,19 @@ TQBrush KoOasisStyles::loadOasisFillStyle( const KoStyleStack &styleStack, const { case 0: case 180: - tmpBrush.setStyle(Qt::HorPattern ); + tmpBrush.setStyle(TQt::HorPattern ); break; case 45: case 225: - tmpBrush.setStyle(Qt::BDiagPattern ); + tmpBrush.setStyle(TQt::BDiagPattern ); break; case 90: case 270: - tmpBrush.setStyle(Qt::VerPattern ); + tmpBrush.setStyle(TQt::VerPattern ); break; case 135: case 315: - tmpBrush.setStyle(Qt::FDiagPattern ); + tmpBrush.setStyle(TQt::FDiagPattern ); break; default: //todo fixme when we will have a kopaint @@ -1542,13 +1542,13 @@ TQBrush KoOasisStyles::loadOasisFillStyle( const KoStyleStack &styleStack, const case 180: case 90: case 270: - tmpBrush.setStyle(Qt::CrossPattern ); + tmpBrush.setStyle(TQt::CrossPattern ); break; case 45: case 135: case 225: case 315: - tmpBrush.setStyle(Qt::DiagCrossPattern ); + tmpBrush.setStyle(TQt::DiagCrossPattern ); break; default: //todo fixme when we will have a kopaint diff --git a/lib/kofficecore/KoPictureImage.h b/lib/kofficecore/KoPictureImage.h index 4647ba42..4e8a011d 100644 --- a/lib/kofficecore/KoPictureImage.h +++ b/lib/kofficecore/KoPictureImage.h @@ -98,7 +98,7 @@ public: { m_originalImage.setAlphaBuffer(enable); } virtual TQImage createAlphaMask(int conversion_flags = 0) const - { return m_originalImage.createAlphaMask((Qt::ImageConversionFlags)conversion_flags); } + { return m_originalImage.createAlphaMask((TQt::ImageConversionFlags)conversion_flags); } virtual void clearCache(void); diff --git a/lib/kofficecore/kkbdaccessextensions.cpp b/lib/kofficecore/kkbdaccessextensions.cpp index cfdfc46d..646606d0 100644 --- a/lib/kofficecore/kkbdaccessextensions.cpp +++ b/lib/kofficecore/kkbdaccessextensions.cpp @@ -80,7 +80,7 @@ class KPanelKbdSizerIcon : public TQCursor if (shayp != shape()) { // Must restore and override to get the icon to refresh. if (isActive) kapp->restoreOverrideCursor(); - TQCursor::setShape((Qt::CursorShape)shayp); + TQCursor::setShape((TQt::CursorShape)shayp); if (isActive) kapp->setOverrideCursor(*this); } } @@ -396,7 +396,7 @@ void KKbdAccessExtensions::showIcon() int handleNdx = d->handleNdx - 1; TQValueList<int> sizes = splitter->sizes(); // kdDebug() << "KKbdAccessExtensions::showIcon: sizes = " << sizes << endl; - if (splitter->orientation() == Qt::Horizontal) { + if (splitter->orientation() == TQt::Horizontal) { d->icon->setShape(TQt::SizeHorCursor); p.setX(sizes[handleNdx] + (splitter->handleWidth() / 2)); p.setY(splitter->height() / 2); @@ -418,7 +418,7 @@ void KKbdAccessExtensions::showIcon() // TODO: How to get the handle width? if (d->handleNdx == 1) { d->icon->setShape(TQt::SizeHorCursor); - if (dockWindow->area()->orientation() == Qt::Vertical) { + if (dockWindow->area()->orientation() == TQt::Vertical) { if (dockWindow->area()->handlePosition() == TQDockArea::Normal) // Handle is to the right of the dock window. p.setX(p.x() + dockWindow->width()); @@ -430,7 +430,7 @@ void KKbdAccessExtensions::showIcon() } else { d->icon->setShape(TQt::SizeVerCursor); p.setX(p.x() + (dockWindow->width() / 2)); - if (dockWindow->area()->orientation() == Qt::Vertical) + if (dockWindow->area()->orientation() == TQt::Vertical) // Handle is below the dock window. p.setY(p.y() + dockWindow->height()); else { @@ -479,7 +479,7 @@ void KKbdAccessExtensions::resizePanel(int dx, int dy, int state) if (d->handleNdx == 1) { // When vertically oriented and dock area is on right side of screen, pressing // left arrow increases size. - if (dockWindow->area()->orientation() == Qt::Vertical && + if (dockWindow->area()->orientation() == TQt::Vertical && dockWindow->area()->handlePosition() == TQDockArea::Reverse) adj = -adj; int w = fe.width(); if (w < 0) w = dockWindow->width(); @@ -488,7 +488,7 @@ void KKbdAccessExtensions::resizePanel(int dx, int dy, int state) } else { // When horizontally oriented and dock area is at bottom of screen, // pressing up arrow increases size. - if (dockWindow->area()->orientation() == Qt::Horizontal && + if (dockWindow->area()->orientation() == TQt::Horizontal && dockWindow->area()->handlePosition() == TQDockArea::Reverse) adj = -adj; int h = fe.height(); if (h < 0) h = dockWindow->height(); diff --git a/lib/kofficeui/KoGuideLineDia.cpp b/lib/kofficeui/KoGuideLineDia.cpp index 9f49d062..740a7191 100644 --- a/lib/kofficeui/KoGuideLineDia.cpp +++ b/lib/kofficeui/KoGuideLineDia.cpp @@ -57,7 +57,7 @@ KoGuideLineDia::KoGuideLineDia( TQWidget *parent, KoPoint &pos, KoRect &rect, setCaption( i18n("Add Guide Line") ); TQVBox * vbox = makeVBoxMainWidget(); - TQButtonGroup *group = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Orientation" ), vbox ); + TQButtonGroup *group = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Orientation" ), vbox ); group->setRadioButtonExclusive( true ); //group->layout(); m_hButton = new TQRadioButton( i18n( "Horizontal" ), group ); @@ -83,12 +83,12 @@ double KoGuideLineDia::pos() const } -Qt::Orientation KoGuideLineDia::orientation() const +TQt::Orientation KoGuideLineDia::orientation() const { - Qt::Orientation o = Qt::Horizontal; + TQt::Orientation o = TQt::Horizontal; if ( m_vButton && m_vButton->isChecked() ) { - o = Qt::Vertical; + o = TQt::Vertical; } return o; } diff --git a/lib/kofficeui/KoGuideLineDia.h b/lib/kofficeui/KoGuideLineDia.h index cac53f76..797df193 100644 --- a/lib/kofficeui/KoGuideLineDia.h +++ b/lib/kofficeui/KoGuideLineDia.h @@ -78,7 +78,7 @@ public: * * @return the orientation of the added guide line */ - Qt::Orientation orientation() const; + TQt::Orientation orientation() const; protected slots: void slotOrientationChanged(); diff --git a/lib/kofficeui/KoGuides.cpp b/lib/kofficeui/KoGuides.cpp index 95fcddbf..cb25ace9 100644 --- a/lib/kofficeui/KoGuides.cpp +++ b/lib/kofficeui/KoGuides.cpp @@ -110,7 +110,7 @@ void KoGuides::paintGuides( TQPainter &painter ) painter.setPen( TQPen( blue, 0, DotLine ) ); painter.save(); - if ( ( *it )->orientation == Qt::Vertical ) + if ( ( *it )->orientation == TQt::Vertical ) { painter.translate( m_zoomHandler->zoomItX( ( *it )->position ), 0 ); painter.drawLine( 0, 0, 0, height ); @@ -137,9 +137,9 @@ bool KoGuides::mousePressEvent( TQMouseEvent *e ) if ( guideLine ) { m_lastPoint = e->pos(); - if ( e->button() == Qt::LeftButton || e->button() == Qt::RightButton ) + if ( e->button() == TQt::LeftButton || e->button() == TQt::RightButton ) { - if ( e->button() == Qt::LeftButton ) + if ( e->button() == TQt::LeftButton ) { m_mouseSelected = true; } @@ -188,7 +188,7 @@ bool KoGuides::mousePressEvent( TQMouseEvent *e ) emit moveGuides( false ); } - if ( e->button() == Qt::RightButton && hasSelected() ) + if ( e->button() == TQt::RightButton && hasSelected() ) { m_popup->update( m_guideLines[GL_SELECTED].count() ); m_popup->exec( TQCursor::pos() ); @@ -212,13 +212,13 @@ bool KoGuides::mouseMoveEvent( TQMouseEvent *e ) emit guideLinesChanged( m_view ); eventProcessed = true; } - else if ( e->state() == Qt::NoButton ) + else if ( e->state() == TQt::NoButton ) { KoPoint p( mapFromScreen( e->pos() ) ); KoGuideLine * guideLine = find( p, m_zoomHandler->unzoomItY( 2 ) ); if ( guideLine ) { - m_view->canvas()->setCursor( guideLine->orientation == Qt::Vertical ? TQt::sizeHorCursor : TQt::sizeVerCursor ); + m_view->canvas()->setCursor( guideLine->orientation == TQt::Vertical ? TQt::sizeHorCursor : TQt::sizeVerCursor ); eventProcessed = true; } } @@ -237,7 +237,7 @@ bool KoGuides::mouseReleaseEvent( TQMouseEvent *e ) int x1, y1, x2, y2; m_view->canvas()->rect().coords( &x1, &y1, &x2, &y2 ); TQPoint gp( m_view->canvas()->mapFromGlobal( e->globalPos() ) ); - if ( m_guideLines[GL_SELECTED].first()->orientation == Qt::Vertical ) + if ( m_guideLines[GL_SELECTED].first()->orientation == TQt::Vertical ) { if ( gp.x() < x1 || gp.x() > x2 ) removeSelected(); @@ -251,7 +251,7 @@ bool KoGuides::mouseReleaseEvent( TQMouseEvent *e ) KoGuideLine * guideLine = find( p, m_zoomHandler->unzoomItY( 2 ) ); if ( guideLine ) { - m_view->canvas()->setCursor( guideLine->orientation == Qt::Vertical ? TQt::sizeHorCursor : TQt::sizeVerCursor ); + m_view->canvas()->setCursor( guideLine->orientation == TQt::Vertical ? TQt::sizeHorCursor : TQt::sizeVerCursor ); } m_mouseSelected = false; eventProcessed = true; @@ -296,13 +296,13 @@ void KoGuides::setGuideLines( const TQValueList<double> &horizontalPos, const TQ TQValueList<double>::ConstIterator posIt = horizontalPos.begin(); for ( ; posIt != horizontalPos.end(); ++posIt ) { - KoGuideLine *guideLine = new KoGuideLine( Qt::Horizontal, *posIt, false ); + KoGuideLine *guideLine = new KoGuideLine( TQt::Horizontal, *posIt, false ); m_guideLines[GL].append( guideLine ); } posIt = verticalPos.begin(); for ( ; posIt != verticalPos.end(); ++posIt ) { - KoGuideLine *guideLine = new KoGuideLine( Qt::Vertical, *posIt, false ); + KoGuideLine *guideLine = new KoGuideLine( TQt::Vertical, *posIt, false ); m_guideLines[GL].append( guideLine ); } paint(); @@ -320,13 +320,13 @@ void KoGuides::setAutoGuideLines( const TQValueList<double> &horizontalPos, cons TQValueList<double>::ConstIterator posIt = horizontalPos.begin(); for ( ; posIt != horizontalPos.end(); ++posIt ) { - KoGuideLine *guideLine = new KoGuideLine( Qt::Horizontal, *posIt, true ); + KoGuideLine *guideLine = new KoGuideLine( TQt::Horizontal, *posIt, true ); m_guideLines[GL_AUTOMATIC].append( guideLine ); } posIt = verticalPos.begin(); for ( ; posIt != verticalPos.end(); ++posIt ) { - KoGuideLine *guideLine = new KoGuideLine( Qt::Vertical, *posIt, true ); + KoGuideLine *guideLine = new KoGuideLine( TQt::Vertical, *posIt, true ); m_guideLines[GL_AUTOMATIC].append( guideLine ); } } @@ -340,7 +340,7 @@ void KoGuides::getGuideLines( TQValueList<double> &horizontalPos, TQValueList<do TQValueList<KoGuideLine *>::const_iterator it = m_guideLines[GL].begin(); for ( ; it != m_guideLines[GL].end(); ++it ) { - if ( ( *it )->orientation == Qt::Horizontal ) + if ( ( *it )->orientation == TQt::Horizontal ) { horizontalPos.append( ( *it )->position ); } @@ -352,7 +352,7 @@ void KoGuides::getGuideLines( TQValueList<double> &horizontalPos, TQValueList<do it = m_guideLines[GL_SELECTED].begin(); for ( ; it != m_guideLines[GL_SELECTED].end(); ++it ) { - if ( ( *it )->orientation == Qt::Horizontal ) + if ( ( *it )->orientation == TQt::Horizontal ) { horizontalPos.append( ( *it )->position ); } @@ -376,7 +376,7 @@ void KoGuides::snapToGuideLines( KoRect &rect, int snap, SnapStatus &snapStatus, TQValueList<KoGuideLine *>::const_iterator it = m_guideLines[i].begin(); for ( ; it != m_guideLines[i].end(); ++it ) { - if ( ( *it )->orientation == Qt::Horizontal ) + if ( ( *it )->orientation == TQt::Horizontal ) { double tmp = (*it)->position - rect.top(); if ( snapStatus & SNAP_HORIZ || TQABS( tmp ) < m_zoomHandler->unzoomItY( snap ) ) @@ -440,7 +440,7 @@ void KoGuides::snapToGuideLines( KoPoint &pos, int snap, SnapStatus &snapStatus, TQValueList<KoGuideLine *>::const_iterator it = m_guideLines[i].begin(); for ( ; it != m_guideLines[i].end(); ++it ) { - if ( ( *it )->orientation == Qt::Horizontal ) + if ( ( *it )->orientation == TQt::Horizontal ) { double tmp = (*it)->position - pos.y(); if ( snapStatus & SNAP_HORIZ || TQABS( tmp ) < m_zoomHandler->unzoomItY( snap ) ) @@ -483,7 +483,7 @@ void KoGuides::repaintSnapping( const KoRect &snappedRect ) TQValueList<KoGuideLine *>::const_iterator it = m_guideLines[i].begin(); for ( ; it != m_guideLines[i].end(); ++it ) { - if ( ( *it )->orientation == Qt::Horizontal ) + if ( ( *it )->orientation == TQt::Horizontal ) { if ( virtuallyEqual( snappedRect.top(), (*it)->position ) || virtuallyEqual( snappedRect.bottom(), ( *it )->position ) ) @@ -537,7 +537,7 @@ void KoGuides::repaintSnapping( const KoPoint &snappedPoint, SnapStatus snapStat TQValueList<KoGuideLine *>::const_iterator it = m_guideLines[i].begin(); for ( ; it != m_guideLines[i].end(); ++it ) { - if ( ( *it )->orientation == Qt::Horizontal && ( snapStatus & SNAP_HORIZ ) ) + if ( ( *it )->orientation == TQt::Horizontal && ( snapStatus & SNAP_HORIZ ) ) { if( virtuallyEqual( snappedPoint.y(), (*it)->position ) ) { @@ -617,7 +617,7 @@ void KoGuides::diffNextGuide( KoRect &rect, KoPoint &diff ) TQValueList<KoGuideLine *>::const_iterator it = m_guideLines[i].begin(); for ( ; it != m_guideLines[i].end(); ++it ) { - if ( ( *it )->orientation == Qt::Horizontal ) + if ( ( *it )->orientation == TQt::Horizontal ) { double moveyl = ( *it )->position - rect.top(); double moveyr = ( *it )->position - rect.bottom(); @@ -686,22 +686,22 @@ void KoGuides::moveGuide( const TQPoint &pos, bool horizontal, int rulerWidth ) if ( ! horizontal && x > 0 ) { m_insertGuide = true; - add( Qt::Vertical, p ); + add( TQt::Vertical, p ); } else if ( horizontal && y > 0 ) { m_insertGuide = true; - add( Qt::Horizontal, p ); + add( TQt::Horizontal, p ); } if ( m_insertGuide ) { - TQMouseEvent e( TQEvent::MouseButtonPress, p, Qt::LeftButton, Qt::LeftButton ); + TQMouseEvent e( TQEvent::MouseButtonPress, p, TQt::LeftButton, TQt::LeftButton ); mousePressEvent( &e ); } } else { - TQMouseEvent e( TQEvent::MouseMove, p, Qt::NoButton, Qt::LeftButton ); + TQMouseEvent e( TQEvent::MouseMove, p, TQt::NoButton, TQt::LeftButton ); mouseMoveEvent( &e ); } } @@ -713,7 +713,7 @@ void KoGuides::addGuide( const TQPoint &pos, bool /* horizontal */, int rulerWid int y = pos.y() - rulerWidth; TQPoint p( x, y ); m_insertGuide = false; - TQMouseEvent e( TQEvent::MouseButtonRelease, p, Qt::LeftButton, Qt::LeftButton ); + TQMouseEvent e( TQEvent::MouseButtonRelease, p, TQt::LeftButton, TQt::LeftButton ); mouseReleaseEvent( &e ); } @@ -725,7 +725,7 @@ void KoGuides::slotChangePosition() const KoPageLayout& pl = m_view->koDocument()->pageLayout(); double max = 0.0; - if ( guideLine->orientation == Qt::Vertical ) + if ( guideLine->orientation == TQt::Vertical ) { max = TQMAX( pl.ptWidth, m_zoomHandler->unzoomItX( m_view->canvas()->size().width() + m_view->canvasXOffset() - 1 ) ); } @@ -757,10 +757,10 @@ void KoGuides::paint() } -void KoGuides::add( Qt::Orientation o, TQPoint &pos ) +void KoGuides::add( TQt::Orientation o, TQPoint &pos ) { KoPoint p( mapFromScreen( pos ) ); - KoGuideLine *guideLine = new KoGuideLine( o, o == Qt::Vertical ? p.x(): p.y() ); + KoGuideLine *guideLine = new KoGuideLine( o, o == TQt::Vertical ? p.x(): p.y() ); m_guideLines[GL].append( guideLine ); } @@ -823,11 +823,11 @@ KoGuides::KoGuideLine * KoGuides::find( KoPoint &p, double diff ) TQValueList<KoGuideLine *>::iterator it = m_guideLines[GL_SELECTED].begin(); for ( ; it != m_guideLines[GL_SELECTED].end(); ++it ) { - if ( ( *it )->orientation == Qt::Vertical && TQABS( ( *it )->position - p.x() ) < diff ) + if ( ( *it )->orientation == TQt::Vertical && TQABS( ( *it )->position - p.x() ) < diff ) { return *it; } - if ( ( *it )->orientation == Qt::Horizontal && TQABS( ( *it )->position - p.y() ) < diff ) + if ( ( *it )->orientation == TQt::Horizontal && TQABS( ( *it )->position - p.y() ) < diff ) { return *it; } @@ -836,11 +836,11 @@ KoGuides::KoGuideLine * KoGuides::find( KoPoint &p, double diff ) it = m_guideLines[GL].begin(); for ( ; it != m_guideLines[GL].end(); ++it ) { - if ( ( *it )->orientation == Qt::Vertical && TQABS( ( *it )->position - p.x() ) < diff ) + if ( ( *it )->orientation == TQt::Vertical && TQABS( ( *it )->position - p.x() ) < diff ) { return *it; } - if ( ( *it )->orientation == Qt::Horizontal && TQABS( ( *it )->position - p.y() ) < diff ) + if ( ( *it )->orientation == TQt::Horizontal && TQABS( ( *it )->position - p.y() ) < diff ) { return *it; } @@ -861,7 +861,7 @@ void KoGuides::moveSelectedBy( TQPoint &p ) TQValueList<KoGuideLine *>::iterator it = m_guideLines[GL_SELECTED].begin(); for ( ; it != m_guideLines[GL_SELECTED].end(); ++it ) { - if ( ( *it )->orientation == Qt::Vertical ) + if ( ( *it )->orientation == TQt::Vertical ) { double tmp = ( *it )->position + point.x(); if ( tmp < 0 ) @@ -892,11 +892,11 @@ void KoGuides::moveSelectedBy( TQPoint &p ) { ( *it )->snapping = false; - if ( ( *it )->orientation == Qt::Vertical && p.x() != 0 ) + if ( ( *it )->orientation == TQt::Vertical && p.x() != 0 ) { ( *it )->position = ( *it )->position + point.x(); } - else if ( ( *it )->orientation == Qt::Horizontal && p.y() != 0 ) + else if ( ( *it )->orientation == TQt::Horizontal && p.y() != 0 ) { ( *it )->position = ( *it )->position + point.y(); } diff --git a/lib/kofficeui/KoGuides.h b/lib/kofficeui/KoGuides.h index 7feb7164..e1ba50ff 100644 --- a/lib/kofficeui/KoGuides.h +++ b/lib/kofficeui/KoGuides.h @@ -275,14 +275,14 @@ private: /// Strukt holding the data of a guide line struct KoGuideLine { - KoGuideLine( Qt::Orientation o, double pos, bool a = false ) + KoGuideLine( TQt::Orientation o, double pos, bool a = false ) : orientation( o ) , position( pos ) , selected( false ) , snapping( false ) , automatic( a ) {} - Qt::Orientation orientation; + TQt::Orientation orientation; double position; bool selected; // if this guide is selected bool snapping; // if this guide is being snapped to @@ -300,7 +300,7 @@ private: * @param pos where to insert the guide * @param o orientation of the guide line */ - void add( Qt::Orientation o, TQPoint &pos ); + void add( TQt::Orientation o, TQPoint &pos ); /** * @brief Select a guide diff --git a/lib/kofficeui/KoPageLayoutDia.cpp b/lib/kofficeui/KoPageLayoutDia.cpp index fc32a2a7..3c0678cc 100644 --- a/lib/kofficeui/KoPageLayoutDia.cpp +++ b/lib/kofficeui/KoPageLayoutDia.cpp @@ -281,7 +281,7 @@ void KoPageLayoutDia::setupTab2( const KoHeadFoot& hf ) TQGridLayout *grid2 = new TQGridLayout( tab2, 7, 2, 0, KDialog::spacingHint() ); // ------------- header --------------- - TQGroupBox *gHead = new TQGroupBox( 0, Qt::Vertical, i18n( "Head Line" ), tab2 ); + TQGroupBox *gHead = new TQGroupBox( 0, TQt::Vertical, i18n( "Head Line" ), tab2 ); gHead->layout()->setSpacing(KDialog::spacingHint()); gHead->layout()->setMargin(KDialog::marginHint()); TQGridLayout *headGrid = new TQGridLayout( gHead->layout(), 2, 3 ); @@ -310,7 +310,7 @@ void KoPageLayoutDia::setupTab2( const KoHeadFoot& hf ) grid2->addMultiCellWidget( gHead, 0, 1, 0, 1 ); // ------------- footer --------------- - TQGroupBox *gFoot = new TQGroupBox( 0, Qt::Vertical, i18n( "Foot Line" ), tab2 ); + TQGroupBox *gFoot = new TQGroupBox( 0, TQt::Vertical, i18n( "Foot Line" ), tab2 ); gFoot->layout()->setSpacing(KDialog::spacingHint()); gFoot->layout()->setMargin(KDialog::marginHint()); TQGridLayout *footGrid = new TQGridLayout( gFoot->layout(), 2, 3 ); diff --git a/lib/kofficeui/KoPageLayoutSize.cpp b/lib/kofficeui/KoPageLayoutSize.cpp index c4e19fa8..7cc70ca5 100644 --- a/lib/kofficeui/KoPageLayoutSize.cpp +++ b/lib/kofficeui/KoPageLayoutSize.cpp @@ -126,7 +126,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout, // --------------- page margins --------------- TQVGroupBox *marginsFrame = new TQVGroupBox( i18n( "Margins" ), this ); - marginsFrame->setColumnLayout( 0, Qt::Vertical ); + marginsFrame->setColumnLayout( 0, TQt::Vertical ); marginsFrame->setMargin( KDialog::marginHint() ); grid1->addWidget( marginsFrame, 3, 0 ); diff --git a/lib/kofficeui/KoPen.cpp b/lib/kofficeui/KoPen.cpp index c1aad91e..caf77a49 100644 --- a/lib/kofficeui/KoPen.cpp +++ b/lib/kofficeui/KoPen.cpp @@ -27,7 +27,7 @@ KoPen::KoPen() m_pointWidth = 1.0; } -KoPen::KoPen(const TQColor& _color, double _pointWidth, Qt::PenStyle _style) +KoPen::KoPen(const TQColor& _color, double _pointWidth, TQt::PenStyle _style) : TQPen() { setColor(_color); diff --git a/lib/kofficeui/KoPen.h b/lib/kofficeui/KoPen.h index 84a7ea66..df802907 100644 --- a/lib/kofficeui/KoPen.h +++ b/lib/kofficeui/KoPen.h @@ -31,7 +31,7 @@ class KoPen : public TQPen { public: KoPen(); - KoPen(const TQColor& _color, double _pointWidth, Qt::PenStyle _style); + KoPen(const TQColor& _color, double _pointWidth, TQt::PenStyle _style); KoPen(const TQColor& _color); ~KoPen(); diff --git a/lib/kofficeui/KoRuler.cpp b/lib/kofficeui/KoRuler.cpp index fade3f71..b5ab6ec9 100644 --- a/lib/kofficeui/KoRuler.cpp +++ b/lib/kofficeui/KoRuler.cpp @@ -79,7 +79,7 @@ const int KoRuler::F_HELPLINES = 4; const int KoRuler::F_NORESIZE = 8; /*================================================================*/ -KoRuler::KoRuler( TQWidget *_parent, TQWidget *_canvas, Qt::Orientation _orientation, +KoRuler::KoRuler( TQWidget *_parent, TQWidget *_canvas, TQt::Orientation _orientation, const KoPageLayout& _layout, int _flags, KoUnit::Unit _unit, KoTabChooser *_tabChooser ) : TQFrame( _parent ), buffer( width(), height() ), m_zoom(1.0), m_1_zoom(1.0), m_unit( _unit ) @@ -124,7 +124,7 @@ KoRuler::KoRuler( TQWidget *_parent, TQWidget *_canvas, Qt::Orientation _orienta d->currTab.type = T_INVALID; d->removeTab.type = T_INVALID; - if ( orientation == Qt::Horizontal ) { + if ( orientation == TQt::Horizontal ) { frameStart = tqRound( zoomIt(d->layout.ptLeft) ); d->frameEnd = tqRound( zoomIt(d->layout.ptWidth - d->layout.ptRight) ); } else { @@ -159,7 +159,7 @@ void KoRuler::setMousePos( int mx, int my ) TQPainter p( this ); p.setRasterOp( TQt::NotROP ); - if ( orientation == Qt::Horizontal ) { + if ( orientation == TQt::Horizontal ) { if ( hasToDelete ) p.drawLine( mposX, 1, mposX, height() - 1 ); p.drawLine( mx, 1, mx, height() - 1 ); @@ -486,7 +486,7 @@ void KoRuler::mousePressEvent( TQMouseEvent *e ) d->removeTab.type = T_INVALID; switch ( e->button() ) { - case Qt::RightButton: + case TQt::RightButton: if(d->currTab.type == T_INVALID || !(d->flags & F_TABS)) d->rb_menu->setItemEnabled(d->mRemoveTab, false); else @@ -495,11 +495,11 @@ void KoRuler::mousePressEvent( TQMouseEvent *e ) d->action = A_NONE; d->mousePressed = false; return; - case Qt::MidButton: + case TQt::MidButton: // MMB shall do like double-click (it opens a dialog). handleDoubleClick(); return; - case Qt::LeftButton: + case TQt::LeftButton: if ( d->action == A_BR_RIGHT || d->action == A_BR_LEFT ) { if ( d->action == A_BR_RIGHT ) d->whileMovingBorderRight = true; @@ -571,7 +571,7 @@ void KoRuler::mousePressEvent( TQMouseEvent *e ) } else if ( d->flags & F_HELPLINES ) { - setCursor( orientation == Qt::Horizontal ? + setCursor( orientation == TQt::Horizontal ? TQt::sizeVerCursor : TQt::sizeHorCursor ); d->action = A_HELPLINES; } @@ -655,8 +655,8 @@ void KoRuler::mouseReleaseEvent( TQMouseEvent *e ) } else if( d->action == A_HELPLINES ) { - emit addGuide( e->pos(), orientation == Qt::Horizontal, orientation == Qt::Horizontal ? size().height() : size().width() ); - emit addHelpline( e->pos(), orientation == Qt::Horizontal); + emit addGuide( e->pos(), orientation == TQt::Horizontal, orientation == TQt::Horizontal ? size().height() : size().width() ); + emit addHelpline( e->pos(), orientation == TQt::Horizontal); setCursor( ArrowCursor ); } d->currTab.type = T_INVALID; // added (DF) @@ -686,7 +686,7 @@ void KoRuler::mouseMoveEvent( TQMouseEvent *e ) TQToolTip::remove( this); switch ( orientation ) { - case Qt::Horizontal: { + case TQt::Horizontal: { if ( !d->mousePressed ) { setCursor( ArrowCursor ); d->action = A_NONE; @@ -871,7 +871,7 @@ void KoRuler::mouseMoveEvent( TQMouseEvent *e ) return; } break; - case Qt::Vertical: { + case TQt::Vertical: { if ( !d->mousePressed ) { setCursor( ArrowCursor ); d->action = A_NONE; diff --git a/lib/kofficeui/KoRuler.h b/lib/kofficeui/KoRuler.h index 9bf6c8c6..4c8031ec 100644 --- a/lib/kofficeui/KoRuler.h +++ b/lib/kofficeui/KoRuler.h @@ -113,7 +113,7 @@ public: * Create a ruler * TODO document params */ - KoRuler( TQWidget *_parent, TQWidget *_canvas, Qt::Orientation _orientation, + KoRuler( TQWidget *_parent, TQWidget *_canvas, TQt::Orientation _orientation, const KoPageLayout& _layout, int _flags, KoUnit::Unit _unit, KoTabChooser *_tabChooser = 0L ); ~KoRuler(); @@ -279,7 +279,7 @@ protected: A_HELPLINES }; void drawContents( TQPainter *_painter ) - { orientation == Qt::Horizontal ? drawHorizontal( _painter ) : drawVertical( _painter ); } + { orientation == TQt::Horizontal ? drawHorizontal( _painter ) : drawVertical( _painter ); } void drawHorizontal( TQPainter *_painter ); void drawVertical( TQPainter *_painter ); @@ -312,7 +312,7 @@ private: KoRulerPrivate *d; - Qt::Orientation orientation; + TQt::Orientation orientation; int diffx, diffy; double i_left, i_first; TQPixmap buffer; diff --git a/lib/kofficeui/KoTabBar.cpp b/lib/kofficeui/KoTabBar.cpp index c751e4e8..319f2baf 100644 --- a/lib/kofficeui/KoTabBar.cpp +++ b/lib/kofficeui/KoTabBar.cpp @@ -768,7 +768,7 @@ void KoTabBar::mousePressEvent( TQMouseEvent* ev ) scrollForward(); } - if( ev->button() == Qt::RightButton ) + if( ev->button() == TQt::RightButton ) if( !d->readOnly ) emit contextMenu( ev->globalPos() ); } @@ -779,7 +779,7 @@ void KoTabBar::mouseReleaseEvent( TQMouseEvent* ev ) d->autoScroll = false; - if ( ev->button() == Qt::LeftButton && d->targetTab != 0 ) + if ( ev->button() == TQt::LeftButton && d->targetTab != 0 ) { emit tabMoved( d->activeTab-1, d->targetTab-1 ); d->targetTab = 0; diff --git a/lib/kofficeui/KoTabChooser.cpp b/lib/kofficeui/KoTabChooser.cpp index 325b9c00..8fc563c7 100644 --- a/lib/kofficeui/KoTabChooser.cpp +++ b/lib/kofficeui/KoTabChooser.cpp @@ -71,7 +71,7 @@ void KoTabChooser::mousePressEvent( TQMouseEvent *e ) return; switch ( e->button() ) { - case Qt::LeftButton: case Qt::MidButton: { + case TQt::LeftButton: case TQt::MidButton: { switch ( currType ) { case TAB_LEFT: { if ( flags & TAB_CENTER ) currType = TAB_CENTER; @@ -96,7 +96,7 @@ void KoTabChooser::mousePressEvent( TQMouseEvent *e ) } repaint( true ); } break; - case Qt::RightButton: { + case TQt::RightButton: { TQPoint pnt( TQCursor::pos() ); rb_menu->setItemChecked( mLeft, false ); diff --git a/lib/kofficeui/KoToolBox.cpp b/lib/kofficeui/KoToolBox.cpp index 222b206d..86d2ad88 100644 --- a/lib/kofficeui/KoToolBox.cpp +++ b/lib/kofficeui/KoToolBox.cpp @@ -139,10 +139,10 @@ void KoToolBox::setupTools() } -void KoToolBox::setOrientation ( Qt::Orientation o ) +void KoToolBox::setOrientation ( TQt::Orientation o ) { if ( barPos() == Floating ) { // when floating, make it a standing toolbox. - o = o == Qt::Vertical ? Qt::Horizontal : Qt::Vertical; + o = o == TQt::Vertical ? TQt::Horizontal : TQt::Vertical; } TQDockWindow::setOrientation( o ); @@ -239,15 +239,15 @@ TQWidget* ToolArea::getNextParent() } -void ToolArea::setOrientation ( Qt::Orientation o ) +void ToolArea::setOrientation ( TQt::Orientation o ) { - TQBoxLayout::Direction dir = (o != Qt::Horizontal + TQBoxLayout::Direction dir = (o != TQt::Horizontal ? TQBoxLayout::TopToBottom : TQBoxLayout::LeftToRight); m_leftLayout->setDirection(dir); m_rightLayout->setDirection(dir); - m_layout->setDirection(o == Qt::Horizontal + m_layout->setDirection(o == TQt::Horizontal ? TQBoxLayout::TopToBottom : TQBoxLayout::LeftToRight); } diff --git a/lib/kofficeui/KoToolBox.h b/lib/kofficeui/KoToolBox.h index 0d5b2b18..5b0e75d6 100644 --- a/lib/kofficeui/KoToolBox.h +++ b/lib/kofficeui/KoToolBox.h @@ -63,7 +63,7 @@ public: public slots: - virtual void setOrientation ( Qt::Orientation o ); + virtual void setOrientation ( TQt::Orientation o ); void slotButtonPressed( int id ); void slotPressButton( int id ); @@ -98,7 +98,7 @@ public: ToolArea(TQWidget *parent); ~ToolArea(); - void setOrientation ( Qt::Orientation o ); + void setOrientation ( TQt::Orientation o ); void add(TQWidget *button); TQWidget* getNextParent(); diff --git a/lib/kofficeui/KoTooluButton.cpp b/lib/kofficeui/KoTooluButton.cpp index 3adcaca8..f2c64a32 100644 --- a/lib/kofficeui/KoTooluButton.cpp +++ b/lib/kofficeui/KoTooluButton.cpp @@ -303,7 +303,7 @@ void KoColorPanel::insertDefaultColors() void KoColorPanel::mousePressEvent( TQMouseEvent* e ) { - if ( e->button() == Qt::LeftButton ) + if ( e->button() == TQt::LeftButton ) m_pressedPos = e->pos(); } @@ -316,7 +316,7 @@ void KoColorPanel::mouseReleaseEvent( TQMouseEvent* ) void KoColorPanel::mouseMoveEvent( TQMouseEvent* e ) { - if ( e->state() & Qt::LeftButton ) { + if ( e->state() & TQt::LeftButton ) { TQPoint p = m_pressedPos - e->pos(); if ( p.manhattanLength() > TQApplication::startDragDistance() ) { TQColor color( mapToColor( m_pressedPos ) ); diff --git a/lib/kofficeui/Kolinestyleaction.cpp b/lib/kofficeui/Kolinestyleaction.cpp index 08176d1b..82ec3ade 100644 --- a/lib/kofficeui/Kolinestyleaction.cpp +++ b/lib/kofficeui/Kolinestyleaction.cpp @@ -76,7 +76,7 @@ void KoLineStyleAction::createMenu() for(int i = 1; i < 6; i++) { pix.fill(white); - pen.setStyle(static_cast<Qt::PenStyle>(i)); + pen.setStyle(static_cast<TQt::PenStyle>(i)); p.setPen(pen); p.drawLine(0, 10, pix.width(), 10); mask = pix; diff --git a/lib/kopainter/koColorSlider.cpp b/lib/kopainter/koColorSlider.cpp index 6e7c0239..720357ca 100644 --- a/lib/kopainter/koColorSlider.cpp +++ b/lib/kopainter/koColorSlider.cpp @@ -87,7 +87,7 @@ void KoColorFrame::drawContents(TQPainter *p) void KoColorFrame::mousePressEvent(TQMouseEvent *e) { - if(e->button() & Qt::LeftButton) + if(e->button() & TQt::LeftButton) { emit clicked(e->pos()); @@ -113,7 +113,7 @@ void KoColorFrame::mousePressEvent(TQMouseEvent *e) void KoColorFrame::mouseReleaseEvent(TQMouseEvent *e) { - if(e->button() & Qt::LeftButton) + if(e->button() & TQt::LeftButton) mDragging = false; else TQFrame::mouseReleaseEvent(e); @@ -190,7 +190,7 @@ void KoSliderWidget::paintEvent(TQPaintEvent *) void KoSliderWidget::mousePressEvent(TQMouseEvent *e) { - if(e->button() & Qt::LeftButton) + if(e->button() & TQt::LeftButton) { mPos = e->pos(); mDragging = true; @@ -201,7 +201,7 @@ void KoSliderWidget::mousePressEvent(TQMouseEvent *e) void KoSliderWidget::mouseReleaseEvent(TQMouseEvent *e) { - if(e->button() & Qt::LeftButton) + if(e->button() & TQt::LeftButton) mDragging = false; else TQWidget::mouseReleaseEvent(e); @@ -346,7 +346,7 @@ void KoColorSlider::slotFrameClicked(const TQPoint &p) void KoColorSlider::mousePressEvent(TQMouseEvent *e) { - if(e->button() & Qt::LeftButton) + if(e->button() & TQt::LeftButton) { TQPoint pos = TQPoint(e->pos().x() - mSlider->width() / 2, height() - mSlider->height()); diff --git a/lib/kopainter/koIconChooser.cpp b/lib/kopainter/koIconChooser.cpp index e8647ffb..bae95a21 100644 --- a/lib/kopainter/koIconChooser.cpp +++ b/lib/kopainter/koIconChooser.cpp @@ -205,7 +205,7 @@ KoIconChooser::startDrag() void KoIconChooser::mouseReleaseEvent(TQMouseEvent * e) { mMouseButtonDown = true; - if(e->button() == Qt::LeftButton) + if(e->button() == TQt::LeftButton) { TQPoint p = e->pos(); mDragStartPos = p; diff --git a/lib/kopainter/ko_hsv_widget.cpp b/lib/kopainter/ko_hsv_widget.cpp index 148d51be..83919d30 100644 --- a/lib/kopainter/ko_hsv_widget.cpp +++ b/lib/kopainter/ko_hsv_widget.cpp @@ -42,7 +42,7 @@ KoHSVWidget::KoHSVWidget(TQWidget *parent, const char *name) : super(parent, nam TQGridLayout *mGrid = new TQGridLayout(this, 5, 7, 5, 2); m_colorwheel = new KoColorWheel(this); m_colorwheel->setFixedSize( 120, 120); - m_VSelector = new KValueSelector(Qt::Vertical, this); + m_VSelector = new KValueSelector(TQt::Vertical, this); m_VSelector-> setFixedSize( 30, 120); /* setup slider labels */ diff --git a/lib/koproperty/editor.cpp b/lib/koproperty/editor.cpp index c6ebe14f..2a72fdbe 100644 --- a/lib/koproperty/editor.cpp +++ b/lib/koproperty/editor.cpp @@ -931,7 +931,7 @@ Editor::handleKeyPress(TQKeyEvent* ev) //selection moving TQListViewItem *item = 0; - if ( ((s == Qt::NoButton) && (k == Key_Up)) || (k==Key_BackTab) ) { + if ( ((s == TQt::NoButton) && (k == Key_Up)) || (k==Key_BackTab) ) { //find prev visible item = selectedItem() ? selectedItem()->itemAbove() : 0; while (item && (!item->isSelectable() || !item->isVisible())) @@ -939,7 +939,7 @@ Editor::handleKeyPress(TQKeyEvent* ev) if (!item) return true; } - else if( (s == Qt::NoButton) && ((k == Key_Down) || (k == Key_Tab)) ) { + else if( (s == TQt::NoButton) && ((k == Key_Down) || (k == Key_Tab)) ) { //find next visible item = selectedItem() ? selectedItem()->itemBelow() : 0; while (item && (!item->isSelectable() || !item->isVisible())) @@ -947,7 +947,7 @@ Editor::handleKeyPress(TQKeyEvent* ev) if (!item) return true; } - else if( (s==Qt::NoButton) && (k==Key_Home) ) { + else if( (s==TQt::NoButton) && (k==Key_Home) ) { if (d->currentWidget && d->currentWidget->hasFocus()) return false; //find 1st visible @@ -955,7 +955,7 @@ Editor::handleKeyPress(TQKeyEvent* ev) while (item && (!item->isSelectable() || !item->isVisible())) item = item->itemBelow(); } - else if( (s==Qt::NoButton) && (k==Key_End) ) { + else if( (s==TQt::NoButton) && (k==Key_End) ) { if (d->currentWidget && d->currentWidget->hasFocus()) return false; //find last visible diff --git a/lib/koproperty/editoritem.cpp b/lib/koproperty/editoritem.cpp index d71bcac2..7c0d7c24 100644 --- a/lib/koproperty/editoritem.cpp +++ b/lib/koproperty/editoritem.cpp @@ -158,7 +158,7 @@ class GroupWidgetBase : public TQWidget virtual bool event( TQEvent * e ) { if (e->type()==TQEvent::MouseButtonPress || e->type()==TQEvent::MouseButtonRelease) { TQMouseEvent* me = TQT_TQMOUSEEVENT(e); - if (me->button() == Qt::LeftButton) { + if (me->button() == TQt::LeftButton) { m_mouseDown = e->type()==TQEvent::MouseButtonPress; update(); } @@ -239,7 +239,7 @@ void GroupContainer::setContents( TQWidget* contents ) bool GroupContainer::event( TQEvent * e ) { if (e->type()==TQEvent::MouseButtonPress) { TQMouseEvent* me = TQT_TQMOUSEEVENT(e); - if (me->button() == Qt::LeftButton && d->contents && d->groupWidget->rect().contains(me->pos())) { + if (me->button() == TQt::LeftButton && d->contents && d->groupWidget->rect().contains(me->pos())) { d->groupWidget->setOpen(!d->groupWidget->isOpen()); if (d->groupWidget->isOpen()) d->contents->show(); diff --git a/lib/koproperty/editors/pixmapedit.cpp b/lib/koproperty/editors/pixmapedit.cpp index 6fdc5f62..b6454a96 100644 --- a/lib/koproperty/editors/pixmapedit.cpp +++ b/lib/koproperty/editors/pixmapedit.cpp @@ -206,7 +206,7 @@ bool PixmapEdit::eventFilter(TQObject *o, TQEvent *ev) { if(o == m_edit) { - if(ev->type() == TQEvent::MouseButtonPress && TQT_TQMOUSEEVENT(ev)->button()==Qt::LeftButton) { + if(ev->type() == TQEvent::MouseButtonPress && TQT_TQMOUSEEVENT(ev)->button()==TQt::LeftButton) { if(m_previewPixmap.height() <= m_edit->height() && m_previewPixmap.width() <= m_edit->width()) return false; diff --git a/lib/kotext/KoAutoFormatDia.cpp b/lib/kotext/KoAutoFormatDia.cpp index 6b48af1f..5b548756 100644 --- a/lib/kotext/KoAutoFormatDia.cpp +++ b/lib/kotext/KoAutoFormatDia.cpp @@ -44,8 +44,8 @@ KoAutoFormatLineEdit::KoAutoFormatLineEdit ( TQWidget * parent, const char * nam void KoAutoFormatLineEdit::keyPressEvent ( TQKeyEvent *ke ) { - if( ke->key() == Qt::Key_Return || - ke->key() == Qt::Key_Enter ) + if( ke->key() == TQt::Key_Return || + ke->key() == TQt::Key_Enter ) { emit keyReturnPressed(); return; diff --git a/lib/kotext/KoBorder.cpp b/lib/kotext/KoBorder.cpp index 5c7461e6..b1d04f1b 100644 --- a/lib/kotext/KoBorder.cpp +++ b/lib/kotext/KoBorder.cpp @@ -27,16 +27,16 @@ #include <float.h> static const struct BorderStyle { - Qt::PenStyle penStyle; + TQt::PenStyle penStyle; TQCString oasisName; TQCString uiStringStyle; } s_borderStyles[] = { - { Qt::SolidLine, "solid", "_________" }, // SOLID - { Qt::DashLine, "dashed", "___ ___ __" }, // DASH - { Qt::DotLine, "dotted", "_ _ _ _ _ _" }, // DOT - { Qt::DashDotLine, "dot-dash", "___ _ ___ _" }, // DASH_DOT - { Qt::DashDotDotLine, "dot-dot-dash", "___ _ _ ___" }, // DASH_DOT_DOT - { Qt::SolidLine, "double", "===========" } // DOUBLE_LINE + { TQt::SolidLine, "solid", "_________" }, // SOLID + { TQt::DashLine, "dashed", "___ ___ __" }, // DASH + { TQt::DotLine, "dotted", "_ _ _ _ _ _" }, // DOT + { TQt::DashDotLine, "dot-dash", "___ _ ___ _" }, // DASH_DOT + { TQt::DashDotDotLine, "dot-dot-dash", "___ _ _ ___" }, // DASH_DOT_DOT + { TQt::SolidLine, "double", "===========" } // DOUBLE_LINE }; KoBorder::KoBorder() diff --git a/lib/kotext/KoChangeCaseDia.cpp b/lib/kotext/KoChangeCaseDia.cpp index a7cff7c2..6bffac9b 100644 --- a/lib/kotext/KoChangeCaseDia.cpp +++ b/lib/kotext/KoChangeCaseDia.cpp @@ -34,7 +34,7 @@ KoChangeCaseDia::KoChangeCaseDia( TQWidget *parent, const char *name ) setCaption( i18n("Change Case") ); TQVBox *page = makeVBoxMainWidget(); - TQButtonGroup *grp = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Case" ),page ); + TQButtonGroup *grp = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Case" ),page ); grp->setRadioButtonExclusive( TRUE ); grp->layout(); m_upperCase=new TQRadioButton( i18n("&Uppercase"), grp ); diff --git a/lib/kotext/KoFontDiaPreview.cpp b/lib/kotext/KoFontDiaPreview.cpp index adf7594d..b8ae8846 100644 --- a/lib/kotext/KoFontDiaPreview.cpp +++ b/lib/kotext/KoFontDiaPreview.cpp @@ -392,7 +392,7 @@ void KoFontDiaPreview::drawUnderlineWave( int x, int y, int width, int thickness p->save(); int offset = 2 * thickness; TQPen pen(color, thickness, TQt::SolidLine); - pen.setCapStyle(Qt::RoundCap); + pen.setCapStyle(TQt::RoundCap); p->setPen(pen); double anc=acos(1.0-2*(static_cast<double>(offset-(x)%offset)/static_cast<double>(offset)))/3.1415*180; int pos=1; diff --git a/lib/kotext/KoHighlightingTab.cpp b/lib/kotext/KoHighlightingTab.cpp index ab7b0577..405887bf 100644 --- a/lib/kotext/KoHighlightingTab.cpp +++ b/lib/kotext/KoHighlightingTab.cpp @@ -39,7 +39,7 @@ KoHighlightingTab::KoHighlightingTab( TQWidget* parent, const char* name, WFlags strikethroughStyleKComboBox->insertStringList( KoTextFormat::strikeOutTypeList() ); strikethroughLineStyleKComboBox->insertStringList( KoTextFormat::strikeOutStyleList() ); - capitalisationButtonGroup->setColumnLayout( 3, Qt::Horizontal ); + capitalisationButtonGroup->setColumnLayout( 3, TQt::Horizontal ); TQStringList attributes = KoTextFormat::fontAttributeList(); for ( TQStringList::Iterator it = attributes.begin(); it != attributes.end(); ++it ) { capitalisationButtonGroup->insert( new TQRadioButton( *it, capitalisationButtonGroup ) ); diff --git a/lib/kotext/KoParagDia.cpp b/lib/kotext/KoParagDia.cpp index 5e038a98..826c44a5 100644 --- a/lib/kotext/KoParagDia.cpp +++ b/lib/kotext/KoParagDia.cpp @@ -747,22 +747,22 @@ TQPen KoBorderPreview::setBorderPen( KoBorder _brd ) switch ( _brd.getStyle() ) { case KoBorder::SOLID: - pen.setStyle( Qt::SolidLine ); + pen.setStyle( TQt::SolidLine ); break; case KoBorder::DASH: - pen.setStyle( Qt::DashLine ); + pen.setStyle( TQt::DashLine ); break; case KoBorder::DOT: - pen.setStyle( Qt::DotLine ); + pen.setStyle( TQt::DotLine ); break; case KoBorder::DASH_DOT: - pen.setStyle( Qt::DashDotLine ); + pen.setStyle( TQt::DashDotLine ); break; case KoBorder::DASH_DOT_DOT: - pen.setStyle( Qt::DashDotDotLine ); + pen.setStyle( TQt::DashDotDotLine ); break; case KoBorder::DOUBLE_LINE: - pen.setStyle( Qt::SolidLine ); + pen.setStyle( TQt::SolidLine ); break; } @@ -1600,7 +1600,7 @@ KoParagCounterWidget::KoParagCounterWidget( bool disableAll, TQWidget * parent, gNumbering = new TQButtonGroup( this, "numberingGroup" ); gNumbering->setTitle( i18n( "Numbering" ) ); - gNumbering->setColumnLayout(0, Qt::Vertical ); + gNumbering->setColumnLayout(0, TQt::Vertical ); gNumbering->layout()->setSpacing( 0 ); gNumbering->layout()->setMargin( 0 ); TQHBoxLayout *numberingGroupLayout = new TQHBoxLayout( gNumbering->layout() ); @@ -1724,8 +1724,8 @@ KoTabulatorsLineEdit::KoTabulatorsLineEdit( TQWidget *parent, double lower, doub void KoTabulatorsLineEdit::keyPressEvent ( TQKeyEvent *ke ) { - if( ke->key() == Qt::Key_Return || - ke->key() == Qt::Key_Enter ) + if( ke->key() == TQt::Key_Return || + ke->key() == TQt::Key_Enter ) { emit keyReturnPressed(); return; @@ -1765,7 +1765,7 @@ KoParagTabulatorsWidget::KoParagTabulatorsWidget( KoUnit::Unit unit, double fram gPosition = new TQGroupBox( this, "gPosition" ); gPosition->setTitle( i18n( "Po&sition" ) ); - gPosition->setColumnLayout(0, Qt::Vertical ); + gPosition->setColumnLayout(0, TQt::Vertical ); gPosition->layout()->setSpacing( 0 ); gPosition->layout()->setMargin( 0 ); TQVBoxLayout* GroupBox2Layout = new TQVBoxLayout( gPosition->layout() ); @@ -1793,7 +1793,7 @@ KoParagTabulatorsWidget::KoParagTabulatorsWidget( KoUnit::Unit unit, double fram bgAlign = new TQButtonGroup( this ); bgAlign->setTitle( i18n( "Alignment" ) ); - bgAlign->setColumnLayout(0, Qt::Vertical ); + bgAlign->setColumnLayout(0, TQt::Vertical ); bgAlign->layout()->setSpacing( 0 ); bgAlign->layout()->setMargin( 0 ); TQVBoxLayout* ButtonGroup1Layout = new TQVBoxLayout( bgAlign->layout() ); diff --git a/lib/kotext/KoSearchDia.cpp b/lib/kotext/KoSearchDia.cpp index 55a4c56b..4e81463d 100644 --- a/lib/kotext/KoSearchDia.cpp +++ b/lib/kotext/KoSearchDia.cpp @@ -603,25 +603,25 @@ KoFormatDia::KoFormatDia( TQWidget* parent, const TQString & _caption, KoSearchC - TQButtonGroup *grpBold = new TQButtonGroup( 1, Qt::Vertical, page ); + TQButtonGroup *grpBold = new TQButtonGroup( 1, TQt::Vertical, page ); grpBold->setRadioButtonExclusive( TRUE ); grpBold->layout(); m_boldYes=new TQRadioButton( i18n("Yes"), grpBold ); m_boldNo=new TQRadioButton( i18n("No"), grpBold ); - TQButtonGroup *grpItalic = new TQButtonGroup( 1, Qt::Vertical, page ); + TQButtonGroup *grpItalic = new TQButtonGroup( 1, TQt::Vertical, page ); grpItalic->setRadioButtonExclusive( TRUE ); grpItalic->layout(); m_italicYes=new TQRadioButton( i18n("Yes"), grpItalic ); m_italicNo=new TQRadioButton( i18n("No"), grpItalic ); - TQButtonGroup *grpShadow = new TQButtonGroup( 1, Qt::Vertical, page ); + TQButtonGroup *grpShadow = new TQButtonGroup( 1, TQt::Vertical, page ); grpShadow->setRadioButtonExclusive( TRUE ); grpShadow->layout(); m_shadowYes=new TQRadioButton( i18n("Yes"), grpShadow ); m_shadowNo=new TQRadioButton( i18n("No"), grpShadow ); - TQButtonGroup *grpWordByWord = new TQButtonGroup( 1, Qt::Vertical, page ); + TQButtonGroup *grpWordByWord = new TQButtonGroup( 1, TQt::Vertical, page ); grpWordByWord->setRadioButtonExclusive( TRUE ); grpWordByWord->layout(); m_wordByWordYes=new TQRadioButton( i18n("Yes"), grpWordByWord ); diff --git a/lib/kotext/KoTextParag.cpp b/lib/kotext/KoTextParag.cpp index c4042779..b3e92c9e 100644 --- a/lib/kotext/KoTextParag.cpp +++ b/lib/kotext/KoTextParag.cpp @@ -2565,7 +2565,7 @@ void KoTextParag::drawFontEffects( TQPainter * p, KoTextFormat *format, KoTextZo p->save(); int offset = 2 * dim; TQPen pen(col, dim, TQt::SolidLine); - pen.setCapStyle(Qt::RoundCap); + pen.setCapStyle(TQt::RoundCap); p->setPen(pen); Q_ASSERT(offset); double anc=acos(1.0-2*(static_cast<double>(offset-(startX)%offset)/static_cast<double>(offset)))/3.1415*180; diff --git a/lib/kotext/KoTextView.cpp b/lib/kotext/KoTextView.cpp index b7608827..d70f9f72 100644 --- a/lib/kotext/KoTextView.cpp +++ b/lib/kotext/KoTextView.cpp @@ -702,7 +702,7 @@ bool KoTextView::handleMousePressEvent( TQMouseEvent *e, const TQPoint &iPoint, addParag = placeCursor( iPoint, insertDirectCursor&& isReadWrite() ); ensureCursorVisible(); - if ( e->button() != Qt::LeftButton ) + if ( e->button() != TQt::LeftButton ) { showCursor(); return addParag; @@ -847,7 +847,7 @@ void KoTextView::tripleClickTimeout() void KoTextView::handleMouseTripleClickEvent( TQMouseEvent*ev, const TQPoint& /* Currently unused */ ) { - if ( ev->button() != Qt::LeftButton) + if ( ev->button() != TQt::LeftButton) { showCursor(); return; diff --git a/lib/kotext/KoVariable.cpp b/lib/kotext/KoVariable.cpp index fb1b6c1c..0c55f52e 100644 --- a/lib/kotext/KoVariable.cpp +++ b/lib/kotext/KoVariable.cpp @@ -125,13 +125,13 @@ void KoVariableSettings::saveOasis( KoXmlWriter &settingsWriter ) const // style:page-number in the first parag of a page (see KoTextParag), or // style:first-page-number in style:page-layout, for spreadsheets etc. if ( d->m_lastPrintingDate.isValid()) - settingsWriter.addConfigItem("lastPrintingDate", d->m_lastPrintingDate.toString(Qt::ISODate)); + settingsWriter.addConfigItem("lastPrintingDate", d->m_lastPrintingDate.toString(TQt::ISODate)); if ( d->m_creationDate.isValid()) - settingsWriter.addConfigItem("creationDate", d->m_creationDate.toString(Qt::ISODate)); + settingsWriter.addConfigItem("creationDate", d->m_creationDate.toString(TQt::ISODate)); if ( d->m_modificationDate.isValid()) - settingsWriter.addConfigItem("modificationDate", d->m_modificationDate.toString(Qt::ISODate)); + settingsWriter.addConfigItem("modificationDate", d->m_modificationDate.toString(TQt::ISODate)); settingsWriter.endElement(); // config:config-item-set } @@ -148,18 +148,18 @@ void KoVariableSettings::loadOasis(const KoOasisSettings&settingsDoc) TQString str = configurationSettings.parseConfigItemString( "lastPrintingDate" ); if ( !str.isEmpty() ) - d->m_lastPrintingDate = TQDateTime::fromString( str, Qt::ISODate ); + d->m_lastPrintingDate = TQDateTime::fromString( str, TQt::ISODate ); else d->m_lastPrintingDate.setTime_t(0); // 1970-01-01 00:00:00.000 locale time str = configurationSettings.parseConfigItemString( "creationDate" ); if ( !str.isEmpty() ) { - d->m_creationDate = TQDateTime::fromString( str, Qt::ISODate ); + d->m_creationDate = TQDateTime::fromString( str, TQt::ISODate ); } str = configurationSettings.parseConfigItemString( "modificationDate" ); if ( !str.isEmpty() ) - d->m_modificationDate = TQDateTime::fromString( str, Qt::ISODate ); + d->m_modificationDate = TQDateTime::fromString( str, TQt::ISODate ); // m_startingPageNumber isn't loaded from OASIS here. KWTextParag::loadOasis does it. } @@ -179,13 +179,13 @@ void KoVariableSettings::save( TQDomElement &parentElem ) elem.setAttribute("displayfieldcode", (int)m_displayFieldCode); if ( d->m_lastPrintingDate.isValid()) - elem.setAttribute("lastPrintingDate", d->m_lastPrintingDate.toString(Qt::ISODate)); + elem.setAttribute("lastPrintingDate", d->m_lastPrintingDate.toString(TQt::ISODate)); if ( d->m_creationDate.isValid()) - elem.setAttribute("creationDate", d->m_creationDate.toString(Qt::ISODate)); + elem.setAttribute("creationDate", d->m_creationDate.toString(TQt::ISODate)); if ( d->m_modificationDate.isValid()) - elem.setAttribute("modificationDate", d->m_modificationDate.toString(Qt::ISODate)); + elem.setAttribute("modificationDate", d->m_modificationDate.toString(TQt::ISODate)); } void KoVariableSettings::load( TQDomElement &elem ) @@ -205,16 +205,16 @@ void KoVariableSettings::load( TQDomElement &elem ) m_displayFieldCode=(bool)e.attribute("displayfieldcode").toInt(); if (e.hasAttribute("lastPrintingDate")) - d->m_lastPrintingDate = TQDateTime::fromString( e.attribute( "lastPrintingDate" ), Qt::ISODate ); + d->m_lastPrintingDate = TQDateTime::fromString( e.attribute( "lastPrintingDate" ), TQt::ISODate ); else d->m_lastPrintingDate.setTime_t(0); // 1970-01-01 00:00:00.000 locale time if (e.hasAttribute("creationDate")) { - d->m_creationDate = TQDateTime::fromString( e.attribute( "creationDate" ), Qt::ISODate ); + d->m_creationDate = TQDateTime::fromString( e.attribute( "creationDate" ), TQt::ISODate ); } if (e.hasAttribute("modificationDate")) - d->m_modificationDate = TQDateTime::fromString( e.attribute( "modificationDate" ), Qt::ISODate ); + d->m_modificationDate = TQDateTime::fromString( e.attribute( "modificationDate" ), TQt::ISODate ); } } @@ -1292,7 +1292,7 @@ void KoDateVariable::saveOasis( KoXmlWriter& writer, KoSavingContext& context ) writer.startElement( "text:date" ); if ( m_subtype == VST_DATE_FIX ) { - writer.addAttribute( "text:date-value", m_varValue.toDate().toString( Qt::ISODate) ); + writer.addAttribute( "text:date-value", m_varValue.toDate().toString( TQt::ISODate) ); writer.addAttribute( "text:fixed", "true" ); } break; @@ -1340,7 +1340,7 @@ void KoDateVariable::loadOasis( const TQDomElement &elem, KoOasisContext& /*cont const TQString dateValue = elem.attributeNS( KoXmlNS::text, "date-value", TQString()); TQDateTime dt; if ( !dateValue.isEmpty() ) // avoid TQDate warning - dt = TQDate::fromString(dateValue, Qt::ISODate); + dt = TQDate::fromString(dateValue, TQt::ISODate); bool fixed = (elem.hasAttributeNS( KoXmlNS::text, "fixed") && elem.attributeNS( KoXmlNS::text, "fixed", TQString())=="true"); if (!dt.isValid()) @@ -1540,7 +1540,7 @@ void KoTimeVariable::loadOasis( const TQDomElement &elem, KoOasisContext& /*cont if ( localName == "time" ) // current (or fixed) time { // Use TQDateTime to work around a possible problem of TQTime::fromString in TQt 3.2.2 - TQDateTime dt(TQDateTime::fromString(elem.attributeNS( KoXmlNS::text, "time-value", TQString()), Qt::ISODate)); + TQDateTime dt(TQDateTime::fromString(elem.attributeNS( KoXmlNS::text, "time-value", TQString()), TQt::ISODate)); bool fixed = (elem.hasAttributeNS( KoXmlNS::text, "fixed") && elem.attributeNS( KoXmlNS::text, "fixed", TQString())=="true"); if (!dt.isValid()) @@ -1563,7 +1563,7 @@ void KoTimeVariable::saveOasis( KoXmlWriter& writer, KoSavingContext& context ) if (m_subtype == VST_TIME_FIX ) { writer.addAttribute( "text:fixed", "true" ); - writer.addAttribute( "text:time-value", m_varValue.toTime().toString( Qt::ISODate ) ); + writer.addAttribute( "text:time-value", m_varValue.toTime().toString( TQt::ISODate ) ); } TQString value( m_varFormat->formatProperties() ); @@ -2527,7 +2527,7 @@ void KoNoteVariable::loadOasis( const TQDomElement &elem, KoOasisContext& /*cont if ( localName == "annotation" && elem.namespaceURI() == KoXmlNS::office ) { TQDomElement date = KoDom::namedItemNS( elem, KoXmlNS::dc, "date" ); - m_createdNoteDate = TQDate::fromString( date.text(), Qt::ISODate ); + m_createdNoteDate = TQDate::fromString( date.text(), TQt::ISODate ); TQDomNode text = KoDom::namedItemNS( elem, KoXmlNS::text, "p" ); for ( ; !text.isNull(); text = text.nextSibling() ) { @@ -2546,7 +2546,7 @@ void KoNoteVariable::saveOasis( KoXmlWriter& writer, KoSavingContext& /*context* // <office:annotation><dc:date>2004-11-10</dc:date><text:p/><text:p>---- 10/11/2004, 16:18 ----</text:p><text:p>dfgsdfsdfg</text:p><text:p>---- 10/11/2004, 16:18 ----</text:p><text:p/><text:p>---- 10/11/2004, 16:18 ----</text:p><text:p>gs</text:p><text:p>---- 10/11/2004, 16:18 ----</text:p><text:p>fg</text:p></office:annotation> writer.startElement( "office:annotation" ); writer.startElement( "dc:date" ); - writer.addTextNode( m_createdNoteDate.toString(Qt::ISODate) ); + writer.addTextNode( m_createdNoteDate.toString(TQt::ISODate) ); writer.endElement(); TQStringList text = TQStringList::split( "\n", m_varValue.toString() ); for ( TQStringList::Iterator it = text.begin(); it != text.end(); ++it ) { diff --git a/lib/kotext/tests/kobordertest.cpp b/lib/kotext/tests/kobordertest.cpp index b19513e6..93f2293b 100644 --- a/lib/kotext/tests/kobordertest.cpp +++ b/lib/kotext/tests/kobordertest.cpp @@ -53,7 +53,7 @@ int main (int argc, char ** argv) KoZoomHandler* zh = new KoZoomHandler(); - TQGrid* grid = new TQGrid(2, Qt::Horizontal, 0L); // 2 columns + TQGrid* grid = new TQGrid(2, TQt::Horizontal, 0L); // 2 columns { // First square MyWidget* w = new MyWidget(zh, grid); diff --git a/lib/kwmf/kowmfpaint.cpp b/lib/kwmf/kowmfpaint.cpp index 43067273..e13170e9 100644 --- a/lib/kwmf/kowmfpaint.cpp +++ b/lib/kwmf/kowmfpaint.cpp @@ -124,7 +124,7 @@ void KoWmfPaint::setBackgroundColor( const TQColor &c ) { } -void KoWmfPaint::setBackgroundMode( Qt::BGMode mode ) { +void KoWmfPaint::setBackgroundMode( TQt::BGMode mode ) { mPainter.setBackgroundMode( mode ); } @@ -267,7 +267,7 @@ void KoWmfPaint::drawPolyPolygon( TQPtrList<TQPointArray>& listPa, bool winding mPainter.setClipRegion( region, TQPainter::CoordPainter ); // fill polygons - if ( brush != Qt::NoBrush ) { + if ( brush != TQt::NoBrush ) { mPainter.fillRect( region.boundingRect(), brush ); } diff --git a/lib/kwmf/kowmfpaint.h b/lib/kwmf/kowmfpaint.h index 7fb9356d..58b27b18 100644 --- a/lib/kwmf/kowmfpaint.h +++ b/lib/kwmf/kowmfpaint.h @@ -71,7 +71,7 @@ private: // Drawing attributes/modes void setBackgroundColor( const TQColor& c ); - void setBackgroundMode( Qt::BGMode mode ); + void setBackgroundMode( TQt::BGMode mode ); void setRasterOp( TQt::RasterOp op ); /** diff --git a/lib/kwmf/kowmfread.h b/lib/kwmf/kowmfread.h index ff8fa9be..ca1183b1 100644 --- a/lib/kwmf/kowmfread.h +++ b/lib/kwmf/kowmfread.h @@ -106,7 +106,7 @@ public: // Drawing attributes/modes virtual void setBackgroundColor( const TQColor & ) = 0; - virtual void setBackgroundMode( Qt::BGMode ) = 0; + virtual void setBackgroundMode( TQt::BGMode ) = 0; virtual void setRasterOp( TQt::RasterOp ) = 0; // Change logical Coordinate diff --git a/lib/kwmf/kowmfreadprivate.cpp b/lib/kwmf/kowmfreadprivate.cpp index f812b766..01ba4df4 100644 --- a/lib/kwmf/kowmfreadprivate.cpp +++ b/lib/kwmf/kowmfreadprivate.cpp @@ -574,9 +574,9 @@ void KoWmfReadPrivate::setBkMode( TQ_UINT32, TQDataStream& stream ) stream >> bkMode; if ( bkMode == 1 ) - mReadWmf->setBackgroundMode( Qt::TransparentMode ); + mReadWmf->setBackgroundMode( TQt::TransparentMode ); else - mReadWmf->setBackgroundMode( Qt::OpaqueMode ); + mReadWmf->setBackgroundMode( TQt::OpaqueMode ); } @@ -867,7 +867,7 @@ void KoWmfReadPrivate::createEmptyObject() void KoWmfReadPrivate::createBrushIndirect( TQ_UINT32, TQDataStream& stream ) { - Qt::BrushStyle style; + TQt::BrushStyle style; TQ_UINT16 sty, arg2; TQ_UINT32 color; KoWmfBrushHandle* handle = new KoWmfBrushHandle; @@ -881,7 +881,7 @@ void KoWmfReadPrivate::createBrushIndirect( TQ_UINT32, TQDataStream& stream ) else { kdDebug() << "KoWmfReadPrivate::createBrushIndirect: invalid hatched brush " << arg2 << endl; - style = Qt::SolidPattern; + style = TQt::SolidPattern; } } else { @@ -889,7 +889,7 @@ void KoWmfReadPrivate::createBrushIndirect( TQ_UINT32, TQDataStream& stream ) style = koWmfStyleBrush[ sty ]; else { kdDebug() << "KoWmfReadPrivate::createBrushIndirect: invalid brush " << sty << endl; - style = Qt::SolidPattern; + style = TQt::SolidPattern; } } handle->brush.setStyle( style ); @@ -901,7 +901,7 @@ void KoWmfReadPrivate::createBrushIndirect( TQ_UINT32, TQDataStream& stream ) void KoWmfReadPrivate::createPenIndirect( TQ_UINT32, TQDataStream& stream ) { // TODO: userStyle and alternateStyle - Qt::PenStyle penStyle; + TQt::PenStyle penStyle; TQ_UINT32 color; TQ_UINT16 style, width, arg; @@ -914,12 +914,12 @@ void KoWmfReadPrivate::createPenIndirect( TQ_UINT32, TQDataStream& stream ) penStyle=koWmfStylePen[ style ]; else { kdDebug() << "KoWmfReadPrivate::createPenIndirect: invalid pen " << style << endl; - penStyle = Qt::SolidLine; + penStyle = TQt::SolidLine; } handle->pen.setStyle( penStyle ); handle->pen.setColor( qtColor( color ) ); - handle->pen.setCapStyle( Qt::RoundCap ); + handle->pen.setCapStyle( TQt::RoundCap ); handle->pen.setWidth( width ); } } diff --git a/lib/kwmf/kowmfstruct.h b/lib/kwmf/kowmfstruct.h index 84281f4e..5bd50b32 100644 --- a/lib/kwmf/kowmfstruct.h +++ b/lib/kwmf/kowmfstruct.h @@ -117,31 +117,31 @@ struct WmfEnhMetaRecord TQt::CopyROP, TQt::OrNotROP, TQt::OrROP, TQt::SetROP }; - static const Qt::BrushStyle koWmfHatchedStyleBrush[] = + static const TQt::BrushStyle koWmfHatchedStyleBrush[] = { - Qt::HorPattern, - Qt::VerPattern, - Qt::FDiagPattern, - Qt::BDiagPattern, - Qt::CrossPattern, - Qt::DiagCrossPattern + TQt::HorPattern, + TQt::VerPattern, + TQt::FDiagPattern, + TQt::BDiagPattern, + TQt::CrossPattern, + TQt::DiagCrossPattern }; - static const Qt::BrushStyle koWmfStyleBrush[] = - { Qt::SolidPattern, - Qt::NoBrush, - Qt::FDiagPattern, /* hatched */ - Qt::Dense4Pattern, /* should be custom bitmap pattern */ - Qt::HorPattern, /* should be BS_INDEXED (?) */ - Qt::VerPattern, /* should be device-independent bitmap */ - Qt::Dense6Pattern, /* should be device-independent packed-bitmap */ - Qt::Dense2Pattern, /* should be BS_PATTERN8x8 */ - Qt::Dense3Pattern /* should be device-independent BS_DIBPATTERN8x8 */ + static const TQt::BrushStyle koWmfStyleBrush[] = + { TQt::SolidPattern, + TQt::NoBrush, + TQt::FDiagPattern, /* hatched */ + TQt::Dense4Pattern, /* should be custom bitmap pattern */ + TQt::HorPattern, /* should be BS_INDEXED (?) */ + TQt::VerPattern, /* should be device-independent bitmap */ + TQt::Dense6Pattern, /* should be device-independent packed-bitmap */ + TQt::Dense2Pattern, /* should be BS_PATTERN8x8 */ + TQt::Dense3Pattern /* should be device-independent BS_DIBPATTERN8x8 */ }; - static const Qt::PenStyle koWmfStylePen[] = - { Qt::SolidLine, Qt::DashLine, Qt::DotLine, Qt::DashDotLine, Qt::DashDotDotLine, - Qt::NoPen, Qt::SolidLine }; + static const TQt::PenStyle koWmfStylePen[] = + { TQt::SolidLine, TQt::DashLine, TQt::DotLine, TQt::DashDotLine, TQt::DashDotDotLine, + TQt::NoPen, TQt::SolidLine }; #endif diff --git a/lib/kwmf/kowmfwrite.cpp b/lib/kwmf/kowmfwrite.cpp index 22a0d131..23bb7024 100644 --- a/lib/kwmf/kowmfwrite.cpp +++ b/lib/kwmf/kowmfwrite.cpp @@ -193,9 +193,9 @@ void KoWmfWrite::setBackgroundColor( const TQColor &c ) { } -void KoWmfWrite::setBackgroundMode( Qt::BGMode mode ) { +void KoWmfWrite::setBackgroundMode( TQt::BGMode mode ) { d->mSt << (TQ_UINT32)4 << (TQ_UINT16)0x0102; - if ( mode == Qt::TransparentMode ) + if ( mode == TQt::TransparentMode ) d->mSt << (TQ_UINT16)1; else d->mSt << (TQ_UINT16)0; diff --git a/lib/kwmf/kowmfwrite.h b/lib/kwmf/kowmfwrite.h index bc3e1411..fda0540f 100644 --- a/lib/kwmf/kowmfwrite.h +++ b/lib/kwmf/kowmfwrite.h @@ -82,7 +82,7 @@ public: // Drawing attributes/modes void setBackgroundColor( const TQColor& r ); - void setBackgroundMode( Qt::BGMode ); + void setBackgroundMode( TQt::BGMode ); void setRasterOp( TQt::RasterOp ); // Change logical Coordinate diff --git a/lib/kwmf/kwmf.cpp b/lib/kwmf/kwmf.cpp index 06092a82..d79596ce 100644 --- a/lib/kwmf/kwmf.cpp +++ b/lib/kwmf/kwmf.cpp @@ -706,17 +706,17 @@ void KWmf::opPenCreateIndirect( U32 /*words*/, TQDataStream &operands) { - static Qt::PenStyle styleTab[] = - { - Qt::SolidLine, - Qt::DashLine, - Qt::DotLine, - Qt::DashDotLine, - Qt::DashDotDotLine, - Qt::NoPen, - Qt::SolidLine, // PS_INSIDEFRAME - Qt::SolidLine, // PS_USERSTYLE - Qt::SolidLine // PS_ALTERNATE + static TQt::PenStyle styleTab[] = + { + TQt::SolidLine, + TQt::DashLine, + TQt::DotLine, + TQt::DashDotLine, + TQt::DashDotDotLine, + TQt::NoPen, + TQt::SolidLine, // PS_INSIDEFRAME + TQt::SolidLine, // PS_USERSTYLE + TQt::SolidLine // PS_ALTERNATE }; WinObjPenHandle *handle = handleCreatePen(); S16 arg; diff --git a/lib/kwmf/qwmf.cpp b/lib/kwmf/qwmf.cpp index 8b6572ae..415c63dd 100644 --- a/lib/kwmf/qwmf.cpp +++ b/lib/kwmf/qwmf.cpp @@ -622,8 +622,8 @@ void QWinMetaFile::setBkColor( long, short* parm ) //----------------------------------------------------------------------------- void QWinMetaFile::setBkMode( long, short* parm ) { - if ( parm[ 0 ]==1 ) mPainter.setBackgroundMode( Qt::TransparentMode ); - else mPainter.setBackgroundMode( Qt::OpaqueMode ); + if ( parm[ 0 ]==1 ) mPainter.setBackgroundMode( TQt::TransparentMode ); + else mPainter.setBackgroundMode( TQt::OpaqueMode ); } @@ -927,26 +927,26 @@ void QWinMetaFile::createEmptyObject( long, short* ) //----------------------------------------------------------------------------- void QWinMetaFile::createBrushIndirect( long, short* parm ) { - static Qt::BrushStyle hatchedStyleTab[] = + static TQt::BrushStyle hatchedStyleTab[] = { - Qt::HorPattern, - Qt::FDiagPattern, - Qt::BDiagPattern, - Qt::CrossPattern, - Qt::DiagCrossPattern + TQt::HorPattern, + TQt::FDiagPattern, + TQt::BDiagPattern, + TQt::CrossPattern, + TQt::DiagCrossPattern }; - static Qt::BrushStyle styleTab[] = - { Qt::SolidPattern, - Qt::NoBrush, - Qt::FDiagPattern, /* hatched */ - Qt::Dense4Pattern, /* should be custom bitmap pattern */ - Qt::HorPattern, /* should be BS_INDEXED (?) */ - Qt::VerPattern, /* should be device-independent bitmap */ - Qt::Dense6Pattern, /* should be device-independent packed-bitmap */ - Qt::Dense2Pattern, /* should be BS_PATTERN8x8 */ - Qt::Dense3Pattern /* should be device-independent BS_DIBPATTERN8x8 */ + static TQt::BrushStyle styleTab[] = + { TQt::SolidPattern, + TQt::NoBrush, + TQt::FDiagPattern, /* hatched */ + TQt::Dense4Pattern, /* should be custom bitmap pattern */ + TQt::HorPattern, /* should be BS_INDEXED (?) */ + TQt::VerPattern, /* should be device-independent bitmap */ + TQt::Dense6Pattern, /* should be device-independent packed-bitmap */ + TQt::Dense2Pattern, /* should be BS_PATTERN8x8 */ + TQt::Dense3Pattern /* should be device-independent BS_DIBPATTERN8x8 */ }; - Qt::BrushStyle style; + TQt::BrushStyle style; short arg; WinObjBrushHandle* handle = new WinObjBrushHandle; addHandle( handle ); @@ -959,7 +959,7 @@ void QWinMetaFile::createBrushIndirect( long, short* parm ) else { kdDebug() << "QWinMetaFile::createBrushIndirect: invalid hatched brush " << arg << endl; - style = Qt::SolidPattern; + style = TQt::SolidPattern; } } else if ( arg>=0 && arg<9 ) @@ -967,7 +967,7 @@ void QWinMetaFile::createBrushIndirect( long, short* parm ) else { kdDebug() << "QWinMetaFile::createBrushIndirect: invalid brush " << arg << endl; - style = Qt::SolidPattern; + style = TQt::SolidPattern; } handle->brush.setStyle( style ); handle->brush.setColor( color( parm+1 ) ); @@ -977,10 +977,10 @@ void QWinMetaFile::createBrushIndirect( long, short* parm ) //----------------------------------------------------------------------------- void QWinMetaFile::createPenIndirect( long, short* parm ) { - static Qt::PenStyle styleTab[] = - { Qt::SolidLine, Qt::DashLine, Qt::DotLine, Qt::DashDotLine, Qt::DashDotDotLine, - Qt::NoPen, Qt::SolidLine }; - Qt::PenStyle style; + static TQt::PenStyle styleTab[] = + { TQt::SolidLine, TQt::DashLine, TQt::DotLine, TQt::DashDotLine, TQt::DashDotDotLine, + TQt::NoPen, TQt::SolidLine }; + TQt::PenStyle style; WinObjPenHandle* handle = new WinObjPenHandle; addHandle( handle ); @@ -988,12 +988,12 @@ void QWinMetaFile::createPenIndirect( long, short* parm ) else { kdDebug() << "QWinMetaFile::createPenIndirect: invalid pen " << parm[ 0 ] << endl; - style = Qt::SolidLine; + style = TQt::SolidLine; } handle->pen.setStyle( style ); handle->pen.setColor( color( parm+3 ) ); - handle->pen.setCapStyle( Qt::RoundCap ); + handle->pen.setCapStyle( TQt::RoundCap ); //int width = 0; // TODO : width of pen proportional to device context width |