diff options
Diffstat (limited to 'kivio')
22 files changed, 61 insertions, 61 deletions
diff --git a/kivio/kiviopart/addstenciltool.cpp b/kivio/kiviopart/addstenciltool.cpp index 7e7a0bec..ddbe38c5 100644 --- a/kivio/kiviopart/addstenciltool.cpp +++ b/kivio/kiviopart/addstenciltool.cpp @@ -53,7 +53,7 @@ bool AddStencilTool::processEvent(TQEvent* e) { TQMouseEvent* me = TQT_TQMOUSEEVENT(e); - if(me->button() == Qt::LeftButton) { + if(me->button() == TQt::LeftButton) { m_leftMouseButtonPressed = true; createStencil(me->pos()); return true; @@ -65,7 +65,7 @@ bool AddStencilTool::processEvent(TQEvent* e) { TQMouseEvent* me = TQT_TQMOUSEEVENT(e); - if(m_leftMouseButtonPressed && (me->button() == Qt::LeftButton)) { + if(m_leftMouseButtonPressed && (me->button() == TQt::LeftButton)) { m_leftMouseButtonPressed = false; endOperation(me->pos()); return true; diff --git a/kivio/kiviopart/kivio_page.cpp b/kivio/kiviopart/kivio_page.cpp index a4836352..c3bdb865 100644 --- a/kivio/kiviopart/kivio_page.cpp +++ b/kivio/kiviopart/kivio_page.cpp @@ -1639,7 +1639,7 @@ void KivioPage::saveGuideLines(TQDomElement& element) TQDomElement e = element.ownerDocument().createElement("Guideline"); element.appendChild(e); XmlWriteDouble(e, "pos", *it); - XmlWriteInt(e, "orient", (int)Qt::Horizontal); + XmlWriteInt(e, "orient", (int)TQt::Horizontal); } itEnd = m_vGuideLines.end(); @@ -1648,7 +1648,7 @@ void KivioPage::saveGuideLines(TQDomElement& element) TQDomElement e = element.ownerDocument().createElement("Guideline"); element.appendChild(e); XmlWriteDouble(e, "pos", *it); - XmlWriteInt(e, "orient", (int)Qt::Vertical); + XmlWriteInt(e, "orient", (int)TQt::Vertical); } } @@ -1662,14 +1662,14 @@ void KivioPage::loadGuideLines(const TQDomElement& element) for( ; !e.isNull(); e = e.nextSibling().toElement() ) { double pos = XmlReadDouble(e, "pos", 0.0); - Qt::Orientation orient = (Qt::Orientation)XmlReadInt(e, "orient", 0); + TQt::Orientation orient = (TQt::Orientation)XmlReadInt(e, "orient", 0); addGuideLine(orient, pos); } } -void KivioPage::addGuideLine(Qt::Orientation orientation, double position) +void KivioPage::addGuideLine(TQt::Orientation orientation, double position) { - if(orientation == Qt::Horizontal) { + if(orientation == TQt::Horizontal) { m_hGuideLines.append(position); } else { m_vGuideLines.append(position); diff --git a/kivio/kiviopart/kivio_page.h b/kivio/kiviopart/kivio_page.h index d6bdb02c..b9c1c314 100644 --- a/kivio/kiviopart/kivio_page.h +++ b/kivio/kiviopart/kivio_page.h @@ -179,7 +179,7 @@ class KIVIO_EXPORT KivioPage : public TQObject void setPaintSelected(bool paint = true); void setGuideLines(const TQValueList<double> hGuideLines, const TQValueList<double> vGuideLines); - void addGuideLine(Qt::Orientation orientation, double position); + void addGuideLine(TQt::Orientation orientation, double position); signals: void sig_updateView( KivioPage *_page ); diff --git a/kivio/kiviopart/kivio_stackbar.cpp b/kivio/kiviopart/kivio_stackbar.cpp index 1c6954bc..32d56ce7 100644 --- a/kivio/kiviopart/kivio_stackbar.cpp +++ b/kivio/kiviopart/kivio_stackbar.cpp @@ -61,7 +61,7 @@ void KivioStackBar::insertPage( TQWidget* w, const TQString& title ) connect( b, TQT_SIGNAL(beginDrag()), TQT_SLOT(buttonBeginDrag()) ); connect( b, TQT_SIGNAL(finishDrag()), TQT_SLOT(buttonFinishDrag()) ); connect( b, TQT_SIGNAL(closeRequired(DragBarButton*)), TQT_SLOT(slotDeleteButton(DragBarButton*)) ); - connect(this, TQT_SIGNAL(orientationChanged(Qt::Orientation)), b, TQT_SLOT(setOrientation(Qt::Orientation))); + connect(this, TQT_SIGNAL(orientationChanged(TQt::Orientation)), b, TQT_SLOT(setOrientation(TQt::Orientation))); boxLayout()->addWidget(b); boxLayout()->addWidget(w, 1); @@ -206,8 +206,8 @@ void KivioStackBar::closeEvent(TQCloseEvent* ev) void KivioStackBar::newPlace(TQDockWindow::Place place) { - if((place == OutsideDock) && (orientation() == Qt::Horizontal)) { - setOrientation(Qt::Vertical); + if((place == OutsideDock) && (orientation() == TQt::Horizontal)) { + setOrientation(TQt::Vertical); } } diff --git a/kivio/kiviopart/kivio_view.cpp b/kivio/kiviopart/kivio_view.cpp index 0b20e35c..d06bc5f0 100644 --- a/kivio/kiviopart/kivio_view.cpp +++ b/kivio/kiviopart/kivio_view.cpp @@ -201,8 +201,8 @@ KivioView::KivioView( TQWidget *_parent, const char *_name, KivioDoc* doc ) m_pTabBar->setReverseLayout( TQApplication::reverseLayout() ); // Scroll Bar - m_vertScrollBar = new TQScrollBar(Qt::Vertical,pRightSide); - m_horzScrollBar = new TQScrollBar(Qt::Horizontal,tabSplit); + m_vertScrollBar = new TQScrollBar(TQt::Vertical,pRightSide); + m_horzScrollBar = new TQScrollBar(TQt::Horizontal,tabSplit); TQValueList<int> sizes; sizes << tabSplit->width() / 2 << tabSplit->width() / 2; @@ -218,11 +218,11 @@ KivioView::KivioView( TQWidget *_parent, const char *_name, KivioDoc* doc ) m_pCanvas->setFocusPolicy(TQWidget::StrongFocus); // Rulers - vRuler = new KoRuler(pRightSide, m_pCanvas, Qt::Vertical, Kivio::Config::defaultPageLayout(), + vRuler = new KoRuler(pRightSide, m_pCanvas, TQt::Vertical, Kivio::Config::defaultPageLayout(), KoRuler::F_HELPLINES, m_pDoc->unit()); vRuler->showMousePos(true); vRuler->setZoom(zoomHandler()->zoomedResolutionY()); - hRuler = new KoRuler(pRightSide, m_pCanvas, Qt::Horizontal, Kivio::Config::defaultPageLayout(), + hRuler = new KoRuler(pRightSide, m_pCanvas, TQt::Horizontal, Kivio::Config::defaultPageLayout(), KoRuler::F_HELPLINES, m_pDoc->unit()); hRuler->showMousePos(true); hRuler->setZoom(zoomHandler()->zoomedResolutionX()); diff --git a/kivio/kiviopart/kiviosdk/kivio_1d_stencil.cpp b/kivio/kiviopart/kiviosdk/kivio_1d_stencil.cpp index a57af7c8..8479eb86 100644 --- a/kivio/kiviopart/kiviosdk/kivio_1d_stencil.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_1d_stencil.cpp @@ -148,7 +148,7 @@ int Kivio1DStencil::linePattern() void Kivio1DStencil::setFillPattern(int p) { - m_pFillStyle->setBrushStyle(static_cast<Qt::BrushStyle>(p)); + m_pFillStyle->setBrushStyle(static_cast<TQt::BrushStyle>(p)); } int Kivio1DStencil::fillPattern() diff --git a/kivio/kiviopart/kiviosdk/kivio_fill_style.cpp b/kivio/kiviopart/kiviosdk/kivio_fill_style.cpp index 29f0f1f5..4d4a68b1 100644 --- a/kivio/kiviopart/kiviosdk/kivio_fill_style.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_fill_style.cpp @@ -32,7 +32,7 @@ KivioFillStyle::KivioFillStyle() m_colorStyle = kcsSolid; m_color = TQColor(255,255,255); m_color2 = TQColor(255,255,255); - m_brushStyle = Qt::SolidPattern; + m_brushStyle = TQt::SolidPattern; m_gradientType = KImageEffect::VerticalGradient; } @@ -130,7 +130,7 @@ TQBrush KivioFillStyle::brush() break; case kcsNone: - b.setStyle(Qt::NoBrush); + b.setStyle(TQt::NoBrush); break; case kcsGradient: diff --git a/kivio/kiviopart/kiviosdk/kivio_fill_style.h b/kivio/kiviopart/kiviosdk/kivio_fill_style.h index 4be7303b..9a362077 100644 --- a/kivio/kiviopart/kiviosdk/kivio_fill_style.h +++ b/kivio/kiviopart/kiviosdk/kivio_fill_style.h @@ -45,7 +45,7 @@ protected: KivioColorStyle m_colorStyle; // The color style to use when filling TQColor m_color; // The color to use when solid filling TQColor m_color2; // The second color to use when using a gradient - Qt::BrushStyle m_brushStyle; // The brush pattern to use when solid filling (maybe gradient too?) + TQt::BrushStyle m_brushStyle; // The brush pattern to use when solid filling (maybe gradient too?) KImageEffect::GradientType m_gradientType; //Which type of gradient to use public: @@ -68,8 +68,8 @@ public: inline TQColor color2() const { return m_color2; } inline void setColor2( const TQColor& c ) { m_color2 = c; } - inline Qt::BrushStyle brushStyle() const { return m_brushStyle; } - inline void setBrushStyle( Qt::BrushStyle b ) { m_brushStyle = b; } + inline TQt::BrushStyle brushStyle() const { return m_brushStyle; } + inline void setBrushStyle( TQt::BrushStyle b ) { m_brushStyle = b; } inline KImageEffect::GradientType gradientType() const { return m_gradientType; } inline void setGradientType(KImageEffect::GradientType t) { m_gradientType = t; } diff --git a/kivio/kiviopart/kiviosdk/kivio_line_style.cpp b/kivio/kiviopart/kiviosdk/kivio_line_style.cpp index 7622a289..cd644669 100644 --- a/kivio/kiviopart/kiviosdk/kivio_line_style.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_line_style.cpp @@ -79,9 +79,9 @@ TQPen KivioLineStyle::pen( float scale ) const p.setColor( m_color ); p.setWidth( (int)s ); - p.setJoinStyle( (Qt::PenJoinStyle)m_joinStyle ); - p.setCapStyle( (Qt::PenCapStyle)m_capStyle ); - p.setStyle( (Qt::PenStyle)m_style ); + p.setJoinStyle( (TQt::PenJoinStyle)m_joinStyle ); + p.setCapStyle( (TQt::PenCapStyle)m_capStyle ); + p.setStyle( (TQt::PenStyle)m_style ); return p; } diff --git a/kivio/kiviopart/kiviosdk/kivio_screen_painter.cpp b/kivio/kiviopart/kiviosdk/kivio_screen_painter.cpp index 02c850e4..4424cc71 100644 --- a/kivio/kiviopart/kiviosdk/kivio_screen_painter.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_screen_painter.cpp @@ -472,7 +472,7 @@ void KivioScreenPainter::drawLineArray( TQPtrList<KivioPoint> *pList ) int i; TQBrush b; - b.setStyle( Qt::NoBrush ); + b.setStyle( TQt::NoBrush ); i=0; pPoint = pList->first(); @@ -878,7 +878,7 @@ void KivioScreenPainter::drawHandle( float x, float y, int flags ) penColor.setRgb(0, 0, 0); b.setColor(fillColor); - b.setStyle(Qt::SolidPattern); + b.setStyle(TQt::SolidPattern); p.setColor(penColor); m_pPainter->setPen(p); m_pPainter->setBrush(b); @@ -910,7 +910,7 @@ void KivioScreenPainter::drawSelectionBox( const TQRect& r ) PAINTER_CHECK(); TQPen p; p.setColor(TQColor(0,200,0)); - p.setStyle(Qt::DashLine); + p.setStyle(TQt::DashLine); m_pPainter->setBrush(TQt::NoBrush); m_pPainter->setPen(p); m_pPainter->drawRect(r); diff --git a/kivio/kiviopart/kiviosdk/kivio_sml_stencil.cpp b/kivio/kiviopart/kiviosdk/kivio_sml_stencil.cpp index dc6f2722..cc6a1a5a 100644 --- a/kivio/kiviopart/kiviosdk/kivio_sml_stencil.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_sml_stencil.cpp @@ -1388,7 +1388,7 @@ void KivioSMLStencil::setFillPattern(int p) pShape = m_pShapeList->first(); while( pShape ) { - pShape->shapeData()->fillStyle()->setBrushStyle( static_cast<Qt::BrushStyle>(p) ); + pShape->shapeData()->fillStyle()->setBrushStyle( static_cast<TQt::BrushStyle>(p) ); pShape = m_pShapeList->next(); } diff --git a/kivio/kiviopart/stencilbarbutton.cpp b/kivio/kiviopart/stencilbarbutton.cpp index bb9b5627..0c41bbc9 100644 --- a/kivio/kiviopart/stencilbarbutton.cpp +++ b/kivio/kiviopart/stencilbarbutton.cpp @@ -38,7 +38,7 @@ DragBarButton::DragBarButton( const TQString& text, TQWidget* parent, const char m_bDragged = false; m_bMouseOn = false; m_bClose = false; - m_orientation = Qt::Vertical; + m_orientation = TQt::Vertical; const char* stencil_xpm[] = { "12 12 17 1", @@ -111,7 +111,7 @@ void DragBarButton::drawButton( TQPainter* paint ) { TQSize pixSize; - if(m_orientation == Qt::Vertical) { + if(m_orientation == TQt::Vertical) { pixSize = TQSize(width(), height()); } else { pixSize = TQSize(height(), width()); @@ -165,7 +165,7 @@ void DragBarButton::drawButton( TQPainter* paint ) pixPainter.drawPixmap(pixSize.width() - 20 + z, (pixSize.height() - m_pClosePix->height()) / 2 + z, *m_pClosePix); } - if(m_orientation == Qt::Vertical) { + if(m_orientation == TQt::Vertical) { paint->drawPixmap(0, 0, pix); } else { paint->rotate(-90); @@ -209,7 +209,7 @@ TQSize DragBarButton::sizeHint() const TQSize size; - if(m_orientation == Qt::Vertical) { + if(m_orientation == TQt::Vertical) { size = TQSize(w, h).expandedTo(TQApplication::globalStrut()); } else { size = TQSize(h, w).expandedTo(TQApplication::globalStrut()); @@ -223,7 +223,7 @@ void DragBarButton::mousePressEvent( TQMouseEvent* ev ) m_bClose = false; TQRect closeRect; - if(m_orientation == Qt::Vertical) { + if(m_orientation == TQt::Vertical) { closeRect.setRect(width() - 20, 0, m_pClosePix->width(), height()); } else { closeRect.setRect(0, 20 - m_pClosePix->width(), width(), m_pClosePix->width()); @@ -246,7 +246,7 @@ void DragBarButton::mouseReleaseEvent( TQMouseEvent* ev ) repaint(); TQRect closeRect; - if(m_orientation == Qt::Vertical) { + if(m_orientation == TQt::Vertical) { closeRect.setRect(width() - 20, 0, m_pClosePix->width(), height()); } else { closeRect.setRect(0, 20 - m_pClosePix->width(), width(), m_pClosePix->width()); @@ -295,11 +295,11 @@ void DragBarButton::leaveEvent( TQEvent* ev ) repaint(); } -void DragBarButton::setOrientation(Qt::Orientation orientation) +void DragBarButton::setOrientation(TQt::Orientation orientation) { m_orientation = orientation; - if(m_orientation == Qt::Vertical) { + if(m_orientation == TQt::Vertical) { setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); } else { setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum); diff --git a/kivio/kiviopart/stencilbarbutton.h b/kivio/kiviopart/stencilbarbutton.h index be4d36b1..16d04df9 100644 --- a/kivio/kiviopart/stencilbarbutton.h +++ b/kivio/kiviopart/stencilbarbutton.h @@ -37,7 +37,7 @@ class DragBarButton : public TQPushButton TQSize sizeHint() const; - Qt::Orientation orientation() const { return m_orientation; } + TQt::Orientation orientation() const { return m_orientation; } signals: void beginDrag(); @@ -45,7 +45,7 @@ class DragBarButton : public TQPushButton void closeRequired(DragBarButton *); public slots: - void setOrientation(Qt::Orientation orientation); + void setOrientation(TQt::Orientation orientation); protected: void drawButton( TQPainter* ); @@ -64,7 +64,7 @@ class DragBarButton : public TQPushButton bool m_bMouseOn; bool m_bClose; TQPoint m_ppoint; - Qt::Orientation m_orientation; + TQt::Orientation m_orientation; }; } diff --git a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp index ba1e9cd5..8cb18976 100644 --- a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp +++ b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp @@ -100,7 +100,7 @@ bool KivioBirdEyePanel::eventFilter(TQObject* o, TQEvent* ev) if (o == canvas && ev->type() == TQEvent::MouseMove) { TQMouseEvent* me = TQT_TQMOUSEEVENT(ev); - if (me->state() == Qt::LeftButton) + if (me->state() == TQt::LeftButton) handleMouseMoveAction(me->pos()); else handleMouseMove(me->pos()); @@ -111,7 +111,7 @@ bool KivioBirdEyePanel::eventFilter(TQObject* o, TQEvent* ev) if (o == canvas && ev->type() == TQEvent::MouseButtonPress) { TQMouseEvent* me = TQT_TQMOUSEEVENT(ev); - if (me->button() == Qt::LeftButton) + if (me->button() == TQt::LeftButton) handleMousePress(me->pos()); return true; diff --git a/kivio/kiviopart/ui/kiviooptionsdialog.cpp b/kivio/kiviopart/ui/kiviooptionsdialog.cpp index f2784d7a..e1623d9c 100644 --- a/kivio/kiviopart/ui/kiviooptionsdialog.cpp +++ b/kivio/kiviopart/ui/kiviooptionsdialog.cpp @@ -51,7 +51,7 @@ // GuidesListViewItem::GuidesListViewItem(TQListView* parent, KivioGuideLineData *gd, KoUnit::Unit u) // : TDEListViewItem(parent), m_data(gd) // { -// setPixmap(0, BarIcon(m_data->orientation() == Qt::Vertical ? +// setPixmap(0, BarIcon(m_data->orientation() == TQt::Vertical ? // "guides_vertical":"guides_horizontal")); // TQString s = TDEGlobal::_locale->formatNumber(KoUnit::toUserValue(m_data->position(), u), 2); // s += " " + KoUnit::unitName(u); @@ -78,10 +78,10 @@ // setText(1, s); // } // -// void GuidesListViewItem::setOrientation(Qt::Orientation o) +// void GuidesListViewItem::setOrientation(TQt::Orientation o) // { // m_data->setOrientation(o); -// setPixmap(0, BarIcon(m_data->orientation() == Qt::Vertical ? +// setPixmap(0, BarIcon(m_data->orientation() == TQt::Vertical ? // "guides_vertical":"guides_horizontal")); // } @@ -174,7 +174,7 @@ void KivioOptionsDialog::initGrid() TQLabel* gridColorLbl = new TQLabel(i18n("Grid &color:"), page); m_gridColorBtn = new KColorButton(Kivio::Config::gridColor(), page); gridColorLbl->setBuddy(m_gridColorBtn); - TQGroupBox* spacingGrp = new TQGroupBox(2, Qt::Horizontal, i18n("Spacing"), page); + TQGroupBox* spacingGrp = new TQGroupBox(2, TQt::Horizontal, i18n("Spacing"), page); TQLabel* spaceHorizLbl = new TQLabel(i18n("&Horizontal:"), spacingGrp); m_spaceHorizUSpin = new KoUnitDoubleSpinBox(spacingGrp, 0.0, pgw, 0.1, fw, unit); @@ -183,7 +183,7 @@ void KivioOptionsDialog::initGrid() m_spaceVertUSpin = new KoUnitDoubleSpinBox(spacingGrp, 0.0, pgh, 0.1, fh, unit); spaceVertLbl->setBuddy(m_spaceVertUSpin); - TQGroupBox* snapGrp = new TQGroupBox(2, Qt::Horizontal, i18n("Snap Distance"), page); + TQGroupBox* snapGrp = new TQGroupBox(2, TQt::Horizontal, i18n("Snap Distance"), page); TQLabel* snapHorizLbl = new TQLabel(i18n("H&orizontal:"), snapGrp); m_snapHorizUSpin = new KoUnitDoubleSpinBox(snapGrp, 0.0, fw, 0.1, sw, unit); diff --git a/kivio/kiviopart/ui/kiviooptionsdialog.h b/kivio/kiviopart/ui/kiviooptionsdialog.h index bdd2138a..a70bbb04 100644 --- a/kivio/kiviopart/ui/kiviooptionsdialog.h +++ b/kivio/kiviopart/ui/kiviooptionsdialog.h @@ -45,7 +45,7 @@ class TQFont; // // void setUnit(KoUnit::Unit u); // void setPosition(double p, KoUnit::Unit u); -// void setOrientation(Qt::Orientation o); +// void setOrientation(TQt::Orientation o); // KivioGuideLineData* guideData() { return m_data; } // // private: diff --git a/kivio/kiviopart/ui/kiviostencilformatdlg.cpp b/kivio/kiviopart/ui/kiviostencilformatdlg.cpp index 26a62671..d16f6e89 100644 --- a/kivio/kiviopart/ui/kiviostencilformatdlg.cpp +++ b/kivio/kiviopart/ui/kiviostencilformatdlg.cpp @@ -92,7 +92,7 @@ void KivioStencilFormatDlg::initLinePatterns() for (int i = NoPen; i <= DashDotDotLine ; i++ ) { pix.fill(white); - pen.setStyle(static_cast<Qt::PenStyle>(i)); + pen.setStyle(static_cast<TQt::PenStyle>(i)); p.setPen(pen); p.drawLine(0, 8, pix.width(), 8); @@ -114,7 +114,7 @@ void KivioStencilFormatDlg::initFillPatterns() for (int i = NoBrush; i <= DiagCrossPattern; i++ ) { pix.fill(white); - brush.setStyle(static_cast<Qt::BrushStyle>(i)); + brush.setStyle(static_cast<TQt::BrushStyle>(i)); p.setBrush(brush); p.fillRect(0, 0, pix.width(), pix.height(), brush); @@ -132,13 +132,13 @@ void KivioStencilFormatDlg::initLineEndStyles() TQPen pen; pen.setColor(TQColor(0, 0, 0)); pen.setWidth(4); - pen.setStyle(Qt::SolidLine); - pen.setJoinStyle(Qt::RoundJoin); + pen.setStyle(TQt::SolidLine); + pen.setJoinStyle(TQt::RoundJoin); p.setBrush(white); for (int i = 0; i < 3; i++) { pix.fill(white); - pen.setCapStyle(static_cast<Qt::PenCapStyle>(i * 0x10)); + pen.setCapStyle(static_cast<TQt::PenCapStyle>(i * 0x10)); p.setPen(pen); p.drawLine(6, 8, pix.width() - 12, 8); diff --git a/kivio/kiviopart/ui/kiviotextformatdlg.cpp b/kivio/kiviopart/ui/kiviotextformatdlg.cpp index 3bf67805..536ab660 100644 --- a/kivio/kiviopart/ui/kiviotextformatdlg.cpp +++ b/kivio/kiviopart/ui/kiviotextformatdlg.cpp @@ -56,12 +56,12 @@ void KivioTextFormatDlg::initFontTab() void KivioTextFormatDlg::initPositionTab() { TQFrame* tab = addPage(i18n("Position")); - m_valignBGrp = new TQButtonGroup(1, Qt::Horizontal, i18n("Vertical"), tab); + m_valignBGrp = new TQButtonGroup(1, TQt::Horizontal, i18n("Vertical"), tab); (void) new TQRadioButton(i18n("&Top"), m_valignBGrp); (void) new TQRadioButton(i18n("&Center"), m_valignBGrp); (void) new TQRadioButton(i18n("&Bottom"), m_valignBGrp); m_valignBGrp->setButton(1); - m_halignBGrp = new TQButtonGroup(1, Qt::Vertical, i18n("Horizontal"), tab); + m_halignBGrp = new TQButtonGroup(1, TQt::Vertical, i18n("Horizontal"), tab); (void) new TQRadioButton(i18n("&Left"), m_halignBGrp); (void) new TQRadioButton(i18n("C&enter"), m_halignBGrp); (void) new TQRadioButton(i18n("&Right"), m_halignBGrp); diff --git a/kivio/plugins/kivioconnectortool/tool_connector.cpp b/kivio/plugins/kivioconnectortool/tool_connector.cpp index f8b5d015..5e45cc36 100644 --- a/kivio/plugins/kivioconnectortool/tool_connector.cpp +++ b/kivio/plugins/kivioconnectortool/tool_connector.cpp @@ -171,7 +171,7 @@ void ConnectorTool::connector(TQRect) void ConnectorTool::mousePress( TQMouseEvent *e ) { - if(e->button() == Qt::LeftButton) { + if(e->button() == TQt::LeftButton) { bool ok = true; if(!m_pStencil || (m_type == StraightConnector)) { ok = startRubberBanding(e); @@ -200,7 +200,7 @@ void ConnectorTool::mousePress( TQMouseEvent *e ) } else { m_mode = stmNone; } - } else if(e->button() == Qt::RightButton) { + } else if(e->button() == TQt::RightButton) { if(m_type == PolyLineConnector) { if(m_mode == stmDrawRubber) { endRubberBanding(e); diff --git a/kivio/plugins/kivioselecttool/tool_select.cpp b/kivio/plugins/kivioselecttool/tool_select.cpp index 34e53196..86a05245 100644 --- a/kivio/plugins/kivioselecttool/tool_select.cpp +++ b/kivio/plugins/kivioselecttool/tool_select.cpp @@ -94,7 +94,7 @@ bool SelectTool::processEvent(TQEvent* e) case TQEvent::MouseButtonDblClick: m = (TQMouseEvent *)e; - if( m->button() == Qt::LeftButton ) { + if( m->button() == TQt::LeftButton ) { leftDoubleClick(m->pos()); } @@ -105,9 +105,9 @@ bool SelectTool::processEvent(TQEvent* e) case TQEvent::MouseButtonPress: m = (TQMouseEvent *)e; - if( m->button() == Qt::RightButton ) { + if( m->button() == TQt::RightButton ) { showPopupMenu(m->globalPos()); - } else if( m->button() == Qt::LeftButton ) { + } else if( m->button() == TQt::LeftButton ) { if(m->state() & ControlButton) { m_controlKey = true; } else { diff --git a/kivio/plugins/kiviotexttool/tool_text.cpp b/kivio/plugins/kiviotexttool/tool_text.cpp index e8ebc0fa..8803b19d 100644 --- a/kivio/plugins/kiviotexttool/tool_text.cpp +++ b/kivio/plugins/kiviotexttool/tool_text.cpp @@ -164,7 +164,7 @@ void TextTool::text(TQRect r) void TextTool::mousePress( TQMouseEvent *e ) { - if(e->button() == Qt::LeftButton) { + if(e->button() == TQt::LeftButton) { KoPoint pagePoint = view()->canvasWidget()->mapFromScreen(e->pos()); int colType; KivioPage *page = view()->activePage(); diff --git a/kivio/plugins/kiviozoomtool/tool_zoom.cpp b/kivio/plugins/kiviozoomtool/tool_zoom.cpp index e20b57e8..d2a10db8 100644 --- a/kivio/plugins/kiviozoomtool/tool_zoom.cpp +++ b/kivio/plugins/kiviozoomtool/tool_zoom.cpp @@ -127,7 +127,7 @@ bool ZoomTool::processEvent(TQEvent* e) { TQMouseEvent* me = TQT_TQMOUSEEVENT(e); - if(me->button() == Qt::LeftButton) { + if(me->button() == TQt::LeftButton) { if(m_pCurrent == m_pMinus) { m_pCurrent->activate(); } else { |