summaryrefslogtreecommitdiffstats
path: root/kivio
diff options
context:
space:
mode:
Diffstat (limited to 'kivio')
-rw-r--r--kivio/kiviopart/kivio_canvas.cpp2
-rw-r--r--kivio/kiviopart/kivio_spawner_drag.cpp4
-rw-r--r--kivio/kiviopart/kivio_spawner_drag.h2
-rw-r--r--kivio/kiviopart/kivio_stackbar.cpp4
-rw-r--r--kivio/kiviopart/kiviodragobject.cpp6
-rw-r--r--kivio/kiviopart/kiviodragobject.h2
-rw-r--r--kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.cpp14
-rw-r--r--kivio/kiviopart/kiviosdk/kivio_screen_painter.cpp4
-rw-r--r--kivio/kiviopart/stencilbarbutton.cpp16
-rw-r--r--kivio/kiviopart/stencilbarbutton.h2
-rw-r--r--kivio/kiviopart/stencilbardockmanager.cpp6
-rw-r--r--kivio/kiviopart/ui/aligndialog.ui12
-rw-r--r--kivio/kiviopart/ui/kivio_protection_panel_base.ui6
-rw-r--r--kivio/kiviopart/ui/kiviooptionsdialog.cpp8
-rw-r--r--kivio/kiviopart/ui/kiviotextformatdlg.cpp10
-rw-r--r--kivio/kiviopart/ui/layerlisttooltip.cpp4
-rw-r--r--kivio/plugins/kiviotexttool/kivio_stenciltexteditorui.ui2
-rw-r--r--kivio/plugins/kiviotexttool/stenciltexteditor.cpp6
18 files changed, 55 insertions, 55 deletions
diff --git a/kivio/kiviopart/kivio_canvas.cpp b/kivio/kiviopart/kivio_canvas.cpp
index 96fee8cb..3bbc05a5 100644
--- a/kivio/kiviopart/kivio_canvas.cpp
+++ b/kivio/kiviopart/kivio_canvas.cpp
@@ -1006,7 +1006,7 @@ KoPoint KivioCanvas::snapToGuides(const KoPoint& point, bool &snappedX, bool &sn
if (m_pView->isSnapGuides())
{
- KoGuides::SnaptqStatus status = KoGuides::SNAP_NONE;
+ KoGuides::SnapStatus status = KoGuides::SNAP_NONE;
KoPoint diff;
m_guides.snapToGuideLines(p, 4, status, diff);
p += diff;
diff --git a/kivio/kiviopart/kivio_spawner_drag.cpp b/kivio/kiviopart/kivio_spawner_drag.cpp
index 7f1ba985..249138b0 100644
--- a/kivio/kiviopart/kivio_spawner_drag.cpp
+++ b/kivio/kiviopart/kivio_spawner_drag.cpp
@@ -47,13 +47,13 @@ const char *KivioSpawnerDrag::format( int i ) const
return 0L;
}
-TQByteArray KivioSpawnerDrag::tqencodedData( const char *mime ) const
+TQByteArray KivioSpawnerDrag::encodedData( const char *mime ) const
{
TQByteArray a;
if( TQString(mime) == "application/x-qiconlist" )
{
- a = TQIconDrag::tqencodedData(mime);
+ a = TQIconDrag::encodedData(mime);
}
else if( TQString(mime) == "kivio/stencilSpawner" )
{
diff --git a/kivio/kiviopart/kivio_spawner_drag.h b/kivio/kiviopart/kivio_spawner_drag.h
index 9bd68dfe..cb494221 100644
--- a/kivio/kiviopart/kivio_spawner_drag.h
+++ b/kivio/kiviopart/kivio_spawner_drag.h
@@ -33,7 +33,7 @@ public:
virtual ~KivioSpawnerDrag();
const char *format(int i) const;
- TQByteArray tqencodedData( const char *mime ) const;
+ TQByteArray encodedData( const char *mime ) const;
static bool canDecode( TQMimeSource* e );
void append( const TQIconDragItem &item, const TQRect &pr,
const TQRect &tr, KivioStencilSpawner &spawner );
diff --git a/kivio/kiviopart/kivio_stackbar.cpp b/kivio/kiviopart/kivio_stackbar.cpp
index 4b42fa09..64fa96bf 100644
--- a/kivio/kiviopart/kivio_stackbar.cpp
+++ b/kivio/kiviopart/kivio_stackbar.cpp
@@ -52,8 +52,8 @@ void KivioStackBar::insertPage( TQWidget* w, const TQString& title )
w->hide();
w->setFocusPolicy(TQ_NoFocus);
- setMinimumWidth( TQMAX(tqminimumSize().width(),w->tqminimumSize().width() ) );
- setMaximumWidth( TQMAX(tqmaximumSize().width(),w->tqmaximumSize().width() ) );
+ setMinimumWidth( TQMAX(minimumSize().width(),w->minimumSize().width() ) );
+ setMaximumWidth( TQMAX(maximumSize().width(),w->maximumSize().width() ) );
DragBarButton* b = new DragBarButton( title, this );
b->setOrientation(orientation());
diff --git a/kivio/kiviopart/kiviodragobject.cpp b/kivio/kiviopart/kiviodragobject.cpp
index 35a6d7ff..9b6b9a46 100644
--- a/kivio/kiviopart/kiviodragobject.cpp
+++ b/kivio/kiviopart/kiviodragobject.cpp
@@ -56,7 +56,7 @@ const char* KivioDragObject::format(int i) const
return id.format(i - NumEncodeFormats);
}
-TQByteArray KivioDragObject::tqencodedData(const char* mimetype) const
+TQByteArray KivioDragObject::encodedData(const char* mimetype) const
{
if((m_encodeMimeList[0] == mimetype) ||
(m_encodeMimeList[1] == mimetype))
@@ -90,7 +90,7 @@ bool KivioDragObject::decode(TQMimeSource* e, TQPtrList<KivioStencil>& sl, Kivio
if(e->provides("application/vnd.kde.kivio")) {
TQDomDocument doc("KivioSelection");
- TQByteArray data = e->tqencodedData("application/vnd.kde.kivio");
+ TQByteArray data = e->encodedData("application/vnd.kde.kivio");
doc.setContent( TQCString( data, data.size()+1 ) );
KivioLayer l(page);
ok = l.loadXML(doc.documentElement());
@@ -178,7 +178,7 @@ TQByteArray KivioDragObject::imageEncoded(const char* mimetype) const
TQImageDrag id;
id.setImage(buffer.convertToImage());
- return id.tqencodedData(mimetype);
+ return id.encodedData(mimetype);
}
#include "kiviodragobject.moc"
diff --git a/kivio/kiviopart/kiviodragobject.h b/kivio/kiviopart/kiviodragobject.h
index 99d632f7..d441af19 100644
--- a/kivio/kiviopart/kiviodragobject.h
+++ b/kivio/kiviopart/kiviodragobject.h
@@ -36,7 +36,7 @@ class KivioDragObject : public TQDragObject
KivioDragObject(TQWidget* dragSource = 0, const char* name = 0);
const char* format(int i) const;
- TQByteArray tqencodedData(const char* mimetype) const;
+ TQByteArray encodedData(const char* mimetype) const;
bool canDecode(TQMimeSource*);
bool decode(TQMimeSource* e, TQPtrList<KivioStencil>& sl, KivioPage* page);
void setStencilList(TQPtrList<KivioStencil> l);
diff --git a/kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.cpp b/kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.cpp
index 4407d2d0..7dac3244 100644
--- a/kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.cpp
@@ -294,7 +294,7 @@ bool KivioDiaStencilSpawner::load(const TQString &file)
{
TQDomElement kivioShape = kivio.createElement("KivioShape");
kivioShape.setAttribute("type", "Rectangle");
- kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs));
+ kivioShape.setAttribute("name", TQString::fromLatin1("Element") + TQString::number(runs));
kivioShape.setAttribute("x", TQString::number(diaPointToKivio(svgChild.attribute("x").toFloat(),true) * m_xscale));
kivioShape.setAttribute("y", TQString::number(diaPointToKivio(svgChild.attribute("y").toFloat(), false) * m_yscale));
kivioShape.setAttribute("w", TQString::number(svgChild.attribute("width").toFloat() * m_xscale));
@@ -309,7 +309,7 @@ bool KivioDiaStencilSpawner::load(const TQString &file)
{
TQDomElement kivioShape = kivio.createElement("KivioShape");
kivioShape.setAttribute("type", "Ellipse");
- kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs));
+ kivioShape.setAttribute("name", TQString::fromLatin1("Element") + TQString::number(runs));
kivioShape.setAttribute("x", TQString::number((diaPointToKivio(svgChild.attribute("cx").toFloat() - svgChild.attribute("r").toFloat(),true) * m_xscale)));
kivioShape.setAttribute("y", TQString::number((diaPointToKivio(svgChild.attribute("cy").toFloat() - svgChild.attribute("r").toFloat(), false) * m_yscale)));
kivioShape.setAttribute("w", TQString::number(svgChild.attribute("r").toFloat() * m_xscale * 2));
@@ -324,7 +324,7 @@ bool KivioDiaStencilSpawner::load(const TQString &file)
{
TQDomElement kivioShape = kivio.createElement("KivioShape");
kivioShape.setAttribute("type", "Ellipse");
- kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs));
+ kivioShape.setAttribute("name", TQString::fromLatin1("Element") + TQString::number(runs));
kivioShape.setAttribute("x", TQString::number((diaPointToKivio(svgChild.attribute("cx").toFloat() - svgChild.attribute("rx").toFloat(),true) * m_xscale)));
kivioShape.setAttribute("y", TQString::number((diaPointToKivio(svgChild.attribute("cy").toFloat() - svgChild.attribute("ry").toFloat(), false) * m_yscale)));
kivioShape.setAttribute("w", TQString::number(svgChild.attribute("rx").toFloat() * m_xscale * 2));
@@ -339,7 +339,7 @@ bool KivioDiaStencilSpawner::load(const TQString &file)
{
TQDomElement kivioShape = kivio.createElement("KivioShape");
kivioShape.setAttribute("type", "LineArray");
- kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs));
+ kivioShape.setAttribute("name", TQString::fromLatin1("Element") + TQString::number(runs));
TQDomElement lineArrayElement = kivio.createElement("Line");
lineArrayElement.setAttribute("x1", TQString::number(diaPointToKivio(svgChild.attribute("x1").toFloat(),true) * m_xscale));
@@ -358,7 +358,7 @@ bool KivioDiaStencilSpawner::load(const TQString &file)
{
TQDomElement kivioShape = kivio.createElement("KivioShape");
kivioShape.setAttribute("type", "Polyline");
- kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs));
+ kivioShape.setAttribute("name", TQString::fromLatin1("Element") + TQString::number(runs));
TQStringList points = TQStringList::split(" ", svgChild.attribute("points"));
for(TQStringList::Iterator it = points.begin(); it != points.end(); ++it)
@@ -387,7 +387,7 @@ bool KivioDiaStencilSpawner::load(const TQString &file)
{
TQDomElement kivioShape = kivio.createElement("KivioShape");
kivioShape.setAttribute("type", "Polygon");
- kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs));
+ kivioShape.setAttribute("name", TQString::fromLatin1("Element") + TQString::number(runs));
TQStringList points = TQStringList::split(" ", svgChild.attribute("points"));
for(TQStringList::Iterator it = points.begin(); it != points.end(); ++it)
@@ -428,7 +428,7 @@ bool KivioDiaStencilSpawner::load(const TQString &file)
kivioShape.setAttribute("type", "OpenPath");
}
- kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs));
+ kivioShape.setAttribute("name", TQString::fromLatin1("Element") + TQString::number(runs));
DiaPathParser *dpp = new DiaPathParser(&kivio,
&kivioShape, m_xscale, m_yscale,
diff --git a/kivio/kiviopart/kiviosdk/kivio_screen_painter.cpp b/kivio/kiviopart/kiviosdk/kivio_screen_painter.cpp
index 07f005fa..02c850e4 100644
--- a/kivio/kiviopart/kiviosdk/kivio_screen_painter.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_screen_painter.cpp
@@ -549,7 +549,7 @@ void KivioScreenPainter::drawPolyline( TQPointArray &pArray )
m_pPainter->setPen(m_pLineStyle->pen(1.0f));
m_pPainter->setBrush( TQBrush::NoBrush );
- m_pPainter->tqdrawPolyline( pArray, 0, pArray.size() );
+ m_pPainter->drawPolyline( pArray, 0, pArray.size() );
}
void KivioScreenPainter::drawPolygon( TQPointArray &pArray )
@@ -586,7 +586,7 @@ void KivioScreenPainter::drawPolygon( TQPointArray &pArray )
m_pPainter->setPen(m_pLineStyle->pen(1.0f));
m_pPainter->setBrush(b);
- m_pPainter->tqdrawPolygon( pArray, true );
+ m_pPainter->drawPolygon( pArray, true );
m_pPainter->setBrushOrigin(0, 0);
}
diff --git a/kivio/kiviopart/stencilbarbutton.cpp b/kivio/kiviopart/stencilbarbutton.cpp
index d3d30dae..4b5b4215 100644
--- a/kivio/kiviopart/stencilbarbutton.cpp
+++ b/kivio/kiviopart/stencilbarbutton.cpp
@@ -74,7 +74,7 @@ DragBarButton::DragBarButton( const TQString& text, TQWidget* parent, const char
setPixmap(stencil_xpm);
- const TQColorGroup& g = tqcolorGroup();
+ const TQColorGroup& g = colorGroup();
TQColor c = g.buttonText();
int cr, cg, cb;
@@ -121,8 +121,8 @@ void DragBarButton::drawButton( TQPainter* paint )
pix.fill(eraseColor());
TQPainter pixPainter(&pix);
- const TQColorGroup& g = tqcolorGroup();
- tqstyle().tqdrawControl( TQStyle::CE_PushButton, &pixPainter, this, TQRect(0, 0, pixSize.width(), pixSize.height()), tqcolorGroup() );
+ const TQColorGroup& g = colorGroup();
+ tqstyle().drawControl( TQStyle::CE_PushButton, &pixPainter, this, TQRect(0, 0, pixSize.width(), pixSize.height()), colorGroup() );
int m = 3;
int tw = 0;
@@ -132,7 +132,7 @@ void DragBarButton::drawButton( TQPainter* paint )
pw = m_pIcon->width();
tqstyle().drawItem( &pixPainter, TQRect( m, 0, pw, pixSize.height() ),
AlignLeft | AlignVCenter,
- tqcolorGroup(), isEnabled(),
+ colorGroup(), isEnabled(),
m_pIcon, TQString(), -1,
&g.buttonText());
}
@@ -146,7 +146,7 @@ void DragBarButton::drawButton( TQPainter* paint )
tqstyle().drawItem( &pixPainter, TQRect( x, 0, tw, pixSize.height() ),
AlignLeft | AlignVCenter|ShowPrefix,
- tqcolorGroup(), isEnabled(),
+ colorGroup(), isEnabled(),
0L, t, -1,
&g.buttonText());
}
@@ -183,7 +183,7 @@ void DragBarButton::setPixmap( const TQPixmap& pixmap )
m_pIcon = new TQPixmap(pixmap);
}
-TQSize DragBarButton::tqsizeHint() const
+TQSize DragBarButton::sizeHint() const
{
constPolish();
int m = 3;
@@ -300,9 +300,9 @@ void DragBarButton::setOrientation(Qt::Orientation orientation)
m_orientation = orientation;
if(m_orientation == Qt::Vertical) {
- tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
+ setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
} else {
- tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum);
+ setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum);
}
}
diff --git a/kivio/kiviopart/stencilbarbutton.h b/kivio/kiviopart/stencilbarbutton.h
index 6f207a7f..67595db9 100644
--- a/kivio/kiviopart/stencilbarbutton.h
+++ b/kivio/kiviopart/stencilbarbutton.h
@@ -35,7 +35,7 @@ class DragBarButton : public TQPushButton
void setIcon( const TQString& );
void setPixmap( const TQPixmap& );
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
Qt::Orientation orientation() const { return m_orientation; }
diff --git a/kivio/kiviopart/stencilbardockmanager.cpp b/kivio/kiviopart/stencilbardockmanager.cpp
index ecf923f9..74ae5d2a 100644
--- a/kivio/kiviopart/stencilbardockmanager.cpp
+++ b/kivio/kiviopart/stencilbardockmanager.cpp
@@ -219,7 +219,7 @@ void StencilBarDockManager::slotMoving()
moveManager->setGeometry(globalPos.x(),
moveManager->y(),
bar->width(),
- moveManager->getWidget()->tqsizeHint().height());
+ moveManager->getWidget()->sizeHint().height());
return;
}
}
@@ -556,8 +556,8 @@ void KoToolDockMoveManager::doResizeInternal()
void KoToolDockMoveManager::setWidget( TQWidget* _w )
{
widget = _w;
- minSize = widget->tqminimumSize();
- maxSize = widget->tqmaximumSize();
+ minSize = widget->minimumSize();
+ maxSize = widget->maximumSize();
rr = TQRect(widget->mapToGlobal(TQPoint(0,0)),widget->size());
p = rr.topLeft();
diff --git a/kivio/kiviopart/ui/aligndialog.ui b/kivio/kiviopart/ui/aligndialog.ui
index 27f8c3b3..1ed0c197 100644
--- a/kivio/kiviopart/ui/aligndialog.ui
+++ b/kivio/kiviopart/ui/aligndialog.ui
@@ -97,7 +97,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -114,7 +114,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -158,7 +158,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>20</height>
@@ -175,7 +175,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -200,7 +200,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>20</height>
@@ -317,7 +317,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
diff --git a/kivio/kiviopart/ui/kivio_protection_panel_base.ui b/kivio/kiviopart/ui/kivio_protection_panel_base.ui
index 55fe9888..e1774900 100644
--- a/kivio/kiviopart/ui/kivio_protection_panel_base.ui
+++ b/kivio/kiviopart/ui/kivio_protection_panel_base.ui
@@ -12,13 +12,13 @@
<height>147</height>
</rect>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -107,7 +107,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>281</height>
diff --git a/kivio/kiviopart/ui/kiviooptionsdialog.cpp b/kivio/kiviopart/ui/kiviooptionsdialog.cpp
index 23900894..393b771d 100644
--- a/kivio/kiviopart/ui/kiviooptionsdialog.cpp
+++ b/kivio/kiviopart/ui/kiviooptionsdialog.cpp
@@ -114,20 +114,20 @@ void KivioOptionsDialog::initPage()
TQLabel* layoutLbl = new TQLabel(i18n("Default tqlayout:"), page);
m_layoutTxtLbl = new TQLabel(page);
m_layoutTxtLbl->setFrameStyle(TQFrame::LineEditPanel | TQFrame::Sunken);
- m_layoutTxtLbl->tqsetSizePolicy(TQSizePolicy(
+ m_layoutTxtLbl->setSizePolicy(TQSizePolicy(
TQSizePolicy::Minimum, TQSizePolicy::Fixed));
setLayoutText(m_layout);
KPushButton* layoutBtn = new KPushButton(i18n("Change..."), page);
- layoutBtn->tqsetSizePolicy(TQSizePolicy(
+ layoutBtn->setSizePolicy(TQSizePolicy(
TQSizePolicy::Fixed, TQSizePolicy::Fixed));
TQLabel* fontLbl = new TQLabel(i18n("Default font:"), page);
m_fontTxtLbl = new TQLabel(page);
m_fontTxtLbl->setFrameStyle(TQFrame::LineEditPanel | TQFrame::Sunken);
- m_fontTxtLbl->tqsetSizePolicy(TQSizePolicy(
+ m_fontTxtLbl->setSizePolicy(TQSizePolicy(
TQSizePolicy::Minimum, TQSizePolicy::Fixed));
setFontText(m_font);
KPushButton* fontBtn = new KPushButton(i18n("Change..."), page);
- layoutBtn->tqsetSizePolicy(TQSizePolicy(
+ layoutBtn->setSizePolicy(TQSizePolicy(
TQSizePolicy::Fixed, TQSizePolicy::Fixed));
m_marginsChBox = new TQCheckBox(i18n("Show page &margins"), page);
m_marginsChBox->setChecked(view->isShowPageMargins());
diff --git a/kivio/kiviopart/ui/kiviotextformatdlg.cpp b/kivio/kiviopart/ui/kiviotextformatdlg.cpp
index 94dd995d..14c390fa 100644
--- a/kivio/kiviopart/ui/kiviotextformatdlg.cpp
+++ b/kivio/kiviopart/ui/kiviotextformatdlg.cpp
@@ -68,7 +68,7 @@ void KivioTextFormatDlg::initPositionTab()
m_halignBGrp->setButton(1);
m_preview = new TQLabel(i18n("Preview"), tab);
m_preview->setFrameStyle(TQFrame::Box | TQFrame::Sunken);
- m_preview->tqsetAlignment(m_valign | m_halign);
+ m_preview->setAlignment(m_valign | m_halign);
TQGridLayout* gl = new TQGridLayout(tab);
gl->setSpacing(KDialog::spacingHint());
gl->setRowStretch(0, 10);
@@ -95,7 +95,7 @@ void KivioTextFormatDlg::updateVAlign(int i)
break;
}
- m_preview->tqsetAlignment(m_valign | m_halign);
+ m_preview->setAlignment(m_valign | m_halign);
}
void KivioTextFormatDlg::updateHAlign(int i)
@@ -112,7 +112,7 @@ void KivioTextFormatDlg::updateHAlign(int i)
break;
}
- m_preview->tqsetAlignment(m_valign | m_halign);
+ m_preview->setAlignment(m_valign | m_halign);
}
int KivioTextFormatDlg::valign()
@@ -150,7 +150,7 @@ void KivioTextFormatDlg::setVAlign(int i)
}
m_valign = static_cast<TQt::AlignmentFlags>(i);
- m_preview->tqsetAlignment(m_valign | m_halign);
+ m_preview->setAlignment(m_valign | m_halign);
}
void KivioTextFormatDlg::setHAlign(int i)
@@ -168,7 +168,7 @@ void KivioTextFormatDlg::setHAlign(int i)
}
m_halign = static_cast<TQt::AlignmentFlags>(i);
- m_preview->tqsetAlignment(m_valign | m_halign);
+ m_preview->setAlignment(m_valign | m_halign);
}
void KivioTextFormatDlg::setFont(TQFont f)
diff --git a/kivio/kiviopart/ui/layerlisttooltip.cpp b/kivio/kiviopart/ui/layerlisttooltip.cpp
index ed32c284..4a2d1fb5 100644
--- a/kivio/kiviopart/ui/layerlisttooltip.cpp
+++ b/kivio/kiviopart/ui/layerlisttooltip.cpp
@@ -49,13 +49,13 @@ void LayerListToolTip::maybeTip(const TQPoint& pos)
return;
}
- TQRect tqitemRect = m_listView->tqitemRect(item);
+ TQRect itemRect = m_listView->itemRect(item);
TQString toolTip = "<b>" + item->layer()->name() + "</b><br>";
toolTip += i18n("Visible: ") + (item->layer()->visible() ? i18n("Yes") : i18n("No")) + "<br>";
toolTip += i18n("Printable: ") + (item->layer()->printable() ? i18n("Yes") : i18n("No")) + "<br>";
toolTip += i18n("Editable: ") + (item->layer()->editable() ? i18n("Yes") : i18n("No")) + "<br>";
toolTip += i18n("Connectable: ") + (item->layer()->connectable() ? i18n("Yes") : i18n("No"));
- tip(tqitemRect, toolTip);
+ tip(itemRect, toolTip);
}
}
diff --git a/kivio/plugins/kiviotexttool/kivio_stenciltexteditorui.ui b/kivio/plugins/kiviotexttool/kivio_stenciltexteditorui.ui
index cfa2f317..0e8aac77 100644
--- a/kivio/plugins/kiviotexttool/kivio_stenciltexteditorui.ui
+++ b/kivio/plugins/kiviotexttool/kivio_stenciltexteditorui.ui
@@ -185,7 +185,7 @@ You should have received a copy of the GNU General Public License along with thi
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>110</width>
<height>20</height>
diff --git a/kivio/plugins/kiviotexttool/stenciltexteditor.cpp b/kivio/plugins/kiviotexttool/stenciltexteditor.cpp
index 49a42589..062e329e 100644
--- a/kivio/plugins/kiviotexttool/stenciltexteditor.cpp
+++ b/kivio/plugins/kiviotexttool/stenciltexteditor.cpp
@@ -108,7 +108,7 @@ void StencilTextEditor::setHorizontalAlign(int flag)
m_mainWidget->m_hAlignButton->popup()->setItemChecked(flag, true);
m_mainWidget->m_hAlignButton->setIconSet(*(m_mainWidget->m_hAlignButton->popup()->iconSet(flag)));
- m_mainWidget->m_textArea->tqsetAlignment(flag|verticalAlignment());
+ m_mainWidget->m_textArea->setAlignment(flag|verticalAlignment());
m_hAlign = flag;
}
@@ -120,7 +120,7 @@ void StencilTextEditor::setVerticalAlign(int flag)
m_mainWidget->m_vAlignButton->popup()->setItemChecked(flag, true);
m_mainWidget->m_vAlignButton->setIconSet(*(m_mainWidget->m_vAlignButton->popup()->iconSet(flag)));
- m_mainWidget->m_textArea->tqsetAlignment(flag|horizontalAlignment());
+ m_mainWidget->m_textArea->setAlignment(flag|horizontalAlignment());
m_vAlign = flag;
}
@@ -169,7 +169,7 @@ void StencilTextEditor::updateFormating()
m_mainWidget->m_textArea->selectAll(true);
- m_mainWidget->m_textArea->tqsetAlignment(horizontalAlignment()|verticalAlignment());
+ m_mainWidget->m_textArea->setAlignment(horizontalAlignment()|verticalAlignment());
m_mainWidget->m_textArea->selectAll(false);
m_mainWidget->m_textArea->setFocus();